nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-30 19:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-12-27 00:02:25 +00:00 committed by GitHub
commit 9c541ade71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
29 changed files with 221 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/applications/misc/prusa-slicer/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, lib, fetchFromGitHub, cmake, copyDesktopItems, makeDesktopItem, pkg-config, wrapGAppsHook
, boost, cereal, cgal_5, curl, dbus, eigen, expat, glew, glib, gmp, gtest, gtk3, hicolor-icon-theme
, ilmbase, libpng, mpfr, nlopt, openvdb, pcre, qhull, systemd, tbb, wxGTK31-gtk3, xorg
, ilmbase, libpng, mpfr, nlopt, openvdb, pcre, qhull, systemd, tbb, wxGTK31-gtk3, xorg, fetchpatch
}:
stdenv.mkDerivation rec {
pname = "prusa-slicer";
version = "2.3.3";
version = "2.4.0";
nativeBuildInputs = [
cmake
@ -38,9 +38,19 @@ stdenv.mkDerivation rec {
xorg.libX11
] ++ checkInputs;
patches = [
# Fix detection of TBB, see https://github.com/prusa3d/PrusaSlicer/issues/6355
(fetchpatch {
url = "https://github.com/prusa3d/PrusaSlicer/commit/76f4d6fa98bda633694b30a6e16d58665a634680.patch";
sha256 = "1r806ycp704ckwzgrw1940hh1l6fpz0k1ww3p37jdk6mygv53nv6";
})
];
doCheck = true;
checkInputs = [ gtest ];
separateDebugInfo = true;
# The build system uses custom logic - defined in
# cmake/modules/FindNLopt.cmake in the package source - for finding the nlopt
# library, which doesn't pick up the package in the nix store. We
@ -56,11 +66,6 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = "-ludev";
prePatch = ''
# In nix ioctls.h isn't available from the standard kernel-headers package
# like in other distributions. The copy in glibc seems to be identical to the
# one in the kernel though, so we use that one instead.
sed -i 's|"/usr/include/asm-generic/ioctls.h"|<asm-generic/ioctls.h>|g' src/libslic3r/GCodeSender.cpp
# Since version 2.5.0 of nlopt we need to link to libnlopt, as libnlopt_cxx
# now seems to be integrated into the main lib.
sed -i 's|nlopt_cxx|nlopt|g' cmake/modules/FindNLopt.cmake
@ -69,7 +74,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "prusa3d";
repo = "PrusaSlicer";
sha256 = "0w0synqi3iz9aigsgv6x1c6sg123fasbx19h4w3ic1l48r8qmpwm";
sha256 = "1mb7v0khrmsgy3inmh4mjn709jlhx422kvbnrhsqziph2wwak9bz";
rev = "version_${version}";
};

2
pkgs/applications/misc/prusa-slicer/super-slicer.nix
View File

@ -20,6 +20,8 @@ let
fetchSubmodules = true;
};
patches = null;
# We don't need PS overrides anymore, and gcode-viewer is embedded in the binary.
postInstall = null;
separateDebugInfo = true;

4
pkgs/applications/networking/cluster/terragrunt/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "terragrunt";
version = "0.35.14";
version = "0.35.16";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
sha256 = "sha256-bK1xWzIowNF5gS4feRkCbTB1je/ttbmrqweaHplk8n8=";
sha256 = "sha256-m32QhQUG3Dkh0odfqYhNmJ5Rrt0qf5wCvxePPusyRyI=";
};
vendorSha256 = "sha256-tNgEepKqwiqXhmoRCIEg7VJw7Y0TGt+R+6dZzd8aECg=";

4
pkgs/applications/networking/sync/unison/default.nix
View File

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "unison";
version = "2.51.4";
version = "2.51.5";
src = fetchFromGitHub {
owner = "bcpierce00";
repo = "unison";
rev = "v${version}";
sha256 = "sha256-jcfq4X+r98bQqbQ3gRqJyryLdt1Y/2CLawqqIiUaQOo=";
sha256 = "sha256-pi5uYwPpIy0lERmgATWQCO3EA3Pg5pnn7gxv49FaPug=";
};
nativeBuildInputs = [ makeWrapper ]

