From ad44318e80ff3ed73c964c953b5c41578acdaff2 Mon Sep 17 00:00:00 2001 From: Tom Fitzhenry Date: Sun, 4 Jun 2023 14:45:43 +1000 Subject: [PATCH 01/28] mindustry-server: enable on aarch64-linux --- pkgs/games/mindustry/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index 0f1a609f4e4d..fdfad0cab2e7 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -243,7 +243,7 @@ stdenv.mkDerivation rec { ]; license = licenses.gpl3Plus; maintainers = with maintainers; [ chkno fgaz thekostins ]; - platforms = platforms.x86_64; + platforms = if enableClient then platforms.x86_64 else platforms.linux; # Hash mismatch on darwin: # https://github.com/NixOS/nixpkgs/pull/105590#issuecomment-737120293 broken = stdenv.isDarwin; From 5c7249086799c1ebcacc5d98dec41c0a8cfce41a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Aug 2023 08:35:12 +0200 Subject: [PATCH 02/28] python311Packages.autocommand: 2.2.1 -> 2.2.2 Diff: https://github.com/Lucretiel/autocommand/compare/2.2.1...2.2.2 --- pkgs/development/python-modules/autocommand/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/autocommand/default.nix b/pkgs/development/python-modules/autocommand/default.nix index ca9eaf668495..3ce1b9ebe001 100644 --- a/pkgs/development/python-modules/autocommand/default.nix +++ b/pkgs/development/python-modules/autocommand/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "autocommand"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "Lucretiel"; repo = "autocommand"; rev = version; - hash = "sha256-bjoVGfP57qhvPuHHcMP8JQddAaW4/fEyatElk1UEPZo="; + hash = "sha256-9bv9Agj4RpeyNJvTLUaMwygQld2iZZkoLb81rkXOd3E="; }; # fails with: SyntaxError: invalid syntax From 043397326cbd95ddcd1e3e24fa15badcb5b37bb2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Aug 2023 08:37:55 +0200 Subject: [PATCH 03/28] python311Packages.autocommand: fix style issues --- .../python-modules/autocommand/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/autocommand/default.nix b/pkgs/development/python-modules/autocommand/default.nix index 3ce1b9ebe001..1b1ab4fe4570 100644 --- a/pkgs/development/python-modules/autocommand/default.nix +++ b/pkgs/development/python-modules/autocommand/default.nix @@ -11,19 +11,23 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Lucretiel"; repo = "autocommand"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-9bv9Agj4RpeyNJvTLUaMwygQld2iZZkoLb81rkXOd3E="; }; # fails with: SyntaxError: invalid syntax doCheck = false; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "autocommand" ]; + pythonImportsCheck = [ + "autocommand" + ]; meta = with lib; { - description = " Autocommand turns a python function into a CLI program "; + description = "Autocommand turns a python function into a CLI program"; homepage = "https://github.com/Lucretiel/autocommand"; license = licenses.lgpl3; maintainers = with maintainers; [ ]; From 7173f833b8db9e997e5a0885052d4b4bd61a2ee2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Aug 2023 08:39:04 +0200 Subject: [PATCH 04/28] python311Packages.autocommand: specify license --- pkgs/development/python-modules/autocommand/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/autocommand/default.nix b/pkgs/development/python-modules/autocommand/default.nix index 1b1ab4fe4570..1dbfa2f5fc17 100644 --- a/pkgs/development/python-modules/autocommand/default.nix +++ b/pkgs/development/python-modules/autocommand/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Autocommand turns a python function into a CLI program"; homepage = "https://github.com/Lucretiel/autocommand"; - license = licenses.lgpl3; + license = licenses.lgpl3Only; maintainers = with maintainers; [ ]; }; } From 390fba20b41b5e0ed69ba0e00b4a32823e9e7ed1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Aug 2023 08:40:21 +0200 Subject: [PATCH 05/28] python311Packages.autocommand: add format - disable on unsupported Python releases --- pkgs/development/python-modules/autocommand/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/autocommand/default.nix b/pkgs/development/python-modules/autocommand/default.nix index 1dbfa2f5fc17..eeee08ec4927 100644 --- a/pkgs/development/python-modules/autocommand/default.nix +++ b/pkgs/development/python-modules/autocommand/default.nix @@ -2,11 +2,15 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "autocommand"; version = "2.2.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Lucretiel"; From f4cc6010045f29c46f75657dd8783c36b74fe52c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Aug 2023 01:01:37 +0000 Subject: [PATCH 06/28] python310Packages.grpcio-testing: 1.54.2 -> 1.56.2 --- pkgs/development/python-modules/grpcio-testing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix index f7a2b7f0330b..12dcb0d35751 100644 --- a/pkgs/development/python-modules/grpcio-testing/default.nix +++ b/pkgs/development/python-modules/grpcio-testing/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "grpcio-testing"; - version = "1.54.2"; + version = "1.56.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-qCMOjSfe7eGIWyomTLiLrLrt/GekmLdlMO2VnPihgI0="; + hash = "sha256-Cg1dONvESb1ayz5ogv9AWHywqd0LdVsRDpIwtos+0SA="; }; postPatch = '' From 4e7affc031fed75465d80ad750b62644aa852828 Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 10 Aug 2023 22:20:22 +0900 Subject: [PATCH 07/28] python310Packages.anthropic: add patch for pytest-asyncio >= 0.21 --- pkgs/development/python-modules/anthropic/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/anthropic/default.nix b/pkgs/development/python-modules/anthropic/default.nix index b9248fcb8716..2d5dbf8f3158 100644 --- a/pkgs/development/python-modules/anthropic/default.nix +++ b/pkgs/development/python-modules/anthropic/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , poetry-core , anyio , distro @@ -28,6 +29,14 @@ buildPythonPackage rec { hash = "sha256-dfMlM7IRP1PG7Ynr+MR4OPeKnHBbhhWKSug7UQ4/4rI="; }; + patches = [ + (fetchpatch { + name = "support-pytest-asyncio-0.21.0.patch"; + url = "https://github.com/anthropics/anthropic-sdk-python/commit/1e199aa9b38970c5b5b4492907494ac653a7f756.patch"; + hash = "sha256-f9KldnvXuRKVgT7Xb/xdhInKOeXvi4g5OxVRD0PMhgQ="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; From 35b2bd5ce2a7cda7c275924391415fa90749c40b Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 10 Aug 2023 22:20:42 +0900 Subject: [PATCH 08/28] python310Packages.anthropic: 0.3.6 -> 0.3.8 Diff: https://github.com/anthropics/anthropic-sdk-python/compare/refs/tags/v0.3.6...v0.3.8 Changelog: https://github.com/anthropics/anthropic-sdk-python/releases/tag/v0.3.8 --- pkgs/development/python-modules/anthropic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/anthropic/default.nix b/pkgs/development/python-modules/anthropic/default.nix index 2d5dbf8f3158..a7bbb6fb2bd6 100644 --- a/pkgs/development/python-modules/anthropic/default.nix +++ b/pkgs/development/python-modules/anthropic/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "anthropic"; - version = "0.3.6"; + version = "0.3.8"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "anthropics"; repo = "anthropic-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-dfMlM7IRP1PG7Ynr+MR4OPeKnHBbhhWKSug7UQ4/4rI="; + hash = "sha256-rNLKIZKX9AI0IKGicozllh+XGU4Ll91EfRaAfJYJtJE="; }; patches = [ From 0897afbf92f866e62489f4dde2afaca222e6c78b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 13 Aug 2023 12:57:16 +0200 Subject: [PATCH 09/28] python311Packages.icalendar: 5.0.4 -> 5.0.7 Diff: https://github.com/collective/icalendar/compare/refs/tags/v5.0.4...v5.0.7 Changelog: https://github.com/collective/icalendar/blob/v5.0.7/CHANGES.rst --- pkgs/development/python-modules/icalendar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix index 9e99b42eab4b..0fd19ff24900 100644 --- a/pkgs/development/python-modules/icalendar/default.nix +++ b/pkgs/development/python-modules/icalendar/default.nix @@ -10,7 +10,7 @@ }: buildPythonPackage rec { - version = "5.0.4"; + version = "5.0.7"; pname = "icalendar"; format = "setuptools"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "collective"; repo = "icalendar"; rev = "refs/tags/v${version}"; - hash = "sha256-Ch0i6hxEnHV/Xu4PqpRVt30KLOHHgtCAI2W9UyXo15E="; + hash = "sha256-fblcbyctnvd7DOc+tMWzg+90NHzZvH5xiY6BfJakQVo="; }; propagatedBuildInputs = [ From eea0f158cc6e3b8be04c47696d6ddb9e19eab0c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Aug 2023 11:43:19 +0000 Subject: [PATCH 10/28] yacreader: 9.12.0 -> 9.13.1 --- pkgs/applications/graphics/yacreader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/yacreader/default.nix b/pkgs/applications/graphics/yacreader/default.nix index 75f0f87c41af..f849512cae5f 100644 --- a/pkgs/applications/graphics/yacreader/default.nix +++ b/pkgs/applications/graphics/yacreader/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "yacreader"; - version = "9.12.0"; + version = "9.13.1"; src = fetchFromGitHub { owner = "YACReader"; repo = pname; rev = version; - sha256 = "sha256-sIQxUiTGQCcHmxBp0Mf49e/XVaJe7onlLHiorMlNLZ8="; + sha256 = "sha256-kiacyHA/G0TnRH/96RqDTF7vdDnf2POMw/iSgtSRbmM="; }; nativeBuildInputs = [ qmake pkg-config ]; From bce4ebfe2390d063ff86afaa2bc42dc5fadeecdf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Aug 2023 11:51:13 +0000 Subject: [PATCH 11/28] oneDNN: 3.2 -> 3.2.1 --- pkgs/development/libraries/oneDNN/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix index 7eb656978e5f..f7495d3e9c8c 100644 --- a/pkgs/development/libraries/oneDNN/default.nix +++ b/pkgs/development/libraries/oneDNN/default.nix @@ -5,13 +5,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation rec { pname = "oneDNN"; - version = "3.2"; + version = "3.2.1"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${version}"; - sha256 = "sha256-V+0NyQMa4pY9Rhw6bLuqTom0ps/+wm4mGfn1rTi+0YM="; + sha256 = "sha256-/LbT2nHPpZHjY3xbJ9bDabR7aIMvetNP4mB+rxuTfy8="; }; outputs = [ "out" "dev" "doc" ]; From 41a2b273ab62bc6813be53e181262a8861aadcf8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Aug 2023 13:01:13 +0000 Subject: [PATCH 12/28] rmlint: 2.10.1 -> 2.10.2 --- pkgs/tools/misc/rmlint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 464b868b35d9..ec59a661ffcf 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -21,13 +21,13 @@ assert withGui -> !stdenv.isDarwin; stdenv.mkDerivation rec { pname = "rmlint"; - version = "2.10.1"; + version = "2.10.2"; src = fetchFromGitHub { owner = "sahib"; repo = "rmlint"; rev = "v${version}"; - sha256 = "15xfkcw1bkfyf3z8kl23k3rlv702m0h7ghqxvhniynvlwbgh6j2x"; + sha256 = "sha256-pOo1YfeqHUU6xyBRFbcj2lX1MHJ+a5Hi31BMC1nYZGo="; }; patches = [ From df8dcb51b94b0e9f244281a9fd5912aa888e8ab5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Aug 2023 05:34:30 +0000 Subject: [PATCH 13/28] okteto: 2.18.0 -> 2.18.3 --- pkgs/development/tools/okteto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix index dd5c8dd40ecd..df89a174158a 100644 --- a/pkgs/development/tools/okteto/default.nix +++ b/pkgs/development/tools/okteto/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "okteto"; - version = "2.18.0"; + version = "2.18.3"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-u0Ue5padTT2hPEta0ysm7W2oR1/FMFyTZd9yuciCehU="; + hash = "sha256-ZSrTVfZfIzfeXr6SDKHZZYrqvGKYA6bwMXZ4fBP+2Uo="; }; vendorHash = "sha256-ruDXfDwVmMLFsIF+YV4CryEPSeU2cEul9FfRiApII9g="; From 70648bee6e8896b641d86bfa9c5c26ded2c4b22c Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 13 Aug 2023 15:33:30 +0200 Subject: [PATCH 14/28] vault-ssh-plus: init at 0.7.0 https://github.com/isometry/vault-ssh-plus --- .../tools/security/vault-ssh-plus/default.nix | 48 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/tools/security/vault-ssh-plus/default.nix diff --git a/pkgs/tools/security/vault-ssh-plus/default.nix b/pkgs/tools/security/vault-ssh-plus/default.nix new file mode 100644 index 000000000000..384571bde265 --- /dev/null +++ b/pkgs/tools/security/vault-ssh-plus/default.nix @@ -0,0 +1,48 @@ +{ buildGoModule +, fetchFromGitHub +, makeWrapper +, lib +, openssh +, testers +, vault-ssh-plus +}: +buildGoModule rec { + pname = "vault-ssh-plus"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "isometry"; + repo = pname; + rev = "v${version}"; + hash = "sha256-D38G947/1//AMmWghgw0TDzNcd4LUcCuyLBhRP7YFJY="; + }; + + vendorHash = "sha256-tNdr2xyxri7mj1bP6oVx1DGzwrzg84TpPCY0kHNkXLw="; + + nativeBuildInputs = [ makeWrapper ]; + + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + ]; + + postInstall = '' + mv $out/bin/vault-ssh-plus $out/bin/vssh + wrapProgram $out/bin/vssh --prefix PATH : ${lib.makeBinPath [ openssh ]}; + ''; + + passthru.tests.version = testers.testVersion { + package = vault-ssh-plus; + command = "vssh --version"; + version = "v${version}"; + }; + + meta = with lib; { + homepage = "https://github.com/isometry/vault-ssh-plus"; + changelog = "https://github.com/isometry/vault-ssh-plus/releases/tag/v${version}"; + description = "Automatically use HashiCorp Vault SSH Client Key Signing with ssh(1)"; + license = licenses.mit; + maintainers = with maintainers; [ lesuisse ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68ef8a93c22c..6f1c8070ee92 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40998,6 +40998,8 @@ with pkgs; vault-medusa = callPackage ../tools/security/vault-medusa { }; + vault-ssh-plus = callPackage ../tools/security/vault-ssh-plus { }; + vault-bin = callPackage ../tools/security/vault/vault-bin.nix { }; vaultenv = haskell.lib.justStaticExecutables haskellPackages.vaultenv; From 7c014dd170c84bd7a4ec0236c54250ea4ff45e4d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Aug 2023 15:30:22 +0000 Subject: [PATCH 15/28] gotraceui: 0.2.0 -> 0.3.0 --- pkgs/development/tools/gotraceui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gotraceui/default.nix b/pkgs/development/tools/gotraceui/default.nix index f76170226a3c..7eeb11612f93 100644 --- a/pkgs/development/tools/gotraceui/default.nix +++ b/pkgs/development/tools/gotraceui/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gotraceui"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "dominikh"; repo = "gotraceui"; rev = "v${version}"; - sha256 = "sha256-dryDDunvxjHHzsMtTbEeIWqWOM7wtcyb9DjqzR2SgYE="; + sha256 = "sha256-hdI1TT33pPHK5018RQ+riPVqzqOF/xDkvh0WoYi6Pes="; }; - vendorHash = "sha256-Nx91u2JOBWYiYeG4VbCYKg66GANDViVHrbE31YdPIzM="; + vendorHash = "sha256-nXPiwSG2Hs86/raDvTv2p77P6Xwm+t8VT0dvZpXE8Os="; subPackages = ["cmd/gotraceui"]; nativeBuildInputs = [ pkg-config ]; From bd4b92f97360ec7f4599d167a0559180439297bc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Aug 2023 15:50:04 +0000 Subject: [PATCH 16/28] uthenticode: 1.0.9 -> 2.0.0 --- pkgs/development/libraries/uthenticode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/uthenticode/default.nix b/pkgs/development/libraries/uthenticode/default.nix index c98d9f930d38..58d1d35be94f 100644 --- a/pkgs/development/libraries/uthenticode/default.nix +++ b/pkgs/development/libraries/uthenticode/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "uthenticode"; - version = "1.0.9"; + version = "2.0.0"; src = fetchFromGitHub { owner = "trailofbits"; repo = "uthenticode"; rev = "v${version}"; - hash = "sha256-MEpbvt03L501BP42j6S7rXE9j1d8j6D2Y5kgPNlbHzc="; + hash = "sha256-XGKROp+1AJWUjCwMOikh+yvNMGuENJGb/kzJsEOEFeY="; }; cmakeFlags = [ "-DBUILD_TESTS=1" "-DUSE_EXTERNAL_GTEST=1" ]; From 189daa5eb3288dd77e7d72805ed677d776705360 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Sun, 13 Aug 2023 12:10:07 -0400 Subject: [PATCH 17/28] python310Packages.chex: 0.1.6 -> 0.1.82; unbreak --- .../python-modules/chex/default.nix | 32 ++++++++----------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/chex/default.nix b/pkgs/development/python-modules/chex/default.nix index b93d3baddcc4..7d7912ff0f45 100644 --- a/pkgs/development/python-modules/chex/default.nix +++ b/pkgs/development/python-modules/chex/default.nix @@ -1,35 +1,39 @@ -{ absl-py +{ lib , buildPythonPackage +, pythonOlder +, fetchFromGitHub +, absl-py , cloudpickle , dm-tree -, fetchFromGitHub , jax , jaxlib -, lib , numpy , pytestCheckHook , toolz +, typing-extensions }: buildPythonPackage rec { pname = "chex"; - version = "0.1.6"; + version = "0.1.82"; format = "setuptools"; + disabled = pythonOlder "3.9"; + src = fetchFromGitHub { owner = "deepmind"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-VolRlLLgKga9S17ByVrYya9VPtu9yiOnvt/WmlE1DOc="; + hash = "sha256-xBq22AaR2Tp1NSPefEyvCDeUYqRZlAf5LVHWo0luiXk="; }; propagatedBuildInputs = [ absl-py - cloudpickle - dm-tree + jaxlib jax numpy toolz + typing-extensions ]; pythonImportsCheck = [ @@ -37,21 +41,11 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - jaxlib + cloudpickle + dm-tree pytestCheckHook ]; - disabledTests = [ - # See https://github.com/deepmind/chex/issues/204. - "test_uninspected_checks" - - # These tests started failing at some point after upgrading to 0.1.5 - "test_useful_failure" - "TreeAssertionsTest" - "PmapFakeTest" - "WithDeviceTest" - ]; - meta = with lib; { description = "Chex is a library of utilities for helping to write reliable JAX code."; homepage = "https://github.com/deepmind/chex"; From 3d08a87bde2c2935d9442a22f1cd35a20d6b993f Mon Sep 17 00:00:00 2001 From: lelgenio Date: Fri, 11 Aug 2023 10:58:40 -0300 Subject: [PATCH 18/28] dart-sass: 1.64.1 -> 1.65.1 --- pkgs/development/tools/misc/dart-sass/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/dart-sass/default.nix b/pkgs/development/tools/misc/dart-sass/default.nix index 3d0a9855bf9f..2c2bf455c288 100644 --- a/pkgs/development/tools/misc/dart-sass/default.nix +++ b/pkgs/development/tools/misc/dart-sass/default.nix @@ -15,17 +15,17 @@ let in buildDartApplication rec { pname = "dart-sass"; - version = "1.64.1"; + version = "1.65.1"; src = fetchFromGitHub { owner = "sass"; repo = pname; rev = version; - hash = "sha256-JIw1I60Av5hUSRyqhc4nK5x9gHJcHTUIdYBTfQf8ob4="; + hash = "sha256-q6UY+A7JFDYb9hzvr2SYI9GfkY9bg49fQkUM7gHKOBU="; }; pubspecLockFile = ./pubspec.lock; - vendorHash = "sha256-kGeQIlNTHhlIEFH4MdWF5smc9lLg4YHx11bZS4BTPgI="; + vendorHash = "sha256-nIiffqM5HwJmORdONz+RADAPTISrz/3/HxK4aOSl5cM="; nativeBuildInputs = [ buf From 777fb1fc154e8ad23782186b4689e53adebf799d Mon Sep 17 00:00:00 2001 From: lelgenio Date: Thu, 20 Jul 2023 14:04:17 -0300 Subject: [PATCH 19/28] dart-sass: add tests --- .../tools/misc/dart-sass/default.nix | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/pkgs/development/tools/misc/dart-sass/default.nix b/pkgs/development/tools/misc/dart-sass/default.nix index 2c2bf455c288..e856e333b33a 100644 --- a/pkgs/development/tools/misc/dart-sass/default.nix +++ b/pkgs/development/tools/misc/dart-sass/default.nix @@ -3,6 +3,10 @@ , buildDartApplication , buf , protoc-gen-dart +, testers +, dart-sass +, runCommand +, writeText }: let @@ -47,4 +51,31 @@ buildDartApplication rec { license = licenses.mit; maintainers = with maintainers; [ lelgenio ]; }; + + passthru.tests = { + version = testers.testVersion { + package = dart-sass; + command = "dart-sass --version"; + }; + + simple = testers.testEqualContents { + assertion = "dart-sass compiles a basic scss file"; + expected = writeText "expected" '' + body h1{color:#123} + ''; + actual = runCommand "actual" { + nativeBuildInputs = [ dart-sass ]; + base = writeText "base" '' + body { + $color: #123; + h1 { + color: $color; + } + } + ''; + } '' + dart-sass --style=compressed $base > $out + ''; + }; + }; } From cf9cf31d1039148fa6262d4572cde8155eb7d459 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Sun, 13 Aug 2023 12:20:27 -0400 Subject: [PATCH 20/28] python310Packages.dicom-numpy: 0.6.3 -> 0.6.5 --- pkgs/development/python-modules/dicom-numpy/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dicom-numpy/default.nix b/pkgs/development/python-modules/dicom-numpy/default.nix index 87fca9a1b6a8..84ec407606b6 100644 --- a/pkgs/development/python-modules/dicom-numpy/default.nix +++ b/pkgs/development/python-modules/dicom-numpy/default.nix @@ -9,14 +9,16 @@ buildPythonPackage rec { pname = "dicom-numpy"; - version = "0.6.3"; + version = "0.6.5"; + format = "pyproject"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "innolitics"; repo = pname; - rev = "v${version}"; - hash = "sha256-QIPuSFaWgHmcTddZ8H9kgzLYuwGUzy/FVsi/ttSUskA="; + rev = "refs/tags/v${version}"; + hash = "sha256-pgmREQlstr0GY2ThIWt4hbcSWmaNWgkr2gO4PSgGHqE="; }; propagatedBuildInputs = [ From 50308ec793f2757df3eddcf06215d909b268e035 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Mon, 14 Aug 2023 00:09:12 +0700 Subject: [PATCH 21/28] lalrpop: set meta.mainProgram See #246386 --- pkgs/development/tools/lalrpop/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/lalrpop/default.nix b/pkgs/development/tools/lalrpop/default.nix index 1679417cbdd7..0bc8bddefbd0 100644 --- a/pkgs/development/tools/lalrpop/default.nix +++ b/pkgs/development/tools/lalrpop/default.nix @@ -41,6 +41,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/lalrpop/lalrpop"; changelog = "https://github.com/lalrpop/lalrpop/blob/${src.rev}/RELEASES.md"; license = with licenses; [ asl20 /* or */ mit ]; + mainProgram = "lalrpop"; maintainers = with maintainers; [ chayleaf ]; }; } From 7f58542d9afe1d055da5b72330afff4d664078a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Aug 2023 16:01:28 +0000 Subject: [PATCH 22/28] kics: 1.7.4 -> 1.7.5 --- pkgs/tools/admin/kics/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/kics/default.nix b/pkgs/tools/admin/kics/default.nix index 31721c6e7aa2..cebb1f2f072d 100644 --- a/pkgs/tools/admin/kics/default.nix +++ b/pkgs/tools/admin/kics/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "kics"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitHub { owner = "Checkmarx"; repo = "kics"; rev = "v${version}"; - sha256 = "sha256-h6ZnaknqMcW+Zp2t5RHPK/e/Ilw5yWY2fcSTJe2mVR4="; + hash = "sha256-+/wqwWRJQKfmh4JuWppcE2444lD1PQ9rDGOsFh57AKs="; }; vendorHash = "sha256-ipXfxqHdushJ2P//oyGGjZsq5EypDEpHKlW32VHaMXw="; From b6a25074ae78bbb8ce10c7ea321871e69c43da16 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Aug 2023 18:47:17 +0000 Subject: [PATCH 23/28] kubie: 0.21.1 -> 0.21.2 --- pkgs/development/tools/kubie/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix index 058cb3381c9c..508c1b4e72a9 100644 --- a/pkgs/development/tools/kubie/default.nix +++ b/pkgs/development/tools/kubie/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kubie"; - version = "0.21.1"; + version = "0.21.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "sbstp"; repo = "kubie"; - sha256 = "sha256-Qe//QBAQzxgNdQ0YrKFhgqNfVMFT9cb9eSQWgbPv0Gk="; + sha256 = "sha256-fkIKb2fcml9E2sSJwhYPrqiThFgpNYh1CampQu8RT4k="; }; - cargoHash = "sha256-hKM1lyVAXaRCIqrrQpVO03FSThzgQw3tFJIjWyUNfXo="; + cargoHash = "sha256-zZwSLMuuaQ8Ht6Ux/wrqB/VEHCvBqTQGvg+RSr8+AiQ="; nativeBuildInputs = [ installShellFiles ]; From bbf08eef8e1a7d8f32615da7fe35be0339d4e09e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Aug 2023 19:23:09 +0000 Subject: [PATCH 24/28] chars: 0.6.0 -> 0.7.0 --- pkgs/tools/text/chars/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/chars/default.nix b/pkgs/tools/text/chars/default.nix index 78caf67bc434..74083feb68f5 100644 --- a/pkgs/tools/text/chars/default.nix +++ b/pkgs/tools/text/chars/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "chars"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "antifuchs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aswosSXAh0wkO4N/y/H54dufMDrloWjpjrSWHvHR1rc="; + sha256 = "sha256-mBtwdPzIc6RgEFTyReStFlhS4UhhRWjBTKT6gD3tzpQ="; }; - cargoSha256 = "sha256-CqPmasdpXWjCn65G2Ua0h3v+TVP0QPFAdtKOFyoYW/0="; + cargoHash = "sha256-wqyExG4haco6jg1zpbouz3xMR7sjiVIAC16PnDU2tc8="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; From 54f5045571a3f728631b507668068f7f06cffa28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=D1=91Nya?= <47749563+L3Nya@users.noreply.github.com> Date: Sun, 13 Aug 2023 21:24:43 +0300 Subject: [PATCH 25/28] nixos/zoneminder: replace lib.optional with lib.optionals to make module work --- nixos/modules/services/misc/zoneminder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix index 616a60a123ea..b2e4e760d828 100644 --- a/nixos/modules/services/misc/zoneminder.nix +++ b/nixos/modules/services/misc/zoneminder.nix @@ -351,7 +351,7 @@ in { CacheDirectory = dirs cacheDirs; RuntimeDirectory = dirName; ReadWriteDirectories = lib.mkIf useCustomDir [ cfg.storageDir ]; - StateDirectory = dirs (lib.optional (!useCustomDir) libDirs); + StateDirectory = dirs (lib.optionals (!useCustomDir) libDirs); LogsDirectory = dirName; PrivateTmp = true; ProtectSystem = "strict"; From 05ff3adc4e933e7baf714caa00ae04dfda68b8bd Mon Sep 17 00:00:00 2001 From: skykanin <3789764+skykanin@users.noreply.github.com> Date: Sun, 13 Aug 2023 21:33:57 +0200 Subject: [PATCH 26/28] ani-cli: 4.5 -> 4.6 --- pkgs/applications/video/ani-cli/default.nix | 28 +++++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/ani-cli/default.nix b/pkgs/applications/video/ani-cli/default.nix index 2766afd7711a..21c04812f9f3 100644 --- a/pkgs/applications/video/ani-cli/default.nix +++ b/pkgs/applications/video/ani-cli/default.nix @@ -4,24 +4,42 @@ , lib , gnugrep , gnused -, wget +, curl +, catt +, syncplay +, ffmpeg , fzf -, mpv , aria2 +, withMpv ? true, mpv +, withVlc ? false, vlc +, withIina ? false, iina +, chromecastSupport ? false +, syncSupport ? false }: +assert withMpv || withVlc || withIina; + stdenvNoCC.mkDerivation rec { pname = "ani-cli"; - version = "4.5"; + version = "4.6"; src = fetchFromGitHub { owner = "pystardust"; repo = "ani-cli"; rev = "v${version}"; - hash = "sha256-HDpspU9OZxDET7/1rnKdGgaVEBt0gpzGtd3DuNIj7FY="; + hash = "sha256-ahyCD4QsYyb3xtNK03HITeF0+hJFIHZ+PAjisuS/Kdo="; }; nativeBuildInputs = [ makeWrapper ]; + runtimeDependencies = + let player = [] + ++ lib.optional withMpv mpv + ++ lib.optional withVlc vlc + ++ lib.optional withIina iina; + in [ gnugrep gnused curl fzf ffmpeg aria2 ] + ++ player + ++ lib.optional chromecastSupport catt + ++ lib.optional syncSupport syncplay; installPhase = '' runHook preInstall @@ -29,7 +47,7 @@ stdenvNoCC.mkDerivation rec { install -Dm755 ani-cli $out/bin/ani-cli wrapProgram $out/bin/ani-cli \ - --prefix PATH : ${lib.makeBinPath [ gnugrep gnused wget fzf mpv aria2 ]} + --prefix PATH : ${lib.makeBinPath runtimeDependencies} runHook postInstall ''; From 4f255e7f10bdeb15d40cea35ea260b08bfbda62c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 13 Aug 2023 17:34:10 -0300 Subject: [PATCH 27/28] colloid-gtk-theme: 2023.04.11 -> 2023-08-12 --- pkgs/data/themes/colloid-gtk-theme/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/themes/colloid-gtk-theme/default.nix b/pkgs/data/themes/colloid-gtk-theme/default.nix index c71c86269e71..6b56064b8734 100644 --- a/pkgs/data/themes/colloid-gtk-theme/default.nix +++ b/pkgs/data/themes/colloid-gtk-theme/default.nix @@ -19,17 +19,17 @@ in lib.checkListOfEnum "${pname}: theme variants" [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey" "all" ] themeVariants lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants -lib.checkListOfEnum "${pname}: tweaks" [ "nord" "black" "dracula" "gruvbox" "rimless" "normal" ] tweaks +lib.checkListOfEnum "${pname}: tweaks" [ "nord" "dracula" "gruvbox" "all" "black" "rimless" "normal" "float" ] tweaks stdenvNoCC.mkDerivation rec { inherit pname; - version = "2023.04.11"; + version = "2023-08-12"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - hash = "sha256-lVHDQmu9GLesasmI2GQ0hx4f2NtgaM4IlJk/hXe2XzY="; + hash = "sha256-Ss6IXd4vYUvIF5/Hn4IVLNvDSaewTY0GNZp7X5Lmz/c="; }; nativeBuildInputs = [ From eafc041a1944229e5e56d81bcd8cb4ee2397a842 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 13 Aug 2023 10:44:04 +0100 Subject: [PATCH 28/28] grub2: workaround parallel build failure by building .po files sequentially Without the change `grub2` build occasionally fails as: https://hydra.nixos.org/log/h04imslmgy9l33z6xxsaf9v4svqsc3n2-grub-2.12-rc1.drv $ msgmerge --update --lang=de de.po grub.pot $ msgmerge --update --lang=de de.po grub.pot ... de.po:745: end-of-file within string de.po:745: missing 'msgstr' section Here `msgmerge --update` attempts to update `de.po` from two parallel `make` calls when translation updates are happening. The change works around `de.po` stomping bu regenerating translations sequentially. Co-authored-by: Samuel Dionne-Riel --- pkgs/tools/misc/grub/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index 27702a6ba4a8..5fc189a4de11 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -149,6 +149,13 @@ stdenv.mkDerivation rec { substituteInPlace ./configure --replace '/usr/share/fonts/unifont' '${unifont}/share/fonts' ''; + postConfigure = '' + # make sure .po files are up to date to workaround + # parallel `msgmerge --update` on autogenerated .po files: + # https://github.com/NixOS/nixpkgs/pull/248747#issuecomment-1676301670 + make dist + ''; + configureFlags = [ "--enable-grub-mount" # dep of os-prober ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [