From 42f6c2c7ed3e5c9b27c7f05415ba0d22913fa3bd Mon Sep 17 00:00:00 2001 From: ReplayCoding Date: Mon, 14 Mar 2022 15:57:16 -0700 Subject: [PATCH 01/37] python: fix enableOptimizations with clang --- pkgs/development/interpreters/python/cpython/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 1bcbd2bb4b5e..642608a72228 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -63,9 +63,6 @@ assert x11Support -> tcl != null assert bluezSupport -> bluez != null; -assert lib.assertMsg (enableOptimizations -> (!stdenv.cc.isClang)) - "Optimizations with clang are not supported. configure: error: llvm-profdata is required for a --enable-optimizations build but could not be found."; - assert lib.assertMsg (reproducibleBuild -> stripBytecode) "Deterministic builds require stripping bytecode."; @@ -111,7 +108,7 @@ let ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ buildPackages.stdenv.cc pythonForBuild - ] ++ optionals (stdenv.cc.isClang && enableLTO) [ + ] ++ optionals (stdenv.cc.isClang && (enableLTO || enableOptimizations)) [ stdenv.cc.cc.libllvm.out ]; From 8fdfe10bcffab56ab95d7e092acd9d8b9157e65c Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Fri, 18 Mar 2022 18:30:32 -0300 Subject: [PATCH 02/37] lean2: 2017-07-22 -> 2018-10-01, unbreak --- .../science/logic/lean2/default.nix | 46 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/applications/science/logic/lean2/default.nix diff --git a/pkgs/applications/science/logic/lean2/default.nix b/pkgs/applications/science/logic/lean2/default.nix new file mode 100644 index 000000000000..e30b8af04735 --- /dev/null +++ b/pkgs/applications/science/logic/lean2/default.nix @@ -0,0 +1,46 @@ +{ lib, stdenv, fetchpatch, fetchFromGitHub, cmake, gmp, mpfr, python3 +, jemalloc, ninja, makeWrapper }: + +stdenv.mkDerivation { + pname = "lean2"; + version = "2018-10-01"; + + src = fetchFromGitHub { + owner = "leanprover"; + repo = "lean2"; + rev = "8072fdf9a0b31abb9d43ab894d7a858639e20ed7"; + sha256 = "12bscgihdgvaq5xi0hqf5r4w386zxm3nkx1n150lv5smhg8ga3gg"; + }; + + patches = [ + # https://github.com/leanprover/lean2/pull/13 + (fetchpatch { + name = "lean2-fix-compilation-error.patch"; + url = "https://github.com/collares/lean2/commit/09b316ce75fd330b3b140d138bcdae2b0e909234.patch"; + sha256 = "060mvqn9y8lsn4l20q9rhamkymzsgh0r1vzkjw78gnj8kjw67jl5"; + }) + ]; + nativeBuildInputs = [ cmake makeWrapper ninja ]; + buildInputs = [ gmp mpfr python3 jemalloc ]; + + preConfigure = '' + patchShebangs bin/leantags + cd src + ''; + + cmakeFlags = [ "-GNinja" ]; + + postInstall = '' + wrapProgram $out/bin/linja --prefix PATH : $out/bin:${ninja}/bin + ''; + + meta = with lib; { + description = "Automatic and interactive theorem prover (version with HoTT support)"; + homepage = "http://leanprover.github.io"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice gebner ]; + broken = stdenv.isAarch64; + mainProgram = "lean"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 743d67d5d6aa..8a610240574d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33276,6 +33276,7 @@ with pkgs; keymapviz = callPackage ../tools/misc/keymapviz { }; lean = callPackage ../applications/science/logic/lean {}; + lean2 = callPackage ../applications/science/logic/lean2 {}; lean3 = lean; elan = callPackage ../applications/science/logic/elan {}; mathlibtools = with python3Packages; toPythonApplication mathlibtools; From 386ccee2fb2df8f671584cb73ec1eb2b7114fdaa Mon Sep 17 00:00:00 2001 From: Arjan Schrijver Date: Mon, 23 May 2022 09:44:02 +0200 Subject: [PATCH 03/37] ntfy-sh: 1.22.0 -> 1.23.0 --- pkgs/tools/misc/ntfy-sh/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/ntfy-sh/default.nix b/pkgs/tools/misc/ntfy-sh/default.nix index 68275f4c7014..ca45473c1748 100644 --- a/pkgs/tools/misc/ntfy-sh/default.nix +++ b/pkgs/tools/misc/ntfy-sh/default.nix @@ -2,21 +2,21 @@ buildGoModule rec { pname = "ntfy-sh"; - version = "1.22.0"; + version = "1.23.0"; src = fetchFromGitHub { owner = "binwiederhier"; repo = "ntfy"; rev = "v${version}"; - sha256 = "sha256-30j62GaO5SXG78c6vMpLZ+ixy1zesjXoX3L9Et/7uhU="; + sha256 = "sha256-eWVcMHP/YJxlxVRYLfnizbAeCqmtkHGaUG/oibCpDVU="; }; - vendorSha256 = "sha256-Sx6l5GJ72A0SHEHyVtlte8Ed9fuJzZAkJzC0zpCbvK8="; + vendorSha256 = "sha256-axuZKkKAnlPQeuTIfYTWF5WqgPYxVttIlFE/e1qv6pc="; doCheck = false; preBuild = '' - make server-deps-static-sites + make cli-deps-static-sites ''; meta = with lib; { From ec44e2cc3923b85ea5a53155e6d79ef6ff65e064 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Tue, 24 May 2022 08:51:46 +0200 Subject: [PATCH 04/37] dbeaver: 22.0.2 -> 22.0.5 --- pkgs/applications/misc/dbeaver/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 439067187c2d..4682c17ddba3 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -23,16 +23,16 @@ inherit maven; # use overridden maven version (see dbeaver's entry in all-packages.nix) }) rec { pname = "dbeaver"; - version = "22.0.2"; # When updating also update mvnSha256 + version = "22.0.5"; # When updating also update mvnSha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "sha256-3tIxHw4734ggIUDjZO2EGIMbyPNP3yvy9QgnMLw+/fc="; + sha256 = "sha256-P+t1wtMTVKbfEXCFuz8zPNy3z4YysJRyOvTxiDFlp2c="; }; - mvnSha256 = "os3eb+In8XreHwdZMacXafIVgOAeSSfCIkO5pwaO6MI="; + mvnSha256 = "veclFlzLhTU+nT360qxRNut+yEi2dfTBxdQASyRMqhI="; mvnParameters = "-P desktop,all-platforms"; nativeBuildInputs = [ From fa4ab568a6ee556a235c91d60f6d22bb7d5973fa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 27 May 2022 00:55:25 +0200 Subject: [PATCH 05/37] python310Packages.zha-quirks: 0.0.73 -> 0.0.74 --- pkgs/development/python-modules/zha-quirks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 33d0bea9b838..cb667e48518e 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.73"; + version = "0.0.74"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-vC1kkh9t2fWmSqmKQz9ON8Y+tBFhTxrprLNzOldQR+A="; + hash = "sha256-W1EToFt+jZ21jEdQZomKB5Co25mcuf/QMJMs1c2kacY="; }; propagatedBuildInputs = [ From 06f3bb21cde622fb6ffe08e85253ea3a18a81ef1 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Sat, 28 May 2022 18:11:34 -0700 Subject: [PATCH 06/37] universal-ctags: 5.9.20220220.0 -> 5.9.20220529.0 --- pkgs/development/tools/misc/universal-ctags/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index 240d8a1f10d4..7b097d221262 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "universal-ctags"; - version = "5.9.20220220.0"; + version = "5.9.20220529.0"; src = fetchFromGitHub { owner = "universal-ctags"; repo = "ctags"; rev = "p${version}"; - sha256 = "1118iq33snxyw1jk8nwvsl08f3zdainksh0yiapzvg0y5906jjjd"; + sha256 = "sha256-Lu4eYMA5Uf/A8r11W6v7xTAnj0gtCjKQ4aX5IbV0dbo="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; From 58fabf558bf98a6436674ba75aaaa2b98684c78d Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Sat, 28 May 2022 18:17:45 -0700 Subject: [PATCH 07/37] universal-ctags: set meta.mainProgram --- pkgs/development/tools/misc/universal-ctags/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index 7b097d221262..c3bf856bc9bc 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { platforms = platforms.unix; # universal-ctags is preferred over emacs's ctags priority = 1; + mainProgram = "ctags"; maintainers = [ maintainers.mimame ]; }; } From 67832a5f0f24bdd6316b7a90a92cfd7a0953e077 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Sun, 29 May 2022 19:19:24 -0700 Subject: [PATCH 08/37] svd2rust: 0.21.0 -> 0.24.0 --- pkgs/development/tools/rust/svd2rust/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix index 20501594c439..dbd0876eb545 100644 --- a/pkgs/development/tools/rust/svd2rust/default.nix +++ b/pkgs/development/tools/rust/svd2rust/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "svd2rust"; - version = "0.21.0"; + version = "0.24.0"; src = fetchCrate { inherit pname version; - sha256 = "0mxzbbxrg1jysxpjqcvgwwmh8qf0lyf64fl1gxxp0whph0x279qj"; + sha256 = "sha256-P0s2mrfYA7DUThvje0LH3Pq0Os6UZJrrnjnzAm8UlDQ="; }; - cargoSha256 = "0kvya6swx1nsxxlhn2w8x4dhl4j3v56jxqr2h259cx6lzv3xjhin"; + cargoSha256 = "sha256-TDgd8RG97ROeAQJ1uDF2m+yIa8US7zFz+5qrQtFbazE="; buildInputs = lib.optional stdenv.isDarwin libiconv; @@ -18,6 +18,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/rust-embedded/svd2rust"; changelog = "https://github.com/rust-embedded/svd2rust/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ newam ]; }; } From bc555806c0259333ae64efe622d2d76d527974f8 Mon Sep 17 00:00:00 2001 From: Arjan Schrijver Date: Mon, 30 May 2022 10:14:22 +0200 Subject: [PATCH 09/37] ntfy-sh: 1.23.0 -> 1.24.0 --- pkgs/tools/misc/ntfy-sh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/ntfy-sh/default.nix b/pkgs/tools/misc/ntfy-sh/default.nix index ca45473c1748..40a6c2d27f2c 100644 --- a/pkgs/tools/misc/ntfy-sh/default.nix +++ b/pkgs/tools/misc/ntfy-sh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ntfy-sh"; - version = "1.23.0"; + version = "1.24.0"; src = fetchFromGitHub { owner = "binwiederhier"; repo = "ntfy"; rev = "v${version}"; - sha256 = "sha256-eWVcMHP/YJxlxVRYLfnizbAeCqmtkHGaUG/oibCpDVU="; + sha256 = "sha256-Jw+8rgbevtk1Mzy/g+DryAk7a/RbQXpEtwPlqJRD/UM="; }; - vendorSha256 = "sha256-axuZKkKAnlPQeuTIfYTWF5WqgPYxVttIlFE/e1qv6pc="; + vendorSha256 = "sha256-MdbC+Hv8jSImg0d2HMeAmUdWLQT8+zSe+0mkIwHIJXM="; doCheck = false; From 76a10f36450fba0f8eff5e936cf80af810d00b73 Mon Sep 17 00:00:00 2001 From: wyndon Date: Tue, 31 May 2022 02:43:32 +0200 Subject: [PATCH 10/37] httm: 0.10.12 -> 0.10.15 --- pkgs/tools/filesystems/httm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/httm/default.nix b/pkgs/tools/filesystems/httm/default.nix index 2f7f0c64d8fd..e85eb7c348d5 100644 --- a/pkgs/tools/filesystems/httm/default.nix +++ b/pkgs/tools/filesystems/httm/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.10.12"; + version = "0.10.15"; src = fetchFromGitHub { owner = "kimono-koans"; repo = pname; rev = version; - sha256 = "Q69XltTdJgRLCwjt+oLSUWexO3MGd2HB11dN/edRGes="; + sha256 = "u18dIw4At78OSeWCDHJIjzDbaxpiSs3g+bf2WClFkuY="; }; - cargoSha256 = "2nQE/5SPAaih4TunHgZHcYKPoAaA+4KDLxxcK0RLUgw="; + cargoSha256 = "mLFponkRIEWePpSyhQK1IG/rnJ0qpDwrS7vwAoP1ro0="; nativeBuildInputs = [ installShellFiles ]; From 477c85f46a91f4dc191ec488f337b2200d8f1d49 Mon Sep 17 00:00:00 2001 From: devhell Date: Tue, 31 May 2022 14:09:22 +0100 Subject: [PATCH 11/37] gurk-rs: 0.2.3 -> 0.2.4 --- .../networking/instant-messengers/gurk-rs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix b/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix index 46d513a37fef..924a918ebceb 100644 --- a/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix +++ b/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "gurk-rs"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "boxdot"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Mko5udM8BY50uUwn7xESxB+s0MEO1kAJX4Dt/DnEEa4="; + sha256 = "sha256-WZUoUvu7GaiBOaRAOGRCXrLe6u3DRbI6CDTAf5jryGc="; }; - cargoHash = "sha256-pYMMgBvLsqkj2peouDQK1vn97ByUjtdCrkbzuZZLXrY="; + cargoHash = "sha256-81ZW61JX40W0D/cmYogR3RJH2dvEKW1K7sIsl2io/7E="; buildInputs = [ protobuf ]; PROTOC = "${protobuf}/bin/protoc"; From 21dc93570f72f741ba6541837ac775441219e5c2 Mon Sep 17 00:00:00 2001 From: Konstantin Alekseev Date: Tue, 31 May 2022 18:45:07 +0300 Subject: [PATCH 12/37] python3Packages.awscrt: fix darwin build --- pkgs/development/python-modules/awscrt/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index 1762fee0d7ba..2ffb2a9060b9 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -33,6 +33,11 @@ buildPythonPackage rec { "strictoverflow" ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "extra_link_args += ['-Wl,-fatal_warnings']" "" + ''; + # gcc <10 is not supported, LLVM on darwin is just fine nativeBuildInputs = [ cmake @@ -52,7 +57,6 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - broken = stdenv.isDarwin; homepage = "https://github.com/awslabs/aws-crt-python"; description = "Python bindings for the AWS Common Runtime"; license = licenses.asl20; From 80b8cd91adf15979f9770615e2713f3182c4bbf9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Jun 2022 00:21:43 +0200 Subject: [PATCH 13/37] python3Packages.archinfo: 9.2.5 -> 9.2.6 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 78bdce887407..348a022d2ccf 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.5"; + version = "9.2.6"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-U++Ly+UwY2CiyKdHpPWRpURqxVv4dgVylZD7ERVzUCA="; + hash = "sha256-yMUcuZ9v1dVbh/t456fpMu8tDFWIdh55LZh7FLkz9GM="; }; checkInputs = [ From 426446b1dd716913993398ffb895ce369bad257c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Jun 2022 00:21:50 +0200 Subject: [PATCH 14/37] python3Packages.ailment: 9.2.5 -> 9.2.6 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 2bc2d1b63bcb..01617f7980ef 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.5"; + version = "9.2.6"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-eETl1AMDdY55okPUVDv7L2zZMtDfA4dRi11z37xAM58="; + hash = "sha256-SymOCHKIr0SOi4OM+OONA7+A2nV4JMA467OkoqDhZ+M="; }; propagatedBuildInputs = [ From 9bb7b7f9e3a4ce26aa4bb649f19ecdc75b567db9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Jun 2022 00:22:04 +0200 Subject: [PATCH 15/37] python3Packages.pyvex: 9.2.5 -> 9.2.6 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 629fa6c5025b..b7bff273b231 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.5"; + version = "9.2.6"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-zQbIhl5MW/RYXV5EgL2Q7eKEwHNXVe+p6LPmIDbokwc="; + hash = "sha256-I2ZQJ/CDvNq5uJoLT9SHDGzeuI32YUy/6fMSNR9WM8I="; }; propagatedBuildInputs = [ From ed0de8992c68ff4f8086965ed5c7c9b007e88aaa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Jun 2022 00:22:10 +0200 Subject: [PATCH 16/37] python3Packages.claripy: 9.2.5 -> 9.2.6 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 8f2944c2d369..7dccab0b7624 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.5"; + version = "9.2.6"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-o5aNHYysIpccWhf09xuJ1WT2Hac4OPyztnKqPne1Vng="; + hash = "sha256-mBpAwKUclwvgOeGD6BvPUKZHdjngfvuHdtKY3nx7jzM="; }; propagatedBuildInputs = [ From ffe661e61633a1123afdf8e236ef98f09b3742d7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Jun 2022 00:22:18 +0200 Subject: [PATCH 17/37] python3Packages.cle: 9.2.5 -> 9.2.6 --- pkgs/development/python-modules/cle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index f2de74c1cf37..25765fc11d3d 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.5"; + version = "9.2.6"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-tBiabSbi4LKXA1Ou7MURRG2eGq1m1TutaHba+hq6DhQ="; + hash = "sha256-GOrjT5CM+yzboOTgkVriuf1UpNDVhDgGpS8vp4D39W0="; }; propagatedBuildInputs = [ From d94e58057750f31e1c48ab919c3121964b3b98c1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Jun 2022 00:22:26 +0200 Subject: [PATCH 18/37] python3Packages.angr: 9.2.5 -> 9.2.6 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index ca15c795a4a7..a6a5aa49953f 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -46,7 +46,7 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.2.5"; + version = "9.2.6"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -55,7 +55,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-uXH/7Qfs4VxG53819TG/Y2M0taIcE4uC06rdfBe22O0="; + hash = "sha256-qXzkrfF8FkALkEaFLSmaadovwLc2DkXXJivdrT6srTc="; }; propagatedBuildInputs = [ From 4745d032d675bd8ce5dea9e39f62be7b6f5cda7b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Jun 2022 00:22:32 +0200 Subject: [PATCH 19/37] python3Packages.angrop: 9.2.5 -> 9.2.6 --- pkgs/development/python-modules/angrop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index d7ea31a0bcfa..63dce4bdbed7 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.2.5"; + version = "9.2.6"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-APm7+V0eLvgnPRzojQsfDPleEfrIssbgeUh5eugKiLM="; + hash = "sha256-qaDAicmYZxLPTl17il61ij01prRv2H4xxe07Xg4KWhI="; }; propagatedBuildInputs = [ From b35ad0da36974e073e4c1c38bcf96a4f63b1f892 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 1 Jun 2022 13:26:51 +1000 Subject: [PATCH 20/37] cri-o: 1.23.2 -> 1.24.0 --- pkgs/applications/virtualization/cri-o/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index b6d238d599ee..0267a52a61e5 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.23.2"; + version = "1.24.0"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-sjeYWBcal6RtoUZd6orQ+237Fz80vQKx5vocFMq4l7U="; + sha256 = "sha256-LbLBG8nvEgSF5KAeAYnp7dM9cbqF078QpVai1iDx63U="; }; vendorSha256 = null; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7345955e993d..99b7247f3fcd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31345,7 +31345,7 @@ with pkgs; bench = haskell.lib.compose.justStaticExecutables haskellPackages.bench; cri-o = callPackage ../applications/virtualization/cri-o/wrapper.nix { }; - cri-o-unwrapped = callPackage ../applications/virtualization/cri-o { }; + cri-o-unwrapped = callPackage ../applications/virtualization/cri-o { buildGoModule = buildGo118Module; }; confd = callPackage ../tools/system/confd { }; From fa36f93646bd7acc2192caa012503fe2f9047033 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Jun 2022 04:06:47 +0000 Subject: [PATCH 21/37] python310Packages.onvif-zeep-async: 1.2.0 -> 1.2.1 --- pkgs/development/python-modules/onvif-zeep-async/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/onvif-zeep-async/default.nix b/pkgs/development/python-modules/onvif-zeep-async/default.nix index 5e9a86acc6bd..d895504186cb 100644 --- a/pkgs/development/python-modules/onvif-zeep-async/default.nix +++ b/pkgs/development/python-modules/onvif-zeep-async/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "onvif-zeep-async"; - version = "1.2.0"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-O4H6oL9cFvgX6whoESA7eRI6+VoT1ncRk/tehQT1WcM="; + hash = "sha256-bRPqbuBrC4Q0gdQGb2KAy1pTHce42WvM7gjvAspH4WE="; }; propagatedBuildInputs = [ From 980aa59726c78343645a5da48e1cb6b158c17bb6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Jun 2022 04:17:28 +0000 Subject: [PATCH 22/37] python310Packages.pycfmodel: 0.20.0 -> 0.20.1 --- pkgs/development/python-modules/pycfmodel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycfmodel/default.nix b/pkgs/development/python-modules/pycfmodel/default.nix index 87f3798410a8..a6d991becbbc 100644 --- a/pkgs/development/python-modules/pycfmodel/default.nix +++ b/pkgs/development/python-modules/pycfmodel/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pycfmodel"; - version = "0.20.0"; + version = "0.20.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Skyscanner"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-c6RbglmG/A1fVOLmJLRsyMy9EgEIzpXnIe9Co/OLMSg="; + hash = "sha256-syEE03lcOt6tTD88+BJ8nHCkamKn+BX/rZU9TOsxATc="; }; propagatedBuildInputs = [ From d4964be44cb430760b266f5df34a185f2920e80e Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Tue, 31 May 2022 18:57:03 -0400 Subject: [PATCH 23/37] ledger: fix Python 3.10 module build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The current default boost (1.77) doesn’t work with Python 3.10, so use 1.79 instead. --- pkgs/applications/office/ledger/default.nix | 1 - pkgs/top-level/python-packages.nix | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index 52e756f5b645..d4b4bde7b10b 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -50,7 +50,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; homepage = "https://ledger-cli.org/"; description = "A double-entry accounting system with a command-line reporting interface"; license = licenses.bsd3; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a4c23948277d..0965a6193d96 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4769,6 +4769,7 @@ in { ledger = (toPythonModule (pkgs.ledger.override { usePython = true; + boost = pkgs.boost179; # Current default boost (1.77) doesn’t work with Python 3.10. python3 = python; })).py; From a358aad21a192ce993f4d91f3a8af7f4edf30d11 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Jun 2022 05:21:05 +0000 Subject: [PATCH 24/37] python310Packages.pyoverkiz: 1.4.0 -> 1.4.1 --- pkgs/development/python-modules/pyoverkiz/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index 019a7682a7ef..6f09f2d6d989 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.4.0"; + version = "1.4.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "iMicknl"; repo = "python-overkiz-api"; - rev = "v${version}"; - hash = "sha256-uaeSyRtnokUJ3jWTioVMuo+T3jFoH+SYTBT3HPCPjm8="; + rev = "refs/tags/v${version}"; + hash = "sha256-PVRNfpV6LwZNzSQaDJnDztNUdzosa2yIdXRLXpPMVW4="; }; nativeBuildInputs = [ From e3151f9b1978846bf0b7fd0421e192dbfcb76121 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Jun 2022 06:01:32 +0000 Subject: [PATCH 25/37] python310Packages.mypy-boto3-s3: 1.23.0.post1 -> 1.24.0 --- pkgs/development/python-modules/mypy-boto3-s3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index 987aa20d2dbb..cb37545aa449 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.23.0.post1"; + version = "1.24.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-eF0ChMOqisXsMWLlKCAWGMrTUe4sGfZxWo5uc/ZKAQk="; + hash = "sha256-ITZItcLZ/Im/tWptkKXGc+H1lT4m1mIlljTP/w+6pNo="; }; propagatedBuildInputs = [ From 1db266dd5d65cd4f179e6b53e813100c044cb53e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Jun 2022 06:23:57 +0000 Subject: [PATCH 26/37] python310Packages.scmrepo: 0.0.22 -> 0.0.23 --- pkgs/development/python-modules/scmrepo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index cfb84743ff3a..984491be9be9 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "0.0.22"; + version = "0.0.23"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-hV0BusvuJUEGfmue7OHR3YYmpBcFTgbQE7UuHmTUBo0="; + hash = "sha256-Yg08twcxXKtDlkOxmD5eafeaeij4zX/3XQQQN948xxs="; }; propagatedBuildInputs = [ From d887e5666b45f7fd895db055ce8006636f37ed03 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Jun 2022 06:54:59 +0000 Subject: [PATCH 27/37] python310Packages.plaid-python: 9.4.0 -> 9.5.0 --- pkgs/development/python-modules/plaid-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 3b68fef41727..20613e518af8 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "9.4.0"; + version = "9.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Md4vzAirCm5fjcTAeiLIQwH0MAP47r2AT8O5yigGqv8="; + hash = "sha256-gjYlr2rp2xRMcFKbA4Y/Pb7YYOUR4LTzMtVoG1iMlx0="; }; propagatedBuildInputs = [ From 583a2312e44b658ac86cba2cd94f4c2014392716 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 31 May 2022 23:39:41 -0700 Subject: [PATCH 28/37] cvc4: fix build on darwin Dependency on cln is optional --- pkgs/applications/science/logic/cvc4/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index b0b3e5e610e6..873c3ca57c0c 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ gmp git python3.pkgs.toml cln readline swig libantlr3c antlr3_4 boost jdk python3 ]; + buildInputs = [ gmp git python3.pkgs.toml readline swig libantlr3c antlr3_4 boost jdk python3 ] + ++ lib.optionals (!stdenv.isDarwin) [ cln ]; configureFlags = [ "--enable-language-bindings=c,c++,java" "--enable-gpl" - "--with-cln" "--with-readline" "--with-boost=${boost.dev}" - ]; + ] ++ lib.optionals (!stdenv.isDarwin) [ "--with-cln" ]; prePatch = '' patch -p1 -i ${./minisat-fenv.patch} -d src/prop/minisat From 239087c990f6da4ebe1801825fe7b9e714f73ae5 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 1 Jun 2022 14:44:48 +1000 Subject: [PATCH 29/37] kubernetes: 1.23.5 -> 1.23.7 --- pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index e4203f0028ad..deb95b695d2b 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.23.5"; + version = "1.23.7"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "sha256-LhJ3gThcsWnawSOmHSzWOG8tfODIPo4dJTMeLKmvMdM="; + sha256 = "sha256-YHlcopB47HVLO/4QI8HxjMBzCpcHVnlAz3EOmZI+EG8="; }; nativeBuildInputs = [ makeWrapper which go rsync installShellFiles ]; From c8367fb9d44233e5e9bcbb8bc2f41cec4785e7db Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sat, 12 Mar 2022 16:20:06 -0800 Subject: [PATCH 30/37] koka: 2.3.8 -> 2.4.0 --- pkgs/development/compilers/koka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/koka/default.nix b/pkgs/development/compilers/koka/default.nix index 031aac03eccd..901830ffb70e 100644 --- a/pkgs/development/compilers/koka/default.nix +++ b/pkgs/development/compilers/koka/default.nix @@ -4,12 +4,12 @@ , parsec, process, regex-compat, text, time }: let - version = "2.3.8"; + version = "2.4.0"; src = fetchFromGitHub { owner = "koka-lang"; repo = "koka"; rev = "v${version}"; - sha256 = "sha256-4a9UwtiWq9eFpNHpcrlhYUwzXcr1EXFMjBmDFYP933U="; + sha256 = "sha256-+evs5g0qrplUMr8zC51GvUx2JXQBYJb39IaI4rC6CSA="; fetchSubmodules = true; }; kklib = stdenv.mkDerivation { From b2a5cf63907fa10aac1f9fc8c757f46ce0185bf5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Jun 2022 10:52:51 +0200 Subject: [PATCH 31/37] python310Packages.zha-quirks: 0.0.74 -> 0.0.75 --- pkgs/development/python-modules/zha-quirks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index cb667e48518e..c4398ff19cb5 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.74"; + version = "0.0.75"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-W1EToFt+jZ21jEdQZomKB5Co25mcuf/QMJMs1c2kacY="; + hash = "sha256-iwNXyoA85NcgrxqAPydTA3FAW+weE2pdPyijEV4PbSA="; }; propagatedBuildInputs = [ From 3773e35a21f55c7c97e5a44ff7f65ed899d9e3ad Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 1 Jun 2022 10:25:14 +0100 Subject: [PATCH 32/37] netdata: do not persist ./configure flags to decrease closure size Before: $ nix path-info -r ./result | wc -l 76 $ nix path-info -Sh ./result ...-netdata-1.34.1 366.8M After: $ nix path-info -r ./result | wc -l 30 $ nix path-info -Sh ./result ...-netdata-1.34.1 205.7M --- pkgs/tools/system/netdata/default.nix | 4 ++++ .../system/netdata/skip-CONFIGURE_COMMAND.patch | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index b194b2f2a4b2..dd50e48f0735 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -49,6 +49,10 @@ in stdenv.mkDerivation rec { # Therefore we put it into `/run/netdata`, which is owned # by netdata only. ./ipc-socket-in-run.patch + + # Avoid build-only inputs in closure leaked by configure command: + # https://github.com/NixOS/nixpkgs/issues/175693#issuecomment-1143344162 + ./skip-CONFIGURE_COMMAND.patch ]; NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; diff --git a/pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch b/pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch new file mode 100644 index 000000000000..fa7a0e7ad9c2 --- /dev/null +++ b/pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch @@ -0,0 +1,16 @@ +Shrink closure size by avoiding paths embedded from configure call. + +https://github.com/NixOS/nixpkgs/issues/175693 +--- a/daemon/buildinfo.c ++++ b/daemon/buildinfo.c +@@ -248,7 +248,9 @@ void print_build_info(void) { + char *prebuilt_distro = NULL; + get_install_type(&install_type, &prebuilt_arch, &prebuilt_distro); + +- printf("Configure options: %s\n", CONFIGURE_COMMAND); ++ // To minimize closure size do not persist configure options ++ // with build-time inputs. ++ printf("Configure options: REMOVED\n"); + + if (install_type == NULL) { + printf("Install type: unknown\n"); From 0fce602773c28f5e9532c1dde588304fc630c0a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Jun 2022 04:04:06 +0000 Subject: [PATCH 33/37] gnome.gnome-settings-daemon: 42.1 -> 42.2 --- pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix index 03698f865d65..7e236dc39fd1 100644 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { pname = "gnome-settings-daemon"; - version = "42.1"; + version = "42.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "7WWFGuVK3NWKJMhoN9Yk/GoUvYSrIulN9Ao6TP0Z/9s="; + sha256 = "nESXFKqOwSccDbUTffNFgZWUPwXM0KyJNdkzl3cLqwA="; }; patches = [ From ff24f484afbbde86aef3f8850034e3e42977db32 Mon Sep 17 00:00:00 2001 From: Matthias Treydte Date: Tue, 31 May 2022 16:42:33 +0200 Subject: [PATCH 34/37] nixos/systemd-boot: fix systemd-boot-builder refusing to update Handling of the string length condition in should_update was broken, as evident with the log message > leaving systemd-boot 246 in place (250.4 is not newer) Discussion with @mweinelt came to the conclusion that Python's "<" operator already does what we need, so the should_update function can be dropped. Fixes a30de3b849bb29b4d2206e1a652707fba8ea18a4 --- .../loader/systemd-boot/systemd-boot-builder.py | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index 4bb39811434c..aca6a1ca2cc2 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -204,21 +204,6 @@ def get_profiles() -> List[str]: else: return [] -def should_update(v_from: str, v_to: str) -> bool: - # see https://github.com/systemd/systemd/blob/main/src/boot/bootctl.c compare_product function - - len_from = len(v_from) - len_to = len(v_to) - - if len_from < len_to: - return False - - if len_from > len_to: - return True - - return v_from < v_to - - def main() -> None: parser = argparse.ArgumentParser(description='Update NixOS-related systemd-boot files') parser.add_argument('default_config', metavar='DEFAULT-CONFIG', help='The default NixOS config to boot') @@ -276,7 +261,7 @@ def main() -> None: installed_version = installed_match.group(1) available_version = available_match.group(1) - if should_update(installed_version, available_version): + if installed_version < available_version: print("updating systemd-boot from %s to %s" % (installed_version, available_version)) subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "update"]) else: From f0d4c085acea890328c79bd5b66a630616ca9c83 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 1 Jun 2022 09:51:32 +0000 Subject: [PATCH 35/37] kexpand: remove --- pkgs/development/tools/kexpand/default.nix | 17 ----------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 pkgs/development/tools/kexpand/default.nix diff --git a/pkgs/development/tools/kexpand/default.nix b/pkgs/development/tools/kexpand/default.nix deleted file mode 100644 index 35d0a5c2da07..000000000000 --- a/pkgs/development/tools/kexpand/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ buildGoPackage, fetchFromGitHub }: - -buildGoPackage { - pname = "kexpand"; - version = "unstable-2017-05-12"; - - goPackagePath = "github.com/kopeio/kexpand"; - - subPackages = [ "." ]; - - src = fetchFromGitHub { - owner = "kopeio"; - repo = "kexpand"; - rev = "c508a43a4e84410dfd30827603e902148c5c1f3c"; - sha256 = "0946h74lsqnr1106j7i2w2a5jg2bbk831d7prlws4bb2kigfm38p"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6c8fed798936..b51a766d9a17 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -635,6 +635,7 @@ mapAliases ({ keepnote = throw "keepnote has been removed from nixpkgs, as it is stuck on python2"; # Added 2022-01-01 kerberos = libkrb5; # moved from top-level 2021-03-14 kexectools = kexec-tools; # Added 2021-09-03 + kexpand = "kexpand awless has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-01 keybase-go = throw "'keybase-go' has been renamed to/replaced by 'keybase'"; # Converted to throw 2022-02-22 keysmith = libsForQt5.plasmaMobileGear.keysmith; # Added 2021-07-14 kgx = gnome-console; # Added 2022-02-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f8e42774535..4a477bce14f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7436,8 +7436,6 @@ with pkgs; keepkey_agent = with python3Packages; toPythonApplication keepkey_agent; - kexpand = callPackage ../development/tools/kexpand { }; - kent = callPackage ../applications/science/biology/kent { }; keybase = callPackage ../tools/security/keybase { From 78d491457dcb1fac4bc34be03c25b5ef6bf7aca6 Mon Sep 17 00:00:00 2001 From: Sandro Date: Wed, 1 Jun 2022 12:43:07 +0200 Subject: [PATCH 36/37] archi: remove myself from maintainers --- pkgs/tools/misc/archi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/archi/default.nix b/pkgs/tools/misc/archi/default.nix index e6f16b93f7d2..8d35ff717f5f 100644 --- a/pkgs/tools/misc/archi/default.nix +++ b/pkgs/tools/misc/archi/default.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { homepage = "https://www.archimatetool.com/"; license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ earldouglas SuperSandro2000 ]; + maintainers = with maintainers; [ earldouglas ]; }; } From 11dd9db95575f30e00e5f671e90d5ac8efbfdd2f Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 1 Jun 2022 10:05:40 +0000 Subject: [PATCH 37/37] grv: remove --- .../git-and-tools/grv/default.nix | 50 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 pkgs/applications/version-management/git-and-tools/grv/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix deleted file mode 100644 index 7cfa5765df4c..000000000000 --- a/pkgs/applications/version-management/git-and-tools/grv/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub, curl, ncurses, pkg-config, readline -, cmake }: -let - version = "0.3.2"; -in -buildGoPackage { - pname = "grv"; - inherit version; - - buildInputs = [ ncurses readline curl ]; - nativeBuildInputs = [ pkg-config cmake ]; - - goPackagePath = "github.com/rgburke/grv"; - - src = fetchFromGitHub { - owner = "rgburke"; - repo = "grv"; - rev = "v${version}"; - sha256 = "0bpjsk35rlp56z8149z890adnhmxyh743vsls3q86j4682b83kyf"; - fetchSubmodules = true; - }; - - postPatch = '' - rm util/update_latest_release.go - ''; - - postConfigure = '' - cd $NIX_BUILD_TOP/go/src/$goPackagePath - ''; - - buildPhase = '' - runHook preBuild - make build-only - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - install -D grv $out/bin/grv - runHook postInstall - ''; - - meta = with lib; { - description = "GRV is a terminal interface for viewing Git repositories"; - homepage = "https://github.com/rgburke/grv"; - license = licenses.gpl3; - platforms = platforms.unix; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6c8fed798936..3f2d67df4eea 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -534,6 +534,7 @@ mapAliases ({ gr-nacl = gnuradio3_7.pkgs.nacl; # Added 2019-05-27, changed 2020-10-16 gr-osmosdr = gnuradio3_7.pkgs.osmosdr; # Added 2019-05-27, changed 2020-10-16 gr-rds = gnuradio3_7.pkgs.rds; # Added 2019-05-27, changed 2020-10-16 + grv = "grv has been dropped due to the lack of maintanence from upstream since 2019"; # Added 2022-06-01 gsettings_desktop_schemas = throw "'gsettings_desktop_schemas' has been renamed to/replaced by 'gsettings-desktop-schemas'"; # Converted to throw 2022-02-22 gtk_doc = throw "'gtk_doc' has been renamed to/replaced by 'gtk-doc'"; # Converted to throw 2022-02-22 gtklick = throw "gtklick has been removed from nixpkgs as the project is stuck on python2"; # Added 2022-01-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f8e42774535..667135c8a76f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6693,8 +6693,6 @@ with pkgs; stdenv = overrideCC stdenv buildPackages.pkgsi686Linux.gcc6; } // (config.grub or {})); - grv = callPackage ../applications/version-management/git-and-tools/grv { }; - trustedGrub = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { }; trustedGrub-for-HP = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { for_HP_laptop = true; };