73
pkgs/applications/science/math/yacas/default.nix
View File

@ -1,6 +1,21 @@
{ lib, stdenv, fetchFromGitHub, cmake, perl
, enableGui ? false, qt5
, enableJupyter ? false, boost, jsoncpp, openssl, zmqpp
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, perl
, enableGui ? false
, qtbase
, wrapQtAppsHook
, qtwebengine
, enableJupyter ? true
, boost
, jsoncpp
, openssl
, zmqpp
, enableJava ? false
, openjdk
, gtest
}:
stdenv.mkDerivation rec {
@ -19,21 +34,53 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DENABLE_CYACAS_GUI=${if enableGui then "ON" else "OFF"}"
"-DENABLE_CYACAS_KERNEL=${if enableJupyter then "ON" else "OFF"}"
"-DENABLE_JYACAS=${if enableJava then "ON" else "OFF"}"
"-DENABLE_CYACAS_UNIT_TESTS=ON"
];
patches = [
# upstream issue: https://github.com/grzegorzmazur/yacas/issues/340
# Upstream patch which doesn't apply on 1.9.1 is:
# https://github.com/grzegorzmazur/yacas/pull/342
./jsoncpp-fix-include.patch
# Fixes testing - https://github.com/grzegorzmazur/yacas/issues/339
# PR: https://github.com/grzegorzmazur/yacas/pull/343
(fetchpatch {
url = "https://github.com/grzegorzmazur/yacas/commit/8bc22d517ecfdde3ac94800dc8506f5405564d48.patch";
sha256 = "sha256-aPO5T8iYNkGtF8j12YxNJyUPJJPKrXje1DmfCPt317A=";
})
];
preCheck = ''
patchShebangs ../tests/test-yacas
'';
checkInputs = [
gtest
];
doCheck = true;
nativeBuildInputs = [
cmake
# Perl is only for the documentation
perl
] ++ lib.optionals enableJava [
openjdk
];
buildInputs = [
] ++ lib.optionals enableGui [
qtbase
wrapQtAppsHook
qtwebengine
] ++ lib.optionals enableJupyter [
boost
jsoncpp
openssl
zmqpp
];
# Perl is only for the documentation
nativeBuildInputs = [ cmake perl ];
buildInputs = [
] ++ lib.optionals enableGui (with qt5; [ qtbase qtwebkit ])
++ lib.optionals enableJupyter [ boost jsoncpp openssl zmqpp ]
;
meta = {
description = "Easy to use, general purpose Computer Algebra System";
description = "Easy to use, general purpose Computer Algebra System${lib.optionalString enableGui ", built with GUI."}";
homepage = "http://www.yacas.org/";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [viric];
maintainers = with lib.maintainers; [ viric ];
platforms = with lib.platforms; linux;
broken = enableGui || enableJupyter;
};
}

26
pkgs/applications/science/math/yacas/fix-test-script.patch Normal file
View File

@ -0,0 +1,26 @@
diff --git i/tests/test-yacas w/tests/test-yacas
index b375d78b..0e3a616b 100755
--- i/tests/test-yacas
+++ w/tests/test-yacas
@@ -35,9 +35,9 @@ FAILED_TESTS="" # list of failed tests
FAILURES=0 # number of failed tests
TOTALTESTS=0 # total number of tests
-TESTFILE=/tmp/test-yacas.$$
-TIMEFILE=/tmp/time-yacas.$$
-VERSIONF=/tmp/version-yacas-$$.ys
+TESTFILE="$(mktemp -t test-yacas.XXX)"
+TIMEFILE="$(mktemp -t time-yacas.XXX)"
+VERSIONF="$(mktemp -t version-yacas-XXX.ys)"
LOGFILE=yacas-logfile.txt
echo "Print(Version());" > $VERSIONF
VERSION=`$CMD $VERSIONF`
@@ -69,7 +69,7 @@ for scr in $SCRIPTS; do
# fi
echo "Running $scr"
if [ -f $TESTFILE ]; then rm $TESTFILE ; fi
- /bin/bash -c "time -p ($CMD $f || echo \"Error: exit status $?\") | tee $TESTFILE" \
+ bash -c "time -p ($CMD $f || echo \"Error: exit status $?\") | tee $TESTFILE" \
2> $TIMEFILE \
|| (echo "Error -- User interrupt" > $TESTFILE)
# cat $TIMEFILE

63
pkgs/applications/science/math/yacas/jsoncpp-fix-include.patch Normal file
View File

