From 950184cf58fd257d2b7fab6400d8e59e19c4b6bc Mon Sep 17 00:00:00 2001 From: PopeRigby Date: Mon, 22 Jul 2024 21:02:58 -0700 Subject: [PATCH 01/29] =?UTF-8?q?vkquake:=201.22.3=20=E2=86=92=201.31.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/Novum/vkQuake/releases/tag/1.31.0 --- pkgs/games/quakespasm/vulkan.nix | 43 +++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix index 81c49e5a017c..2f91ff92c0eb 100644 --- a/pkgs/games/quakespasm/vulkan.nix +++ b/pkgs/games/quakespasm/vulkan.nix @@ -1,30 +1,52 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper -, SDL2, gzip, libvorbis, libmad, vulkan-headers, vulkan-loader, moltenvk +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + glslang, + pkg-config, + flac, + libopus, + opusfile, + makeWrapper, + SDL2, + gzip, + libvorbis, + libmad, + vulkan-headers, + vulkan-loader, + moltenvk, }: stdenv.mkDerivation rec { pname = "vkquake"; - version = "1.22.3"; + version = "1.31.0"; src = fetchFromGitHub { owner = "Novum"; repo = "vkQuake"; rev = version; - sha256 = "sha256-+8DU1QT3Lgqf1AIReVnXQ2Lq6R6eBb8VjdkJfAn/Rtc="; + sha256 = "sha256-3xWwqN0EcwDMEhVxfLa0bMMClM+zELEFWzO/EJvPNs0="; }; - sourceRoot = "${src.name}/Quake"; - nativeBuildInputs = [ makeWrapper + glslang + meson + ninja + pkg-config vulkan-headers ]; buildInputs = [ - gzip SDL2 - libvorbis + flac + gzip libmad + libopus + libvorbis + opusfile vulkan-loader ] ++ lib.optional stdenv.isDarwin moltenvk; @@ -34,19 +56,16 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" ''; - makeFlags = [ "prefix=$(out) bindir=$(out)/bin" ]; - env = lib.optionalAttrs stdenv.isDarwin { NIX_CFLAGS_COMPILE = "-Wno-error=unused-but-set-variable"; }; postFixup = '' + cp vkquake "$out/bin" wrapProgram $out/bin/vkquake \ --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib ''; - enableParallelBuilding = true; - meta = with lib; { description = "Vulkan Quake port based on QuakeSpasm"; mainProgram = "vkquake"; From bee68305fe3f392ba416b50ac8a492ae0a9d92c9 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Wed, 24 Jul 2024 22:30:09 -0700 Subject: [PATCH 02/29] libseccomp: disable broken tests on llvm --- pkgs/development/libraries/libseccomp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index 19ba1f2b8911..a8b2a98850dd 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; nativeCheckInputs = [ util-linuxMinimal which ]; - doCheck = true; + doCheck = !(stdenv.targetPlatform.useLLVM or false); # Hack to ensure that patchelf --shrink-rpath get rids of a $TMPDIR reference. preFixup = "rm -rfv src"; From 396a42e529d44e496acd067e7e4de155fa6b8932 Mon Sep 17 00:00:00 2001 From: DarkOnion0 Date: Wed, 24 Jul 2024 16:47:53 +0200 Subject: [PATCH 03/29] appflowy: 0.6.4 -> 0.6.5 https://github.com/AppFlowy-IO/AppFlowy/releases/tag/0.6.5 --- pkgs/applications/office/appflowy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index 4d5e23b12205..41753336e1f6 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -17,11 +17,11 @@ let rec { x86_64-linux = { urlSuffix = "linux-x86_64.tar.gz"; - hash = "sha256-PVlHPjr6aUkTp9x4MVC8cgebmdaUQXX6eV0/LfAmiJc="; + hash = "sha256-p2rfGO31B7q5MInsvGFaNkHpbfRjhEcI++I2Le0tb5s="; }; x86_64-darwin = { urlSuffix = "macos-universal.zip"; - hash = "sha256-gx+iMo2611uoR549gpBoHlp2h6zQtugPZnU9qbH6VIQ="; + hash = "sha256-ekQe2L61wYaHIOdvNPjyiEqLPU3cmcXTuBGryu3roEQ="; }; aarch64-darwin = x86_64-darwin; } @@ -29,7 +29,7 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "appflowy"; - version = "0.6.4"; + version = "0.6.5"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${finalAttrs.version}/AppFlowy-${finalAttrs.version}-${dist.urlSuffix}"; From 0fb2bc98952e3815d6ea87d0dd3c221207656962 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Thu, 25 Jul 2024 14:33:05 -0700 Subject: [PATCH 04/29] libunwind: fix building with llvm --- pkgs/development/libraries/libunwind/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 7999fa497187..1f7074866d58 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, xz, buildPackages }: +{ stdenv, lib, fetchpatch, fetchFromGitHub, autoreconfHook, xz, buildPackages }: stdenv.mkDerivation rec { pname = "libunwind"; @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { hash = "sha256-rCFBHs6rCSnp5FEwbUR5veNNTqSQpFblAv8ebSPX0qE="; }; + patches = lib.optional (stdenv.targetPlatform.useLLVM or false) (fetchpatch { + url = "https://github.com/libunwind/libunwind/pull/770/commits/a69d0f14c9e6c46e82ba6e02fcdedb2eb63b7f7f.patch"; + hash = "sha256-9oBZimCXonNN++jJs3emp9w+q1aj3eNzvSKPgh92itA="; + }); + postPatch = if (stdenv.cc.isClang || stdenv.hostPlatform.isStatic) then '' substituteInPlace configure.ac --replace "-lgcc_s" "" '' else lib.optionalString stdenv.hostPlatform.isMusl '' From 6a7783bac4a9f827b46c877638535c7c67d984db Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 26 Jul 2024 08:33:28 -0700 Subject: [PATCH 05/29] tremor: fix version script with lld 17+ --- pkgs/development/libraries/tremor/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/tremor/default.nix b/pkgs/development/libraries/tremor/default.nix index d17ef6c8fd7c..0477b6ca6d11 100644 --- a/pkgs/development/libraries/tremor/default.nix +++ b/pkgs/development/libraries/tremor/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; + configureFlags = lib.optional (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") "LDFLAGS=-Wl,--undefined-version"; + nativeBuildInputs = [ autoreconfHook pkg-config ]; propagatedBuildInputs = [ libogg ]; From 571e27fb2a8829fd2edeba943470994d91fe6db1 Mon Sep 17 00:00:00 2001 From: DarkOnion0 Date: Thu, 1 Aug 2024 11:58:37 +0200 Subject: [PATCH 06/29] appflowy: 0.6.5 -> 0.6.6 https://github.com/AppFlowy-IO/AppFlowy/releases/tag/0.6.6 --- pkgs/applications/office/appflowy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index 41753336e1f6..1df4815b6a28 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -17,11 +17,11 @@ let rec { x86_64-linux = { urlSuffix = "linux-x86_64.tar.gz"; - hash = "sha256-p2rfGO31B7q5MInsvGFaNkHpbfRjhEcI++I2Le0tb5s="; + hash = "sha256-2v7LF53UmVxFzoNHwv+B2zN7I6pSP66x32OplcIR7Fk="; }; x86_64-darwin = { urlSuffix = "macos-universal.zip"; - hash = "sha256-ekQe2L61wYaHIOdvNPjyiEqLPU3cmcXTuBGryu3roEQ="; + hash = "sha256-73Do2Jhso6GJsyDiSz3ACN8pEmZbuPNW3vjW3BFLhY4="; }; aarch64-darwin = x86_64-darwin; } @@ -29,7 +29,7 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "appflowy"; - version = "0.6.5"; + version = "0.6.6"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${finalAttrs.version}/AppFlowy-${finalAttrs.version}-${dist.urlSuffix}"; From eb146164560bbd947bc4417b4f3e8304895d0be9 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 4 Aug 2024 03:24:44 +0200 Subject: [PATCH 07/29] termsvg: init at 0.9.2 --- pkgs/by-name/te/termsvg/package.nix | 35 +++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/te/termsvg/package.nix diff --git a/pkgs/by-name/te/termsvg/package.nix b/pkgs/by-name/te/termsvg/package.nix new file mode 100644 index 000000000000..9726eeb44474 --- /dev/null +++ b/pkgs/by-name/te/termsvg/package.nix @@ -0,0 +1,35 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "termsvg"; + version = "0.9.2"; + + src = fetchFromGitHub { + owner = "mrmarble"; + repo = "termsvg"; + rev = "v${version}"; + hash = "sha256-q6xjsoxQTIQwPYkBTGwLfTt1VQ8GJPdsiP5dvTyEBIw="; + }; + + vendorHash = "sha256-HhJcf+NwM1h0Hh76LU/cddaLoCaQdyuKLSvDFmiKEEg="; + + ldflags = [ + "-s" + "-w" + "-X=main.version=${version}" + "-X=main.commit=${src.rev}" + "-X=main.date=1970-01-01T00:00:00Z" + ]; + + meta = with lib; { + description = "Record, share and export your terminal as a animated SVG image"; + homepage = "https://github.com/mrmarble/termsvg"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ pbsds ]; + mainProgram = "termsvg"; + }; +} From e55ed5e3949a9a012586d9951911e67b14276e9f Mon Sep 17 00:00:00 2001 From: PopeRigby Date: Sun, 4 Aug 2024 12:18:28 -0700 Subject: [PATCH 08/29] maintainers: add poperigby --- maintainers/maintainer-list.nix | 5 +++++ pkgs/games/quakespasm/vulkan.nix | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 28e1e618bac6..226fa54e4516 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16230,6 +16230,11 @@ githubId = 4201956; name = "pongo1231"; }; + PopeRigby = { + name = "PopeRigby"; + github = "poperigby"; + githubId = 20866468; + }; poptart = { email = "poptart@hosakacorp.net"; github = "terrorbyte"; diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix index 2f91ff92c0eb..eead5476e415 100644 --- a/pkgs/games/quakespasm/vulkan.nix +++ b/pkgs/games/quakespasm/vulkan.nix @@ -14,7 +14,6 @@ gzip, libvorbis, libmad, - vulkan-headers, vulkan-loader, moltenvk, }: @@ -36,7 +35,6 @@ stdenv.mkDerivation rec { meson ninja pkg-config - vulkan-headers ]; buildInputs = [ @@ -80,6 +78,6 @@ stdenv.mkDerivation rec { ''; platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ ylh ]; + maintainers = with maintainers; [ PopeRigby ylh ]; }; } From 1a58a2093e5cc143f8969e0b323681febffa9854 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 5 Aug 2024 17:38:12 +0000 Subject: [PATCH 09/29] sgt-puzzles: 20240330.fd304c5 -> 20240802.1c1899e --- pkgs/games/sgt-puzzles/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index 304c0f9b27c7..bddbadde7cc2 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "sgt-puzzles"; - version = "20240330.fd304c5"; + version = "20240802.1c1899e"; src = fetchurl { url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz"; - hash = "sha256-usEgCfbeKOkAg/sHpRxuMcPGHxb+J5+r92aO4Ar7iUA="; + hash = "sha256-9y6epjABG6Cs31m3T/8k8OTzOuYnH/gxLFEitRfRwkk="; }; sgt-puzzles-menu = fetchurl { From 5bcfc8dd35684e57946c03482a00142910d27c6c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 6 Aug 2024 03:55:43 +0000 Subject: [PATCH 10/29] home-manager: 0-unstable-2024-07-24 -> 0-unstable-2024-08-02 --- pkgs/by-name/ho/home-manager/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix index 36bb2f444b6d..74381ea96950 100644 --- a/pkgs/by-name/ho/home-manager/package.nix +++ b/pkgs/by-name/ho/home-manager/package.nix @@ -16,14 +16,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-manager"; - version = "0-unstable-2024-07-24"; + version = "0-unstable-2024-08-02"; src = fetchFromGitHub { name = "home-manager-source"; owner = "nix-community"; repo = "home-manager"; - rev = "304a011325b7ac7b8c9950333cd215a7aa146b0e"; - hash = "sha256-JH8N5uoqoVA6erV4O40VtKKHsnfmhvMGbxMNDLtim5o="; + rev = "afc892db74d65042031a093adb6010c4c3378422"; + hash = "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA="; }; nativeBuildInputs = [ From 92ceff55c9ebc5943853b83287f49fd73a909abd Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 6 Aug 2024 09:00:34 +0200 Subject: [PATCH 11/29] azure-cli: 2.62.0 -> 2.63.0 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-manual.nix | 7 ++----- pkgs/by-name/az/azure-cli/package.nix | 13 ++++--------- pkgs/by-name/az/azure-cli/python-packages.nix | 2 -- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index d4b79640a96b..592d8accb451 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -7,7 +7,6 @@ mkAzExtension, mycli, python3Packages, - python3, }: { @@ -17,9 +16,7 @@ url = "https://azcliprod.blob.core.windows.net/cli-extensions/application_insights-${version}-py2.py3-none-any.whl"; sha256 = "e1fa824eb587e2bec7f4cb4d1c4ce1033ab3d3fac65af42dd6218f673b019cee"; description = "Support for managing Application Insights components and querying metrics, events, and logs from such components"; - propagatedBuildInputs = with python3Packages; [ - isodate - ]; + propagatedBuildInputs = with python3Packages; [ isodate ]; meta.maintainers = with lib.maintainers; [ andreasvoss ]; }; @@ -59,7 +56,7 @@ pymysql setproctitle ]) - ++ [ (mycli.override { inherit python3; }) ]; + ++ [ mycli ]; meta.maintainers = with lib.maintainers; [ obreitwi ]; }; diff --git a/pkgs/by-name/az/azure-cli/package.nix b/pkgs/by-name/az/azure-cli/package.nix index ab2d5d4d0f51..f7f7f8cb0b26 100644 --- a/pkgs/by-name/az/azure-cli/package.nix +++ b/pkgs/by-name/az/azure-cli/package.nix @@ -7,7 +7,7 @@ fetchFromGitHub, runCommand, installShellFiles, - python311, + python3, writeScriptBin, # Whether to include patches that enable placing certain behavior-defining @@ -21,21 +21,16 @@ }: let - version = "2.62.0"; + version = "2.63.0"; src = fetchFromGitHub { name = "azure-cli-${version}-src"; owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - hash = "sha256-Rb27KRAb50YzTZzMs6n8g04x14ni3rIYAL3c5j/ieRw="; + hash = "sha256-HpWdEZAMnAkB07fnE7IrA0FqpBYKChqojxwAo8RfuQs="; }; - # Pin Python version to 3.11. - # See https://discourse.nixos.org/t/breaking-changes-announcement-for-unstable/17574/53 - # and https://github.com/Azure/azure-cli/issues/27673 - python3 = python311; - # put packages that needs to be overridden in the py package scope py = callPackage ./python-packages.nix { inherit src version python3; }; @@ -74,7 +69,7 @@ let extensions = callPackages ./extensions-generated.nix { inherit mkAzExtension; } // callPackages ./extensions-manual.nix { - inherit mkAzExtension python3; + inherit mkAzExtension; python3Packages = python3.pkgs; }; diff --git a/pkgs/by-name/az/azure-cli/python-packages.nix b/pkgs/by-name/az/azure-cli/python-packages.nix index fc15dc4aba24..7c46ba257210 100644 --- a/pkgs/by-name/az/azure-cli/python-packages.nix +++ b/pkgs/by-name/az/azure-cli/python-packages.nix @@ -1,9 +1,7 @@ { - lib, stdenv, python3, fetchPypi, - fetchpatch, src, version, }: From 0a0d962db06bf0752f64a8fec7d118749e8c05fa Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 6 Aug 2024 09:03:09 +0200 Subject: [PATCH 12/29] azure-cli-extensions.vm-repair: remove Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-generated.nix | 7 ------- pkgs/by-name/az/azure-cli/extensions-manual.nix | 1 + 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.nix b/pkgs/by-name/az/azure-cli/extensions-generated.nix index 9519a5e706da..982d7193dfd8 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.nix +++ b/pkgs/by-name/az/azure-cli/extensions-generated.nix @@ -1023,13 +1023,6 @@ sha256 = "0ef7b4bf9ffd0aa1ad5c50e15a343276636bcfe0296e52d2ee5f0b75ce70633d"; description = "Manage virtual WAN, hubs, VPN gateways and VPN sites"; }; - vm-repair = mkAzExtension rec { - pname = "vm-repair"; - version = "1.0.7"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/vm_repair-${version}-py2.py3-none-any.whl"; - sha256 = "989b15053fe19f1dbb37fd4a31720e2a1ca622ecadaaa4b5c568c44e44c20fa6"; - description = "Auto repair commands to fix VMs"; - }; vmware = mkAzExtension rec { pname = "vmware"; version = "6.0.1"; diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index 592d8accb451..821400868ffb 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -62,4 +62,5 @@ # Removed extensions blockchain = throw "The 'blockchain' extension for azure-cli was deprecated upstream"; # Added 2024-04-26 + vm-repair = throw "The 'vm-repair' extension for azure-cli was deprecated upstream"; # Added 2024-08-06 } From bea7f3509684b380d14be9fc5c4d5032bdb8d20a Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 6 Aug 2024 09:03:22 +0200 Subject: [PATCH 13/29] azure-cli-extensions.aks-preview: 7.0.0b2 -> 7.0.0b3 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.nix b/pkgs/by-name/az/azure-cli/extensions-generated.nix index 982d7193dfd8..e0dc3ab17bc6 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.nix +++ b/pkgs/by-name/az/azure-cli/extensions-generated.nix @@ -59,9 +59,9 @@ }; aks-preview = mkAzExtension rec { pname = "aks-preview"; - version = "7.0.0b2"; + version = "7.0.0b3"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-${version}-py2.py3-none-any.whl"; - sha256 = "f2f8aba2abf4252b3e77c2d4245320c025e111d5374bb6c1a57631cd72c42e39"; + sha256 = "04067e9050de7b3560030613232bf51d9ada4b91885285954afe77b3e40ad90a"; description = "Provides a preview for upcoming AKS features"; }; akshybrid = mkAzExtension rec { From d8519bbb79b2ac8536764f00b0f7c776edc1e92a Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 6 Aug 2024 09:03:23 +0200 Subject: [PATCH 14/29] azure-cli-extensions.connectedmachine: 1.0.0b1 -> 1.0.0b2 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.nix b/pkgs/by-name/az/azure-cli/extensions-generated.nix index e0dc3ab17bc6..7b349d266053 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.nix +++ b/pkgs/by-name/az/azure-cli/extensions-generated.nix @@ -227,9 +227,9 @@ }; connectedmachine = mkAzExtension rec { pname = "connectedmachine"; - version = "1.0.0b1"; + version = "1.0.0b2"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/connectedmachine-${version}-py3-none-any.whl"; - sha256 = "f829b171bc489bd1bffea518040acc74608581dae798f4b23bedfe8bf7445383"; + sha256 = "8b8c4340c4c6552e3826220ffb95bf619447675b0469304b71fa80e2e4e31c81"; description = "Microsoft Azure Command-Line Tools ConnectedMachine Extension"; }; connectedvmware = mkAzExtension rec { From e1454b751283372d48fc4aa423f7dd13e9c76b87 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 6 Aug 2024 09:03:23 +0200 Subject: [PATCH 15/29] azure-cli-extensions.hdinsightonaks: 1.0.0b2 -> 1.0.0b3 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.nix b/pkgs/by-name/az/azure-cli/extensions-generated.nix index 7b349d266053..d22299d1d024 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.nix +++ b/pkgs/by-name/az/azure-cli/extensions-generated.nix @@ -514,9 +514,9 @@ }; hdinsightonaks = mkAzExtension rec { pname = "hdinsightonaks"; - version = "1.0.0b2"; + version = "1.0.0b3"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/hdinsightonaks-${version}-py3-none-any.whl"; - sha256 = "c323291952f9ec6014af5f760b26860bd8029aa04cc226fd5996f20726641c59"; + sha256 = "f549b85107b7b83ff64fcfa5c90a5d7e900a5ea2efe76eec9b1f81689e58c365"; description = "Microsoft Azure Command-Line Tools Hdinsightonaks Extension"; }; healthbot = mkAzExtension rec { From 7c2afac7ad8383d29368eeae70445054eb5672d1 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 6 Aug 2024 09:03:23 +0200 Subject: [PATCH 16/29] azure-cli-extensions.scvmm: 1.0.0 -> 1.1.1 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.nix b/pkgs/by-name/az/azure-cli/extensions-generated.nix index d22299d1d024..0a1615013548 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.nix +++ b/pkgs/by-name/az/azure-cli/extensions-generated.nix @@ -864,9 +864,9 @@ }; scvmm = mkAzExtension rec { pname = "scvmm"; - version = "1.0.0"; + version = "1.1.1"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/scvmm-${version}-py2.py3-none-any.whl"; - sha256 = "565aa9d75dd4d276df2f8ffec5311bd2ae16a2d6172d525a7763fc5972b262b7"; + sha256 = "7d704578bc5eb60b8105de0b4a924176581a4cf2fd162b0896d81246f7f73a68"; description = "Microsoft Azure Command-Line Tools SCVMM Extension"; }; self-help = mkAzExtension rec { From 90527b2c9879cb48fddb37f6b2c5c81569efcd56 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 6 Aug 2024 09:03:24 +0200 Subject: [PATCH 17/29] azure-cli-extensions.stack-hci-vm: 1.1.16 -> 1.1.20 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.nix b/pkgs/by-name/az/azure-cli/extensions-generated.nix index 0a1615013548..93dbd2bb776e 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.nix +++ b/pkgs/by-name/az/azure-cli/extensions-generated.nix @@ -913,9 +913,9 @@ }; stack-hci-vm = mkAzExtension rec { pname = "stack-hci-vm"; - version = "1.1.16"; + version = "1.1.20"; url = "https://hciarcvmsstorage.z13.web.core.windows.net/cli-extensions/stack_hci_vm-${version}-py3-none-any.whl"; - sha256 = "6b08c750b3c3898aab17c459ff626210c17ad12f960f2ab89204765a17d530da"; + sha256 = "7de544b8058ab11d9713b551db65aeaec6b8e5832cdadbbf26ccb7a4a282db6b"; description = "Microsoft Azure Command-Line Tools Stack-HCi-VM Extension"; }; standbypool = mkAzExtension rec { From 3761217491dc7cd582b1df00ece06f64f5a598c2 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 6 Aug 2024 09:03:24 +0200 Subject: [PATCH 18/29] azure-cli-extensions.vmware: 6.0.1 -> 7.0.0 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.nix b/pkgs/by-name/az/azure-cli/extensions-generated.nix index 93dbd2bb776e..0ae0152ab66a 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.nix +++ b/pkgs/by-name/az/azure-cli/extensions-generated.nix @@ -1025,9 +1025,9 @@ }; vmware = mkAzExtension rec { pname = "vmware"; - version = "6.0.1"; + version = "7.0.0"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/vmware-${version}-py2.py3-none-any.whl"; - sha256 = "2e07a4ddf1b244cfe8b63a29b7f82c3ec94294f10bacfe8fd604841d290020b5"; + sha256 = "e0fadce4fc02996443a8e1673d19ebd24383c584ca89bd396ce963e85865ac0d"; description = "Azure VMware Solution commands"; }; webapp = mkAzExtension rec { From 1f620252b7b578a232e65b486d3e2112e1e5d818 Mon Sep 17 00:00:00 2001 From: aktaboot Date: Wed, 31 Jul 2024 22:28:53 +0200 Subject: [PATCH 19/29] taskwarrior3: 3.0.2 -> 3.1.0 --- pkgs/by-name/ta/taskwarrior3/package.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ta/taskwarrior3/package.nix b/pkgs/by-name/ta/taskwarrior3/package.nix index 79c82c0ea509..6f9af02e2e70 100644 --- a/pkgs/by-name/ta/taskwarrior3/package.nix +++ b/pkgs/by-name/ta/taskwarrior3/package.nix @@ -15,12 +15,12 @@ }: stdenv.mkDerivation rec { pname = "taskwarrior"; - version = "3.0.2"; + version = "3.1.0"; src = fetchFromGitHub { owner = "GothenburgBitFactory"; repo = "taskwarrior"; - rev = "v3.0.2"; - hash = "sha256-vN3X6vLuD4Fw9wpEUYLf8sboA5GIcdP5EFb41KS6d5s="; + rev = "v${version}"; + hash = "sha256-iKpOExj1xM9rU/rIcOLLKMrZrAfz7y9X2kt2CjfMOOQ="; fetchSubmodules = true; }; @@ -45,16 +45,13 @@ stdenv.mkDerivation rec { ]; doCheck = true; - preCheck = '' - patchShebangs --build test - ''; - checkTarget = "test"; + checkTarget = "build_tests"; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}-cargo-deps"; inherit src; sourceRoot = src.name; - hash = "sha256-4hdM9LgDa47ZYcX30HXvixIRy0xaahG4XBqPiUM+IUM="; + hash = "sha256-L+hYYKXSOG4XYdexLMG3wdA7st+A9Wk9muzipSNjxrA="; }; cargoRoot = "./"; preConfigure = '' From ef70f7d028122dd184139a60fac0bad410ab5cc8 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 6 Aug 2024 20:15:54 +0200 Subject: [PATCH 20/29] docs/language-frameworks/python: pythonRemoveDepsHook is added automatically --- doc/languages-frameworks/python.section.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 5a2e2de2edef..6456666ca0ec 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -1365,6 +1365,10 @@ those specified in `build-system`. If a package requires incompatible build time dependencies, they should be removed in `postPatch` through `substituteInPlace` or similar. +For ease of use, both `buildPythonPackage` and `buildPythonApplication` will +automatically add `pythonRelaxDepsHook` if either `pythonRelaxDeps` or +`pythonRemoveDeps` is specified. + #### Using unittestCheckHook {#using-unittestcheckhook} `unittestCheckHook` is a hook which will set up (or configure) a [`checkPhase`](#ssec-check-phase) to run `python -m unittest discover`: From 6488c3d4388eb951be2aa557263435d11798377e Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 6 Aug 2024 20:16:59 +0200 Subject: [PATCH 21/29] docs/language-frameworks/python: update python{,2,3}Package aliases --- doc/languages-frameworks/python.section.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 5a2e2de2edef..2b41eb26a0c8 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -55,13 +55,19 @@ sets are * `pkgs.python311Packages` * `pkgs.python312Packages` * `pkgs.python313Packages` -* `pkgs.pypyPackages` +* `pkgs.pypy27Packages` +* `pkgs.pypy39Packages` +* `pkgs.pypy310Packages` and the aliases * `pkgs.python2Packages` pointing to `pkgs.python27Packages` -* `pkgs.python3Packages` pointing to `pkgs.python311Packages` +* `pkgs.python3Packages` pointing to `pkgs.python312Packages` * `pkgs.pythonPackages` pointing to `pkgs.python2Packages` +* `pkgs.pypy2Packages` pointing to `pkgs.pypy27Packages` +* `pkgs.pypy3Packages` pointing to `pkgs.pypy39Packages` +* `pkgs.pypyPackages` pointing to `pkgs.pypy2Packages` + #### `buildPythonPackage` function {#buildpythonpackage-function} From 7bbbeff617184c5aac665f8463025db48c700498 Mon Sep 17 00:00:00 2001 From: PopeRigby Date: Tue, 6 Aug 2024 12:19:38 -0700 Subject: [PATCH 22/29] vkquake: use makeLibraryPath Co-authored-by: Sandro --- pkgs/games/quakespasm/vulkan.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix index eead5476e415..f9206dce5dfb 100644 --- a/pkgs/games/quakespasm/vulkan.nix +++ b/pkgs/games/quakespasm/vulkan.nix @@ -60,8 +60,8 @@ stdenv.mkDerivation rec { postFixup = '' cp vkquake "$out/bin" - wrapProgram $out/bin/vkquake \ - --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib + patchelf $out/bin/vkquake \ + --add-rpath ${lib.makeLibraryPath [ vulkan-loader ]} ''; meta = with lib; { From 10b32454ad5f8c522c7a3a96435444191d7de28d Mon Sep 17 00:00:00 2001 From: PopeRigby Date: Tue, 6 Aug 2024 12:23:38 -0700 Subject: [PATCH 23/29] vkquake: move installation steps to installPhase --- pkgs/games/quakespasm/vulkan.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix index f9206dce5dfb..2df8f1b83710 100644 --- a/pkgs/games/quakespasm/vulkan.nix +++ b/pkgs/games/quakespasm/vulkan.nix @@ -50,23 +50,22 @@ stdenv.mkDerivation rec { buildFlags = [ "DO_USERDIRS=1" ]; - preInstall = '' - mkdir -p "$out/bin" - ''; - env = lib.optionalAttrs stdenv.isDarwin { NIX_CFLAGS_COMPILE = "-Wno-error=unused-but-set-variable"; }; - postFixup = '' + installPhase = '' + mkdir -p "$out/bin" cp vkquake "$out/bin" + ''; + + postFixup = '' patchelf $out/bin/vkquake \ --add-rpath ${lib.makeLibraryPath [ vulkan-loader ]} ''; meta = with lib; { description = "Vulkan Quake port based on QuakeSpasm"; - mainProgram = "vkquake"; homepage = src.meta.homepage; longDescription = '' vkQuake is a Quake 1 port using Vulkan instead of OpenGL for rendering. @@ -79,5 +78,6 @@ stdenv.mkDerivation rec { platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ PopeRigby ylh ]; + mainProgram = "vkquake"; }; } From 668174cd08f43b10c46992f67527897c86cc80fb Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 6 Aug 2024 23:22:35 +0200 Subject: [PATCH 24/29] mujoco: 3.2.0 -> 3.2.1 Diff: https://github.com/google-deepmind/mujoco/compare/refs/tags/3.2.0...3.2.1 Changelog: https://github.com/google-deepmind/mujoco/releases/tag/3.2.1 --- .../science/robotics/mujoco/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/science/robotics/mujoco/default.nix b/pkgs/applications/science/robotics/mujoco/default.nix index ba79ddb237a4..9aed3b75b7e2 100644 --- a/pkgs/applications/science/robotics/mujoco/default.nix +++ b/pkgs/applications/science/robotics/mujoco/default.nix @@ -16,14 +16,14 @@ let abseil-cpp = fetchFromGitHub { owner = "abseil"; repo = "abseil-cpp"; - rev = "d7aaad83b488fd62bd51c81ecf16cd938532cc0a"; - hash = "sha256-eA2/dZpNOlex1O5PNa3XSZhpMB3AmaIoHzVDI9TD/cg="; + rev = "4447c7562e3bc702ade25105912dce503f0c4010"; + hash = "sha256-51jpDhdZ0n+KLmxh8KVaTz53pZAB0dHjmILFX+OLud4="; }; benchmark = fetchFromGitHub { owner = "google"; repo = "benchmark"; - rev = "e45585a4b8e75c28479fa4107182c28172799640"; - hash = "sha256-pgHvmRpPd99ePUVRsi7WXLVSZngZ5q6r1vWW4mdGvxY="; + rev = "7c8ed6b082aa3c7a3402f18e50da4480421d08fd"; + hash = "sha256-xX3o4wX7RUvw1x2gOlT6sGhutDYLBZ/JzFnv68qN6E8="; }; ccd = fetchFromGitHub { owner = "danfis"; @@ -40,8 +40,8 @@ let googletest = fetchFromGitHub { owner = "google"; repo = "googletest"; - rev = "f8d7d77c06936315286eb55f8de22cd23c188571"; - hash = "sha256-t0RchAHTJbuI5YW4uyBPykTvcjy90JW9AOPNjIhwh6U="; + rev = "b514bdc898e2951020cbdca1304b75f5950d1f59"; + hash = "sha256-1OJ2SeSscRBNr7zZ/a8bJGIqAnhkg45re0j3DtPfcXM="; }; lodepng = fetchFromGitHub { owner = "lvandeve"; @@ -129,7 +129,7 @@ let in stdenv.mkDerivation rec { pname = "mujoco"; - version = "3.2.0"; + version = "3.2.1"; # Bumping version? Make sure to look though the MuJoCo's commit # history for bumped dependency pins! @@ -137,7 +137,7 @@ in stdenv.mkDerivation rec { owner = "google-deepmind"; repo = "mujoco"; rev = "refs/tags/${version}"; - hash = "sha256-BCvWVOpViEhwvlBzXuj0hoN6W4z5vC8MeO91SsdQ+x4="; + hash = "sha256-Il1ZZdHXsBcamIILfae8n51W8wJ78a/H3gQx2/+n9kQ="; }; patches = [ ./mujoco-system-deps-dont-fetch.patch ]; From 11610c3432e3f51290939b7edfb783a8f4c75669 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 6 Aug 2024 23:31:18 +0200 Subject: [PATCH 25/29] python312Packages.mujoco: 3.2.0 -> 3.2.1 Diff: https://github.com/google-deepmind/mujoco/compare/refs/tags/3.2.0...3.2.1 Changelog: https://github.com/google-deepmind/mujoco/releases/tag/3.2.1 --- pkgs/development/python-modules/mujoco/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/mujoco/default.nix b/pkgs/development/python-modules/mujoco/default.nix index 569988aabb9d..06dbf2e5e2a3 100644 --- a/pkgs/development/python-modules/mujoco/default.nix +++ b/pkgs/development/python-modules/mujoco/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { # in the project's CI. src = fetchPypi { inherit pname version; - hash = "sha256-R388jEIbzd60en1SRC8mKSSlvdW/xWl1xDnUET7QvKc="; + hash = "sha256-fLo4sQryDNNutDiNqWYHHNwS/bEBg4iQ/jwgyx1+ZsU="; }; nativeBuildInputs = [ From a622c107de9f9778874e245102407dcf1c2a4ff6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 7 Aug 2024 01:39:05 +0200 Subject: [PATCH 26/29] pretalx: add missing django[argon2] extra Breaks the login flow, since passwords will be migrated to argon2, but the dependency is missing. --- pkgs/by-name/pr/pretalx/package.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix index 53ed12a22bf5..b60c5ee7244a 100644 --- a/pkgs/by-name/pr/pretalx/package.nix +++ b/pkgs/by-name/pr/pretalx/package.nix @@ -81,9 +81,11 @@ python.pkgs.buildPythonApplication rec { nativeBuildInputs = [ gettext - ] ++ (with python.pkgs; [ + ]; + + build-system = with python.pkgs; [ setuptools - ]); + ]; pythonRelaxDeps = [ "celery" @@ -105,7 +107,7 @@ python.pkgs.buildPythonApplication rec { "whitenoise" ]; - propagatedBuildInputs = with python.pkgs; [ + dependencies = with python.pkgs; [ beautifulsoup4 bleach celery @@ -141,9 +143,12 @@ python.pkgs.buildPythonApplication rec { vobject whitenoise zxcvbn - ] ++ beautifulsoup4.optional-dependencies.lxml ++ plugins; + ] + ++ beautifulsoup4.optional-dependencies.lxml + ++ django.optional-dependencies.argon2 + ++ plugins; - passthru.optional-dependencies = { + optional-dependencies = { mysql = with python.pkgs; [ mysqlclient ]; @@ -196,7 +201,7 @@ python.pkgs.buildPythonApplication rec { pytest-xdist pytestCheckHook responses - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTests = [ # tries to run npm run i18n:extract From 0d805fdbbf39047e028cf78518148d4e591d2444 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 Aug 2024 02:39:51 +0000 Subject: [PATCH 27/29] python312Packages.redis-om: 0.3.1 -> 0.3.2 --- pkgs/development/python-modules/redis-om/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/redis-om/default.nix b/pkgs/development/python-modules/redis-om/default.nix index e4c545ad48fd..98cdc98457b8 100644 --- a/pkgs/development/python-modules/redis-om/default.nix +++ b/pkgs/development/python-modules/redis-om/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "redis-om"; - version = "0.3.1"; + version = "0.3.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "redis"; repo = "redis-om-python"; rev = "refs/tags/v${version}"; - hash = "sha256-jwFtRnj/jhH+AKjExdOCgUfgEWweFCXVuz6F3qQRcs0="; + hash = "sha256-FN39Db94Z7z3luCDKi8b4Ku7bFwxEOXtBT5aXbDGVtw="; }; build-system = [ From c81e46d64fc570074c746adba11aeefd27ab52f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 Aug 2024 03:46:59 +0000 Subject: [PATCH 28/29] python312Packages.optimum: 1.21.2 -> 1.21.3 --- pkgs/development/python-modules/optimum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/optimum/default.nix b/pkgs/development/python-modules/optimum/default.nix index c7d204d10eec..844c6f1e6f98 100644 --- a/pkgs/development/python-modules/optimum/default.nix +++ b/pkgs/development/python-modules/optimum/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "optimum"; - version = "1.21.2"; + version = "1.21.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "optimum"; rev = "refs/tags/v${version}"; - hash = "sha256-OhquE+QhNOXFkKy/TvKlLn65CMchvKjcbR/S4Rl2MT4="; + hash = "sha256-eEfKWBwhtDkoAhsLH8P2ybM7aF/d2yREIv7/5RVz0Z8="; }; build-system = [ setuptools ]; From 805e45fdcaee36b4cc8cdc2e69f6cb5235f44d1d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 Aug 2024 03:46:59 +0000 Subject: [PATCH 29/29] python312Packages.clarifai: 10.5.4 -> 10.7.0 --- pkgs/development/python-modules/clarifai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clarifai/default.nix b/pkgs/development/python-modules/clarifai/default.nix index 13654b2a92ec..f3fb349f412d 100644 --- a/pkgs/development/python-modules/clarifai/default.nix +++ b/pkgs/development/python-modules/clarifai/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "clarifai"; - version = "10.5.4"; + version = "10.7.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python"; rev = "refs/tags/${version}"; - hash = "sha256-C/ZmU1RRV4gJsgTgBGnhsJ7JUasHdKgoIro+fpjH4Ss="; + hash = "sha256-a/twKAwlvn017fqUsDBOcDxoZ63W0p6whQf53wlXFRU="; }; pythonRelaxDeps = [