From 9cb2b9a4ebae9f43001360167069ffb7f4dbe3f1 Mon Sep 17 00:00:00 2001 From: mcpar-land Date: Wed, 19 Mar 2025 12:47:44 -0400 Subject: [PATCH 01/12] maintainers: add mcparland --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index df560b7f3e23..a66cc798a834 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15134,6 +15134,13 @@ githubId = 158568; name = "Matthias C. M. Troffaes"; }; + mcparland = { + email = "john@mcpar.land"; + github = "mcpar-land"; + githubId = 55669980; + name = "John McParland"; + keys = [ { fingerprint = "39D2 171D D733 C718 DD21 285E B326 E14B 05D8 7A4E"; } ]; + }; McSinyx = { email = "cnx@loang.net"; github = "McSinyx"; From 3f3be8e735ca044f1c39ff1efc9015c9ca146355 Mon Sep 17 00:00:00 2001 From: mcpar-land Date: Wed, 19 Mar 2025 13:00:47 -0400 Subject: [PATCH 02/12] git-who: init at 0.6 h reformat --- pkgs/by-name/gi/git-who/package.nix | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 pkgs/by-name/gi/git-who/package.nix diff --git a/pkgs/by-name/gi/git-who/package.nix b/pkgs/by-name/gi/git-who/package.nix new file mode 100644 index 000000000000..5c6b63157ce8 --- /dev/null +++ b/pkgs/by-name/gi/git-who/package.nix @@ -0,0 +1,28 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, +}: +buildGoModule rec { + pname = "git-who"; + version = "0.6"; + + src = fetchFromGitHub { + owner = "sinclairtarget"; + repo = "git-who"; + rev = "v${version}"; + hash = "sha256-/MCvFmZNEVnSrSezTiwH3uWPbh/a7mVxmKduc63E3LA="; + }; + + vendorHash = "sha256-VdQw0mBCALeQfPMjQ4tp3DcLAzmHvW139/COIXSRT0s="; + # some automated tests require submodule to clone and will fail. + # see project readme + doCheck = false; + + meta = { + description = "Git blame for file trees"; + homepage = "https://github.com/sinclairtarget/git-who"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mcparland ]; + }; +} From 3fda177a8a2d71494a069f0c649ecf6a144ef896 Mon Sep 17 00:00:00 2001 From: satler Date: Thu, 20 Mar 2025 13:15:30 +0900 Subject: [PATCH 03/12] cargo-codspeed: 2.4.0 -> 2.9.1 --- pkgs/development/tools/rust/cargo-codspeed/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-codspeed/default.nix b/pkgs/development/tools/rust/cargo-codspeed/default.nix index 07220d39ecde..be42ec00b39f 100644 --- a/pkgs/development/tools/rust/cargo-codspeed/default.nix +++ b/pkgs/development/tools/rust/cargo-codspeed/default.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-codspeed"; - version = "2.4.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "CodSpeedHQ"; repo = "codspeed-rust"; rev = "v${version}"; - hash = "sha256-pi02Bn5m4JoTtCIZvxkiUVKkjmtCShKqZw+AyhaVdyY="; + hash = "sha256-q5xsZ8KHuC/Qm+o4xcWbW9Y9VrxHZ+/AxUO8TYEbE74="; }; useFetchCargoVendor = true; - cargoHash = "sha256-xHA6fe1/0p/PHGV6JcyVir5uGAqJ7qkHObjVqDPGwSY="; + cargoHash = "sha256-Ance7Hfl0EOmMfZf3ZqvawrK7scot7WpefLtemHKb+U="; nativeBuildInputs = [ curl @@ -43,6 +43,10 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "-p=cargo-codspeed" ]; cargoTestFlags = cargoBuildFlags; + checkFlags = [ + # requires an extra dependency, blit + "--skip=test_package_in_deps_build" + ]; env = { LIBGIT2_NO_VENDOR = 1; From 2c327f70763ca06afb5719f2deed48b89c3ba51c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Mar 2025 12:33:27 +0000 Subject: [PATCH 04/12] git-recent: 1.1.1 -> 2.0.1 --- pkgs/applications/version-management/git-recent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-recent/default.nix b/pkgs/applications/version-management/git-recent/default.nix index 91b664b7a748..8c4f1c79b585 100644 --- a/pkgs/applications/version-management/git-recent/default.nix +++ b/pkgs/applications/version-management/git-recent/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "git-recent"; - version = "1.1.1"; + version = "2.0.1"; src = fetchFromGitHub { owner = "paulirish"; repo = "git-recent"; rev = "v${version}"; - sha256 = "1g8i6vpjnnfh7vc1269c91bap267w4bxdqqwnzb8x18vqgn2fx8i"; + sha256 = "sha256-KPM24DVwvLdHeOkq77fz1TJ6NxJ2h21bP0TrItCPamo="; }; nativeBuildInputs = [ makeWrapper ]; From 227c2c4ba75379c03afabc2269dafc597859557e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Mar 2025 12:52:19 +0000 Subject: [PATCH 05/12] swaylock: 1.8.0 -> 1.8.1 --- pkgs/by-name/sw/swaylock/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sw/swaylock/package.nix b/pkgs/by-name/sw/swaylock/package.nix index b575c35be975..6f2b7dc8b0e9 100644 --- a/pkgs/by-name/sw/swaylock/package.nix +++ b/pkgs/by-name/sw/swaylock/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "swaylock"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "swaywm"; repo = "swaylock"; tag = "v${version}"; - hash = "sha256-1+AXxw1gH0SKAxUa0JIhSzMbSmsfmBPCBY5IKaYtldg="; + hash = "sha256-bzsgjRyyQudf3odrvJ5wdM49VjUgWxfoaU876A2sYus="; }; strictDeps = true; From c7347386eb8f3667eb238b2806c9874639b997af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Mar 2025 18:45:14 +0000 Subject: [PATCH 06/12] wasmtime: 30.0.2 -> 31.0.0 --- pkgs/development/interpreters/wasmtime/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index bc1167f457eb..d4f7be9bc71b 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "30.0.2"; + version = "31.0.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-crVetjCSdwMotVvlIB2fJIFDrGrRE72LmRRw9DwYmyc="; + hash = "sha256-IQeYmqCXhzWsuufrLKeBI2sw86dXbn7c5DbmcoJTWvo="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; useFetchCargoVendor = true; - cargoHash = "sha256-YupZr9jturuiFICubrXeOpAeFRvvdX4iRrarBkGL2s0="; + cargoHash = "sha256-zMDpbJoOaKJ974Ln43JtY3f3WOq2dEmdgX9TubYdlow="; cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; outputs = [ "out" "dev" ]; From 7bf906339f8bdda101fcb6b5aacc26d1303e8d27 Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Thu, 20 Mar 2025 21:08:40 +0100 Subject: [PATCH 07/12] platypus: drop --- pkgs/by-name/pl/platypus/package.nix | 53 ---------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 53 deletions(-) delete mode 100644 pkgs/by-name/pl/platypus/package.nix diff --git a/pkgs/by-name/pl/platypus/package.nix b/pkgs/by-name/pl/platypus/package.nix deleted file mode 100644 index 893377db79a1..000000000000 --- a/pkgs/by-name/pl/platypus/package.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - python27, - htslib, - zlib, - makeWrapper, -}: - -let - python = python27.withPackages (ps: with ps; [ cython ]); - -in -stdenv.mkDerivation { - pname = "platypus-unstable"; - version = "2018-07-22"; - - src = fetchFromGitHub { - owner = "andyrimmer"; - repo = "Platypus"; - rev = "3e72641c69800da0cd4906b090298e654d316ee1"; - sha256 = "0nah6r54b8xm778gqyb8b7rsd76z8ji4g73sm6rvpw5s96iib1vw"; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ - htslib - python - zlib - ]; - - buildPhase = '' - patchShebangs . - make - ''; - - installPhase = '' - mkdir -p $out/libexec/platypus - cp -r ./* $out/libexec/platypus - - mkdir -p $out/bin - makeWrapper ${python}/bin/python $out/bin/platypus --add-flags "$out/libexec/platypus/bin/Platypus.py" - ''; - - meta = with lib; { - description = "Platypus variant caller"; - license = licenses.gpl3; - homepage = "https://github.com/andyrimmer/Platypus"; - maintainers = with maintainers; [ jbedo ]; - platforms = platforms.x86_64; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 712e0e62d8b5..01e4e65beec4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1205,6 +1205,7 @@ mapAliases { pio = throw "pio has been removed due to lack of upstream maintenance"; # Added 2025-01-25 pipewire_0_2 = throw "pipewire_0_2 has been removed as it is outdated and no longer used"; # Added 2024-07-28 pipewire-media-session = throw "pipewire-media-session is no longer maintained and has been removed. Please use Wireplumber instead."; + platypus = throw "platypus is unmaintained and has not merged Python3 support"; # Added 2025-03-20 pleroma-otp = throw "'pleroma-otp' has been renamed to/replaced by 'pleroma'"; # Converted to throw 2024-10-17 plots = throw "'plots' has been replaced by 'gnome-graphs'"; # Added 2025-02-05 pltScheme = racket; # just to be sure From b618f68af8b2b1ce68d97b9f3a1eefa4c8b7ba27 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Mar 2025 20:51:58 +0000 Subject: [PATCH 08/12] cargo-hack: 0.6.35 -> 0.6.36 --- pkgs/by-name/ca/cargo-hack/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-hack/package.nix b/pkgs/by-name/ca/cargo-hack/package.nix index bcb683354db5..df9814680e37 100644 --- a/pkgs/by-name/ca/cargo-hack/package.nix +++ b/pkgs/by-name/ca/cargo-hack/package.nix @@ -6,15 +6,15 @@ rustPlatform.buildRustPackage rec { pname = "cargo-hack"; - version = "0.6.35"; + version = "0.6.36"; src = fetchCrate { inherit pname version; - hash = "sha256-6C3YiPgoszEvJBkaOg7URYxnEl17oGLYzl0P+m3VAAI="; + hash = "sha256-AO4bB+aqAzGxFyPhuwaEQDAbL+fCIWY2rv3QFdBAq7s="; }; useFetchCargoVendor = true; - cargoHash = "sha256-pRZ6mmCQCaio7aW55dKSAEHeGNJoFJNUnnUGoBlmZ6w="; + cargoHash = "sha256-fWKrHo5WdeEhnPxATbZ9Cjv+aiSxOh0pRDeeHHDk8u4="; # some necessary files are absent in the crate version doCheck = false; From e2511a2de77809b898c6a76b17a2dd45b40c6965 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Mar 2025 21:18:47 +0000 Subject: [PATCH 09/12] cargo-3ds: 0.1.3 -> 0.1.4 --- pkgs/by-name/ca/cargo-3ds/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-3ds/package.nix b/pkgs/by-name/ca/cargo-3ds/package.nix index 3fa0edd168bd..01bd90334b72 100644 --- a/pkgs/by-name/ca/cargo-3ds/package.nix +++ b/pkgs/by-name/ca/cargo-3ds/package.nix @@ -6,17 +6,17 @@ }: rustPlatform.buildRustPackage rec { pname = "cargo-3ds"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "rust3ds"; repo = "cargo-3ds"; tag = "v${version}"; - hash = "sha256-G1XSpvE94gcamvyKKzGZgj5QSwkBNbYWYdZ17ScwW90="; + hash = "sha256-APi1K5LtdHFI5kjPfZUOFcsZ/xoQixjKq5xZxwlW9CE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-X2n7htrvRPLJkQKONz26hbgXmB8JYafdG1/a0LRGEgs="; + cargoHash = "sha256-2JpBm0ahgiL4KSM4J/nQRbdo3MDZgZj6EDg7Jr5ZanA="; # Integration tests do not run in Nix build environment due to needing to # create and build Cargo workspaces. From d84f8e3efc8a5c61de81a2133fc6bfbd1d3f481e Mon Sep 17 00:00:00 2001 From: Logan Barnett Date: Thu, 20 Mar 2025 13:16:04 -0700 Subject: [PATCH 10/12] nc4nix: allow Darwin builds `nc4nix` builds and runs on Darwin, so add it to the platforms list. --- pkgs/by-name/nc/nc4nix/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/nc/nc4nix/package.nix b/pkgs/by-name/nc/nc4nix/package.nix index 7cf9d4f35e53..904d6582b94a 100644 --- a/pkgs/by-name/nc/nc4nix/package.nix +++ b/pkgs/by-name/nc/nc4nix/package.nix @@ -26,6 +26,6 @@ buildGoModule { homepage = "https://github.com/helsinki-systems/nc4nix"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ onny ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } From 9277caf1e0f261828f50efdb93c2186c1e092fc1 Mon Sep 17 00:00:00 2001 From: misilelab Date: Fri, 21 Mar 2025 10:06:53 +0900 Subject: [PATCH 11/12] glance: add v prefix to version Signed-off-by: misilelab --- pkgs/by-name/gl/glance/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/gl/glance/package.nix b/pkgs/by-name/gl/glance/package.nix index 8b396f77343f..681a27a30fb6 100644 --- a/pkgs/by-name/gl/glance/package.nix +++ b/pkgs/by-name/gl/glance/package.nix @@ -22,7 +22,7 @@ buildGoModule (finalAttrs: { ldflags = [ "-s" "-w" - "-X github.com/glanceapp/glance/internal/glance.buildVersion=${finalAttrs.version}" + "-X github.com/glanceapp/glance/internal/glance.buildVersion=v${finalAttrs.version}" ]; excludedPackages = [ "scripts/build-and-ship" ]; From f9691c4d682c5073d4e60196a223d2335bd0aa75 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 21 Mar 2025 09:41:05 +0300 Subject: [PATCH 12/12] mesa: drop clover It's officially deprecated now, and Rusticl is both faster and more compatible. --- pkgs/development/libraries/mesa/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index c636a32cf13f..14f98cb9d407 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -215,9 +215,6 @@ in stdenv.mkDerivation { # Required for OpenCL (lib.mesonOption "clang-libdir" "${lib.getLib llvmPackages.clang-unwrapped}/lib") - # Clover, old OpenCL frontend - (lib.mesonOption "gallium-opencl" "icd") - # Rusticl, new OpenCL frontend (lib.mesonBool "gallium-rusticl" true) @@ -321,9 +318,8 @@ in stdenv.mkDerivation { moveToOutput bin/vtn_bindgen $cross_tools moveToOutput "lib/lib*OpenCL*" $opencl - # Construct our own .icd files that contain absolute paths. + # Construct our own .icd file that contains an absolute path. mkdir -p $opencl/etc/OpenCL/vendors/ - echo $opencl/lib/libMesaOpenCL.so > $opencl/etc/OpenCL/vendors/mesa.icd echo $opencl/lib/libRusticlOpenCL.so > $opencl/etc/OpenCL/vendors/rusticl.icd moveToOutput bin/spirv2dxil $spirv2dxil