From 560957bae1ee123b43d6534eebf2a5917a78e0a2 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Wed, 22 Nov 2023 18:23:59 +0200 Subject: [PATCH 01/63] edk2: building of `antlr` and `dlg` should be built with native architecture. They should be built with native architecture --- pkgs/development/compilers/edk2/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 17151cf9f947..b448a9c51406 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -82,6 +82,13 @@ edk2 = stdenv.mkDerivation rec { hardeningDisable = [ "format" "fortify" ]; + # Fix cross-compilation issue, use build cc/c++ for building antlr and dlg + postPatch = '' + substituteInPlace BaseTools/Source/C/VfrCompile/GNUmakefile \ + --replace '$(MAKE) -C Pccts/antlr' '$(MAKE) -C Pccts/antlr CC=cc CXX=c++' \ + --replace '$(MAKE) -C Pccts/dlg' '$(MAKE) -C Pccts/dlg CC=cc CXX=c++' + ''; + installPhase = '' mkdir -vp $out mv -v BaseTools $out From da5ec6b0c3e0bfce25dc9e5c3e45fdd8c38affdf Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Thu, 23 Nov 2023 21:16:33 +0200 Subject: [PATCH 02/63] edk2: Fix OVMF cross compilation --- pkgs/development/compilers/edk2/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index b448a9c51406..2d2cce113f9e 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -82,11 +82,10 @@ edk2 = stdenv.mkDerivation rec { hardeningDisable = [ "format" "fortify" ]; - # Fix cross-compilation issue, use build cc/c++ for building antlr and dlg - postPatch = '' - substituteInPlace BaseTools/Source/C/VfrCompile/GNUmakefile \ - --replace '$(MAKE) -C Pccts/antlr' '$(MAKE) -C Pccts/antlr CC=cc CXX=c++' \ - --replace '$(MAKE) -C Pccts/dlg' '$(MAKE) -C Pccts/dlg CC=cc CXX=c++' + # For cross-compilation we need to build antlr and dlg for the build arch + preBuild = '' + BIN_DIR='.' make -C BaseTools/Source/C/VfrCompile/Pccts/antlr CC=$CC_FOR_BUILD CXX=$CXX_FOR_BUILD -j$NIX_BUILD_CORES + BIN_DIR='.' make -C BaseTools/Source/C/VfrCompile/Pccts/dlg CC=$CC_FOR_BUILD CXX=$CXX_FOR_BUILD -j$NIX_BUILD_CORES ''; installPhase = '' @@ -125,13 +124,13 @@ edk2 = stdenv.mkDerivation rec { prePatch = '' rm -rf BaseTools - ln -sv ${edk2}/BaseTools BaseTools + ln -sv ${buildPackages.edk2}/BaseTools BaseTools ''; configurePhase = '' runHook preConfigure export WORKSPACE="$PWD" - . ${edk2}/edksetup.sh BaseTools + . ${buildPackages.edk2}/edksetup.sh BaseTools runHook postConfigure ''; From 474fe1a90547c7d1b8509e8b4aeef9e8935f94a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 14 May 2024 15:18:04 +0200 Subject: [PATCH 03/63] edk2: use patchShebangs for fixing up shell wrappers --- pkgs/development/compilers/edk2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 2d2cce113f9e..302d5611c19e 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -94,8 +94,8 @@ edk2 = stdenv.mkDerivation rec { mv -v edksetup.sh $out # patchShebangs fails to see these when cross compiling for i in $out/BaseTools/BinWrappers/PosixLike/*; do - substituteInPlace $i --replace '/usr/bin/env bash' ${buildPackages.bash}/bin/bash chmod +x "$i" + patchShebangs --build "$i" done ''; From 7e2c76bb84c4cd7cccf07a3ef645c14516f09b6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 14 May 2024 15:50:21 +0200 Subject: [PATCH 04/63] edk2: fix cross-compilation by using an upstream patch --- pkgs/development/compilers/edk2/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 302d5611c19e..cd15f29e370c 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -41,6 +41,11 @@ edk2 = stdenv.mkDerivation rec { url = "https://src.fedoraproject.org/rpms/edk2/raw/08f2354cd280b4ce5a7888aa85cf520e042955c3/f/0021-Tweak-the-tools_def-to-support-cross-compiling.patch"; hash = "sha256-E1/fiFNVx0aB1kOej2DJ2DlBIs9tAAcxoedym2Zhjxw="; }) + # https://github.com/tianocore/edk2/pull/5658 + (fetchpatch { + url = "https://github.com/tianocore/edk2/commit/a34ff4a8f69a7b8a52b9b299153a8fac702c7df1.patch"; + hash = "sha256-u+niqwjuLV5tNPykW4xhb7PW2XvUmXhx5uvftG1UIbU="; + }) ]; srcWithVendoring = fetchFromGitHub { @@ -82,12 +87,6 @@ edk2 = stdenv.mkDerivation rec { hardeningDisable = [ "format" "fortify" ]; - # For cross-compilation we need to build antlr and dlg for the build arch - preBuild = '' - BIN_DIR='.' make -C BaseTools/Source/C/VfrCompile/Pccts/antlr CC=$CC_FOR_BUILD CXX=$CXX_FOR_BUILD -j$NIX_BUILD_CORES - BIN_DIR='.' make -C BaseTools/Source/C/VfrCompile/Pccts/dlg CC=$CC_FOR_BUILD CXX=$CXX_FOR_BUILD -j$NIX_BUILD_CORES - ''; - installPhase = '' mkdir -vp $out mv -v BaseTools $out From 7f301eab1b3989fefb49f6c1f4edd7eb7b274756 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 14 May 2024 19:32:49 -0700 Subject: [PATCH 05/63] imagemagick: fix passthru.tests.pkg-config The version suffix starting with "-" is not present in the pkg-config file. --- pkgs/applications/graphics/ImageMagick/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index c15af9d94fb2..608e7bc50612 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -135,7 +135,10 @@ stdenv.mkDerivation (finalAttrs: { inherit nixos-icons; inherit (perlPackages) ImageMagick; inherit (python3.pkgs) img2pdf; - pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + version = lib.head (lib.splitString "-" finalAttrs.version); + }; }; meta = with lib; { From 8dc644818790363b40f86700f3d0399f2aa7d966 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 16 May 2024 14:22:57 +0200 Subject: [PATCH 06/63] rasm: 0.117 -> 2.2.3, change upstream source --- pkgs/development/compilers/rasm/default.nix | 22 +++++++++------------ 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/pkgs/development/compilers/rasm/default.nix b/pkgs/development/compilers/rasm/default.nix index c131e4b79980..024fd484f7d4 100644 --- a/pkgs/development/compilers/rasm/default.nix +++ b/pkgs/development/compilers/rasm/default.nix @@ -1,22 +1,18 @@ -{ lib, stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "rasm"; - version = "0.117"; + version = "2.2.3"; - src = fetchurl { - url = "http://www.roudoudou.com/export/cpc/rasm/${pname}_v0117_src.zip"; - sha256 = "1hwily4cfays59qm7qd1ax48i7cpbxhs5l9mfpyn7m2lxsfqrl3z"; + src = fetchFromGitHub { + owner = "EdouardBERGE"; + repo = "rasm"; + rev = "v${version}"; + hash = "sha256-cG/RZqZRS5uuXlQo7hylCEfbXXLBa68NXsr1iQCjhNc="; }; - sourceRoot = "."; - - nativeBuildInputs = [ unzip ]; - - buildPhase = '' - # according to official documentation - ${stdenv.cc.targetPrefix}cc rasm_v*.c -O2 -lm -o rasm - ''; + # by default the EXEC variable contains `rasm.exe` + makeFlags = [ "EXEC=rasm" ]; installPhase = '' install -Dt $out/bin rasm From 4d6e011773176acead319a9869fc7420a5872349 Mon Sep 17 00:00:00 2001 From: lucasew Date: Thu, 16 May 2024 13:03:49 -0300 Subject: [PATCH 07/63] ablog: move to by-name, fix build Signed-off-by: lucasew --- .../default.nix => by-name/ab/ablog/package.nix} | 14 ++++++++++---- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 10 insertions(+), 6 deletions(-) rename pkgs/{applications/misc/ablog/default.nix => by-name/ab/ablog/package.nix} (77%) diff --git a/pkgs/applications/misc/ablog/default.nix b/pkgs/by-name/ab/ablog/package.nix similarity index 77% rename from pkgs/applications/misc/ablog/default.nix rename to pkgs/by-name/ab/ablog/package.nix index 67b21e5199de..791c8598868c 100644 --- a/pkgs/applications/misc/ablog/default.nix +++ b/pkgs/by-name/ab/ablog/package.nix @@ -1,6 +1,7 @@ { lib , python3 -, fetchPypi +, fetchFromGitHub +, gitUpdater }: python3.pkgs.buildPythonApplication rec { @@ -8,9 +9,11 @@ python3.pkgs.buildPythonApplication rec { version = "0.11.8"; format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-PpNBfa4g14l8gm9+PxOFc2NDey031D7Ohutx2OGUeak="; + src = fetchFromGitHub { + owner = "sunpy"; + repo = "ablog"; + rev = "v${version}"; + hash = "sha256-t3Vxw1IJoHuGqHv/0S4IoHwjWbtR6knXCBg4d0cM3lw="; }; nativeBuildInputs = with python3.pkgs; [ @@ -31,6 +34,7 @@ python3.pkgs.buildPythonApplication rec { nativeCheckInputs = with python3.pkgs; [ pytestCheckHook + defusedxml ]; pytestFlagsArray = [ @@ -39,6 +43,8 @@ python3.pkgs.buildPythonApplication rec { "-W" "ignore::sphinx.deprecation.RemovedInSphinx90Warning" # Ignore ImportError ]; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + meta = with lib; { description = "ABlog for blogging with Sphinx"; mainProgram = "ablog"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be39de7832ac..19b6da52820a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1501,8 +1501,6 @@ with pkgs; abduco = callPackage ../tools/misc/abduco { }; - ablog = callPackage ../applications/misc/ablog { }; - acct = callPackage ../tools/system/acct { }; accuraterip-checksum = callPackage ../tools/audio/accuraterip-checksum { }; From 1e1685f116d30b0dcddc4e022cd2ee87d320493f Mon Sep 17 00:00:00 2001 From: lucasew Date: Thu, 16 May 2024 13:04:30 -0300 Subject: [PATCH 08/63] ablog: 0.11.8 -> 0.11.10 Signed-off-by: lucasew --- pkgs/by-name/ab/ablog/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ab/ablog/package.nix b/pkgs/by-name/ab/ablog/package.nix index 791c8598868c..3221b16dcfcf 100644 --- a/pkgs/by-name/ab/ablog/package.nix +++ b/pkgs/by-name/ab/ablog/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ablog"; - version = "0.11.8"; + version = "0.11.10"; format = "pyproject"; src = fetchFromGitHub { owner = "sunpy"; repo = "ablog"; rev = "v${version}"; - hash = "sha256-t3Vxw1IJoHuGqHv/0S4IoHwjWbtR6knXCBg4d0cM3lw="; + hash = "sha256-8NyFLGtMJLUkojEhWpWNZz3zlfgGVgSvgk4dDEz1jzs="; }; nativeBuildInputs = with python3.pkgs; [ From a1c8fe355c1f9809e72c320d0b629cdc3849d5d4 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 16 May 2024 14:26:02 +0200 Subject: [PATCH 09/63] rasm: migrate to by-name --- .../compilers/rasm/default.nix => by-name/ra/rasm/package.nix} | 2 +- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) rename pkgs/{development/compilers/rasm/default.nix => by-name/ra/rasm/package.nix} (91%) diff --git a/pkgs/development/compilers/rasm/default.nix b/pkgs/by-name/ra/rasm/package.nix similarity index 91% rename from pkgs/development/compilers/rasm/default.nix rename to pkgs/by-name/ra/rasm/package.nix index 024fd484f7d4..d770d13578f8 100644 --- a/pkgs/development/compilers/rasm/default.nix +++ b/pkgs/by-name/ra/rasm/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://www.roudoudou.com/rasm/"; + homepage = "http://rasm.wikidot.com/english-index:home"; description = "Z80 assembler"; mainProgram = "rasm"; # use -n option to display all licenses diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05aca9f4018f..d18ebba36121 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16538,8 +16538,6 @@ with pkgs; qbe = callPackage ../development/compilers/qbe { }; - rasm = callPackage ../development/compilers/rasm { }; - replibyte = callPackage ../development/tools/database/replibyte { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; From 16cfb8dcbf698f8767a82507c38fe24446130abd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 May 2024 19:11:30 +0000 Subject: [PATCH 10/63] gitoxide: 0.35.0 -> 0.36.0 --- pkgs/applications/version-management/gitoxide/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index 40c744e1aed4..1688160c3459 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -18,16 +18,16 @@ let gix = "${stdenv.hostPlatform.emulator buildPackages} $out/bin/gix"; in rustPlatform.buildRustPackage rec { pname = "gitoxide"; - version = "0.35.0"; + version = "0.36.0"; src = fetchFromGitHub { owner = "Byron"; repo = "gitoxide"; rev = "v${version}"; - hash = "sha256-Sl7nNYoiCdTZ50tIfJcq5x9KOBkgJsb5bq09chWbyQc="; + hash = "sha256-HXuMcLY5BAC2dODlI6sgwCyGEBDW6ojlHRCBnIQ6P6A="; }; - cargoHash = "sha256-G1NWRkhcmFrcHaIxQ7nzvRejPZUuZQDiNonZykkt4qM="; + cargoHash = "sha256-v+HVrYMPwbD0RDyxufv11KOnWGbTljpbx6ZlSJ46Olk="; nativeBuildInputs = [ cmake pkg-config installShellFiles ]; From da16e1c80ecf8345b29f8cfa4e9bdb0058184624 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 May 2024 21:55:19 +0000 Subject: [PATCH 11/63] astyle: 3.4.15 -> 3.4.16 --- pkgs/development/tools/misc/astyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix index a23e7936985c..ca714b393ee1 100644 --- a/pkgs/development/tools/misc/astyle/default.nix +++ b/pkgs/development/tools/misc/astyle/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "astyle"; - version = "3.4.15"; + version = "3.4.16"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - hash = "sha256-BQTHM7v+lmiLZsEHtt8/oFJj3vq7I4WOQsRLpVRYbms="; + hash = "sha256-y3YENPfkYk1e6yd2rDNOeeARGb6kGfyYbt0sJNk4A2Q="; }; nativeBuildInputs = [ cmake ]; From c232871be174283d6f507fc48190b5ca399b1740 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 May 2024 22:54:34 +0000 Subject: [PATCH 12/63] melange: 0.7.0 -> 0.8.0 --- pkgs/development/tools/melange/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/melange/default.nix b/pkgs/development/tools/melange/default.nix index 90383cba4c03..d013f88086e1 100644 --- a/pkgs/development/tools/melange/default.nix +++ b/pkgs/development/tools/melange/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "melange"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-RkX6jS3Oh0pRn7kwNDRi8RQ2apLx3W82yQYI1JLJXjQ="; + hash = "sha256-l2KVy3E1JkVPmRPLNSagjlWpkW3wTF4NylWrSwUW/fQ="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -25,7 +25,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-0IBpnwAkvrGkll/mE67BXb/TmwYJyX2oG/aBqsKcn4g="; + vendorHash = "sha256-+O7SXIf1nCiNsIfhq2xkDqjPBwMsv95gWEZmFwIZ7VE="; subPackages = [ "." ]; From c18af227ff69246a16fb6da912cde12b5bd22a25 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 May 2024 23:45:33 +0000 Subject: [PATCH 13/63] kdiff3: 1.11.0 -> 1.11.1 --- pkgs/tools/text/kdiff3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index c22814372314..456b2c568d82 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "kdiff3"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { url = "mirror://kde/stable/kdiff3/kdiff3-${finalAttrs.version}.tar.xz"; - hash = "sha256-O/N5VMoZo2Xze1WLV0yPvTZnGcCH17gheI0++tDESFE="; + hash = "sha256-MPFKWrbg1VEWgpF42CdlTDDoQhwE/pcA085npTCEYpg="; }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapQtAppsHook ]; From e0f7a8d00ee5b11cfcdbdcb635fe7256e6e8beda Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 06:08:12 +0000 Subject: [PATCH 14/63] yamlscript: 0.1.58 -> 0.1.59 --- pkgs/by-name/ya/yamlscript/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ya/yamlscript/package.nix b/pkgs/by-name/ya/yamlscript/package.nix index eb67d09dbb85..603f6c88371f 100644 --- a/pkgs/by-name/ya/yamlscript/package.nix +++ b/pkgs/by-name/ya/yamlscript/package.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "yamlscript"; - version = "0.1.58"; + version = "0.1.59"; src = fetchurl { url = "https://github.com/yaml/yamlscript/releases/download/${version}/yamlscript.cli-${version}-standalone.jar"; - hash = "sha256-rARUkbVq77uPrQZwfQ0NNM4XwYaVhSinLi0sCoVR63E="; + hash = "sha256-I5Z9QB8ZmTyeMs/WxUhJZM65VpUIx+t7QKzCRuRdRG4="; }; executable = "ys"; From cbcb982a1d3847afa69deed5aad0ade9efd85c49 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Thu, 23 May 2024 14:02:41 +0700 Subject: [PATCH 15/63] s9fes: fix build on darwin --- pkgs/development/interpreters/s9fes/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/interpreters/s9fes/default.nix b/pkgs/development/interpreters/s9fes/default.nix index 7cf60b00eb9b..4107b28e1cf9 100644 --- a/pkgs/development/interpreters/s9fes/default.nix +++ b/pkgs/development/interpreters/s9fes/default.nix @@ -22,7 +22,11 @@ stdenv.mkDerivation rec { ''; buildInputs = [ ncurses ]; + preBuild = '' + makeFlagsArray+=(CFLAGS="-O2 -std=c89") + ''; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "PREFIX=$(out)" ]; + enableParallelBuilding = true; # ...-bash-5.2-p15/bin/bash: line 1: ...-s9fes-20181205/bin/s9help: No such file or directory # make: *** [Makefile:157: install-util] Error 1 From dede7feaa7730c8b43d0f06fd295b865da9a1e6a Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Sun, 4 Feb 2024 05:06:05 -0500 Subject: [PATCH 16/63] openjdk: 16+36 -> 16.0.2-ga Build number is set to 1, as this was the last release and thus had no build number. Additionally, this update is made despite the fact that the package is marked as insecure, to pull in the small number of accumulated fixes. --- pkgs/development/compilers/openjdk/16.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/openjdk/16.nix b/pkgs/development/compilers/openjdk/16.nix index 4b0874a03a41..12ba5c9c16db 100644 --- a/pkgs/development/compilers/openjdk/16.nix +++ b/pkgs/development/compilers/openjdk/16.nix @@ -11,8 +11,8 @@ let version = { feature = "16"; - interim = "0"; - build = "36"; + interim = ".0.2-ga"; + build = "1"; }; # when building a headless jdk, also bootstrap it with a headless jdk @@ -20,13 +20,14 @@ let openjdk = stdenv.mkDerivation { pname = "openjdk" + lib.optionalString headless "-headless"; - version = "${version.feature}+${version.build}"; + version = "${version.feature}${version.interim}+${version.build}"; src = fetchFromGitHub { owner = "openjdk"; repo = "jdk${version.feature}u"; - rev = "jdk-${version.feature}+${version.build}"; - sha256 = "165nr15dqfcxzsl5z95g4iklln4rlfkgdigdma576mx8813ldi44"; + rev = "jdk-${version.feature}${version.interim}"; + # rev = "jdk-${version.feature}${version.interim}+${version.build}"; + sha256 = "sha256-/8XHNrf9joCCXMCyPncT54JhqlF+KBL7eAf8hUW/BxU="; }; nativeBuildInputs = [ pkg-config autoconf unzip ]; From 0611f7c61bc095c3d96777c9ae40c4eaee6c1d47 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Sun, 4 Feb 2024 04:54:52 -0500 Subject: [PATCH 17/63] openjdk: 18+36 -> 18.0.2.1+1 This bump was made to match the last available version of OpenJDK 18, despite the package being marked as insecure due to End of Life. --- pkgs/development/compilers/openjdk/18.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/openjdk/18.nix b/pkgs/development/compilers/openjdk/18.nix index 2c496721be07..5ce4ff8f5467 100644 --- a/pkgs/development/compilers/openjdk/18.nix +++ b/pkgs/development/compilers/openjdk/18.nix @@ -11,7 +11,8 @@ let version = { feature = "18"; - build = "36"; + interim = ".0.2.1"; + build = "1"; }; # when building a headless jdk, also bootstrap it with a headless jdk @@ -19,13 +20,13 @@ let openjdk = stdenv.mkDerivation { pname = "openjdk" + lib.optionalString headless "-headless"; - version = "${version.feature}+${version.build}"; + version = "${version.feature}${version.interim}+${version.build}"; src = fetchFromGitHub { owner = "openjdk"; repo = "jdk${version.feature}u"; - rev = "jdk-${version.feature}+${version.build}"; - sha256 = "sha256-yGPC8VA983Ml6Fv/oiEgRrcVe4oe+Q4oCHbzOmFbZq8="; + rev = "jdk-${version.feature}${version.interim}+${version.build}"; + sha256 = "sha256-L6dsN0kqWcfemM8LBg62qtHQdymwRQoV1ndc8r+0qn8="; }; nativeBuildInputs = [ pkg-config autoconf unzip ]; From 25f344d272fd9e73d104cb5a365e85235c568d39 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Sun, 4 Feb 2024 04:06:36 -0500 Subject: [PATCH 18/63] openjdk: 19.0.2+7 -> 19-ga --- pkgs/development/compilers/openjdk/19.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/openjdk/19.nix b/pkgs/development/compilers/openjdk/19.nix index 51fd0d8eb533..187d724b57b5 100644 --- a/pkgs/development/compilers/openjdk/19.nix +++ b/pkgs/development/compilers/openjdk/19.nix @@ -14,8 +14,8 @@ let version = { feature = "19"; - interim = ".0.2"; - build = "7"; + interim = "-ga"; + build = ""; }; # when building a headless jdk, also bootstrap it with a headless jdk @@ -23,13 +23,15 @@ let openjdk = stdenv.mkDerivation { pname = "openjdk" + lib.optionalString headless "-headless"; - version = "${version.feature}${version.interim}+${version.build}"; + version = "${version.feature}${version.interim}"; + # version = "${version.feature}${version.interim}+${version.build}"; src = fetchFromGitHub { owner = "openjdk"; repo = "jdk${version.feature}u"; - rev = "jdk-${version.feature}${version.interim}+${version.build}"; - hash = "sha256-pBEHmBtIgG4Czou4C/zpBBYZEDImvXiLoA5CjOzpeyI="; + rev = "jdk-${version.feature}${version.interim}"; + # rev = "jdk-${version.feature}${version.interim}+${version.build}"; + hash = "sha256-XbYTku/nWF+maBvYz2rJYIUBEgOmqICKjk9wufHqyj0="; }; nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ]; From 9572407ad8550527955fae3afdd21c785963667e Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Sun, 4 Feb 2024 04:07:03 -0500 Subject: [PATCH 19/63] openjdk: 20+36 -> 20.0.2+9 --- pkgs/development/compilers/openjdk/20.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/openjdk/20.nix b/pkgs/development/compilers/openjdk/20.nix index 2be834a27b58..bdb7d057f263 100644 --- a/pkgs/development/compilers/openjdk/20.nix +++ b/pkgs/development/compilers/openjdk/20.nix @@ -14,8 +14,8 @@ let version = { feature = "20"; - interim = ""; - build = "36"; + interim = ".0.2"; + build = "9"; }; # when building a headless jdk, also bootstrap it with a headless jdk @@ -29,7 +29,7 @@ let owner = "openjdk"; repo = "jdk${version.feature}u"; rev = "jdk-${version.feature}${version.interim}+${version.build}"; - hash = "sha256-fXoSO8nq5qpUYbCtbrRr2C46XRdYX77Pxmk7GfmlZV4="; + hash = "sha256-CZH2JwR+MrkTlLdcVYuFRB3McdrM0A+1YaSjNpjYwak="; }; nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ]; From 895d63ca56becfe66385cd101891e72d5696fb8f Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Sun, 4 Feb 2024 13:36:26 -0500 Subject: [PATCH 20/63] openjfx: 20+19 -> 20.0.2-ga --- pkgs/development/compilers/openjdk/openjfx/20.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/openjdk/openjfx/20.nix b/pkgs/development/compilers/openjdk/openjfx/20.nix index 794590dc7e60..1c89800bcab0 100644 --- a/pkgs/development/compilers/openjdk/openjfx/20.nix +++ b/pkgs/development/compilers/openjdk/openjfx/20.nix @@ -7,8 +7,8 @@ let major = "20"; - update = ""; - build = "+19"; + update = ".0.2"; + build = "-ga"; repover = "${major}${update}${build}"; gradle_ = (gradle_7.override { # note: gradle does not yet support running on 19 @@ -30,9 +30,9 @@ let src = fetchFromGitHub { owner = "openjdk"; - repo = "jfx"; + repo = "jfx20u"; rev = repover; - hash = "sha256-QPPJyl6+XU+m5xqYOFtQKJNNrovqy7ngNE/e7kiEJVU="; + hash = "sha256-3Hhz4i8fPU2yowb4roylCXzuO9HkW7ZWF9TMA3HIH9o="; }; buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; From 82ee713858979434baab31f0d6cc2caf86096123 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Mon, 29 Apr 2024 15:22:29 -0400 Subject: [PATCH 21/63] openjfx: 22+30 -> 22.0.1-ga --- pkgs/development/compilers/openjdk/openjfx/22.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/openjdk/openjfx/22.nix b/pkgs/development/compilers/openjdk/openjfx/22.nix index d585dbdf0141..4b5e8ff77933 100644 --- a/pkgs/development/compilers/openjdk/openjfx/22.nix +++ b/pkgs/development/compilers/openjdk/openjfx/22.nix @@ -26,8 +26,8 @@ let major = "22"; - update = ""; - build = "+30"; + update = ".0.1"; + build = "-ga"; repover = "${major}${update}${build}"; icuVersionWithSep = s: "73${s}1"; @@ -45,9 +45,9 @@ let src = fetchFromGitHub { owner = "openjdk"; - repo = "jfx"; + repo = "jfx22u"; rev = repover; - hash = "sha256-sZF7ZPC0kgTTxWgtkxmGtOlfroGPGVZcMw0/wSTJUxQ="; + hash = "sha256-VoEufSO+LciUCvoAM86MG1iMjCA3FSb60Ik4OP2Rk/Q="; }; buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; From f6376745deb50a25fbf39474cd4477f7516319ac Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Sun, 4 Feb 2024 06:44:43 -0500 Subject: [PATCH 22/63] mysql-workbench: use latest jre --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fdb2b6e0f0a9..0065eb6024a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39840,7 +39840,6 @@ with pkgs; }; mysql = mysql; pcre = pcre-cpp; - jre = openjdk19; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }); r128gain = callPackage ../applications/audio/r128gain { }; From ef13f279d1f970b555c31efc84faf2b122973f16 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Thu, 23 May 2024 13:26:30 +0200 Subject: [PATCH 23/63] wordpressPackages.themes.proton: init at 1.0.1 --- .../wordpress/packages/thirdparty.nix | 37 ++++++++++++++----- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/web-apps/wordpress/packages/thirdparty.nix b/pkgs/servers/web-apps/wordpress/packages/thirdparty.nix index 24836f3ac42c..764408470064 100644 --- a/pkgs/servers/web-apps/wordpress/packages/thirdparty.nix +++ b/pkgs/servers/web-apps/wordpress/packages/thirdparty.nix @@ -10,16 +10,35 @@ }; meta.license = lib.licenses.agpl3Only; }; - themes.geist = stdenv.mkDerivation rec { - pname = "geist"; - version = "2.0.3"; - src = fetchzip { - inherit version; - name = pname; - url = "https://github.com/christophery/geist/archive/refs/tags/${version}.zip"; - hash = "sha256-c85oRhqu5E5IJlpgqKJRQITur1W7x40obOvHZbPevzU="; + themes = { + geist = stdenv.mkDerivation rec { + pname = "geist"; + version = "2.0.3"; + src = fetchzip { + inherit version; + name = pname; + url = "https://github.com/christophery/geist/archive/refs/tags/${version}.zip"; + hash = "sha256-c85oRhqu5E5IJlpgqKJRQITur1W7x40obOvHZbPevzU="; + }; + meta.license = lib.licenses.gpl2Only; + }; + proton = stdenv.mkDerivation rec { + pname = "proton"; + version = "1.0.1"; + src = fetchzip { + inherit version; + name = pname; + url = "https://github.com/christophery/proton/archive/refs/tags/${version}.zip"; + hash = "sha256-JgKyLJ3dRqh1uwlsNuffCOM7LPBigGkLVFqftjFAiP4="; + }; + installPhase = '' + runHook preInstall + mkdir -p $out + cp -r ./* $out/ + runHook postInstall + ''; + meta.license = lib.licenses.mit; }; - meta.license = lib.licenses.gpl2Only; }; } From eff2e77eee92395e7486f1f10d10569eeb9ddd51 Mon Sep 17 00:00:00 2001 From: Lucas Hoffmann Date: Mon, 20 May 2024 23:50:54 +0200 Subject: [PATCH 24/63] nvimpager: 0.12.0 -> 0.13.0 --- .../doc/manual/release-notes/rl-2411.section.md | 4 +++- pkgs/tools/misc/nvimpager/default.nix | 17 +++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 530ca68e0c77..2277308d6ba2 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -12,7 +12,9 @@ ## Backward Incompatibilities {#sec-release-24.11-incompatibilities} -- Create the first release note entry in this section! +- `nvimpager` was updated to version 0.13.0, which changes the order of user and + nvimpager settings: user commands in `-c` and `--cmd` now override the + respective default settings because they are executed later. ## Other Notable Changes {#sec-release-24.11-notable-changes} diff --git a/pkgs/tools/misc/nvimpager/default.nix b/pkgs/tools/misc/nvimpager/default.nix index fb10d0ad89c9..80900bf30ae8 100644 --- a/pkgs/tools/misc/nvimpager/default.nix +++ b/pkgs/tools/misc/nvimpager/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "nvimpager"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "lucc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RmpPWS9gnBnR+Atw6uzBmeDSgoTOFSdKzHoJ84O+gyA="; + sha256 = "sha256-Au9rRZMZfU4qHi/ng6JO8FnMpySKDbKzr75SBPY3QiA="; }; buildInputs = [ @@ -25,18 +25,15 @@ stdenv.mkDerivation rec { buildFlags = [ "nvimpager.configured" "nvimpager.1" ]; preBuild = '' patchShebangs nvimpager - substituteInPlace nvimpager --replace ':-nvim' ':-${neovim}/bin/nvim' + substituteInPlace nvimpager --replace-fail ':-nvim' ':-${lib.getExe neovim}' ''; doCheck = true; nativeCheckInputs = [ lua51Packages.busted util-linux neovim ]; - # filter out one test that fails in the sandbox of nix - checkPhase = let - exclude-tags = if stdenv.isDarwin then "nix,mac" else "nix"; - in '' - runHook preCheck - make test BUSTED='busted --output TAP --exclude-tags=${exclude-tags}' - runHook postCheck + # filter out one test that fails in the sandbox of nix or with neovim v0.10 + # or on macOS + preCheck = '' + checkFlagsArray+=('BUSTED=busted --output TAP --exclude-tags=${"nix,v10" + lib.optionalString stdenv.isDarwin ",mac"}') ''; meta = with lib; { From f221b4f5f5ab5d8608df03ba5566c717a2bb4f57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 29 Apr 2024 16:37:49 +0200 Subject: [PATCH 25/63] nixos/oauth2_proxy_nginx: fix proxy_set_header --- .../services/security/oauth2-proxy-nginx.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/security/oauth2-proxy-nginx.nix b/nixos/modules/services/security/oauth2-proxy-nginx.nix index 07192e7287b0..44bf56233e95 100644 --- a/nixos/modules/services/security/oauth2-proxy-nginx.nix +++ b/nixos/modules/services/security/oauth2-proxy-nginx.nix @@ -83,6 +83,15 @@ in } ++ (lib.mapAttrsToList (vhost: conf: { virtualHosts.${vhost} = { locations = { + "/".extraConfig = '' + # pass information via X-User and X-Email headers to backend, requires running with --set-xauthrequest flag + proxy_set_header X-User $user; + proxy_set_header X-Email $email; + + # if you enabled --cookie-refresh, this is needed for it to work with auth_request + add_header Set-Cookie $auth_cookie; + ''; + "/oauth2/auth" = let maybeQueryArg = name: value: if value == null then null @@ -102,6 +111,7 @@ in proxy_pass_request_body off; ''; }; + "@redirectToAuth2ProxyLogin" = { return = "307 https://${cfg.domain}/oauth2/start?rd=$scheme://$host$request_uri"; extraConfig = '' @@ -114,16 +124,10 @@ in auth_request /oauth2/auth; error_page 401 = @redirectToAuth2ProxyLogin; - # pass information via X-User and X-Email headers to backend, - # requires running with --set-xauthrequest flag + # set variables being used in locations."/".extraConfig auth_request_set $user $upstream_http_x_auth_request_user; auth_request_set $email $upstream_http_x_auth_request_email; - proxy_set_header X-User $user; - proxy_set_header X-Email $email; - - # if you enabled --cookie-refresh, this is needed for it to work with auth_request auth_request_set $auth_cookie $upstream_http_set_cookie; - add_header Set-Cookie $auth_cookie; ''; }; }) cfg.virtualHosts))); From f57d95541284634a64704d29ecac6f1593901acb Mon Sep 17 00:00:00 2001 From: Jussi Kuokkanen Date: Thu, 23 May 2024 11:38:09 +0300 Subject: [PATCH 26/63] pkgs/shells: remove licenses.gpl2 --- pkgs/shells/dash/default.nix | 2 +- pkgs/shells/fish/default.nix | 2 +- pkgs/shells/murex/default.nix | 2 +- pkgs/shells/zsh/grml-zsh-config/default.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index 6bdbd1798e3d..00857a5cd958 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://gondor.apana.org.au/~herbert/dash/"; description = "A POSIX-compliant implementation of /bin/sh that aims to be as small as possible"; platforms = platforms.unix; - license = with licenses; [ bsd3 gpl2 ]; + license = with licenses; [ bsd3 gpl2Plus ]; mainProgram = "dash"; }; }) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 0013c205f31f..921e0fc6d7fe 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -299,7 +299,7 @@ let description = "Smart and user-friendly command line shell"; homepage = "https://fishshell.com/"; changelog = "https://github.com/fish-shell/fish-shell/releases/tag/${version}"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.unix; maintainers = with maintainers; [ adamcstephens cole-h winter ]; mainProgram = "fish"; diff --git a/pkgs/shells/murex/default.nix b/pkgs/shells/murex/default.nix index 4e44b6bd7ecf..b6a802b8c8c5 100644 --- a/pkgs/shells/murex/default.nix +++ b/pkgs/shells/murex/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { description = "Bash-like shell and scripting environment with advanced features designed for safety and productivity"; mainProgram = "murex"; homepage = "https://murex.rocks"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ dit7ya kashw2 ]; }; } diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/pkgs/shells/zsh/grml-zsh-config/default.nix index cff5a814bd13..ed7e81fd88d6 100644 --- a/pkgs/shells/zsh/grml-zsh-config/default.nix +++ b/pkgs/shells/zsh/grml-zsh-config/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "grml's zsh setup"; homepage = "https://grml.org/zsh/"; - license = licenses.gpl2; + license = with licenses; [ gpl2Plus gpl2Only ]; platforms = platforms.unix; maintainers = with maintainers; [ msteen rvolosatovs ]; }; From a5979ef2255447bfd60d043bfc38c70944a31ae1 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 18 May 2024 11:07:39 +0800 Subject: [PATCH 27/63] pantheon.elementary-icon-theme: 7.3.1 -> 8.0.0 https://github.com/elementary/icons/compare/7.3.1...8.0.0 --- .../artwork/elementary-icon-theme/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix index ff93bb62379d..8f875620141f 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , nix-update-script , meson -, python3 , ninja , hicolor-icon-theme , gtk3 @@ -13,13 +12,13 @@ stdenvNoCC.mkDerivation rec { pname = "elementary-icon-theme"; - version = "7.3.1"; + version = "8.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "icons"; rev = version; - sha256 = "sha256-3qvbpY1O8E3sX+66yBoZXEOeWQrgyNu2rOT6PPbli58="; + sha256 = "sha256-EPmQgE33+HBI78SlCBV3WlyLCP6AggvqsQa7gZuOMRM="; }; nativeBuildInputs = [ @@ -27,7 +26,6 @@ stdenvNoCC.mkDerivation rec { librsvg meson ninja - python3 xcursorgen ]; @@ -42,11 +40,6 @@ stdenvNoCC.mkDerivation rec { "-Dpalettes=false" # Don't install gimp and inkscape palette files ]; - postPatch = '' - chmod +x meson/symlink.py - patchShebangs meson/symlink.py - ''; - postFixup = "gtk-update-icon-cache $out/share/icons/elementary"; passthru = { From cb8e62b899d94611841e30a709af741b03db8d6b Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Thu, 23 May 2024 23:44:31 +0800 Subject: [PATCH 28/63] python3Packages.scikits-samplerate: remove --- .../scikits-samplerate/default.nix | 40 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 -- 3 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 pkgs/development/python-modules/scikits-samplerate/default.nix diff --git a/pkgs/development/python-modules/scikits-samplerate/default.nix b/pkgs/development/python-modules/scikits-samplerate/default.nix deleted file mode 100644 index b2cd98d477de..000000000000 --- a/pkgs/development/python-modules/scikits-samplerate/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - buildPythonPackage, - numpy, - libsamplerate, - fetchFromGitHub, -}: - -buildPythonPackage { - pname = "scikits-samplerate"; - version = "0.3.3"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "cournape"; - repo = "samplerate"; - rev = "a536c97eb2d6195b5f266ea3cc3a35364c4c2210"; - hash = "sha256-7x03Q6VXfP9p8HCk15IDZ9HeqTyi5F1AlGX/otdh8VU="; - }; - - buildInputs = [ libsamplerate ]; - - propagatedBuildInputs = [ numpy ]; - - preConfigure = '' - cat > site.cfg << END - [samplerate] - library_dirs=${libsamplerate.out}/lib - include_dirs=${lib.getDev libsamplerate}/include - END - ''; - - doCheck = false; - - meta = with lib; { - homepage = "https://github.com/cournape/samplerate"; - description = "High quality sampling rate convertion from audio data in numpy arrays"; - license = licenses.gpl2; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 53a63162091c..206b08ad509b 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -486,6 +486,7 @@ mapAliases ({ sapi-python-client = kbcstorage; # added 2022-04-20 scikitimage = scikit-image; # added 2023-05-14 scikitlearn = scikit-learn; # added 2021-07-21 + scikits-samplerate = throw "scikits-samplerate has been removed, it was unsed and unmaintained since 2015"; # added 2024-05-23 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # added 2021-06-10 sequoia = throw "python3Packages.sequoia was replaced by pysequoia - built from a dedicated repository, with a new API."; # added 2023-06-24 setuptools_dso = setuptools-dso; # added 2024-03-03 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6725e7d1a152..6f9ae3db44f1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13631,10 +13631,6 @@ self: super: with self; { scikits-odes = callPackage ../development/python-modules/scikits-odes { }; - scikits-samplerate = callPackage ../development/python-modules/scikits-samplerate { - inherit (pkgs) libsamplerate; - }; - scikit-tda = callPackage ../development/python-modules/scikit-tda { }; scipy = callPackage ../development/python-modules/scipy { }; From d5a6ef09a867abca2f63f389a30d1858b913bec9 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Thu, 23 May 2024 17:47:21 +0200 Subject: [PATCH 29/63] yaralyzer: 0.9.3 -> 0.9.4 https://github.com/michelcrypt4d4mus/yaralyzer/blob/v0.9.4/CHANGELOG.md https://github.com/michelcrypt4d4mus/yaralyzer/compare/v0.9.3...v0.9.4 --- pkgs/tools/security/yaralyzer/default.nix | 33 +++++++---------------- 1 file changed, 9 insertions(+), 24 deletions(-) diff --git a/pkgs/tools/security/yaralyzer/default.nix b/pkgs/tools/security/yaralyzer/default.nix index ddfc828741e5..47b5576e7bec 100644 --- a/pkgs/tools/security/yaralyzer/default.nix +++ b/pkgs/tools/security/yaralyzer/default.nix @@ -3,31 +3,16 @@ , fetchFromGitHub }: -let - python = python3.override { - packageOverrides = self: super: { - yara-python = super.yara-python.overridePythonAttrs (oldAttrs: rec { - version = "4.2.3"; - src = fetchFromGitHub { - owner = "VirusTotal"; - repo = "yara-python"; - rev = "v${version}"; - hash = "sha256-spUQuezQMqaG1hboM0/Gs7siCM6x0b40O+sV7qGGBng="; - }; - }); - }; - }; -in -python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "yaralyzer"; - version = "0.9.3"; + version = "0.9.4"; pyproject = true; src = fetchFromGitHub { owner = "michelcrypt4d4mus"; repo = "yaralyzer"; rev = "refs/tags/v${version}"; - hash = "sha256-KGQNonzAZp8c0a3Rjb1WfsEkx5srgRzZfGR3gfNEdzY="; + hash = "sha256-rDb09XJOGWNARR0hhQQ91KXWepsLyR2a6/o3jagh6nA="; }; pythonRelaxDeps = [ @@ -35,12 +20,12 @@ python.pkgs.buildPythonApplication rec { "rich" ]; - nativeBuildInputs = with python.pkgs; [ + build-system = with python3.pkgs; [ poetry-core pythonRelaxDepsHook ]; - propagatedBuildInputs = with python.pkgs; [ + dependencies = with python3.pkgs; [ chardet python-dotenv rich @@ -52,12 +37,12 @@ python.pkgs.buildPythonApplication rec { "yaralyzer" ]; - meta = with lib; { + meta = { description = "Tool to visually inspect and force decode YARA and regex matches"; homepage = "https://github.com/michelcrypt4d4mus/yaralyzer"; - changelog = "https://github.com/michelcrypt4d4mus/yaralyzer/blob/${version}/CHANGELOG.md"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ fab ]; + changelog = "https://github.com/michelcrypt4d4mus/yaralyzer/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "yaralyze"; }; } From 14fdf50a3ca0c1ea0218d0ef081883f72c6c9f39 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 17:44:52 +0000 Subject: [PATCH 30/63] nuclei-templates: 9.8.6 -> 9.8.7 --- pkgs/by-name/nu/nuclei-templates/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix index 90eb9d35d25e..1d4910c212de 100644 --- a/pkgs/by-name/nu/nuclei-templates/package.nix +++ b/pkgs/by-name/nu/nuclei-templates/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nuclei-templates"; - version = "9.8.6"; + version = "9.8.7"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei-templates"; rev = "refs/tags/v${version}"; - hash = "sha256-3hJfWSBciJ/UutVBIGisptcxmtWfvSfTbx55cyWxs4k="; + hash = "sha256-Masj0v9WGcLJKd/43T4klwyIM2uqhvuLSW5PBuKzsQg="; }; installPhase = '' From 5799862064c90933efc06b2b4aa6e6f04ea450e0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 19:46:36 +0200 Subject: [PATCH 31/63] python312Packages.fastparquet: 2024.2.0 -> 2024.5.0 Diff: https://github.com/dask/fastparquet/compare/refs/tags/2024.2.0...2024.5.0 Changelog: https://github.com/dask/fastparquet/blob/2024.5.0/docs/source/releasenotes.rst --- .../python-modules/fastparquet/default.nix | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index 40c841b38536..4add91da0926 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -1,62 +1,61 @@ { lib, buildPythonPackage, - fetchFromGitHub, - python, - cython, - oldest-supported-numpy, - setuptools, - setuptools-scm, - numpy, - pandas, cramjam, + cython, + fetchFromGitHub, fsspec, - thrift, - python-lzo, - pytestCheckHook, - pythonOlder, + git, + numpy, + oldest-supported-numpy, packaging, + pandas, + pytestCheckHook, + python-lzo, + python, + pythonOlder, + setuptools-scm, + setuptools, wheel, }: buildPythonPackage rec { pname = "fastparquet"; - version = "2024.2.0"; + version = "2024.5.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "dask"; repo = "fastparquet"; rev = "refs/tags/${version}"; - hash = "sha256-e0gnC/HMYdrYdEwy6qNOD1J52xgN2x81oCG03YNsYjg="; + hash = "sha256-YiaVkpPzH8ZmTiEtCom9xLbKzByIt7Ilig/WlmGrYH4="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail '"pytest-runner"' "" - - sed -i \ - -e "/pytest-runner/d" \ - -e '/"git", "status"/d' setup.py + --replace-fail "numpy>=2.0.0rc1" "oldest-supported-numpy" ''; - nativeBuildInputs = [ - cython - oldest-supported-numpy + build-system = [ setuptools setuptools-scm wheel ]; - propagatedBuildInputs = [ + nativeBuildInputs = [ + cython + git + oldest-supported-numpy + ]; + + dependencies = [ cramjam fsspec numpy - pandas - thrift packaging + pandas ]; passthru.optional-dependencies = { @@ -82,7 +81,8 @@ buildPythonPackage rec { meta = with lib; { description = "Implementation of the parquet format"; homepage = "https://github.com/dask/fastparquet"; - license = with licenses; [ asl20 ]; + changelog = "https://github.com/dask/fastparquet/blob/${version}/docs/source/releasenotes.rst"; + license = licenses.asl20; maintainers = with maintainers; [ veprbl ]; }; } From 576acc733127c223176070e5e70683d58abd22d0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 21:17:37 +0200 Subject: [PATCH 32/63] python312Packages.intake-parquet: remove vendorized versioneer.py --- .../python-modules/intake-parquet/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/intake-parquet/default.nix b/pkgs/development/python-modules/intake-parquet/default.nix index a1b241f92ce4..fe6fa3b2a656 100644 --- a/pkgs/development/python-modules/intake-parquet/default.nix +++ b/pkgs/development/python-modules/intake-parquet/default.nix @@ -1,13 +1,14 @@ { lib, buildPythonPackage, - fetchFromGitHub, - pandas, dask, fastparquet, + fetchFromGitHub, + pandas, pyarrow, - setuptools, pythonOlder, + setuptools, + versioneer, }: buildPythonPackage rec { @@ -28,11 +29,17 @@ buildPythonPackage rec { # Break circular dependency substituteInPlace requirements.txt \ --replace-fail "intake" "" + + # Remove vendorized versioneer.py + rm versioneer.py ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ + setuptools + versioneer + ]; - propagatedBuildInputs = [ + dependencies = [ pandas dask fastparquet From 8d29d8af024520c61b85d1ca598c71f52f3b1867 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 23 May 2024 09:17:04 +0200 Subject: [PATCH 33/63] fcast-client: init at 0.1.0-unstable-2024-05-23 --- pkgs/by-name/fc/fcast-client/package.nix | 37 ++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 pkgs/by-name/fc/fcast-client/package.nix diff --git a/pkgs/by-name/fc/fcast-client/package.nix b/pkgs/by-name/fc/fcast-client/package.nix new file mode 100644 index 000000000000..9f9277fed327 --- /dev/null +++ b/pkgs/by-name/fc/fcast-client/package.nix @@ -0,0 +1,37 @@ +{ + lib, + rustPlatform, + fetchFromGitLab, +}: + +rustPlatform.buildRustPackage rec { + pname = "fcast-client"; + version = "0.1.0-unstable-2024-05-23"; + + src = fetchFromGitLab { + domain = "gitlab.futo.org"; + owner = "videostreaming"; + repo = "fcast"; + rev = "cc07f95d2315406fcacf67cb3abb98efff5df5d9"; + hash = "sha256-vsD4xgrC5KbnZT6hPX3fi3M/CH39LtoRfa6nYD0iFew="; + }; + + sourceRoot = "${src.name}/clients/terminal"; + cargoHash = "sha256-VVG7AbwbbgCANMcFYNAIF76MQr7Fkmq5HXPxL3MnEhI="; + + meta = { + description = "FCast Client Terminal, a terminal open-source media streaming client"; + homepage = "https://fcast.org/"; + license = lib.licenses.gpl3; + longDescription = '' + FCast is a protocol designed for wireless streaming of audio and video + content between devices. Unlike alternative protocols like Chromecast and + AirPlay, FCast is an open source protocol that allows for custom receiver + implementations, enabling third-party developers to create their own + receiver devices or integrate the FCast protocol into their own apps. + ''; + mainProgram = "fcast-client"; + maintainers = with lib.maintainers; [ drupol ]; + platforms = lib.platforms.linux; + }; +} From 42d21c614766fe69cac21d1ba4f3e53bef18c040 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 21:36:58 +0200 Subject: [PATCH 34/63] lse: init at 4.14nw Linux enumeration tool with verbosity levels https://github.com/diego-treitos/linux-smart-enumeration --- pkgs/by-name/ls/lse/package.nix | 40 +++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pkgs/by-name/ls/lse/package.nix diff --git a/pkgs/by-name/ls/lse/package.nix b/pkgs/by-name/ls/lse/package.nix new file mode 100644 index 000000000000..52d050e5ba7c --- /dev/null +++ b/pkgs/by-name/ls/lse/package.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenv, + bash, + fetchFromGitHub, + makeWrapper, +}: + +stdenv.mkDerivation rec { + pname = "lse"; + version = "4.14nw"; + + src = fetchFromGitHub { + owner = "diego-treitos"; + repo = "linux-smart-enumeration"; + rev = "refs/tags/${version}"; + hash = "sha256-qGLmrbyeyhHG6ONs7TJLTm68xpvxB1iAnMUApfTSqEk="; + }; + + buildInputs = [ bash ]; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + cp lse.sh $out/bin/lse.sh + wrapProgram $out/bin/lse.sh \ + --prefix PATH : ${lib.makeBinPath [ bash ]} + ''; + + meta = with lib; { + description = "Linux enumeration tool with verbosity levels"; + homepage = "https://github.com/diego-treitos/linux-smart-enumeration"; + changelog = "https://github.com/diego-treitos/linux-smart-enumeration/releases/tag/${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + mainProgram = "lse.sh"; + platforms = platforms.all; + }; +} From 8bdc233bb4f79f61e1defada6756c3ba703d4c65 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Fri, 24 May 2024 09:07:22 +1200 Subject: [PATCH 35/63] soju: migrate to pkgs/by-name --- .../networking/soju/default.nix => by-name/so/soju/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/networking/soju/default.nix => by-name/so/soju/package.nix} (100%) diff --git a/pkgs/applications/networking/soju/default.nix b/pkgs/by-name/so/soju/package.nix similarity index 100% rename from pkgs/applications/networking/soju/default.nix rename to pkgs/by-name/so/soju/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a3ec0b320ab5..26059dc282d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6194,8 +6194,6 @@ with pkgs; socklog = callPackage ../tools/system/socklog { }; - soju = callPackage ../applications/networking/soju { }; - spacevim = callPackage ../applications/editors/spacevim { }; srvc = callPackage ../applications/version-management/srvc { }; From ef5f78e7b8d75fbf6ad7c0d93e5253e04cd96064 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Fri, 24 May 2024 09:07:54 +1200 Subject: [PATCH 36/63] soju: adopt --- pkgs/by-name/so/soju/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/so/soju/package.nix b/pkgs/by-name/so/soju/package.nix index f8d6e3044314..8d619ddbed3f 100644 --- a/pkgs/by-name/so/soju/package.nix +++ b/pkgs/by-name/so/soju/package.nix @@ -50,6 +50,6 @@ buildGoModule rec { homepage = "https://soju.im"; changelog = "https://git.sr.ht/~emersion/soju/refs/${src.rev}"; license = licenses.agpl3Only; - maintainers = with maintainers; [ azahi malte-v ]; + maintainers = with maintainers; [ azahi malte-v jtbx ]; }; } From 274e87e5fdfa1f9c7ec718a5594e2debb2a57c76 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Fri, 24 May 2024 09:31:52 +1200 Subject: [PATCH 37/63] soju: 0.7.0 -> 0.8.0 --- pkgs/by-name/so/soju/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/so/soju/package.nix b/pkgs/by-name/so/soju/package.nix index 8d619ddbed3f..ddc7cd5c2d2d 100644 --- a/pkgs/by-name/so/soju/package.nix +++ b/pkgs/by-name/so/soju/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "soju"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromSourcehut { owner = "~emersion"; repo = "soju"; rev = "v${version}"; - hash = "sha256-nzaYa4h+UZcP6jqFHxVjgQ/F3q9aOeOPgVKFWBy6Fag="; + hash = "sha256-K7Dgc1HQ6+GnjraQNcK9LOFxUIoKKWro1mWKDZFwLiE="; }; - vendorHash = "sha256-JLght6bOrtc/VP3tfQboASa68VL2GGBTdK02DOC5EQk="; + vendorHash = "sha256-4Yl87Gk/HykjIyNpRfgthLf6b+v7kxmONIhYBWVXi0I="; nativeBuildInputs = [ installShellFiles From 5e27d26753f74a6a3f2e48c07c80878017d5bb13 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 21:34:29 +0000 Subject: [PATCH 38/63] mdbook-katex: 0.8.1 -> 0.9.0 --- pkgs/tools/text/mdbook-katex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdbook-katex/default.nix b/pkgs/tools/text/mdbook-katex/default.nix index f914dedaf6aa..9dbde52266ed 100644 --- a/pkgs/tools/text/mdbook-katex/default.nix +++ b/pkgs/tools/text/mdbook-katex/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-katex"; - version = "0.8.1"; + version = "0.9.0"; src = fetchCrate { inherit pname version; - hash = "sha256-mVgI2lvT4w5+Tpq3Sx7j86LHFnuwI4bAAAqrUkiF1B4="; + hash = "sha256-OTMPf/ZlUtqKz8Lb0uFOhad33N6SaCIZ86I2ajZ19fU="; }; - cargoHash = "sha256-ps31HGsAqWJBTP7HNLjfTz610ihDlvfAvlRHqZR01No="; + cargoHash = "sha256-U8uDcNkEyz7zAqCTthY5SVGshsJRKRaoBLOpBpQ9sho="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; From cc8120d3ff134c155a0288aee9092fdbfbf4ba2a Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 24 May 2024 02:45:55 +0200 Subject: [PATCH 39/63] pkgs/by-name: remove unuseed fetchpatch arguments --- pkgs/by-name/bm/bmake/package.nix | 1 - pkgs/by-name/bp/bpftrace/package.nix | 2 +- pkgs/by-name/co/connman/package.nix | 1 - pkgs/by-name/de/dependabot-cli/package.nix | 1 - pkgs/by-name/dt/dtools/package.nix | 1 - pkgs/by-name/ic/icewm/package.nix | 1 - pkgs/by-name/im/imhex/package.nix | 1 - pkgs/by-name/ki/kikit/solidpython/default.nix | 4 ---- pkgs/by-name/li/libbfio/package.nix | 1 - pkgs/by-name/li/libcpuid/package.nix | 2 +- pkgs/by-name/li/libewf-legacy/package.nix | 1 - pkgs/by-name/li/libiconv-darwin/package.nix | 1 - pkgs/by-name/ml/mlx42/package.nix | 1 - pkgs/by-name/mo/mommy/package.nix | 1 - pkgs/by-name/op/opensnitch/package.nix | 2 -- pkgs/by-name/op/openturns/package.nix | 1 - pkgs/by-name/pe/perf_data_converter/package.nix | 2 -- pkgs/by-name/pe/perl-debug-adapter/package.nix | 1 - pkgs/by-name/rc/rcu/package.nix | 1 - pkgs/by-name/re/reactphysics3d/package.nix | 2 +- pkgs/by-name/re/recoverdm/package.nix | 1 - pkgs/by-name/re/redict/package.nix | 2 +- pkgs/by-name/sc/scion/package.nix | 1 - pkgs/by-name/si/silicon/package.nix | 1 - pkgs/by-name/sw/swaylock/package.nix | 2 +- pkgs/by-name/tp/tpnote/package.nix | 1 - pkgs/by-name/un/undbx/package.nix | 1 - pkgs/by-name/ze/zesarux/package.nix | 1 - 28 files changed, 5 insertions(+), 33 deletions(-) diff --git a/pkgs/by-name/bm/bmake/package.nix b/pkgs/by-name/bm/bmake/package.nix index fe4e8b6ed6dd..f1440556f6f4 100644 --- a/pkgs/by-name/bm/bmake/package.nix +++ b/pkgs/by-name/bm/bmake/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , getopt , ksh , bc diff --git a/pkgs/by-name/bp/bpftrace/package.nix b/pkgs/by-name/bp/bpftrace/package.nix index 6e516c5806ee..bc5aab6a9406 100644 --- a/pkgs/by-name/bp/bpftrace/package.nix +++ b/pkgs/by-name/bp/bpftrace/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , llvmPackages, elfutils, bcc , libbpf, libbfd, libopcodes , cereal, asciidoctor diff --git a/pkgs/by-name/co/connman/package.nix b/pkgs/by-name/co/connman/package.nix index a90fb1ffd727..c3bb59b6ab8a 100644 --- a/pkgs/by-name/co/connman/package.nix +++ b/pkgs/by-name/co/connman/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , autoreconfHook , dbus , file diff --git a/pkgs/by-name/de/dependabot-cli/package.nix b/pkgs/by-name/de/dependabot-cli/package.nix index b5b8eadad45b..13d53ad70442 100644 --- a/pkgs/by-name/de/dependabot-cli/package.nix +++ b/pkgs/by-name/de/dependabot-cli/package.nix @@ -1,7 +1,6 @@ { buildGoModule , dependabot-cli , fetchFromGitHub -, fetchpatch , installShellFiles , lib , testers diff --git a/pkgs/by-name/dt/dtools/package.nix b/pkgs/by-name/dt/dtools/package.nix index 9de7ed6b125b..feb4dc740b80 100644 --- a/pkgs/by-name/dt/dtools/package.nix +++ b/pkgs/by-name/dt/dtools/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , ldc , curl }: diff --git a/pkgs/by-name/ic/icewm/package.nix b/pkgs/by-name/ic/icewm/package.nix index 2d606a0c3aac..c4f7e28c7df7 100644 --- a/pkgs/by-name/ic/icewm/package.nix +++ b/pkgs/by-name/ic/icewm/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , expat , flac diff --git a/pkgs/by-name/im/imhex/package.nix b/pkgs/by-name/im/imhex/package.nix index d10ffb8a56e9..da3a2b4e20fa 100644 --- a/pkgs/by-name/im/imhex/package.nix +++ b/pkgs/by-name/im/imhex/package.nix @@ -3,7 +3,6 @@ , cmake , llvm , fetchFromGitHub -, fetchpatch , mbedtls , gtk3 , pkg-config diff --git a/pkgs/by-name/ki/kikit/solidpython/default.nix b/pkgs/by-name/ki/kikit/solidpython/default.nix index c03637907a36..2244166bbfea 100644 --- a/pkgs/by-name/ki/kikit/solidpython/default.nix +++ b/pkgs/by-name/ki/kikit/solidpython/default.nix @@ -1,15 +1,11 @@ # SolidPython is an unmaintained library with old dependencies. { buildPythonPackage -, callPackage , fetchFromGitHub -, fetchFromGitLab -, fetchpatch , lib , pythonRelaxDepsHook , poetry-core , prettytable -, pypng , ply , setuptools , euclid3 diff --git a/pkgs/by-name/li/libbfio/package.nix b/pkgs/by-name/li/libbfio/package.nix index ccc4c640677c..1695b65272d2 100644 --- a/pkgs/by-name/li/libbfio/package.nix +++ b/pkgs/by-name/li/libbfio/package.nix @@ -1,6 +1,5 @@ { lib , fetchzip -, fetchpatch , stdenv , gettext , libtool diff --git a/pkgs/by-name/li/libcpuid/package.nix b/pkgs/by-name/li/libcpuid/package.nix index cf4afd8df7d5..6cbc2c689cab 100644 --- a/pkgs/by-name/li/libcpuid/package.nix +++ b/pkgs/by-name/li/libcpuid/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "libcpuid"; diff --git a/pkgs/by-name/li/libewf-legacy/package.nix b/pkgs/by-name/li/libewf-legacy/package.nix index 536a28eceebe..3d2aee4d2874 100644 --- a/pkgs/by-name/li/libewf-legacy/package.nix +++ b/pkgs/by-name/li/libewf-legacy/package.nix @@ -1,6 +1,5 @@ { lib , fetchurl -, fetchpatch , stdenv , zlib , openssl diff --git a/pkgs/by-name/li/libiconv-darwin/package.nix b/pkgs/by-name/li/libiconv-darwin/package.nix index bb5291831b65..0cb34224a6c7 100644 --- a/pkgs/by-name/li/libiconv-darwin/package.nix +++ b/pkgs/by-name/li/libiconv-darwin/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, atf, libiconvReal, meson, diff --git a/pkgs/by-name/ml/mlx42/package.nix b/pkgs/by-name/ml/mlx42/package.nix index 3387dec3378d..31df5cf11e17 100644 --- a/pkgs/by-name/ml/mlx42/package.nix +++ b/pkgs/by-name/ml/mlx42/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , glfw , darwin diff --git a/pkgs/by-name/mo/mommy/package.nix b/pkgs/by-name/mo/mommy/package.nix index 8d2187068514..280b8caae996 100644 --- a/pkgs/by-name/mo/mommy/package.nix +++ b/pkgs/by-name/mo/mommy/package.nix @@ -4,7 +4,6 @@ , makeWrapper , writeText , shellspec -, fetchpatch # usage: # pkgs.mommy.override { # mommySettings.sweetie = "catgirl"; diff --git a/pkgs/by-name/op/opensnitch/package.nix b/pkgs/by-name/op/opensnitch/package.nix index df8647bdeb05..52b8b9ef80b4 100644 --- a/pkgs/by-name/op/opensnitch/package.nix +++ b/pkgs/by-name/op/opensnitch/package.nix @@ -1,13 +1,11 @@ { buildGoModule , fetchFromGitHub -, fetchpatch , protobuf , go-protobuf , pkg-config , libnetfilter_queue , libnfnetlink , lib -, coreutils , iptables , makeWrapper , protoc-gen-go-grpc diff --git a/pkgs/by-name/op/openturns/package.nix b/pkgs/by-name/op/openturns/package.nix index 152714133fa7..e6f3fb3a5ff7 100644 --- a/pkgs/by-name/op/openturns/package.nix +++ b/pkgs/by-name/op/openturns/package.nix @@ -7,7 +7,6 @@ darwin, dlib, fetchFromGitHub, - fetchpatch, hdf5, hmat-oss, ipopt, diff --git a/pkgs/by-name/pe/perf_data_converter/package.nix b/pkgs/by-name/pe/perf_data_converter/package.nix index 22f6e5aa9a8d..c8d49ab84c92 100644 --- a/pkgs/by-name/pe/perf_data_converter/package.nix +++ b/pkgs/by-name/pe/perf_data_converter/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, buildBazelPackage, fetchFromGitHub, - fetchpatch, bazel_6, jdk, elfutils, diff --git a/pkgs/by-name/pe/perl-debug-adapter/package.nix b/pkgs/by-name/pe/perl-debug-adapter/package.nix index 4b1dd4e09ee6..eb9dd371a9b9 100644 --- a/pkgs/by-name/pe/perl-debug-adapter/package.nix +++ b/pkgs/by-name/pe/perl-debug-adapter/package.nix @@ -1,7 +1,6 @@ { lib , buildNpmPackage , fetchFromGitHub -, fetchpatch , makeWrapper , perl # Needed if you want to use it for a perl script with dependencies. diff --git a/pkgs/by-name/rc/rcu/package.nix b/pkgs/by-name/rc/rcu/package.nix index 250dda8940e6..4ae6c6894d08 100644 --- a/pkgs/by-name/rc/rcu/package.nix +++ b/pkgs/by-name/rc/rcu/package.nix @@ -1,7 +1,6 @@ { stdenv , lib , requireFile -, fetchpatch , runCommand , rcu , testers diff --git a/pkgs/by-name/re/reactphysics3d/package.nix b/pkgs/by-name/re/reactphysics3d/package.nix index 2245eeee4214..a4f8edc823c0 100644 --- a/pkgs/by-name/re/reactphysics3d/package.nix +++ b/pkgs/by-name/re/reactphysics3d/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation (finalAttrs: { pname = "reactphysics3d"; diff --git a/pkgs/by-name/re/recoverdm/package.nix b/pkgs/by-name/re/recoverdm/package.nix index b0de4b7d1cfe..647f50e97a8c 100644 --- a/pkgs/by-name/re/recoverdm/package.nix +++ b/pkgs/by-name/re/recoverdm/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch , installShellFiles }: diff --git a/pkgs/by-name/re/redict/package.nix b/pkgs/by-name/re/redict/package.nix index 39133faa9b1b..c64f6b7b63bd 100644 --- a/pkgs/by-name/re/redict/package.nix +++ b/pkgs/by-name/re/redict/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitea, fetchurl, fetchpatch, lua, jemalloc, pkg-config, nixosTests +{ lib, stdenv, fetchFromGitea, fetchurl, lua, jemalloc, pkg-config, nixosTests , tcl, which, ps, getconf , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd # dependency ordering is broken at the moment when building with openssl diff --git a/pkgs/by-name/sc/scion/package.nix b/pkgs/by-name/sc/scion/package.nix index 9044dc44f2a5..2044b994673b 100644 --- a/pkgs/by-name/sc/scion/package.nix +++ b/pkgs/by-name/sc/scion/package.nix @@ -1,7 +1,6 @@ { lib , buildGoModule , fetchFromGitHub -, fetchpatch2 , nixosTests }: let diff --git a/pkgs/by-name/si/silicon/package.nix b/pkgs/by-name/si/silicon/package.nix index 57a86a27213d..18edc3b84948 100644 --- a/pkgs/by-name/si/silicon/package.nix +++ b/pkgs/by-name/si/silicon/package.nix @@ -2,7 +2,6 @@ , stdenv , rustPlatform , fetchFromGitHub -, fetchpatch , pkg-config , cmake , expat diff --git a/pkgs/by-name/sw/swaylock/package.nix b/pkgs/by-name/sw/swaylock/package.nix index 0b438df13d28..0ba3b727c949 100644 --- a/pkgs/by-name/sw/swaylock/package.nix +++ b/pkgs/by-name/sw/swaylock/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , meson, ninja, pkg-config, scdoc, wayland-scanner , wayland, wayland-protocols, libxkbcommon, cairo, gdk-pixbuf, pam }: diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix index eec1f68f5f44..267b9766abdb 100644 --- a/pkgs/by-name/tp/tpnote/package.nix +++ b/pkgs/by-name/tp/tpnote/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , rustPlatform , cmake , pkg-config diff --git a/pkgs/by-name/un/undbx/package.nix b/pkgs/by-name/un/undbx/package.nix index 69db03479e99..269abccdbdf2 100644 --- a/pkgs/by-name/un/undbx/package.nix +++ b/pkgs/by-name/un/undbx/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , autoreconfHook }: diff --git a/pkgs/by-name/ze/zesarux/package.nix b/pkgs/by-name/ze/zesarux/package.nix index 096f4bf2b0ec..b75e4ade88eb 100644 --- a/pkgs/by-name/ze/zesarux/package.nix +++ b/pkgs/by-name/ze/zesarux/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , SDL2 , aalib , alsa-lib From 203a48ad353b4a5ab287e57b5f4958fe9753787a Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 24 May 2024 02:43:14 +0200 Subject: [PATCH 40/63] pkgs/development: remove unused fetchpatch arguments --- pkgs/development/ada-modules/gprbuild/default.nix | 2 -- pkgs/development/compilers/ccl/default.nix | 2 +- pkgs/development/compilers/ghc/common-hadrian.nix | 1 - pkgs/development/compilers/ghdl/default.nix | 1 - pkgs/development/compilers/ispc/default.nix | 2 +- pkgs/development/compilers/ocaml/ber-metaocaml.nix | 1 - pkgs/development/compilers/openjdk/openjfx/20.nix | 2 +- pkgs/development/compilers/openjdk/openjfx/21.nix | 2 +- pkgs/development/compilers/openjdk/openjfx/22.nix | 1 - pkgs/development/compilers/solc/default.nix | 1 - pkgs/development/compilers/souffle/default.nix | 2 +- pkgs/development/compilers/vala/default.nix | 2 +- pkgs/development/interpreters/lfe/2.1.nix | 2 +- pkgs/development/interpreters/lua-5/default.nix | 2 +- pkgs/development/libraries/mesa/default.nix | 1 - pkgs/development/libraries/qt-6/default.nix | 1 - pkgs/development/ocaml-modules/bap/default.nix | 2 +- pkgs/development/ocaml-modules/bisect_ppx/default.nix | 2 +- pkgs/development/ocaml-modules/bistro/default.nix | 2 -- pkgs/development/ocaml-modules/git/unix.nix | 4 ++-- pkgs/development/ocaml-modules/httpaf/default.nix | 2 +- pkgs/development/ocaml-modules/piqi-ocaml/default.nix | 2 +- pkgs/development/ocaml-modules/pyml/default.nix | 1 - pkgs/development/ocaml-modules/uring/default.nix | 1 - pkgs/development/perl-modules/Bio-BigFile/default.nix | 2 -- pkgs/development/php-packages/apcu/default.nix | 2 -- pkgs/development/ruby-modules/gem-config/default.nix | 2 +- pkgs/development/tools/analysis/frama-c/default.nix | 2 +- pkgs/development/tools/analysis/radare2/default.nix | 1 - pkgs/development/tools/analysis/rr/default.nix | 2 +- pkgs/development/tools/build-managers/alire/default.nix | 1 - .../tools/build-managers/bazel/bazel_5/default.nix | 2 +- .../tools/build-managers/bazel/bazel_6/default.nix | 2 +- pkgs/development/tools/build-managers/bear/default.nix | 1 - pkgs/development/tools/build-managers/msbuild/default.nix | 2 +- pkgs/development/tools/capnproto-java/default.nix | 2 +- pkgs/development/tools/esbuild/netlify.nix | 1 - pkgs/development/tools/misc/gdb/default.nix | 2 +- pkgs/development/tools/misc/jcli/default.nix | 2 +- pkgs/development/tools/misc/libtool/libtool2.nix | 2 +- pkgs/development/tools/misc/nix-bisect/default.nix | 1 - pkgs/development/tools/rust/cargo-readme/default.nix | 2 +- pkgs/development/web/nodejs/v18.nix | 2 +- 43 files changed, 26 insertions(+), 48 deletions(-) diff --git a/pkgs/development/ada-modules/gprbuild/default.nix b/pkgs/development/ada-modules/gprbuild/default.nix index 00eaa7209767..f1cf28f00af3 100644 --- a/pkgs/development/ada-modules/gprbuild/default.nix +++ b/pkgs/development/ada-modules/gprbuild/default.nix @@ -1,7 +1,5 @@ { lib , stdenv -, fetchFromGitHub -, fetchpatch , gprbuild-boot , which , gnat diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index 332e0b1bccf4..9fe1a8aa8e56 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, runCommand, bootstrap_cmds, coreutils, glibc, m4, runtimeShell }: +{ lib, stdenv, fetchurl, bootstrap_cmds, coreutils, glibc, m4, runtimeShell }: let options = rec { diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 5db97cc0d976..55cc96dfd3ed 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -19,7 +19,6 @@ , autoconf , automake , coreutils -, fetchpatch , fetchurl , fetchgit , perl diff --git a/pkgs/development/compilers/ghdl/default.nix b/pkgs/development/compilers/ghdl/default.nix index 96f1db0e6492..3a28aa03c110 100644 --- a/pkgs/development/compilers/ghdl/default.nix +++ b/pkgs/development/compilers/ghdl/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchFromGitHub -, fetchpatch , callPackage , gnat , zlib diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index b7f2ad1228b7..ee162260929b 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , cmake, which, m4, python3, bison, flex, llvmPackages, ncurses, xcode, tbb # the default test target is sse4, but that is not supported by all Hydra agents , testedTargets ? if stdenv.isAarch64 || stdenv.isAarch32 then [ "neon-i32x4" ] else [ "sse2-i32x4" ] diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml.nix b/pkgs/development/compilers/ocaml/ber-metaocaml.nix index 230c911ef68c..5279fc7481b6 100644 --- a/pkgs/development/compilers/ocaml/ber-metaocaml.nix +++ b/pkgs/development/compilers/ocaml/ber-metaocaml.nix @@ -1,7 +1,6 @@ { lib, stdenv, fetchurl , ncurses , libX11, xorgproto, buildEnv -, fetchpatch , useX11 ? stdenv.hostPlatform.isx86 }: diff --git a/pkgs/development/compilers/openjdk/openjfx/20.nix b/pkgs/development/compilers/openjdk/openjfx/20.nix index 794590dc7e60..9485498c4f64 100644 --- a/pkgs/development/compilers/openjdk/openjfx/20.nix +++ b/pkgs/development/compilers/openjdk/openjfx/20.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, writeText, openjdk17_headless +{ stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless , openjdk19_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst , libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, fetchurl, runCommand , withMedia ? true diff --git a/pkgs/development/compilers/openjdk/openjfx/21.nix b/pkgs/development/compilers/openjdk/openjfx/21.nix index f49dbe3b0e98..071420100e97 100644 --- a/pkgs/development/compilers/openjdk/openjfx/21.nix +++ b/pkgs/development/compilers/openjdk/openjfx/21.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, writeText, openjdk17_headless +{ stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless , openjdk19_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst , libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, fetchurl, runCommand , withMedia ? true diff --git a/pkgs/development/compilers/openjdk/openjfx/22.nix b/pkgs/development/compilers/openjdk/openjfx/22.nix index d585dbdf0141..2b9db91c0274 100644 --- a/pkgs/development/compilers/openjdk/openjfx/22.nix +++ b/pkgs/development/compilers/openjdk/openjfx/22.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , fetchurl , runCommand , writeText diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 0603706164ae..2147d59ffd93 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -3,7 +3,6 @@ , boost , cmake , coreutils -, fetchpatch , jq , ncurses , python3 diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index 68ceb1a7d7f6..770d84573dbe 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , bash-completion, perl, ncurses, zlib, sqlite, libffi , mcpp, cmake, bison, flex, doxygen, graphviz , makeWrapper diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index a7041bfc6a29..1b880b61a05a 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, pkg-config, flex, bison, libxslt, autoconf, autoreconfHook +{ stdenv, lib, fetchurl, pkg-config, flex, bison, libxslt, autoconf, autoreconfHook , gnome, graphviz, glib, libiconv, libintl, libtool, expat, substituteAll, vala, gobject-introspection }: diff --git a/pkgs/development/interpreters/lfe/2.1.nix b/pkgs/development/interpreters/lfe/2.1.nix index f239aa94b78f..2270c0a219d6 100644 --- a/pkgs/development/interpreters/lfe/2.1.nix +++ b/pkgs/development/interpreters/lfe/2.1.nix @@ -1,4 +1,4 @@ -{ fetchpatch, mkDerivation }: +{ mkDerivation }: mkDerivation { version = "2.1.3"; diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index bbd93c725f73..a7587dafe392 100644 --- a/pkgs/development/interpreters/lua-5/default.nix +++ b/pkgs/development/interpreters/lua-5/default.nix @@ -1,5 +1,5 @@ # similar to interpreters/python/default.nix -{ stdenv, config, lib, callPackage, fetchFromGitHub, fetchurl, fetchpatch, makeBinaryWrapper }: +{ stdenv, config, lib, callPackage, fetchFromGitHub, fetchurl, makeBinaryWrapper }: let diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 80621fd9bbb5..79c9c0cdf18b 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -7,7 +7,6 @@ , elfutils , expat , fetchCrate -, fetchpatch , fetchurl , file , flex diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index c4b851207954..c724bd21d11f 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -4,7 +4,6 @@ , generateSplicesForMkScope , makeScopeWithSplicing' , fetchurl -, fetchpatch , fetchpatch2 , makeSetupHook , makeWrapper diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix index 0d2b4247bd42..a56bce316ef6 100644 --- a/pkgs/development/ocaml-modules/bap/default.nix +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, fetchpatch +{ lib, stdenv, fetchFromGitHub, fetchurl , ocaml, findlib, ocamlbuild, ocaml_oasis , bitstring, camlzip, cmdliner, core_kernel, ezjsonm, fileutils, mmap, lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm, frontc, ounit, ppx_jane, parsexp , utop, libxml2, ncurses diff --git a/pkgs/development/ocaml-modules/bisect_ppx/default.nix b/pkgs/development/ocaml-modules/bisect_ppx/default.nix index 114e638fa6c4..4d01125188dc 100644 --- a/pkgs/development/ocaml-modules/bisect_ppx/default.nix +++ b/pkgs/development/ocaml-modules/bisect_ppx/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, fetchpatch, buildDunePackage, cmdliner, ppxlib }: +{ lib, fetchFromGitHub, buildDunePackage, cmdliner, ppxlib }: buildDunePackage rec { pname = "bisect_ppx"; diff --git a/pkgs/development/ocaml-modules/bistro/default.nix b/pkgs/development/ocaml-modules/bistro/default.nix index fd409b51091d..bb424a5ce9ae 100644 --- a/pkgs/development/ocaml-modules/bistro/default.nix +++ b/pkgs/development/ocaml-modules/bistro/default.nix @@ -1,6 +1,4 @@ { lib -, ocaml -, fetchpatch , fetchFromGitHub , buildDunePackage , base64 diff --git a/pkgs/development/ocaml-modules/git/unix.nix b/pkgs/development/ocaml-modules/git/unix.nix index 28bfb40cf8cb..adad5dc0792e 100644 --- a/pkgs/development/ocaml-modules/git/unix.nix +++ b/pkgs/development/ocaml-modules/git/unix.nix @@ -1,11 +1,11 @@ -{ buildDunePackage, fetchpatch, git +{ buildDunePackage, git , rresult, result, bigstringaf , fmt, bos, fpath, uri, digestif, logs, lwt , mirage-clock, mirage-clock-unix, astring, awa, cmdliner , decompress, domain-name, ipaddr, mtime , tcpip, awa-mirage, mirage-flow, mirage-unix , alcotest, alcotest-lwt, base64, cstruct -, ke, mirage-crypto-rng, ocurl, git-binary +, ke, mirage-crypto-rng, git-binary , ptime, mimic, ca-certs-nss, tls, tls-mirage , cacert, happy-eyeballs-lwt, git-mirage }: diff --git a/pkgs/development/ocaml-modules/httpaf/default.nix b/pkgs/development/ocaml-modules/httpaf/default.nix index 6dce28fb2020..336b74f8277b 100644 --- a/pkgs/development/ocaml-modules/httpaf/default.nix +++ b/pkgs/development/ocaml-modules/httpaf/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, fetchpatch, buildDunePackage +{ lib, fetchFromGitHub, buildDunePackage , angstrom, faraday, result, alcotest }: diff --git a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix index 39ae5a86c598..ae1efafb2251 100644 --- a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, piqi, stdlib-shims, num }: +{ lib, stdenv, fetchFromGitHub, ocaml, findlib, piqi, stdlib-shims, num }: stdenv.mkDerivation rec { version = "0.7.8"; diff --git a/pkgs/development/ocaml-modules/pyml/default.nix b/pkgs/development/ocaml-modules/pyml/default.nix index ed7f2ef559ed..d5840c8af53d 100644 --- a/pkgs/development/ocaml-modules/pyml/default.nix +++ b/pkgs/development/ocaml-modules/pyml/default.nix @@ -1,7 +1,6 @@ { buildDunePackage , lib , fetchFromGitHub -, fetchpatch , utop , python3 , stdcompat diff --git a/pkgs/development/ocaml-modules/uring/default.nix b/pkgs/development/ocaml-modules/uring/default.nix index 9da63a8cd895..c78e794b8034 100644 --- a/pkgs/development/ocaml-modules/uring/default.nix +++ b/pkgs/development/ocaml-modules/uring/default.nix @@ -3,7 +3,6 @@ , cstruct , dune-configurator , fetchurl -, fetchpatch , fmt , optint , mdx diff --git a/pkgs/development/perl-modules/Bio-BigFile/default.nix b/pkgs/development/perl-modules/Bio-BigFile/default.nix index 516b6d014c5a..3c360c2396a8 100644 --- a/pkgs/development/perl-modules/Bio-BigFile/default.nix +++ b/pkgs/development/perl-modules/Bio-BigFile/default.nix @@ -3,14 +3,12 @@ IOString, buildPerlModule, fetchFromGitHub, - fetchpatch, fetchurl, kent, lib, libmysqlclient, libpng, openssl, - perl }: buildPerlModule rec { diff --git a/pkgs/development/php-packages/apcu/default.nix b/pkgs/development/php-packages/apcu/default.nix index f8b8ff1d83b7..9cfe9b96cf34 100644 --- a/pkgs/development/php-packages/apcu/default.nix +++ b/pkgs/development/php-packages/apcu/default.nix @@ -3,8 +3,6 @@ lib, pcre2, fetchFromGitHub, - php, - fetchpatch, }: let diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 02d014bef899..3a64f7d2fd9d 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -28,7 +28,7 @@ , bundler, libsass, dart-sass, libexif, libselinux, libsepol, shared-mime-info, libthai, libdatrie , CoreServices, DarwinTools, cctools, libtool, discount, exiv2, libepoxy, libxkbcommon, libmaxminddb, libyaml , cargo, rustc, rustPlatform -, autoSignDarwinBinariesHook, fetchpatch +, autoSignDarwinBinariesHook }@args: let diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index 26cd487d9ebe..2467b124170b 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, makeWrapper, writeText +{ lib, stdenv, fetchurl, writeText , graphviz, doxygen , ocamlPackages, ltl2ba, coq, why3 , gdk-pixbuf, wrapGAppsHook3 diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 61ac7bbfe464..0efbd75773ff 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , buildPackages , pkg-config , meson diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index 587bb7758909..3a2ecc4c6d48 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , cmake, pkg-config, which, makeWrapper , libpfm, zlib, python3Packages, procps, gdb, capnproto }: diff --git a/pkgs/development/tools/build-managers/alire/default.nix b/pkgs/development/tools/build-managers/alire/default.nix index b7613fe6e045..6d2e8cce61a8 100644 --- a/pkgs/development/tools/build-managers/alire/default.nix +++ b/pkgs/development/tools/build-managers/alire/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , gprbuild , gnat }: diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix index 5ef2a183fa0a..2e1459c16bea 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, lib, fetchurl, fetchpatch, fetchFromGitHub, installShellFiles +{ stdenv, callPackage, lib, fetchurl, fetchFromGitHub, installShellFiles , runCommand, runCommandCC, makeWrapper, recurseIntoAttrs # this package (through the fixpoint glass) , bazel_self diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix index 186d585d626e..5521fcf0d53d 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, lib, fetchurl, fetchpatch, fetchFromGitHub, installShellFiles +{ stdenv, callPackage, lib, fetchurl, fetchFromGitHub, installShellFiles , runCommand, runCommandCC, makeWrapper, recurseIntoAttrs # this package (through the fixpoint glass) , bazel_self diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 2b8d3106f3ce..2e0c1d54122b 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , cmake , ninja , pkg-config diff --git a/pkgs/development/tools/build-managers/msbuild/default.nix b/pkgs/development/tools/build-managers/msbuild/default.nix index 1f5261649b85..c9d6c19c450e 100644 --- a/pkgs/development/tools/build-managers/msbuild/default.nix +++ b/pkgs/development/tools/build-managers/msbuild/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, makeWrapper, glibcLocales, mono, nuget, unzip, dotnetCorePackages, writeText, roslyn }: +{ lib, stdenv, fetchurl, makeWrapper, glibcLocales, mono, nuget, unzip, dotnetCorePackages, writeText, roslyn }: let diff --git a/pkgs/development/tools/capnproto-java/default.nix b/pkgs/development/tools/capnproto-java/default.nix index fa59a5ad2abf..73c068543fb3 100644 --- a/pkgs/development/tools/capnproto-java/default.nix +++ b/pkgs/development/tools/capnproto-java/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, capnproto, pkg-config }: +{ lib, stdenv, fetchFromGitHub, capnproto, pkg-config }: stdenv.mkDerivation rec { pname = "capnproto-java"; diff --git a/pkgs/development/tools/esbuild/netlify.nix b/pkgs/development/tools/esbuild/netlify.nix index 1ed35d64f027..0d754060c211 100644 --- a/pkgs/development/tools/esbuild/netlify.nix +++ b/pkgs/development/tools/esbuild/netlify.nix @@ -1,7 +1,6 @@ { lib , buildGoModule , fetchFromGitHub -, fetchpatch , netlify-cli }: diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index e607967a1205..30f824c4e476 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, targetPackages # Build time -, fetchurl, fetchpatch, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages +, fetchurl, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages # Run time , ncurses, readline, gmp, mpfr, expat, libipt, zlib, zstd, xz, dejagnu, sourceHighlight, libiconv diff --git a/pkgs/development/tools/misc/jcli/default.nix b/pkgs/development/tools/misc/jcli/default.nix index f5d9d7a85899..2b7f14284f16 100644 --- a/pkgs/development/tools/misc/jcli/default.nix +++ b/pkgs/development/tools/misc/jcli/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "jcli"; diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index 50c064cadfd0..259fb2b113c7 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, m4 +{ lib, stdenv, fetchurl, m4 , runtimeShell , file }: diff --git a/pkgs/development/tools/misc/nix-bisect/default.nix b/pkgs/development/tools/misc/nix-bisect/default.nix index 7c9f474ab531..9927be16d36a 100644 --- a/pkgs/development/tools/misc/nix-bisect/default.nix +++ b/pkgs/development/tools/misc/nix-bisect/default.nix @@ -1,5 +1,4 @@ { lib -, fetchpatch , fetchFromGitHub , python3 }: diff --git a/pkgs/development/tools/rust/cargo-readme/default.nix b/pkgs/development/tools/rust/cargo-readme/default.nix index 2b5fb7abc69b..aa4a6cf5ea37 100644 --- a/pkgs/development/tools/rust/cargo-readme/default.nix +++ b/pkgs/development/tools/rust/cargo-readme/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, fetchpatch }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "cargo-readme"; diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index c4a97a47a4b6..6b3ca7635e43 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -1,4 +1,4 @@ -{ callPackage, lib, overrideCC, pkgs, buildPackages, fetchpatch, openssl, python3, enableNpm ? true }: +{ callPackage, lib, overrideCC, pkgs, buildPackages, openssl, python3, enableNpm ? true }: let # Clang 16+ cannot build Node v18 due to -Wenum-constexpr-conversion errors. From ca514fead12ea6ef2c90f1f9a0dfbdd23f14cea7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 01:15:48 +0000 Subject: [PATCH 41/63] kubestroyer: 0.2 -> 0.3.0 --- pkgs/tools/security/kubestroyer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/kubestroyer/default.nix b/pkgs/tools/security/kubestroyer/default.nix index 8e0922e4dfb0..a3f03e605c42 100644 --- a/pkgs/tools/security/kubestroyer/default.nix +++ b/pkgs/tools/security/kubestroyer/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "kubestroyer"; - version = "0.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "Rolix44"; repo = "Kubestroyer"; rev = "refs/tags/v${version}"; - hash = "sha256-M/abb2IT0mXwj8lAitr18VtIgC4NvapPywBwcUWr9i8="; + hash = "sha256-A4kx0Xx3p9rP8OKRLPe9AfX+rqGggtvPb7Hsg+lLkSI="; }; - vendorHash = "sha256-x0lIi4QUuYn0kv0HV4h8k61kRu10LCyELudisqUdTAg="; + vendorHash = "sha256-V6qEvMsX7tdhooW116+0ayT6RYkdjDbz6QwWb8rC4ig="; ldflags = [ "-s" From 09f2111db53905ca7ea623c3a1c4de06b434c796 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 02:43:23 +0000 Subject: [PATCH 42/63] rng-tools: 6.16 -> 6.17 --- pkgs/tools/security/rng-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix index a5470f05613b..ec7fd33b295b 100644 --- a/pkgs/tools/security/rng-tools/default.nix +++ b/pkgs/tools/security/rng-tools/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "rng-tools"; - version = "6.16"; + version = "6.17"; src = fetchFromGitHub { owner = "nhorman"; repo = pname; rev = "v${version}"; - hash = "sha256-9pXQhG2nbu6bq4BnBgEOyyUBNkQTI5RhWmJIoLtFU+c="; + hash = "sha256-wqJvLvxmNG2nb5P525w25Y8byUUJi24QIHNJomCKeG8="; }; nativeBuildInputs = [ autoreconfHook libtool pkg-config ]; From 7c2d8b3d1247abd57dffff3d1b01ed360c8b0f57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 02:43:42 +0000 Subject: [PATCH 43/63] redpanda-client: 24.1.2 -> 24.1.3 --- pkgs/servers/redpanda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix index 10e8cd3ed717..cc1496ccb90d 100644 --- a/pkgs/servers/redpanda/default.nix +++ b/pkgs/servers/redpanda/default.nix @@ -7,12 +7,12 @@ , stdenv }: let - version = "24.1.2"; + version = "24.1.3"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-RkJymtTTIPTPzpoUyWmCKpfQBqGFoR7ZeEWCKKzkn54="; + sha256 = "sha256-LuaUm8FToGJ4//tDFvdHbTCHzhul4ympSznbp1wrLM8="; }; server = callPackage ./server.nix { inherit src version; }; in From 24576e85fa38128bc139e13a16a60fd846399d07 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 02:49:49 +0000 Subject: [PATCH 44/63] rocksdb: 9.1.1 -> 9.2.1 --- pkgs/development/libraries/rocksdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index f07a43cfbec0..0491ef2e6725 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocksdb"; - version = "9.1.1"; + version = "9.2.1"; src = fetchFromGitHub { owner = "facebook"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-/Xf0bzNJPclH9IP80QNaABfhj4IAR5LycYET18VFCXc="; + hash = "sha256-Zifn5Gu/4h6TaEqSaWQ2mFdryeAarqbHWW3fKUGGFac="; }; nativeBuildInputs = [ cmake ninja ]; From 754ec45a96a74b669855efc9aeb104aef32f3789 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 02:56:47 +0000 Subject: [PATCH 45/63] sdrangel: 7.20.1 -> 7.21.0 --- pkgs/applications/radio/sdrangel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index 639fee520c85..daf5abd644e1 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -52,13 +52,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sdrangel"; - version = "7.20.1"; + version = "7.21.0"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${finalAttrs.version}"; - hash = "sha256-8v00JiPRCFqg+6wEZw5BrsHMvUYweigbroBHKQGOlHI="; + hash = "sha256-TbOGuxFFBSjva1dbZxd2oQJs6X43QWYSU6VjlXKlDfk="; }; nativeBuildInputs = [ From 536e6566ffe1edea82d4cdca537d38bd9e4930a0 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 24 May 2024 10:29:56 +0900 Subject: [PATCH 46/63] python311Packages.langchain-core: add updateScript --- .../python-modules/langchain-community/default.nix | 4 ++++ .../python-modules/langchain-core/default.nix | 14 ++++++++++++++ .../langchain-text-splitters/default.nix | 4 ++++ .../python-modules/langchain/default.nix | 4 ++++ 4 files changed, 26 insertions(+) diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix index e8e028570abd..947d23fb21fd 100644 --- a/pkgs/development/python-modules/langchain-community/default.nix +++ b/pkgs/development/python-modules/langchain-community/default.nix @@ -52,6 +52,10 @@ buildPythonPackage rec { # PyPI source does not have tests doCheck = false; + passthru = { + updateScript = langchain-core.updateScript; + }; + meta = with lib; { description = "Community contributed LangChain integrations"; homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/community"; diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix index 8cfa8cafd9ee..d2ee9ee504cf 100644 --- a/pkgs/development/python-modules/langchain-core/default.nix +++ b/pkgs/development/python-modules/langchain-core/default.nix @@ -13,6 +13,7 @@ pyyaml, requests, tenacity, + writeScript, }: buildPythonPackage rec { @@ -53,6 +54,19 @@ buildPythonPackage rec { # PyPI source does not have tests doCheck = false; + passthru = { + updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p nix-update + + set -eu -o pipefail + nix-update --commit --version-regex 'langchain-core==(.*)' python3Packages.langchain-core + nix-update --commit --version-regex 'langchain-text-splitters==(.*)' python3Packages.langchain-text-splitters + nix-update --commit --version-regex 'langchain==(.*)' python3Packages.langchain + nix-update --commit --version-regex 'langchain-community==(.*)' python3Packages.langchain-community + ''; + }; + meta = with lib; { description = "Building applications with LLMs through composability"; homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/core"; diff --git a/pkgs/development/python-modules/langchain-text-splitters/default.nix b/pkgs/development/python-modules/langchain-text-splitters/default.nix index 3f8fa837af7a..6084bbf5ee0b 100644 --- a/pkgs/development/python-modules/langchain-text-splitters/default.nix +++ b/pkgs/development/python-modules/langchain-text-splitters/default.nix @@ -33,6 +33,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "langchain_text_splitters" ]; + passthru = { + inherit (langchain-core) updateScript; + }; + meta = with lib; { description = "Build context-aware reasoning applications"; homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/text-splitters"; diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index 804f63a88e9f..7b085b2cde6f 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -166,6 +166,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "langchain" ]; + passthru = { + updateScript = langchain-core.updateScript; + }; + meta = with lib; { description = "Building applications with LLMs through composability"; homepage = "https://github.com/langchain-ai/langchain"; From d33016aecc71f8e6514aab87412aba7e406acf1f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 02:58:26 +0000 Subject: [PATCH 47/63] symengine: 0.11.2 -> 0.12.0 --- pkgs/development/libraries/symengine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/symengine/default.nix b/pkgs/development/libraries/symengine/default.nix index cc08b7ff3c2e..8bd5b7055a59 100644 --- a/pkgs/development/libraries/symengine/default.nix +++ b/pkgs/development/libraries/symengine/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "symengine"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "symengine"; repo = "symengine"; rev = "v${version}"; - hash = "sha256-CwVDpDbx00r7Fys+5r1n0m/E86zTx1i4ti5JCcVp20g="; + hash = "sha256-SfifujR2VM1OlPN0ZRUC3hWImXO/8PuiyrBdpyNoKW4="; }; nativeBuildInputs = [ cmake ]; From bcbfcb8a177cab0682f5cb3efd91e309a9bea7b4 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 24 May 2024 01:32:31 +0000 Subject: [PATCH 48/63] python3Packages.langchain-core: 0.1.52 -> 0.2.1 Diff: https://github.com/langchain-ai/langchain/compare/langchain-core==0.1.52...langchain-core==0.2.1 --- .../python-modules/langchain-core/default.nix | 42 +++++++++++++------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix index d2ee9ee504cf..cf919d3404da 100644 --- a/pkgs/development/python-modules/langchain-core/default.nix +++ b/pkgs/development/python-modules/langchain-core/default.nix @@ -1,34 +1,43 @@ { lib, - anyio, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + freezegun, + grandalf, jsonpatch, langsmith, + numpy, packaging, poetry-core, pydantic, + pytest-asyncio, + pytest-mock, + pytest-xdist, + pytestCheckHook, pythonOlder, pythonRelaxDepsHook, pyyaml, - requests, + syrupy, tenacity, writeScript, }: buildPythonPackage rec { pname = "langchain-core"; - version = "0.1.52"; + version = "0.2.1"; pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - pname = "langchain_core"; - inherit version; - hash = "sha256-CEw/xFL1ppZsKKs+xdvIuNJvw/YzeAc5KPTinZC2OT8="; + src = fetchFromGitHub { + owner = "langchain-ai"; + repo = "langchain"; + rev = "langchain-core==${version}"; + hash = "sha256-D0y6kW5bWcCKW2TwVPlZcAUxqADgsOm9fWySAjHYYIg="; }; + sourceRoot = "${src.name}/libs/core"; + pythonRelaxDeps = [ "langsmith" "packaging" @@ -39,20 +48,28 @@ buildPythonPackage rec { nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ - anyio jsonpatch langsmith packaging pydantic pyyaml - requests tenacity ]; pythonImportsCheck = [ "langchain_core" ]; - # PyPI source does not have tests - doCheck = false; + nativeCheckInputs = [ + freezegun + grandalf + numpy + pytest-asyncio + pytest-mock + pytest-xdist + pytestCheckHook + syrupy + ]; + + pytestFlagsArray = [ "tests/unit_tests" ]; passthru = { updateScript = writeScript "update.sh" '' @@ -70,6 +87,7 @@ buildPythonPackage rec { meta = with lib; { description = "Building applications with LLMs through composability"; homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/core"; + changelog = "https://github.com/langchain-ai/langchain/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ natsukium ]; }; From 5eba8fa86acf45c7c7791c9c74c246541433a7fd Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 24 May 2024 01:32:54 +0000 Subject: [PATCH 49/63] python3Packages.langchain: 0.1.52 -> 0.2.1 Diff: https://github.com/langchain-ai/langchain/compare/refs/tags/langchain==0.1.52...langchain==0.2.1 Changelog: https://github.com/langchain-ai/langchain/releases/tag/v0.2.1 --- .../development/python-modules/langchain/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index 7b085b2cde6f..94dad83b0f31 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -10,13 +10,10 @@ chardet, clarifai, cohere, - dataclasses-json, esprima, fetchFromGitHub, freezegun, huggingface-hub, - jsonpatch, - langchain-community, langchain-core, langchain-text-splitters, langsmith, @@ -51,7 +48,7 @@ buildPythonPackage rec { pname = "langchain"; - version = "0.1.52"; + version = "0.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -59,8 +56,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; - rev = "refs/tags/langchain-core==${version}"; - hash = "sha256-H8rtysRIwyuJEUFI93vid3MsqReyRCER88xztsuYpOc="; + rev = "refs/tags/langchain==${version}"; + hash = "sha256-cLJhdeft9XNLk5njSBaEBSuP31c2VFCJ1ET+ypo6mNY="; }; sourceRoot = "${src.name}/libs/langchain"; @@ -71,9 +68,6 @@ buildPythonPackage rec { dependencies = [ aiohttp - dataclasses-json - jsonpatch - langchain-community langchain-core langchain-text-splitters langsmith From daec3817ea3182ed7dcf0915bc40c558f3a234df Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 24 May 2024 01:33:13 +0000 Subject: [PATCH 50/63] python3Packages.langchain-community: 0.0.38 -> 0.2.1 Diff: https://github.com/langchain-ai/langchain/compare/langchain-community==0.0.38...langchain-community==0.2.1 --- .../langchain-community/default.nix | 44 +++++++++++++++---- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix index 947d23fb21fd..684591f833eb 100644 --- a/pkgs/development/python-modules/langchain-community/default.nix +++ b/pkgs/development/python-modules/langchain-community/default.nix @@ -1,40 +1,55 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, poetry-core, pythonOlder, aiohttp, dataclasses-json, + duckdb-engine, + langchain, langchain-core, langsmith, + lark, numpy, + pandas, + pytest-asyncio, + pytest-mock, + pytestCheckHook, pyyaml, requests, + requests-mock, + responses, sqlalchemy, + syrupy, tenacity, + toml, typer, }: buildPythonPackage rec { pname = "langchain-community"; - version = "0.0.38"; + version = "0.2.1"; pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - pname = "langchain_community"; - inherit version; - hash = "sha256-En/Et1vGe2L+gnxmwC5xWnMP74/mm9ICPUZrqwa1gQ0="; + src = fetchFromGitHub { + owner = "langchain-ai"; + repo = "langchain"; + rev = "langchain-community==${version}"; + hash = "sha256-h8ZJiQYmyvzaRrEVNS7SamJTq4zY7J1IgYdQiVBFh4I="; }; + sourceRoot = "${src.name}/libs/community"; + build-system = [ poetry-core ]; dependencies = [ aiohttp dataclasses-json langchain-core + langchain langsmith numpy pyyaml @@ -49,8 +64,20 @@ buildPythonPackage rec { pythonImportsCheck = [ "langchain_community" ]; - # PyPI source does not have tests - doCheck = false; + nativeCheckInputs = [ + duckdb-engine + lark + pandas + pytest-asyncio + pytest-mock + pytestCheckHook + requests-mock + responses + syrupy + toml + ]; + + pytestFlagsArray = [ "tests/unit_tests" ]; passthru = { updateScript = langchain-core.updateScript; @@ -59,6 +86,7 @@ buildPythonPackage rec { meta = with lib; { description = "Community contributed LangChain integrations"; homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/community"; + changelog = "https://github.com/langchain-ai/langchain/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ natsukium ]; }; From 3f5b5e6ee65a2f122aa0ca74b0eb02c65c525d2c Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 24 May 2024 02:24:26 +0000 Subject: [PATCH 51/63] python3Packages.langchain-text-splitters: 0.0.2 -> 0.2.0 Diff: https://github.com/langchain-ai/langchain/compare/refs/tags/langchain-text-splitters==0.0.2...langchain-text-splitters==0.2.0 --- .../langchain-text-splitters/default.nix | 34 +++++++++++-------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/langchain-text-splitters/default.nix b/pkgs/development/python-modules/langchain-text-splitters/default.nix index 6084bbf5ee0b..73a1e722019a 100644 --- a/pkgs/development/python-modules/langchain-text-splitters/default.nix +++ b/pkgs/development/python-modules/langchain-text-splitters/default.nix @@ -1,38 +1,43 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, poetry-core, langchain-core, - lxml, + pytest-asyncio, + pytestCheckHook, pythonOlder, }: buildPythonPackage rec { pname = "langchain-text-splitters"; - version = "0.0.2"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.9"; - src = fetchPypi { - pname = "langchain_text_splitters"; - inherit version; - hash = "sha256-rIkn3AugjrpwL2lhye19986tjeGan3EBqyteo0IBs8E="; + src = fetchFromGitHub { + owner = "langchain-ai"; + repo = "langchain"; + rev = "refs/tags/langchain-text-splitters==${version}"; + hash = "sha256-QrgZ0j/YdOgEgLeQNSKjOIwqdr/Izuw9Gh6eKQ/00tQ="; }; + sourceRoot = "${src.name}/libs/text-splitters"; + build-system = [ poetry-core ]; - dependencies = [ - langchain-core - lxml - ]; - - # PyPI source does not have tests - doCheck = false; + dependencies = [ langchain-core ]; pythonImportsCheck = [ "langchain_text_splitters" ]; + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pytestFlagsArray = [ "tests/unit_tests" ]; + passthru = { inherit (langchain-core) updateScript; }; @@ -40,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Build context-aware reasoning applications"; homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/text-splitters"; + changelog = "https://github.com/langchain-ai/langchain/releases/tag/${src.rev}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From e38cfd5ef4313905e35c89e1e85869fe3442fc50 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 03:01:51 +0000 Subject: [PATCH 52/63] stern: 1.29.0 -> 1.30.0 --- pkgs/applications/networking/cluster/stern/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix index fd4b70de5acd..b2a54862c1ed 100644 --- a/pkgs/applications/networking/cluster/stern/default.nix +++ b/pkgs/applications/networking/cluster/stern/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "stern"; - version = "1.29.0"; + version = "1.30.0"; src = fetchFromGitHub { owner = "stern"; repo = "stern"; rev = "v${version}"; - sha256 = "sha256-8Tvhul7GwVbRJqJenbYID8OY5zGzFhIormUwEtLE0Lw="; + sha256 = "sha256-sqRPX+NC58mQi0wvs3u3Lb81LBntaY1FzzlY1TIiz18="; }; vendorHash = "sha256-RLcF7KfKtkwB+nWzaQb8Va9pau+TS2uE9AmJ0aFNsik="; From 7db23ccdfb242ab888b131c8556a24319d6e4643 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 03:25:00 +0000 Subject: [PATCH 53/63] python311Packages.goodwe: 0.4.3 -> 0.4.5 --- pkgs/development/python-modules/goodwe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/goodwe/default.nix b/pkgs/development/python-modules/goodwe/default.nix index d2e8b5495f14..feff5d186fea 100644 --- a/pkgs/development/python-modules/goodwe/default.nix +++ b/pkgs/development/python-modules/goodwe/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "goodwe"; - version = "0.4.3"; + version = "0.4.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "marcelblijleven"; repo = "goodwe"; rev = "refs/tags/v${version}"; - hash = "sha256-Hj/iTFGUqvMeFQso6wCbkUmoGOSCEtMsO8HaQ/UQKeM="; + hash = "sha256-xWVYxOc0PibttftZIrnmClPcu4EnJCQ1Zob8Pg+FTBE="; }; postPatch = '' From e77e8002b3d36672c3f48c31ee2c9d939dfe81b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 04:51:51 +0000 Subject: [PATCH 54/63] python311Packages.griffe: 0.45.1 -> 0.45.2 --- pkgs/development/python-modules/griffe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index 2fd12f938674..eaccbad28682 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "0.45.1"; + version = "0.45.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "griffe"; rev = "refs/tags/${version}"; - hash = "sha256-NmCnhImkdo2zAHhl2fLknV0rXXmJ9A+FL1uXUBF4IPk="; + hash = "sha256-mWJNEZPZgpqJ15HuptpjD9e14CYh4TNFbE38zI42wRk="; }; build-system = [ pdm-backend ]; From 3259f97ac0d7923096e36411a49c735b41045f39 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 05:34:13 +0000 Subject: [PATCH 55/63] wasmer: 4.2.7 -> 4.3.1 --- pkgs/development/interpreters/wasmer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix index a509107ec163..ed9139af17b8 100644 --- a/pkgs/development/interpreters/wasmer/default.nix +++ b/pkgs/development/interpreters/wasmer/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "wasmer"; - version = "4.2.7"; + version = "4.3.1"; src = fetchFromGitHub { owner = "wasmerio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-jyA1DUouODq9giAWeGOw7VMGwA+FbyqpEU77jtCb5v4="; + hash = "sha256-1bxxy0Dso54cYQIZC9UUjtkgL1eyd3oRbhaYCwI0otw="; }; - cargoHash = "sha256-EpHM8YaT2Ty9IBX/gXEa9n8006A9Y5/fq/ueODxHlnc="; + cargoHash = "sha256-3MwQZdFIWqHvELpIGlqsn/VKyobWki7OcMXQrjbxwKk="; nativeBuildInputs = [ rustPlatform.bindgenHook From 42b94fa833ce9a6c7d5b9f561ad6056f49a2c675 Mon Sep 17 00:00:00 2001 From: Aleksana Date: Fri, 24 May 2024 14:48:58 +0800 Subject: [PATCH 56/63] share-preview: init at 0.5.0 (#313676) * share-preview: init at 0.5.0 * share-preview: fix build on darwin --------- Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com> --- pkgs/by-name/sh/share-preview/package.nix | 66 +++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 pkgs/by-name/sh/share-preview/package.nix diff --git a/pkgs/by-name/sh/share-preview/package.nix b/pkgs/by-name/sh/share-preview/package.nix new file mode 100644 index 000000000000..093bbaf33270 --- /dev/null +++ b/pkgs/by-name/sh/share-preview/package.nix @@ -0,0 +1,66 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + meson, + ninja, + pkg-config, + rustc, + cargo, + wrapGAppsHook4, + desktop-file-utils, + libadwaita, + openssl, + darwin, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "share-preview"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "rafaelmardojai"; + repo = "share-preview"; + rev = finalAttrs.version; + hash = "sha256-FqualaTkirB+gBcgkThQpSBHhM4iaXkiGujwBUnUX0E="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit (finalAttrs) src; + name = "share-preview-${finalAttrs.version}"; + hash = "sha256-Gh6bQZD1mlkj3XeGp+fF/NShC4PZCZSEqymrsSdX4Ec="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + rustPlatform.cargoSetupHook + rustc + cargo + wrapGAppsHook4 + desktop-file-utils + ]; + + buildInputs = [ + libadwaita + openssl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Foundation + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + env.NIX_CFLAGS_COMPILE = toString ( + lib.optionals stdenv.isDarwin [ "-Wno-error=incompatible-function-pointer-types" ] + ); + + meta = { + description = "Preview and debug websites metadata tags for social media share"; + homepage = "https://apps.gnome.org/SharePreview"; + license = lib.licenses.gpl3Plus; + mainProgram = "share-preview"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.unix; + }; +}) From 1478fde15ff8950d7bca60f1a0d2a857baad55fb Mon Sep 17 00:00:00 2001 From: DamitusThyYeetus123 <108782125+DamitusThyYeetus123@users.noreply.github.com> Date: Fri, 24 May 2024 17:46:32 +1000 Subject: [PATCH 57/63] openttd: 13.4 -> 14.1 (#303969) * openttd: 13.4 -> 14.0 openttd: switch fetchurl to fetchzip openttd: remove fetchurl from input args * openttd: 14.0 -> 14.1 --- pkgs/games/openttd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 69a2c75fa463..268cead62dc4 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchzip, cmake, pkg-config +{ lib, stdenv, fetchzip, cmake, pkg-config , SDL2, libpng, zlib, xz, freetype, fontconfig , nlohmann_json, curl, icu, harfbuzz, expat, glib, pcre2 , withOpenGFX ? true, withOpenSFX ? true, withOpenMSX ? true @@ -32,11 +32,11 @@ let in stdenv.mkDerivation rec { pname = "openttd"; - version = "13.4"; + version = "14.1"; - src = fetchurl { + src = fetchzip { url = "https://cdn.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz"; - hash = "sha256-Kh3roBv+WOIYiHn0UMP6TzgZJxq0m/NI3WZUXwQNFG8="; + hash = "sha256-YT4IE/rJ9pnpeMWKbOra6AbSUwW19RwOKlXkxwoMeKY="; }; nativeBuildInputs = [ cmake pkg-config makeWrapper ]; From f90996a6df21f237e11fc772b8e0e0a850f39f6d Mon Sep 17 00:00:00 2001 From: Yureka Date: Fri, 24 May 2024 10:10:54 +0200 Subject: [PATCH 58/63] CoinMP: backport build fixes for musl-libc (#313603) --- ...terpret_cast-from-NULL-to-C-cast-see.patch | 95 +++++++++++++++++++ ...tatic_cast-for-static-cast-fixes-319.patch | 25 +++++ ...et_cast-of-NULL-to-C-style-case-fixe.patch | 26 +++++ pkgs/development/libraries/CoinMP/default.nix | 18 +++- 4 files changed, 163 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/CoinMP/0001-change-more-reinterpret_cast-from-NULL-to-C-cast-see.patch create mode 100644 pkgs/development/libraries/CoinMP/0001-use-static_cast-for-static-cast-fixes-319.patch create mode 100644 pkgs/development/libraries/CoinMP/0002-change-reinterpret_cast-of-NULL-to-C-style-case-fixe.patch diff --git a/pkgs/development/libraries/CoinMP/0001-change-more-reinterpret_cast-from-NULL-to-C-cast-see.patch b/pkgs/development/libraries/CoinMP/0001-change-more-reinterpret_cast-from-NULL-to-C-cast-see.patch new file mode 100644 index 000000000000..fccba169df49 --- /dev/null +++ b/pkgs/development/libraries/CoinMP/0001-change-more-reinterpret_cast-from-NULL-to-C-cast-see.patch @@ -0,0 +1,95 @@ +From 0259f2b936ee0d9288ff39c509c69a66f5b13b80 Mon Sep 17 00:00:00 2001 +From: Stefan Vigerske +Date: Mon, 11 Mar 2019 16:34:25 +0000 +Subject: [PATCH 1/2] change more reinterpret_cast from NULL to C-cast, see + also #93 + +--- + Clp/src/AbcSimplex.cpp | 48 +++++++++++++++++++++--------------------- + Clp/src/ClpModel.cpp | 2 +- + 2 files changed, 25 insertions(+), 25 deletions(-) + +diff --git a/Clp/src/AbcSimplex.cpp b/Clp/src/AbcSimplex.cpp +index 0eacd91e..1715e6d8 100644 +--- a/Clp/src/AbcSimplex.cpp ++++ b/Clp/src/AbcSimplex.cpp +@@ -368,19 +368,19 @@ AbcSimplex::gutsOfInitialize(int numberRows,int numberColumns,bool doMore) + // say Steepest pricing + abcDualRowPivot_ = new AbcDualRowSteepest(); + abcPrimalColumnPivot_ = new AbcPrimalColumnSteepest(); +- internalStatus_ = newArray(reinterpret_cast(NULL), ++ internalStatus_ = newArray((unsigned char *)NULL, + sizeArray+maximumNumberTotal_); +- abcLower_ = newArray(reinterpret_cast(NULL),sizeArray); +- abcUpper_ = newArray(reinterpret_cast(NULL),sizeArray); +- abcCost_ = newArray(reinterpret_cast(NULL),sizeArray+maximumNumberTotal_); +- abcDj_ = newArray(reinterpret_cast(NULL),sizeArray); +- abcSolution_ = newArray(reinterpret_cast(NULL),sizeArray+maximumNumberTotal_); +- //fromExternal_ = newArray(reinterpret_cast(NULL),sizeArray); +- //toExternal_ = newArray(reinterpret_cast(NULL),sizeArray); +- scaleFromExternal_ = newArray(reinterpret_cast(NULL),sizeArray); +- offset_ = newArray(reinterpret_cast(NULL),sizeArray); +- abcPerturbation_ = newArray(reinterpret_cast(NULL),sizeArray); +- abcPivotVariable_ = newArray(reinterpret_cast(NULL),maximumAbcNumberRows_); ++ abcLower_ = newArray((double *)NULL,sizeArray); ++ abcUpper_ = newArray((double *)NULL,sizeArray); ++ abcCost_ = newArray((double *)NULL,sizeArray+maximumNumberTotal_); ++ abcDj_ = newArray((double *)NULL,sizeArray); ++ abcSolution_ = newArray((double *)NULL,sizeArray+maximumNumberTotal_); ++ //fromExternal_ = newArray((int *)NULL,sizeArray); ++ //toExternal_ = newArray((int *)NULL,sizeArray); ++ scaleFromExternal_ = newArray((double *)NULL,sizeArray); ++ offset_ = newArray((double *)NULL,sizeArray); ++ abcPerturbation_ = newArray((double *)NULL,sizeArray); ++ abcPivotVariable_ = newArray((int *)NULL,maximumAbcNumberRows_); + // Fill perturbation array + setupPointers(maximumAbcNumberRows_,maximumAbcNumberColumns_); + fillPerturbation(0,maximumNumberTotal_); +@@ -554,19 +554,19 @@ AbcSimplex::createSubProblem(int numberColumns,const int * whichColumn) + subProblem->maximumNumberTotal_= maximumAbcNumberRows_+numberColumns; + subProblem->numberTotalWithoutFixed_= subProblem->numberTotal_; + int sizeArray=2*subProblem->maximumNumberTotal_+maximumAbcNumberRows_; +- subProblem->internalStatus_ = newArray(reinterpret_cast(NULL), ++ subProblem->internalStatus_ = newArray((unsigned char *)NULL, + sizeArray+subProblem->maximumNumberTotal_); +- subProblem->abcLower_ = newArray(reinterpret_cast(NULL),sizeArray); +- subProblem->abcUpper_ = newArray(reinterpret_cast(NULL),sizeArray); +- subProblem->abcCost_ = newArray(reinterpret_cast(NULL),sizeArray+subProblem->maximumNumberTotal_); +- subProblem->abcDj_ = newArray(reinterpret_cast(NULL),sizeArray); +- subProblem->abcSolution_ = newArray(reinterpret_cast(NULL),sizeArray+subProblem->maximumNumberTotal_); +- //fromExternal_ = newArray(reinterpret_cast(NULL),sizeArray); +- //toExternal_ = newArray(reinterpret_cast(NULL),sizeArray); +- subProblem->scaleFromExternal_ = newArray(reinterpret_cast(NULL),sizeArray); +- subProblem->offset_ = newArray(reinterpret_cast(NULL),sizeArray); +- subProblem->abcPerturbation_ = newArray(reinterpret_cast(NULL),sizeArray); +- subProblem->abcPivotVariable_ = newArray(reinterpret_cast(NULL),maximumAbcNumberRows_); ++ subProblem->abcLower_ = newArray((double *)NULL,sizeArray); ++ subProblem->abcUpper_ = newArray((double *)NULL,sizeArray); ++ subProblem->abcCost_ = newArray((double *)NULL,sizeArray+subProblem->maximumNumberTotal_); ++ subProblem->abcDj_ = newArray((double *)NULL,sizeArray); ++ subProblem->abcSolution_ = newArray((double *)NULL,sizeArray+subProblem->maximumNumberTotal_); ++ //fromExternal_ = newArray((int *)NULL,sizeArray); ++ //toExternal_ = newArray((int *)NULL,sizeArray); ++ subProblem->scaleFromExternal_ = newArray((double *)NULL,sizeArray); ++ subProblem->offset_ = newArray((double *)NULL,sizeArray); ++ subProblem->abcPerturbation_ = newArray((double *)NULL,sizeArray); ++ subProblem->abcPivotVariable_ = newArray((int *)NULL,maximumAbcNumberRows_); + subProblem->setupPointers(maximumAbcNumberRows_,numberColumns); + // could use arrays - but for now be safe + int * backward = new int [numberFullColumns+numberRows_]; +diff --git a/Clp/src/ClpModel.cpp b/Clp/src/ClpModel.cpp +index 1fc905c4..83aa3b63 100644 +--- a/Clp/src/ClpModel.cpp ++++ b/Clp/src/ClpModel.cpp +@@ -3845,7 +3845,7 @@ ClpModel::writeMps(const char *filename, + writer.setMpsData(*(matrix_->getPackedMatrix()), COIN_DBL_MAX, + getColLower(), getColUpper(), + objective, +- reinterpret_cast (NULL) /*integrality*/, ++ (const char*)NULL /*integrality*/, + getRowLower(), getRowUpper(), + columnNames, rowNames); + // Pass in array saying if each variable integer +-- +2.37.3 + diff --git a/pkgs/development/libraries/CoinMP/0001-use-static_cast-for-static-cast-fixes-319.patch b/pkgs/development/libraries/CoinMP/0001-use-static_cast-for-static-cast-fixes-319.patch new file mode 100644 index 000000000000..3f1790bd50c3 --- /dev/null +++ b/pkgs/development/libraries/CoinMP/0001-use-static_cast-for-static-cast-fixes-319.patch @@ -0,0 +1,25 @@ +From b36a5bd502fbf6b8ad31b6bc35c7bab4aff24313 Mon Sep 17 00:00:00 2001 +From: Stefan Vigerske +Date: Mon, 20 Jul 2020 18:39:20 +0200 +Subject: [PATCH] use static_cast for static cast, fixes #319 + +--- + Cbc/src/CbcModel.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Cbc/src/CbcModel.cpp b/Cbc/src/CbcModel.cpp +index 8603942b..239bf0b4 100644 +--- a/Cbc/src/CbcModel.cpp ++++ b/Cbc/src/CbcModel.cpp +@@ -5357,7 +5357,7 @@ void CbcModel::branchAndBound(int doStatistics) + OsiClpSolverInterface * clpSolver + = dynamic_cast (solver_); + if (clpSolver) +- clpSolver->setFakeObjective(reinterpret_cast (NULL)); ++ clpSolver->setFakeObjective(static_cast (NULL)); + } + #endif + moreSpecialOptions_ = saveMoreSpecialOptions; +-- +2.37.3 + diff --git a/pkgs/development/libraries/CoinMP/0002-change-reinterpret_cast-of-NULL-to-C-style-case-fixe.patch b/pkgs/development/libraries/CoinMP/0002-change-reinterpret_cast-of-NULL-to-C-style-case-fixe.patch new file mode 100644 index 000000000000..b1ca1806b5a9 --- /dev/null +++ b/pkgs/development/libraries/CoinMP/0002-change-reinterpret_cast-of-NULL-to-C-style-case-fixe.patch @@ -0,0 +1,26 @@ +From 4571de031e528bc145590d6a1be5ceb87bd8cdb5 Mon Sep 17 00:00:00 2001 +From: Stefan Vigerske +Date: Mon, 11 Mar 2019 16:29:20 +0000 +Subject: [PATCH 2/2] change reinterpret_cast of NULL to C-style case, fixes + #93 + +--- + Clp/src/OsiClp/OsiClpSolverInterface.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Clp/src/OsiClp/OsiClpSolverInterface.cpp b/Clp/src/OsiClp/OsiClpSolverInterface.cpp +index 55dd4dcd..a0217d42 100644 +--- a/Clp/src/OsiClp/OsiClpSolverInterface.cpp ++++ b/Clp/src/OsiClp/OsiClpSolverInterface.cpp +@@ -1448,7 +1448,7 @@ OsiClpSolverInterface::setupForRepeatedUse(int senseOfAdventure, int printOut) + if (stopPrinting) { + CoinMessages * messagesPointer = modelPtr_->messagesPointer(); + // won't even build messages +- messagesPointer->setDetailMessages(100,10000,reinterpret_cast (NULL)); ++ messagesPointer->setDetailMessages(100,10000,(int*)NULL); + } + #endif + } +-- +2.37.3 + diff --git a/pkgs/development/libraries/CoinMP/default.nix b/pkgs/development/libraries/CoinMP/default.nix index 0a2954f4a7dd..7b829305b031 100644 --- a/pkgs/development/libraries/CoinMP/default.nix +++ b/pkgs/development/libraries/CoinMP/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { pname = "CoinMP"; @@ -9,6 +9,22 @@ stdenv.mkDerivation rec { sha256 = "13d3j1sdcjzpijp4qks3n0zibk649ac3hhv88hkk8ffxrc6gnn9l"; }; + patches = [ + # backport build fixes for pkgsMusl.CoinMP + (fetchpatch { + url = "https://github.com/coin-or/Cgl/commit/57d8c71cd50dc27a89eaeb4672499bca55f1fd72.patch"; + extraPrefix = "Cgl/"; + stripLen = 1; + hash = "sha256-NdwXpIL1w6kHVfhBFscTlpriQOfUXx860/4x7pK+698="; + }) + # https://github.com/coin-or/Clp/commit/b637e1d633425ae21ec041bf7f9e06f56b741de0 + ./0001-change-more-reinterpret_cast-from-NULL-to-C-cast-see.patch + # https://github.com/coin-or/Clp/commit/e749fe6b11a90006d744af2ca2691220862e3a59 + ./0002-change-reinterpret_cast-of-NULL-to-C-style-case-fixe.patch + # https://github.com/coin-or/Cbc/commit/584fd12fba6a562d49864f44bedd13ee32d06999 + ./0001-use-static_cast-for-static-cast-fixes-319.patch + ]; + enableParallelBuilding = true; env = lib.optionalAttrs stdenv.cc.isClang { From e81da2ef9d893370153bcdc327ff032c9b8e8c31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 08:16:52 +0000 Subject: [PATCH 59/63] git-delete-merged-branches: 7.4.0 -> 7.4.1 --- .../version-management/git-delete-merged-branches/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-delete-merged-branches/default.nix b/pkgs/applications/version-management/git-delete-merged-branches/default.nix index 08d93bcf69e7..423dc72d24ff 100644 --- a/pkgs/applications/version-management/git-delete-merged-branches/default.nix +++ b/pkgs/applications/version-management/git-delete-merged-branches/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "git-delete-merged-branches"; - version = "7.4.0"; + version = "7.4.1"; src = fetchFromGitHub { owner = "hartwork"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-17uFV3pjklqVW5ofeR54mgMh+q3uUCdqZG00Cc+4zFQ="; + sha256 = "sha256-1CUwac2TPU5s1uLS1zPvtXZEGCWYwm1y935jqbI173Q="; }; propagatedBuildInputs = with python3Packages; [ From 477f540b11daf72e4ce5565f632a8e9d092f21a9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 May 2024 10:17:14 +0200 Subject: [PATCH 60/63] python311Packages.weatherflow4py: init at 0.2.20 Module to interact with the WeatherFlow REST API https://github.com/jeeftor/weatherflow4py --- .../python-modules/weatherflow4py/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/weatherflow4py/default.nix diff --git a/pkgs/development/python-modules/weatherflow4py/default.nix b/pkgs/development/python-modules/weatherflow4py/default.nix new file mode 100644 index 000000000000..d3dd7c8fd6fb --- /dev/null +++ b/pkgs/development/python-modules/weatherflow4py/default.nix @@ -0,0 +1,54 @@ +{ + lib, + aiohttp, + aioresponses, + buildPythonPackage, + dataclasses-json, + fetchFromGitHub, + marshmallow, + poetry-core, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + websockets, +}: + +buildPythonPackage rec { + pname = "weatherflow4py"; + version = "0.2.20"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "jeeftor"; + repo = "weatherflow4py"; + rev = "refs/tags/v${version}"; + hash = "sha256-kkNGhFhciOfhrbjxLM01YC2IRmkdKEbk4EUyDJZJuxU="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + aiohttp + dataclasses-json + marshmallow + websockets + ]; + + nativeCheckInputs = [ + aioresponses + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "weatherflow4py" ]; + + meta = with lib; { + description = "Module to interact with the WeatherFlow REST API"; + homepage = "https://github.com/jeeftor/weatherflow4py"; + changelog = "https://github.com/jeeftor/weatherflow4py/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 377d5e2587d1..88c1b07e09e5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16378,6 +16378,8 @@ self: super: with self; { weasyprint = callPackage ../development/python-modules/weasyprint { }; + weatherflow4py = callPackage ../development/python-modules/weatherflow4py { }; + weaviate-client = callPackage ../development/python-modules/weaviate-client { }; web3 = callPackage ../development/python-modules/web3 { }; From a6340441a8158671ad01fa6c47415b8ea659934b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 May 2024 10:17:39 +0200 Subject: [PATCH 61/63] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index b9fc857f211c..5af7ec264860 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -5510,7 +5510,8 @@ pyweatherflowudp ]; "weatherflow_cloud" = ps: with ps; [ - ]; # missing inputs: weatherflow4py + weatherflow4py + ]; "weatherkit" = ps: with ps; [ apple-weatherkit ]; @@ -6623,6 +6624,7 @@ "waze_travel_time" "weather" "weatherflow" + "weatherflow_cloud" "weatherkit" "webhook" "webostv" From 6033cd12606fab23a30539bf2da7d98ed6d82506 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 08:21:57 +0000 Subject: [PATCH 62/63] python311Packages.panel: 1.4.1 -> 1.4.3 --- pkgs/development/python-modules/panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index 30c6c52c6780..b497d6de4cd7 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "panel"; - version = "1.4.1"; + version = "1.4.3"; format = "wheel"; @@ -26,7 +26,7 @@ buildPythonPackage rec { # tries to fetch even more artifacts src = fetchPypi { inherit pname version format; - hash = "sha256-x7ywbO2uY1r06bDXV/+X/7cs9f6jFawyDHeo8pLWZVE="; + hash = "sha256-iIBQ9UEcmO6q3bS2faFK7tY4mPVaoIWS7bMzKLzkfWw="; dist = "py3"; python = "py3"; }; From 80ecf81052f876de0bee462283e3a7002211b145 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 18:53:46 +0000 Subject: [PATCH 63/63] matrix-sliding-sync: 0.99.17 -> 0.99.18 --- pkgs/servers/matrix-synapse/sliding-sync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/sliding-sync/default.nix b/pkgs/servers/matrix-synapse/sliding-sync/default.nix index b0fc3c27f9c2..eaaa3f2292d1 100644 --- a/pkgs/servers/matrix-synapse/sliding-sync/default.nix +++ b/pkgs/servers/matrix-synapse/sliding-sync/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "matrix-sliding-sync"; - version = "0.99.17"; + version = "0.99.18"; src = fetchFromGitHub { owner = "matrix-org"; repo = "sliding-sync"; rev = "refs/tags/v${version}"; - hash = "sha256-tzhz2Jlhvn2blO5jdWNS++V28kNXmmg+a2BU7g5zTx0="; + hash = "sha256-zqqCgmzea25H1wcvgIb4hIV3maReL9tmNxvo9JsSlZk="; }; vendorHash = "sha256-THjvc0TepIBFOTte7t63Dmadf3HMuZ9m0YzQMI5e5Pw=";