@ -0,0 +1,63 @@
diff --git i/cyacas/yacas-kernel/CMakeLists.txt w/cyacas/yacas-kernel/CMakeLists.txt
index fe1600aa..dcc329f8 100644
--- i/cyacas/yacas-kernel/CMakeLists.txt
+++ w/cyacas/yacas-kernel/CMakeLists.txt
@@ -22,8 +22,9 @@ find_library (ZEROMQ_LIBRARY NAMES zmq)
find_path (ZMQPP_INCLUDE_DIR zmqpp.hpp)
find_library (ZMQPP_LIBRARY NAMES zmqpp)
-find_path (JSONCPP_INCLUDE_DIR json.h)
-find_library (JSONCPP_LIBRARY NAMES jsoncpp)
+# https://github.com/open-source-parsers/jsoncpp/wiki/Building#another-approach-for-cmake
+find_package(jsoncpp REQUIRED)
+get_target_property(JSON_INC_PATH jsoncpp_lib INTERFACE_INCLUDE_DIRECTORIES)
find_package (OpenSSL)
find_package (Boost REQUIRED date_time filesystem)
@@ -31,6 +32,6 @@ find_package (Boost REQUIRED date_time filesystem)
include_directories (include)
add_executable (yacas-kernel src/main.cpp src/yacas_kernel.cpp src/yacas_engine.cpp src/hmac_sha256.cpp src/base64.cpp)
-target_link_libraries (yacas-kernel libyacas ${ZMQPP_LIBRARY} ${ZEROMQ_LIBRARY} ${JSONCPP_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY} ${Boost_LIBRARIES} pthread ${CMAKE_DL_LIBS})
+target_link_libraries (yacas-kernel libyacas ${ZMQPP_LIBRARY} ${ZEROMQ_LIBRARY} jsoncpp_lib ${OPENSSL_CRYPTO_LIBRARY} ${Boost_LIBRARIES} pthread ${CMAKE_DL_LIBS})
install (TARGETS yacas-kernel DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git i/cyacas/yacas-kernel/include/yacas_kernel.hpp w/cyacas/yacas-kernel/include/yacas_kernel.hpp
index 91d36ac0..d12f905c 100644
--- i/cyacas/yacas-kernel/include/yacas_kernel.hpp
+++ w/cyacas/yacas-kernel/include/yacas_kernel.hpp
@@ -29,7 +29,7 @@
#include "yacas_engine.hpp"
#include <boost/uuid/random_generator.hpp>
-#include <jsoncpp/json/json.h>
+#include <json/json.h>
#include <zmqpp/zmqpp.hpp>
#include <map>
diff --git i/cyacas/yacas-kernel/src/main.cpp w/cyacas/yacas-kernel/src/main.cpp
index c31f17f2..832e9128 100644
--- i/cyacas/yacas-kernel/src/main.cpp
+++ w/cyacas/yacas-kernel/src/main.cpp
@@ -24,7 +24,7 @@
#include "yacas_kernel.hpp"
-#include <jsoncpp/json/json.h>
+#include <json/json.h>
#include <boost/dll/runtime_symbol_info.hpp>
diff --git i/cyacas/yacas-kernel/src/yacas_engine.cpp w/cyacas/yacas-kernel/src/yacas_engine.cpp
index 6ed60ca3..18e9b3fd 100644
--- i/cyacas/yacas-kernel/src/yacas_engine.cpp
+++ w/cyacas/yacas-kernel/src/yacas_engine.cpp
@@ -22,7 +22,7 @@
* Created on November 7, 2015, 12:52 PM
*/
-#include <jsoncpp/json/writer.h>
+#include <json/writer.h>
#include "yacas_engine.hpp"

1
pkgs/applications/science/misc/root/default.nix
View File

@ -117,6 +117,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-Drpath=ON"
"-DCMAKE_CXX_STANDARD=17"
"-DCMAKE_INSTALL_BINDIR=bin"
"-DCMAKE_INSTALL_LIBDIR=lib"
"-DCMAKE_INSTALL_INCLUDEDIR=include"
"-Dbuiltin_llvm=OFF"

2
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -1712,6 +1712,8 @@ self: super: {
# Issue reported upstream, no bug tracker url yet.
darcs = doJailbreak super.darcs;
# Too strict verion bounds on cryptonite and github.
# PRs are merged, will be fixed next release or Hackage revision.
nix-thunk = appendPatches [
(pkgs.fetchpatch {
url = "https://github.com/obsidiansystems/nix-thunk/commit/49d27a85dd39cd9413c99958c67e596756a502b5.patch";

8
pkgs/development/interpreters/wasmer/default.nix
View File

@ -8,17 +8,17 @@
rustPlatform.buildRustPackage rec {
pname = "wasmer";
version = "2.1.0";
version = "2.1.1";
src = fetchFromGitHub {
owner = "wasmerio";
repo = pname;
rev = version;
sha256 = "sha256-8aNJDu3MuXWcPp/nW1ly9+82YSfiMWc75Q4nQD6eUaA=";
sha256 = "sha256-uD+JH42AxXxLMLqBurNDfYc7tLlBlEmaLB5rbip+/D4=";
fetchSubmodules = true;
};
cargoSha256 = "sha256-l/Se0ijSX5zkAoedorsJvj5EhCuwgI4jE+S8lHZh6+4=";
cargoSha256 = "sha256-eiX5p2qWUZgoHzoHYXDsp9N6foiX3JovKO6MpoJOXFo=";
nativeBuildInputs = [ cmake pkg-config ];
@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
];
# Can't use test-jit:
# error: Package `wasmer-workspace v2.1.0 (/build/source)` does not have the feature `test-jit`
# error: Package `wasmer-workspace v2.1.1 (/build/source)` does not have the feature `test-jit`
checkFeatures = [ "test-cranelift" ];
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";

4
pkgs/development/libraries/rocksdb/default.nix
View File

@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "rocksdb";
version = "6.26.1";
version = "6.27.3";
src = fetchFromGitHub {
owner = "facebook";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Tx809Q/Mn5C9LbtmTlJN9eDGWPDpJSRhnyNxA4Kq1Fc=";
sha256 = "sha256-s3vBW/vN6lUvOp3vlx/Wo2ZrzobZ2s8MHujFouSU2NM=";
};
nativeBuildInputs = [ cmake ninja ];

4
pkgs/development/python-modules/databricks-connect/default.nix
View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "databricks-connect";
version = "9.1.4";
version = "9.1.5";
src = fetchPypi {
inherit pname version;
sha256 = "0e4c9178635d47b18ca12284c8ba970747e0b2e2fb7dd6f0a06d35788e81cb91";
sha256 = "26b88b1d8fdacf5226cf9c1924fae974c955ccbfe2fdcd08574327007bdcbdd9";
};
sourceRoot = ".";

4
pkgs/development/python-modules/funcy/default.nix
View File

@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "funcy";
version = "1.16";
version = "1.17";
src = fetchPypi {
inherit pname version;
sha256 = "2775409b7dc9106283f1224d97e6df5f2c02e7291c8caed72764f5a115dffb50";
sha256 = "40b9b9a88141ae6a174df1a95861f2b82f2fdc17669080788b73a3ed9370e968";
};
# No tests

4
pkgs/development/python-modules/schema-salad/default.nix
View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "schema-salad";
version = "8.2.20211116214159";
version = "8.2.20211222191353";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "0c737af600e0a03dd97c93b9867e862463b65d95580ba711fd22f542bc80ad00";
sha256 = "bae31897a9f5c16546081811728cc20296455dc805ffd0bac0064de6cbbcbf88";
};
propagatedBuildInputs = [

6
pkgs/development/tools/ammonite/default.nix
View File

@ -9,7 +9,7 @@ let
common = { scalaVersion, sha256 }:
stdenv.mkDerivation rec {
pname = "ammonite";
version = "2.4.1";
version = "2.5.0";
src = fetchurl {
url =
@ -83,10 +83,10 @@ let
in {
ammonite_2_12 = common {
scalaVersion = "2.12";
sha256 = "5n9q/7d/PwDJfBPITYyDua24+fci6bi1oG5dSw8A244=";
sha256 = "sha256-JTW1xb+eCb0yhzrA1ntmalP88JoUo+KrjOBvs+cuE/A=";
};
ammonite_2_13 = common {
scalaVersion = "2.13";
sha256 = "RIuNyWvwNM39/rczUH328K5ky5hePflokW/VP603j+I=";
sha256 = "sha256-l5kGPP8tuYi16t6u8ZeAY54yqAWJZR5UuopSGQ69v9Y=";
};
}

4
pkgs/development/tools/analysis/flow/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "flow";
version = "0.166.1";
version = "0.168.0";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "v${version}";
sha256 = "sha256-n07P7C+RehZJ+s7ZAgtHBMUwG62rxbjcXKLjKJf+rDA=";
sha256 = "sha256:0bd5xja547gwjh7zn26l52mssp6l9djd0lfc581zj30yx07aimi5";
};
installPhase = ''

6
pkgs/development/tools/wrangler/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "wrangler";
version = "1.19.5";
version = "1.19.6";
src = fetchFromGitHub {
owner = "cloudflare";
repo = pname;
rev = "v${version}";
sha256 = "sha256-r8Ni6r1NpHJ0UVEV+aG1RkGn0GQijTiWWZyQWJRXPi8=";
sha256 = "sha256-eFrILGq6rlm/u8RAxGHRaFgOT88I8T4inAKCoJpqPYA=";
};
cargoSha256 = "sha256-GWBY4diq6VFpBcb1ROmJcXX/zJGwanja8eoaxxm+ij8=";
cargoSha256 = "sha256-8JgtaSROcS9DwcnK7Yky8Ol8AJPI7guU08iaz9yPC8g=";
nativeBuildInputs = [ pkg-config ];

2
pkgs/games/mudlet/default.nix
View File

@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Crossplatform mud client";
homepage = "http://mudlet.org/";
homepage = "https://mudlet.org";
maintainers = [ maintainers.wyvie maintainers.pstn ];
platforms = platforms.linux;
license = licenses.gpl2;

4
pkgs/misc/screensavers/xlockmore/default.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "xlockmore";
version = "5.67";
version = "5.68";
src = fetchurl {
url = "http://sillycycle.com/xlock/xlockmore-${version}.tar.xz";
sha256 = "sha256-qGB+Fw4N9K+PcH07OPfOsNDhKHc9fhdeICCSaV9/I0w=";
sha256 = "sha256-MHMf3LID8W61wcQ8BdQuRSrQ60VVyXxVVmpuyxh3zW4=";
curlOpts = "--user-agent 'Mozilla/5.0'";
};

4
pkgs/servers/clickhouse/default.nix
View File

@ -8,7 +8,7 @@
stdenv.mkDerivation rec {
pname = "clickhouse";
version = "21.8.8.29";
version = "21.8.12.29";
broken = stdenv.buildPlatform.is32bit; # not supposed to work on 32-bit https://github.com/ClickHouse/ClickHouse/pull/23959#issuecomment-835343685
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
repo = "ClickHouse";
rev = "v${version}-lts";
fetchSubmodules = true;
sha256 = "1hvsnh3fzbh1vl7cki0sbpd5ar6cxdc7k3mfqby0xxv3zfywmmr2";
sha256 = "1qqacb7v7mhr9k162yll8mcbh0cxa347f5hypz0a8l54v1dz5fyl";
};
nativeBuildInputs = [ cmake libtool llvm-bintools ninja ];

6
pkgs/shells/elvish/default.nix
View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "elvish";
version = "0.16.3";
version = "0.17.0";
excludedPackages = [ "website" ];
@ -12,10 +12,10 @@ buildGoModule rec {
owner = "elves";
repo = pname;
rev = "v${version}";
sha256 = "1na2fswqp4rbgvlagz9nj3cmlxavlhi2gj6k6jpjq05mcbkxr3bd";
sha256 = "sha256-F6yjfsEEBrD6kXUgbMrz+1mxrz0z+sdfeoyztpy7rEk=";
};
vendorSha256 = "06rx09vs08d9arim53al73z22hb40xj2101kbvafz6wbyp6pqws1";
vendorSha256 = "sha256-810YVxO1rjeDV1XWvE4RmJjGOMdTlicnv7YbvKtoDbM=";
doCheck = false;

4
pkgs/tools/admin/stripe-cli/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "stripe-cli";
version = "1.7.8";
version = "1.7.9";
src = fetchFromGitHub {
owner = "stripe";
repo = pname;
rev = "v${version}";
sha256 = "sha256-QxfMfuqSxuyvzNC79sr4U0tdj2pSvGKQ28V3E523z+U=";
sha256 = "sha256-rCo3iHLfiEH/+APNztKKSdoJerz161jF7sNx8qTFw3U=";
};
vendorSha256 = "sha256-Duu6lP87KKLC1eGIebycBSIPw7FN6BBxPexize9+jPE=";

4
pkgs/tools/filesystems/gcsfuse/default.nix
View File

@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "gcsfuse";
version = "0.37.0";
version = "0.38.0";
src = fetchFromGitHub {
owner = "googlecloudplatform";
repo = "gcsfuse";
rev = "v${version}";
sha256 = "sha256-X7EZKHdSWQ9HKaXtoeDGNnzsBmffqHvZ6rfQXpjYTB8=";
sha256 = "sha256-5qn20Vqtvuld9/IBW/3j+8C3ac8xJ9kRMTiL6GsOrrE=";
};
goPackagePath = "github.com/googlecloudplatform/gcsfuse";

4
pkgs/tools/graphics/vips/default.nix
View File

@ -38,7 +38,7 @@
stdenv.mkDerivation rec {
pname = "vips";
version = "8.11.4";
version = "8.12.1";
outputs = [ "bin" "out" "man" "dev" ];
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
owner = "libvips";
repo = "libvips";
rev = "v${version}";
sha256 = "sha256-cPg5pH7/N40D9lvya/t+6wwelrvmbf28OwSZnnGSfo8=";
sha256 = "sha256-Zo1Y4pYa+o55+ASrAiDUO7SAC4zpcAniEKkTFvIoU6o=";
# Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation.
extraPostFetch = ''

6
pkgs/tools/misc/kak-lsp/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "kak-lsp";
version = "11.0.1";
version = "11.1.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-rSUXMQF4V+ToYw3RIfEZd2AfAiHoRPDC3DZBAg2zeKo=";
sha256 = "sha256-li7djFP5luEnbKUF+rynEiQbx704KNUJw8/AqwxPRnI=";
};
cargoSha256 = "sha256-vcq+WVHmGFrZFLzNWyHU7qN6cDSKP9pAzxZNs2+8jR8=";
cargoSha256 = "sha256-X1Qe86U4zlN1umRQOiRPRcbgCayqF6GILSt/nM8m1Yg=";
buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];

4
pkgs/tools/misc/svtplay-dl/default.nix
View File

@ -9,13 +9,13 @@ let
in stdenv.mkDerivation rec {
pname = "svtplay-dl";
version = "4.9";
version = "4.10";
src = fetchFromGitHub {
owner = "spaam";
repo = "svtplay-dl";
rev = version;
sha256 = "01jbhydj6q1zgzsrs9prpsc3ycqzisx4jqm70dikkmsr5b64hhni";
sha256 = "sha256-JK/JtGDmmTJ+g0kmM7mSJi7+/N552GKtlMkh7quOBjo=";
};
pythonPaths = [ cryptography pyyaml requests ];

6
pkgs/tools/misc/zoxide/default.nix
View File

@ -10,13 +10,13 @@
rustPlatform.buildRustPackage rec {
pname = "zoxide";
version = "0.7.9";
version = "0.8.0";
src = fetchFromGitHub {
owner = "ajeetdsouza";
repo = "zoxide";
rev = "v${version}";
sha256 = "sha256-afjEqHUoLYS+IOMnWocT5dVkjWdWGavJn7q9Fqjliss=";
sha256 = "sha256-5syCq2Qjjk/XoYqW4MGoSSTRLqzgBwadBJwZDDdWNgU=";
};
nativeBuildInputs = [ installShellFiles ];
@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
--replace '"fzf"' '"${fzf}/bin/fzf"'
'';
cargoSha256 = "sha256-CgbjSP8QotCxQ8n8SLVuLpkg8hLuRYZwsl/9HsrkCt8=";
cargoSha256 = "sha256-egZqMiN53k2R1b1dbCn4j0KEJqb27TdE25YYEZ4Nvao=";
postInstall = ''
installManPage man/*

12
pkgs/tools/security/echidna/default.nix
View File

@ -12,23 +12,15 @@
}:
mkDerivation rec {
pname = "echidna";
version = "1.7.2";
version = "1.7.3";
src = fetchFromGitHub {
owner = "crytic";
repo = "echidna";
rev = "v${version}";
sha256 = "sha256-eFhL8Zn8204JRrF69ibPtd7VpFW63i1iVXoGwXHlqps=";
sha256 = "sha256-NkAAXYa1bbCNUO0eDM7LQbyC3//RRFAKmEHGH2Dhl/M=";
};
patches = [
(fetchpatch {
name = "update-hevm-to-0.47.0.patch";
url = "https://github.com/crytic/echidna/commit/25dfdad93d0e0dd822f22a1c1e63a0ecf2b22a23.patch";
sha256 = "sha256-dj3Ie+Z4zE1fgROE/KuWZXaH9knsXJi1ai3gu5zyw/E=";
})
];
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [

8
pkgs/top-level/all-packages.nix
View File

@ -14668,7 +14668,6 @@ with pkgs;
ffuf = callPackage ../tools/security/ffuf { };
flow = callPackage ../development/tools/analysis/flow {
ocamlPackages = ocaml-ng.ocamlPackages_4_10;
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
@ -32259,7 +32258,12 @@ with pkgs;
yad = callPackage ../tools/misc/yad { };
yacas = callPackage ../applications/science/math/yacas { };
yacas = libsForQt5.callPackage ../applications/science/math/yacas { };
yacas-gui = yacas.override {
enableGui = true;
enableJupyter = false;
};
speedcrunch = libsForQt5.callPackage ../applications/science/math/speedcrunch { };