From d8b356caafb34d454737a79bb0fc6076f3da0b5d Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Mon, 8 Aug 2022 23:10:59 +0200 Subject: [PATCH 01/23] fix: ssh-keygen fails if directory does not exist --- nixos/modules/services/networking/ssh/sshd.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 6da83eb7de10..00ec15c54bc1 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -435,13 +435,12 @@ in # socket activation, it goes to the remote side (#19589). exec >&2 - mkdir -m 0755 -p /etc/ssh - ${flip concatMapStrings cfg.hostKeys (k: '' if ! [ -s "${k.path}" ]; then if ! [ -h "${k.path}" ]; then rm -f "${k.path}" fi + mkdir -m 0755 -p "$(dirname '${k.path}')" ssh-keygen \ -t "${k.type}" \ ${if k ? bits then "-b ${toString k.bits}" else ""} \ From 0b390c407c0a10aa02c310519c8034ee689ad55a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Aug 2022 14:07:41 +0000 Subject: [PATCH 02/23] freecad: 0.20 -> 0.20.1 --- pkgs/applications/graphics/freecad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 6c3f6fac3039..17537083aaed 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -49,13 +49,13 @@ mkDerivation rec { pname = "freecad"; - version = "0.20"; + version = "0.20.1"; src = fetchFromGitHub { owner = "FreeCAD"; repo = "FreeCAD"; rev = version; - hash = "sha256-Em4XVxDfvVG1Kf7q+6uHNA/VcMGLKMTv5TCh2XF/BtQ="; + hash = "sha256-r2lhFv4ReASteoVxwwiW9TdSckpaju6QE8UegxeY4rE="; }; nativeBuildInputs = [ From 0d47dc55952662295debb4e226019d23854a9b33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20He=C3=9Felmann?= Date: Mon, 2 May 2022 14:17:44 +0200 Subject: [PATCH 03/23] openshift: 4.10.0 -> 4.11.0 The commit needs to be pinned because the release branches are not tagged properly. --- .../applications/networking/cluster/openshift/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index 89bbd0cb7d6d..9933e8056670 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -10,14 +10,14 @@ buildGoModule rec { pname = "openshift"; - version = "4.10.0"; - gitCommit = "346b183"; + version = "4.11.0"; + gitCommit = "20dd77d5"; src = fetchFromGitHub { owner = "openshift"; repo = "oc"; - rev = "release-4.10"; - sha256 = "Pdq3OwT5P7vvB70X+GVglT9CdJbhkm35nvEGurO1HPc="; + rev = "20dd77d5c889f86b05e2bdd182853ae702852c63"; + sha256 = "wqLo/CKGzeMDJUoI9PUEjJER5hSPu+FmUCJLPZ9PJuw="; }; vendorSha256 = null; From 6e577ff4047593b0917604f81c9788e48bfabe91 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Tue, 2 Aug 2022 21:46:55 -0400 Subject: [PATCH 04/23] =?UTF-8?q?texlab:=204.2.0=20=E2=86=92=204.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../development/tools/misc/texlab/default.nix | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 229c2b68f62b..00d12e182831 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -2,6 +2,7 @@ , stdenv , rustPlatform , fetchFromGitHub +, help2man , installShellFiles , libiconv , Security @@ -11,24 +12,34 @@ rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "latex-lsp"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-oYM+OAYjQ8aNAryg0Cthj14BsxMFnOtz38XdUQZZolk="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-za3TauhNoxGDphpY615EnTt46HpMgS+sYpBln/twefw="; }; - cargoSha256 = "sha256-TDGiqC9eNIJfLTc1R3nvE84rAsVE8jtTaeQbVNMeVgg="; + cargoSha256 = "sha256-wppaa3IGOqkFu/1CAp8g+PlPtMWm/7qNpPu0k4/mL3A="; outputs = [ "out" "man" ]; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + help2man + installShellFiles + ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security CoreServices ]; + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + Security + CoreServices + ]; postInstall = '' + # TexLab builds man page separately in CI: + # https://github.com/latex-lsp/texlab/blob/v4.2.1/.github/workflows/publish.yml#L131-L135 + help2man --no-info "$out/bin/texlab" > texlab.1 installManPage texlab.1 # Remove generated dylib of human_name dependency. TexLab statically From f7637100655127dffbe14011b45be6a71f0e203d Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 11 Aug 2022 02:35:29 +0200 Subject: [PATCH 05/23] nixos/udisks2: don't enable by default This was enabled by default in 18a7ce76fcf80389bc8db2dd3e961a74637b5162 with the reason that it would be "useful regardless of the desktop environment.", which I'm not arguing against. The reason why this should not be enabled by default is that there are a lot of systems that NixOS runs on that are not desktop systems. Users on such systems most likely do not want or need this feature and could even consider this an antifeature. Furthermore, it is surprising to them to find out that they have this enabled on their systems. They might be even more surprised to find that they have polkit enabled by default, which was a default that was flipped in a813be071ceed15b9238373bd751ee99e2470357. For some discussion as to why see https://github.com/NixOS/nixpkgs/pull/156858. Evidently, this default is not only surprising to users, but also module developers, as most if not all modules for desktop environments already explicity set services.udisks2.enable = true; which they don't need to right now. --- .../manual/from_md/release-notes/rl-2211.section.xml | 12 ++++++++++++ nixos/doc/manual/release-notes/rl-2211.section.md | 3 +++ nixos/modules/services/hardware/udisks2.nix | 9 +-------- nixos/modules/virtualisation/container-config.nix | 1 - 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 5d09d3a93aae..aaa85138dfa1 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -392,6 +392,18 @@ as coreboot’s fork is no longer available. + + + The udisks2 service, available at + services.udisks2.enable, is now disabled by + default. It will automatically be enabled through services and + desktop environments as needed. This also means that polkit + will now actually be disabled by default. The default for + security.polkit.enable was already flipped + in the previous release, but udisks2 being enabled by default + re-enabled it. + + Add udev rules for the Teensy family of microcontrollers. diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index f37d7d827bd9..e1253d46190f 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -145,6 +145,9 @@ Use `configure.packages` instead. - memtest86+ was updated from 5.00-coreboot-002 to 6.00-beta2. It is now the upstream version from https://www.memtest.org/, as coreboot's fork is no longer available. +- The udisks2 service, available at `services.udisks2.enable`, is now disabled by default. It will automatically be enabled through services and desktop environments as needed. + This also means that polkit will now actually be disabled by default. The default for `security.polkit.enable` was already flipped in the previous release, but udisks2 being enabled by default re-enabled it. + - Add udev rules for the Teensy family of microcontrollers. - The `pass-secret-service` package now includes systemd units from upstream, so adding it to the NixOS `services.dbus.packages` option will make it start automatically as a systemd user service when an application tries to talk to the libsecret D-Bus API. diff --git a/nixos/modules/services/hardware/udisks2.nix b/nixos/modules/services/hardware/udisks2.nix index f9b5afceac32..988e975d7e66 100644 --- a/nixos/modules/services/hardware/udisks2.nix +++ b/nixos/modules/services/hardware/udisks2.nix @@ -19,14 +19,7 @@ in services.udisks2 = { - enable = mkOption { - type = types.bool; - default = true; - description = lib.mdDoc '' - Whether to enable Udisks, a DBus service that allows - applications to query and manipulate storage devices. - ''; - }; + enable = mkEnableOption "udisks2, a DBus service that allows applications to query and manipulate storage devices."; settings = mkOption rec { type = types.attrsOf settingsFormat.type; diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix index 0966ef84827f..94f28ea80d09 100644 --- a/nixos/modules/virtualisation/container-config.nix +++ b/nixos/modules/virtualisation/container-config.nix @@ -8,7 +8,6 @@ with lib; # Disable some features that are not useful in a container. nix.optimise.automatic = mkDefault false; # the store is host managed - services.udisks2.enable = mkDefault false; powerManagement.enable = mkDefault false; documentation.nixos.enable = mkDefault false; From ec5bd8b169534fece0c72c52d65bc6ba2b7255db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Aug 2022 05:06:38 +0000 Subject: [PATCH 06/23] jenkins: 2.346.2 -> 2.346.3 --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 0bd1d5484388..9a7dd92a5bb8 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.346.2"; + version = "2.346.3"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "0ymp4zy73rxakk7i1pxai1i0hxp65ilzi57dan3mqspaprfllk7g"; + sha256 = "12bxni81qldm7f3sbr2rhx6wghbkabhy634pgbrmq6m3j1c8q7hl"; }; nativeBuildInputs = [ makeWrapper ]; From f9a39878f8f1be1d14b77bfb0386e59287e8f751 Mon Sep 17 00:00:00 2001 From: kilianar Date: Thu, 11 Aug 2022 11:58:51 +0200 Subject: [PATCH 07/23] inkscape: fix bug when saving as an optimized svg When saving an optimized svg, inkscape failed with a ModuleNotFoundError: No module named 'packaging'. To fix this issue we add packaging to python3Env. --- pkgs/applications/graphics/inkscape/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 88f62793483a..83fd78c63134 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -48,6 +48,7 @@ let cachecontrol numpy lxml + packaging pillow scour pyserial From f3c62556212130413411dcaad4af680f150ac8eb Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Wed, 10 Aug 2022 20:10:01 -0400 Subject: [PATCH 08/23] texlab: fix cross-compilation --- .../development/tools/misc/texlab/default.nix | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 00d12e182831..4371efca4f0a 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -10,7 +10,9 @@ , nix-update-script }: -rustPlatform.buildRustPackage rec { +let + isCross = stdenv.hostPlatform != stdenv.buildPlatform; +in rustPlatform.buildRustPackage rec { pname = "texlab"; version = "4.2.1"; @@ -23,12 +25,10 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-wppaa3IGOqkFu/1CAp8g+PlPtMWm/7qNpPu0k4/mL3A="; - outputs = [ "out" "man" ]; + outputs = [ "out" ] ++ lib.optional (!isCross) "man"; - nativeBuildInputs = [ - help2man - installShellFiles - ]; + nativeBuildInputs = [ installShellFiles ] + ++ lib.optional (!isCross) help2man; buildInputs = lib.optionals stdenv.isDarwin [ libiconv @@ -37,17 +37,20 @@ rustPlatform.buildRustPackage rec { ]; postInstall = '' - # TexLab builds man page separately in CI: - # https://github.com/latex-lsp/texlab/blob/v4.2.1/.github/workflows/publish.yml#L131-L135 - help2man --no-info "$out/bin/texlab" > texlab.1 - installManPage texlab.1 - # Remove generated dylib of human_name dependency. TexLab statically # links to the generated rlib and doesn't reference the dylib. I # couldn't find any way to prevent building this by passing cargo flags. # See https://github.com/djudd/human-name/blob/master/Cargo.toml#L43 rm "$out/lib/libhuman_name${stdenv.hostPlatform.extensions.sharedLibrary}" rmdir "$out/lib" + '' + # When we cross compile we cannot run the output executable to + # generate the man page + + lib.optionalString (!isCross) '' + # TexLab builds man page separately in CI: + # https://github.com/latex-lsp/texlab/blob/v4.2.1/.github/workflows/publish.yml#L131-L135 + help2man --no-info "$out/bin/texlab" > texlab.1 + installManPage texlab.1 ''; passthru.updateScript = nix-update-script { From 90d88829da22d5b90048ce6c82bb164b660ddab8 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 11 Aug 2022 13:28:31 +0200 Subject: [PATCH 09/23] nixos/gvfs: enable udisks2 can be used by gvfs and is disabled by default after f7637100655127dffbe14011b45be6a71f0e203d --- nixos/modules/services/desktops/gvfs.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/desktops/gvfs.nix b/nixos/modules/services/desktops/gvfs.nix index 4aa6412aaa5f..84cd29638723 100644 --- a/nixos/modules/services/desktops/gvfs.nix +++ b/nixos/modules/services/desktops/gvfs.nix @@ -56,6 +56,8 @@ in services.udev.packages = [ pkgs.libmtp.out ]; + services.udisks2.enable = true; + # Needed for unwrapped applications environment.sessionVariables.GIO_EXTRA_MODULES = [ "${cfg.package}/lib/gio/modules" ]; From 6bfdf1f074dcf0fd053a688c133c6c7b3de39a71 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 11 Aug 2022 14:19:28 +0200 Subject: [PATCH 10/23] grafana: 9.0.6 -> 9.0.7 ChangeLog: https://github.com/grafana/grafana/releases/tag/v9.0.7 --- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 8218735a94c9..c25c34c125a9 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "9.0.6"; + version = "9.0.7"; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ]; @@ -10,12 +10,12 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-at9JvFLP2xGIFQODHw8zi3kEqIKJ8SBwBbcjVLVeYRc="; + sha256 = "sha256-rmcoyYBTT1po0TphmoGSoiS13W98LvjBhizKkhZVMzE="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-92gWk5G6zLmesS0r5QRePdsVYJ9CFS/i0rsT8HOK1Js="; + sha256 = "sha256-9mXmot/UjMNrfDQ1MXSQvjn6cBBNQ4gP7bJvpBqBIKc="; }; vendorSha256 = "sha256-6Z1qvn5HTybKAjsst8kSGYCbEIBsPyhNswVGGiMD9B8="; From 83d9fd99c284eb765e96ee10ba47a9df39be4ff6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Aug 2022 23:38:53 +0000 Subject: [PATCH 11/23] spire: 1.3.3 -> 1.4.0 --- pkgs/tools/security/spire/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/spire/default.nix b/pkgs/tools/security/spire/default.nix index 0ddd6d4db722..aa121e72ea97 100644 --- a/pkgs/tools/security/spire/default.nix +++ b/pkgs/tools/security/spire/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "spire"; - version = "1.3.3"; + version = "1.4.0"; outputs = [ "out" "agent" "server" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "spiffe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hkmmNY0L7yMH1DoPKHUq6F2lWpKnGj6Ftni8E+jIfH4="; + sha256 = "sha256-wyKluqYKNmaJaXK70v7/f2WEGgekd0Qgdu3UZnXm/UU="; }; - vendorSha256 = "sha256-sjR8HCEBWj4BAIMeYkQZqzuOVL3PDG7ELpRo8K5wn1A="; + vendorSha256 = "sha256-EZWoMSBxdvnrdBmSrRYf4+2d1LCka7oUIhRAW+2n7CU="; subPackages = [ "cmd/spire-agent" "cmd/spire-server" ]; From 090e83412b40f2f619ea5217ba77f3bcd82e3d08 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Jul 2022 14:07:46 +0000 Subject: [PATCH 12/23] ooniprobe-cli: 3.15.1 -> 3.15.3 --- pkgs/tools/networking/ooniprobe-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/ooniprobe-cli/default.nix b/pkgs/tools/networking/ooniprobe-cli/default.nix index 8ae015102bb3..ea7a14563257 100644 --- a/pkgs/tools/networking/ooniprobe-cli/default.nix +++ b/pkgs/tools/networking/ooniprobe-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "ooniprobe-cli"; - version = "3.15.1"; + version = "3.15.3"; src = fetchFromGitHub { owner = "ooni"; repo = "probe-cli"; rev = "v${version}"; - hash = "sha256-s1q9QgdbLmMaEV2ovGRKWHRhUFvbTHhFvo7ALdhUG4Y="; + hash = "sha256-21D/1ImKOr9+GeSrIRCUGCcALU0WPohrnz1qqUXLy1A="; }; - vendorSha256 = "sha256-h06WoKykuVzNgco74YbpSP+1nu/bOEf2mT4rUEX8MxU="; + vendorSha256 = "sha256-tZHBcVTCll3dSfQnQDfo9z3ALAykRmFvH7vjLLtQHDc="; subPackages = [ "cmd/ooniprobe" ]; From e16d071f023c0b3ddd9a50cada69d1f9a916fdad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 05:41:43 +0000 Subject: [PATCH 13/23] python310Packages.xsdata: 22.5 -> 22.7 --- pkgs/development/python-modules/xsdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xsdata/default.nix b/pkgs/development/python-modules/xsdata/default.nix index 280cead6d2ee..fbc621a59692 100644 --- a/pkgs/development/python-modules/xsdata/default.nix +++ b/pkgs/development/python-modules/xsdata/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "xsdata"; - version = "22.5"; + version = "22.7"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "701dcda5a4a07df3a642f8fb6f73f0e2e18224d359bcb7f4212b3c29d7af72c2"; + sha256 = "sha256-2EpbTNYdjcHOQQqe+bEpMzGxD2Jh34P+eI+uK4SJPdo="; }; postPatch = '' From cfb653e47f57a0b64674258ceca93c19dd6153c1 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Thu, 28 Jul 2022 21:51:42 +0200 Subject: [PATCH 14/23] python310Packages.pytorch-metric-learning: 1.5.0 -> 1.5.1 --- .../pytorch-metric-learning/default.nix | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix index 24be3f3eb4fb..1c6b2d61ecb6 100644 --- a/pkgs/development/python-modules/pytorch-metric-learning/default.nix +++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -8,11 +8,12 @@ , pytorch , torchvision , tqdm +, faiss }: buildPythonPackage rec { pname = "pytorch-metric-learning"; - version = "1.5.0"; + version = "1.5.1"; disabled = isPy27; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "KevinMusgrave"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-ge6y5n1N/+nymgD4La3ger7N4vvcoo1Bxa+etirNFNI="; + sha256 = "sha256-d7Ngd4SzGTJXtpgs2Jqb+y1aeMt9YUqIOft5ByDtRsc="; }; propagatedBuildInputs = [ @@ -36,14 +37,18 @@ buildPythonPackage rec { export TEST_DEVICE=cpu export TEST_DTYPES=float32,float64 # half-precision tests fail on CPU ''; + # package only requires `unittest`, but use `pytest` to exclude tests - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + faiss + pytestCheckHook + ]; + disabledTests = [ - # requires FAISS (not in Nixpkgs) - "test_accuracy_calculator_and_faiss" - "test_global_embedding_space_tester" - "test_with_same_parent_label_tester" + # TypeError: setup() missing 1 required positional argument: 'world_size' + "TestDistributedLossWrapper" # require network access: + "TestInference" "test_get_nearest_neighbors" "test_tuplestoweights_sampler" "test_untrained_indexer" @@ -59,6 +64,5 @@ buildPythonPackage rec { changelog = "https://github.com/KevinMusgrave/pytorch-metric-learning/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ bcdarwin ]; - broken = true; # requires faiss which is unpackaged }; } From 8e4b07340d7b23c96923283168daa3d5e9bb3bb7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Aug 2022 15:22:32 +0000 Subject: [PATCH 15/23] mlflow-server: 1.27.0 -> 1.28.0 --- pkgs/development/python-modules/mlflow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 9016272384ad..48b70d35a896 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "mlflow"; - version = "1.27.0"; + version = "1.28.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ah401r4mZyXkHUVHVyqEJdhtZiPhyIiM8/IrkAGb4Ko="; + hash = "sha256-aXZp4eQuiHwzBQKuTw7WROgUvgas2pDOpEU57M4zSmQ="; }; propagatedBuildInputs = [ From dc8cd700673615e56d4ebb091f2fe3ee2dc927be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Aug 2022 02:05:36 +0000 Subject: [PATCH 16/23] xml2rfc: 3.13.1 -> 3.14.0 --- pkgs/development/python-modules/xml2rfc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 61e6d877eb6a..06c494d76d45 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "3.13.1"; + version = "3.14.0"; disabled = pythonOlder "3.6"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "ietf-tools"; repo = "xml2rfc"; rev = "refs/tags/v${version}"; - sha256 = "sha256-DRHhcMPLBr1SM6e3BCB8gfvadd8CeMIOsPT+uzcET+4="; + sha256 = "sha256-BuOHQ6LnfjdlE9+wdJbl6wdD/oddKIklabVBx1IJJBA="; }; postPatch = '' From 361b400464f66ef6e3ffeba6fcff9f8f9cf04196 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Aug 2022 11:45:52 +0000 Subject: [PATCH 17/23] python310Packages.rapidfuzz: 2.4.2 -> 2.4.3 https://github.com/maxbachmann/RapidFuzz/releases/tag/v2.4.3 --- pkgs/development/python-modules/rapidfuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 1475b42ec939..e981ea48524c 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "2.4.2"; + version = "2.4.3"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "RapidFuzz"; rev = "refs/tags/v${version}"; - hash = "sha256-nLYxPGK+7ThvpsmvF2zlo+DqykY8bW1j2si3Lnyq7oo="; + hash = "sha256-KKRqSMU1AzXYDB50CBQ1ZcL87KgG2/tL+cmR1jnrTVk="; }; nativeBuildInputs = [ From 862dee7c9c369760fa1113f4793def8eba5306f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Aug 2022 11:53:56 +0000 Subject: [PATCH 18/23] python310Packages.levenshtein: 0.19.3 -> 0.20.2 https://github.com/maxbachmann/Levenshtein/blob/v0.20.2/HISTORY.md --- pkgs/development/python-modules/levenshtein/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix index a51d65cedc8d..24c4f11b6759 100644 --- a/pkgs/development/python-modules/levenshtein/default.nix +++ b/pkgs/development/python-modules/levenshtein/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "levenshtein"; - version = "0.19.3"; + version = "0.20.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "Levenshtein"; rev = "refs/tags/v${version}"; - hash = "sha256-4Oc1n/ZgLdq57ZeyZHzTQOjar9Ligeb4yqKeT0s5dHY="; + hash = "sha256-zVYfErh9tts3yPgXqqeX6xp8o+gLd7nN64+Ml6YZfjE="; }; nativeBuildInputs = [ @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Functions for fast computation of Levenshtein distance and string similarity"; homepage = "https://github.com/maxbachmann/Levenshtein"; + changelog = "https://github.com/maxbachmann/Levenshtein/blob/${src.rev}/HISTORY.md"; license = licenses.gpl2Plus; maintainers = with maintainers; [ fab ]; }; From c0607b398b2ccb89baf59a53c4d7d4b617461cbf Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Mon, 8 Aug 2022 17:26:40 +0200 Subject: [PATCH 19/23] python310Packages.streamz: 0.6.3 -> 0.6.4 --- .../python-modules/streamz/default.nix | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/streamz/default.nix b/pkgs/development/python-modules/streamz/default.nix index 0b2fb134a921..a4fe702c8c5d 100644 --- a/pkgs/development/python-modules/streamz/default.nix +++ b/pkgs/development/python-modules/streamz/default.nix @@ -20,28 +20,16 @@ buildPythonPackage rec { pname = "streamz"; - version = "0.6.3"; + version = "0.6.4"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-0wZ1ldLFRAIL9R+gLfwsFbL+gvdORAkYWNjnDmeafm8="; + hash = "sha256-VXfWkEwuxInBQVQJV3IQXgGVRkiBmYfUZCBMbjyWNPM="; }; - patches = [ - # remove with next bump - (fetchpatch { - name = "fix-tests-against-distributed-2021.10.0.patch"; - url = "https://github.com/python-streamz/streamz/commit/5bd3bc4d305ff40c740bc2550c8491be9162778a.patch"; - sha256 = "1xzxcbf7yninkyizrwm3ahqk6ij2fmh0454iqjx2n7mmzx3sazx7"; - includes = [ - "streamz/tests/test_dask.py" - ]; - }) - ]; - propagatedBuildInputs = [ networkx six @@ -65,6 +53,12 @@ buildPythonPackage rec { ]; disabledTests = [ + # Error with distutils version: fixture 'cleanup' not found + "test_separate_thread_without_time" + "test_await_syntax" + "test_partition_then_scatter_sync" + "test_sync" + "test_sync_2" # Test fail in the sandbox "test_tcp_async" "test_tcp" From 8c4a87a9f2792f1edc63f88671895e142b2d7f03 Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Sat, 30 Jul 2022 15:04:37 +0200 Subject: [PATCH 20/23] Clear maintainer of pc-ble-driver --- pkgs/development/libraries/pc-ble-driver/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/pc-ble-driver/default.nix b/pkgs/development/libraries/pc-ble-driver/default.nix index b06a771e1999..ae139639c732 100644 --- a/pkgs/development/libraries/pc-ble-driver/default.nix +++ b/pkgs/development/libraries/pc-ble-driver/default.nix @@ -43,6 +43,5 @@ stdenv.mkDerivation rec { homepage = "https://github.com/NordicSemiconductor/pc-ble-driver"; license = licenses.unfreeRedistributable; platforms = platforms.unix; - maintainers = with maintainers; [ jschievink ]; }; } From f35f4a28a64fdf04354467572cd8089d4484da52 Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Wed, 27 Jul 2022 15:39:42 +0200 Subject: [PATCH 21/23] Remove myself as a maintainer --- maintainers/maintainer-list.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d51c11e14914..c35d0df8f056 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6440,13 +6440,6 @@ githubId = 3267697; name = "Joshua Potter"; }; - jschievink = { - email = "jonasschievink@gmail.com"; - matrix = "@jschievink:matrix.org"; - github = "jonas-schievink"; - githubId = 1786438; - name = "Jonas Schievink"; - }; jshcmpbll = { email = "me@joshuadcampbell.com"; github = "jshcmpbll"; From a37dd32ab6a512a8f3c06b8ea1868a7122ef3105 Mon Sep 17 00:00:00 2001 From: Eric Wolf Date: Tue, 9 Aug 2022 12:28:31 +0200 Subject: [PATCH 22/23] cargo-pgx: init at 0.4.5 --- .../tools/rust/cargo-pgx/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/tools/rust/cargo-pgx/default.nix diff --git a/pkgs/development/tools/rust/cargo-pgx/default.nix b/pkgs/development/tools/rust/cargo-pgx/default.nix new file mode 100644 index 000000000000..4ad70bfa9ed4 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-pgx/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchCrate, rustPlatform, pkg-config, openssl, Security }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-pgx"; + version = "0.4.5"; + + src = fetchCrate { + inherit version pname; + sha256 = "sha256-BcMGa/1ATwLG8VnwItfd5eqmrck/u0MEoR5sA2yuzyQ="; + }; + + cargoSha256 = "sha256-urlwqBCZMxlPEjLLPBhI2lDNTusCSZ1bZu1p8poVrtw="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ Security ]; + + meta = with lib; { + description = "Cargo subcommand for ‘pgx’ to make Postgres extension development easy"; + homepage = "https://github.com/tcdi/pgx/tree/v${version}/cargo-pgx"; + license = licenses.mit; + maintainers = with maintainers; [ typetetris ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 39a56d96e964..0e343708626f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14223,6 +14223,9 @@ with pkgs; cargo-outdated = callPackage ../development/tools/rust/cargo-outdated { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; + cargo-pgx = callPackage ../development/tools/rust/cargo-pgx { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-release = callPackage ../development/tools/rust/cargo-release { inherit (darwin.apple_sdk.frameworks) Security; }; From f2c28f668c4b622fba7a5b8362dbe9df7d7eb264 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 15:04:11 +0000 Subject: [PATCH 23/23] intel-media-sdk: 22.3.0 -> 22.5.1 --- pkgs/development/libraries/intel-media-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix index 31f25ec10d77..a8591f40ee98 100644 --- a/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/pkgs/development/libraries/intel-media-sdk/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "intel-media-sdk"; - version = "22.3.0"; + version = "22.5.1"; src = fetchFromGitHub { owner = "Intel-Media-SDK"; repo = "MediaSDK"; rev = "intel-mediasdk-${version}"; - sha256 = "sha256-6/MOjISfLsrsocdeFC148hRwl2os5dvJV1eYq/jIMr4="; + sha256 = "sha256-HTCqJG//byTTlTRdE8IyFGuUaLiNVDfl9swbH6d5gCk="; }; nativeBuildInputs = [ cmake pkg-config ];