From 8727e350d3ed72afbab0184c99fbc5c5ab01825e Mon Sep 17 00:00:00 2001 From: emaryn Date: Tue, 29 Apr 2025 11:57:15 +0800 Subject: [PATCH 01/94] govc: 0.46.3 -> 0.50.0 Diff: https://github.com/vmware/govmomi/compare/v0.46.3...v0.50.0 --- pkgs/by-name/go/govc/package.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/go/govc/package.nix b/pkgs/by-name/go/govc/package.nix index f9caec412a5b..812c065713ae 100644 --- a/pkgs/by-name/go/govc/package.nix +++ b/pkgs/by-name/go/govc/package.nix @@ -4,32 +4,32 @@ buildGoModule, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "govc"; - version = "0.46.3"; - - subPackages = [ "govc" ]; + version = "0.50.0"; src = fetchFromGitHub { - rev = "v${version}"; owner = "vmware"; repo = "govmomi"; - sha256 = "sha256-vwvhVC+Avi55uenlW68tWGREEHRZw8RUjgiC0r7BgQ4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-4dGwX9+b94KT0Y78o4f7hvlZUipuV1q6j70v7pRytAg="; }; - vendorHash = "sha256-ddofXjBnyHRn7apS8hpM57S1oo+1w5i4n0Z6ZPKQEDI="; + vendorHash = "sha256-IyQ9a8dIny3QA1VXeLydif195idH5U4xr9/+76g5nYY="; + + sourceRoot = "${finalAttrs.src.name}/govc"; ldflags = [ "-s" "-w" - "-X github.com/vmware/govmomi/govc/flags.BuildVersion=${version}" + "-X github.com/vmware/govmomi/govc/flags.BuildVersion=${finalAttrs.version}" ]; meta = { description = "VSphere CLI built on top of govmomi"; - homepage = "https://github.com/vmware/govmomi/tree/master/govc"; + homepage = "https://github.com/vmware/govmomi/tree/main/govc"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ nicknovitski ]; mainProgram = "govc"; }; -} +}) From 3ad29bcee6c26a29eccf70ffe617a4430acabf3e Mon Sep 17 00:00:00 2001 From: Scott Edlund Date: Wed, 30 Apr 2025 09:59:00 +0800 Subject: [PATCH 02/94] tinymembench: 0.4 -> 0.4.9-unstable-2017-02-15 v0.4 was the last tagged version. Commits have been added to master branch that fix building in recent compiler upgrades. Move from tagged release to current HEAD. --- pkgs/by-name/ti/tinymembench/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ti/tinymembench/package.nix b/pkgs/by-name/ti/tinymembench/package.nix index 0dc6f5a7fd10..2273809280d0 100644 --- a/pkgs/by-name/ti/tinymembench/package.nix +++ b/pkgs/by-name/ti/tinymembench/package.nix @@ -4,15 +4,15 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tinymembench"; - version = "0.4"; + version = "0.4.9-unstable-2017-02-15"; src = fetchFromGitHub { owner = "ssvb"; repo = "tinymembench"; - rev = "v${version}"; - hash = "sha256-N6jHRLqVSNe+Mk3WNfIEBGtVC7Y6/sERVaeAD68LQJc="; + rev = "a2cf6d7e382e3aea1eb39173174d9fa28cad15f3"; + hash = "sha256-INgvyu7jAA+07vkO9DsIDMcEy713jcnaEx3CI6GTMDA="; }; installPhase = '' From 4af7bafdf07ba207ac2bd66c5ff220c3b2f6534d Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Thu, 1 May 2025 10:50:00 -0700 Subject: [PATCH 03/94] codex: 0.1.2504251709 -> 0.1.2504301751 --- pkgs/by-name/co/codex/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix index 1add11343ffa..59613e6e254e 100644 --- a/pkgs/by-name/co/codex/package.nix +++ b/pkgs/by-name/co/codex/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "codex"; - version = "0.1.2504251709"; # from codex-cli/package.json + version = "0.1.2504301751"; # from codex-cli/package.json src = fetchFromGitHub { owner = "openai"; repo = "codex"; - rev = "103093f79324482020490cb658cc1a696aece3bc"; - hash = "sha256-GmMQi67HRanGKhiTKX8wgnpUbA1UwkPVe3siU4qC02Y="; + rev = "463a230991393c7b39f2543a9766e6133ef65393"; + hash = "sha256-CSd5e6BsGEigENjPu6R6s+QhZRLQ2CTmI5XBI9mPkmA="; }; pnpmWorkspaces = [ "@openai/codex" ]; From 2e2405e09fe910be51d336eb62dd721320694c21 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 May 2025 18:38:47 +0000 Subject: [PATCH 04/94] vkquake: 1.32.1 -> 1.32.2 --- 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 48e36f5d3990..36fbaa4e10cf 100644 --- a/pkgs/games/quakespasm/vulkan.nix +++ b/pkgs/games/quakespasm/vulkan.nix @@ -23,13 +23,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vkquake"; - version = "1.32.1"; + version = "1.32.2"; src = fetchFromGitHub { owner = "Novum"; repo = "vkQuake"; tag = finalAttrs.version; - hash = "sha256-yqoP24SNjq7YZ9QfkZQte6tsSeR16ScknXgZ5nQJerI="; + hash = "sha256-ImgzfwpgALKsK0NvJr9/NBCaUWDxuINu5vYOCMhbRQg="; }; nativeBuildInputs = [ From a1a326186acf861fdafb717d869c34dfbe8be037 Mon Sep 17 00:00:00 2001 From: Sam Estep Date: Thu, 1 May 2025 17:57:57 -0400 Subject: [PATCH 05/94] maintainers: add samestep --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2a95930545f9..a897fa2f43d2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -21567,6 +21567,12 @@ github = "samemrecebi"; githubId = 64419750; }; + samestep = { + name = "Sam Estep"; + email = "sam@samestep.com"; + github = "samestep"; + githubId = 8246041; + }; samfundev = { name = "samfundev"; github = "samfundev"; From 2209a1216634688de59bb4a8fd4322e77cb52a0e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 May 2025 02:24:02 +0000 Subject: [PATCH 06/94] cni-plugins: 1.6.1 -> 1.7.1 --- pkgs/applications/networking/cluster/cni/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index 36b0d7e57887..11bfe5498ce3 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "cni-plugins"; - version = "1.6.1"; + version = "1.7.1"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - hash = "sha256-thtN7po5SToM0ZFYIbycaPJTafLvk9hFV4XFGOpWmpg="; + hash = "sha256-S1BpOLPmWxaemPHTqZsYwGMH5KM1bPALcl78waZ0TBE="; }; vendorHash = null; From 467a6ddac7f379cef84bdbafe85fc3543c195630 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 4 May 2025 00:54:52 +0200 Subject: [PATCH 07/94] unclutter: fix build --- pkgs/by-name/un/unclutter/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/un/unclutter/package.nix b/pkgs/by-name/un/unclutter/package.nix index 6d2193e42d7e..e97a2b1d9b0f 100644 --- a/pkgs/by-name/un/unclutter/package.nix +++ b/pkgs/by-name/un/unclutter/package.nix @@ -15,7 +15,10 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 ]; - buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + buildFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "CFLAGS=-std=c89" + ]; installPhase = '' mkdir -pv "$out/bin" From 8e2d898e3f5f21b7dc79fefc34506cf82b75dea3 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 4 May 2025 09:13:43 +0200 Subject: [PATCH 08/94] unclutter: clean up the install phase --- pkgs/by-name/un/unclutter/package.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/un/unclutter/package.nix b/pkgs/by-name/un/unclutter/package.nix index e97a2b1d9b0f..d586ec94eca0 100644 --- a/pkgs/by-name/un/unclutter/package.nix +++ b/pkgs/by-name/un/unclutter/package.nix @@ -20,11 +20,19 @@ stdenv.mkDerivation rec { "CFLAGS=-std=c89" ]; - installPhase = '' - mkdir -pv "$out/bin" - mkdir -pv "$out/share/man/man1" - make DESTDIR="$out" BINDIR="$out/bin" PREFIX="" install - make DESTDIR="$out" MANPATH="$out/share/man" PREFIX="" install.man + installFlags = [ + "DESTDIR=${placeholder "out"}" + "BINDIR=${placeholder "out"}/bin" + "MANPATH=${placeholder "out"}/share/man" + ]; + + installTargets = [ + "install" + "install.man" + ]; + + preInstall = '' + mkdir -pv "$out"/{bin,share/man/man1} ''; meta = with lib; { From 613e1971f24cdae8d0e321af5a7ee6fc4ce87ce2 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Mon, 5 May 2025 19:45:27 +0000 Subject: [PATCH 09/94] hickory-dns: 0.25.1 -> 0.25.2 https://github.com/hickory-dns/hickory-dns/releases/tag/v0.25.2 --- pkgs/by-name/hi/hickory-dns/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hi/hickory-dns/package.nix b/pkgs/by-name/hi/hickory-dns/package.nix index b19102bc2be4..3f0195da142b 100644 --- a/pkgs/by-name/hi/hickory-dns/package.nix +++ b/pkgs/by-name/hi/hickory-dns/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "hickory-dns"; - version = "0.25.1"; + version = "0.25.2"; src = fetchFromGitHub { owner = "hickory-dns"; repo = "hickory-dns"; tag = "v${finalAttrs.version}"; - hash = "sha256-H8wJozmuXtJ6d96DMgQ/Uw2sp3sa+UKMXT9vf5azcyc="; + hash = "sha256-sPVulok18WAWyCXDNJzjioCO733vHmCcC5SjYrs/T+E="; }; useFetchCargoVendor = true; - cargoHash = "sha256-nuT2WUejpIhfI8WVTupAgdo7iav9YL1ipHu/PR4S2Hg="; + cargoHash = "sha256-q54faGF/eLdCRB0Eljkgl/x78Fnpm0eAEK9gCUwiAgo="; buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; From d807892d1f42210129f9fc18f81e5f828150cf4d Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Thu, 1 May 2025 15:25:48 -0300 Subject: [PATCH 10/94] check-meta: wrap maintainers attribute to include team members This is a work-around that resolves the issues that spawned from #400458 by adding the team members from teams declared in `meta.teams` to `meta.maintainers`, effectively restoring the original behaviour of the `maintainers` attribute, and thus allowing downstreams to keep consuming `meta.maintainers` without any extra changes to support `meta.teams`. Follow-up to #394797. Signed-off-by: Fernando Rodrigues --- pkgs/stdenv/generic/check-meta.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index f5e4dc5fe3c7..550aa2c02ffc 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -594,6 +594,11 @@ let // optionalAttrs (pos != null) { position = pos.file + ":" + toString pos.line; } + // { + maintainers = + attrs.meta.maintainers or [ ] + ++ concatMap (team: team.members or [ ]) attrs.meta.teams or [ ]; + } // { # Expose the result of the checks for everyone to see. unfree = hasUnfreeLicense attrs; From 92bd743239823dc7c80572539528398f722a9278 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Mon, 5 May 2025 23:32:00 -0700 Subject: [PATCH 11/94] ci/eval: use correct maintainer and team positions We need to pass through the maintainers and teams positions from the original meta so pings work correctly, since check-meta clobbers the original attribute positions in them. Tested with `maintainers/scripts/get-maintainer-pings-between.sh` on a handful of major packages maintained by both individuals and teams. --- ci/eval/compare/maintainers.nix | 7 +++---- pkgs/stdenv/generic/check-meta.nix | 12 ++++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ci/eval/compare/maintainers.nix b/ci/eval/compare/maintainers.nix index 8fb43be4d8e7..9b641d6ec60f 100644 --- a/ci/eval/compare/maintainers.nix +++ b/ci/eval/compare/maintainers.nix @@ -53,9 +53,7 @@ let // { # TODO: Refactor this so we can ping entire teams instead of the individual members. # Note that this will require keeping track of GH team IDs in "maintainers/teams.nix". - maintainers = - meta.maintainers or [ ] - ++ lib.flatten (map (team: team.members or [ ]) (meta.teams or [ ])); + maintainers = meta.maintainers or [ ]; } ) attrsWithPackages; @@ -64,7 +62,8 @@ let (lib.lists.unique ( builtins.map (pos: lib.strings.removePrefix (toString ../..) pos.file) ( builtins.filter (x: x != null) [ - (builtins.unsafeGetAttrPos "maintainers" (drv.meta or { })) + ((drv.meta or { }).maintainersPosition or null) + ((drv.meta or { }).teamsPosition or null) (builtins.unsafeGetAttrPos "src" drv) # broken because name is always set by stdenv: # # A hack to make `nix-env -qa` and `nix search` ignore broken packages. diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 550aa2c02ffc..57cbc175d201 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -411,6 +411,10 @@ let isFcitxEngine = bool; isIbusEngine = bool; isGutenprint = bool; + + # Used for the original location of the maintainer and team attributes to assist with pings. + maintainersPosition = any; + teamsPosition = any; }; checkMetaAttr = @@ -589,12 +593,20 @@ let ) ] ++ optional (hasOutput "man") "man"; } + // { + # CI scripts look at these to determine pings. + maintainersPosition = builtins.unsafeGetAttrPos "maintainers" (attrs.meta or { }); + teamsPosition = builtins.unsafeGetAttrPos "teams" (attrs.meta or { }); + } // attrs.meta or { } # Fill `meta.position` to identify the source location of the package. // optionalAttrs (pos != null) { position = pos.file + ":" + toString pos.line; } // { + # Maintainers should be inclusive of teams. + # Note that there may be external consumers of this API (repology, for instance) - + # if you add a new maintainer or team attribute please ensure that this expectation is still met. maintainers = attrs.meta.maintainers or [ ] ++ concatMap (team: team.members or [ ]) attrs.meta.teams or [ ]; From b066ab37f96b734aecba720854392b6340a9e42f Mon Sep 17 00:00:00 2001 From: Dionysis Grigoropoulos Date: Tue, 6 May 2025 13:29:38 +0300 Subject: [PATCH 12/94] ripe-atlas-tools: fix build --- pkgs/by-name/ri/ripe-atlas-tools/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ri/ripe-atlas-tools/package.nix b/pkgs/by-name/ri/ripe-atlas-tools/package.nix index 7cdcd6020ad3..8ccac955b77e 100644 --- a/pkgs/by-name/ri/ripe-atlas-tools/package.nix +++ b/pkgs/by-name/ri/ripe-atlas-tools/package.nix @@ -59,6 +59,8 @@ python3.pkgs.buildPythonApplication rec { ]; disabledTests = [ + # Disable this test because on Python >= 3.12 it fails due to argparse changes https://github.com/python/cpython/pull/124578 + "test_add_arguments" # Network tests: https://github.com/RIPE-NCC/ripe-atlas-tools/issues/234 "test_arg_from_file" "test_arg_from_stdin" From 0f0ccb81adbdd530b1762eae3fc26b1d2d19acb7 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Tue, 6 May 2025 06:16:08 -0500 Subject: [PATCH 13/94] chiaki-ng: use nanopb from nixpkgs --- pkgs/games/chiaki-ng/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/games/chiaki-ng/default.nix b/pkgs/games/chiaki-ng/default.nix index cead8704e11b..314a62fe2177 100644 --- a/pkgs/games/chiaki-ng/default.nix +++ b/pkgs/games/chiaki-ng/default.nix @@ -23,6 +23,7 @@ json_c, fftw, miniupnpc, + nanopb, speexdsp, libplacebo, vulkan-loader, @@ -73,6 +74,7 @@ stdenv.mkDerivation rec { json_c fftw miniupnpc + nanopb libevdev udev speexdsp From bbf2164f4a650ca624dc14ffd9efadb8815b24dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 6 May 2025 14:20:34 +0200 Subject: [PATCH 14/94] papi: 7.0.1 -> 7.1.0 --- pkgs/by-name/pa/papi/package.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/pa/papi/package.nix b/pkgs/by-name/pa/papi/package.nix index 1c4cf77e8427..4ced6c351e74 100644 --- a/pkgs/by-name/pa/papi/package.nix +++ b/pkgs/by-name/pa/papi/package.nix @@ -4,15 +4,13 @@ fetchurl, }: -stdenv.mkDerivation rec { - version = "7.0.1"; +stdenv.mkDerivation (finalAttrs: { + version = "7.1.0"; pname = "papi"; src = fetchurl { - url = "https://bitbucket.org/icl/papi/get/papi-${ - lib.replaceStrings [ "." ] [ "-" ] version - }-t.tar.gz"; - sha256 = "sha256-VajhmPW8sEJksfhLjBVlpBH7+AZr4fwKZPAtZxRF1Bk="; + url = "http://icl.utk.edu/projects/papi/downloads/papi-${finalAttrs.version}.tar.gz"; + sha256 = "sha256-WBivttuj7OV/UeZYl9tQYvjjRk5u0pS2VOvzTDmRvE8="; }; setSourceRoot = '' @@ -32,4 +30,4 @@ stdenv.mkDerivation rec { zhaofengli ]; }; -} +}) From edc2d6283e5b635f813dc66696efe22c9b6ae7f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 6 May 2025 14:26:51 +0000 Subject: [PATCH 15/94] python3Packages.limnoria: 2024.12.20 -> 2025.5.3 --- pkgs/development/python-modules/limnoria/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 74ddf2035eb7..c61df1df5171 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2024.12.20"; + version = "2025.5.3"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-e8YvB29tggssX8aMRSoLvprsSBWeKVKfhDrSZeA2rCQ="; + hash = "sha256-EZ42Ufnw3sUM1fM3+hTreKr58QOgeRANilXP9uxU/Cs="; }; build-system = [ setuptools ]; From 650d286b2cd1d25ca9e34ee1395d427dfb09d8f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 6 May 2025 16:26:24 +0000 Subject: [PATCH 16/94] lomiri.lomiri-schemas: 0.1.7 -> 0.1.8 --- pkgs/desktops/lomiri/data/lomiri-schemas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lomiri/data/lomiri-schemas/default.nix b/pkgs/desktops/lomiri/data/lomiri-schemas/default.nix index ca2ac8e58c83..966bbe3df349 100644 --- a/pkgs/desktops/lomiri/data/lomiri-schemas/default.nix +++ b/pkgs/desktops/lomiri/data/lomiri-schemas/default.nix @@ -14,13 +14,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "lomiri-schemas"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-schemas"; tag = finalAttrs.version; - hash = "sha256-AI/tpTzhnzKygG/zgszQAmvbaM8VdU+Chs9bjd9Jx9A="; + hash = "sha256-Xm21KM+IxKQwOlBsmGTgFq2bUJy/WTBBcf/2Cqkdlos="; }; strictDeps = true; From 56be58429ae69e7139d876c4b20dcaf60c072408 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Tue, 6 May 2025 09:33:24 -0700 Subject: [PATCH 17/94] cudaPackages: introduce and use lib.packagesFromDirectoryRecursive Signed-off-by: Connor Baker --- .../auto-add-cuda-compat-runpath.sh | 0 .../autoAddCudaCompatRunpath/package.nix | 27 +++++++++ .../backendStdenv.nix} | 8 +++ ...at-out-common-python-bindings-option.patch | 0 ...-so-headers-can-be-discovered-when-i.patch | 0 ...install-samples-and-tests-when-built.patch | 0 ...fix-instances-of-maybe-uninitialized.patch | 0 .../cudnn-frontend/CMakeLists.txt | 0 .../cudnn_frontend-config.cmake.in | 0 .../cudnn-frontend/package.nix} | 0 .../mark-for-cudatoolkit-root-hook.sh | 0 .../markForCudatoolkitRootHook/package.nix | 4 ++ .../default.nix => packages/nccl-tests.nix} | 0 .../{nccl/default.nix => packages/nccl.nix} | 0 .../saxpy/package.nix} | 0 .../{ => packages}/saxpy/src/CMakeLists.txt | 0 .../{ => packages}/saxpy/src/saxpy.cu | 0 .../packages/setupCudaHook/package.nix | 14 +++++ .../setupCudaHook}/setup-cuda-hook.sh | 0 .../writeGpuTestPython.nix} | 0 .../cuda-modules/setup-hooks/extension.nix | 55 ------------------- pkgs/top-level/cuda-packages.nix | 33 ++++------- 22 files changed, 65 insertions(+), 76 deletions(-) rename pkgs/development/cuda-modules/{setup-hooks => packages/autoAddCudaCompatRunpath}/auto-add-cuda-compat-runpath.sh (100%) create mode 100644 pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/package.nix rename pkgs/development/cuda-modules/{backend-stdenv.nix => packages/backendStdenv.nix} (63%) rename pkgs/development/cuda-modules/{ => packages}/cudnn-frontend/0001-cmake-float-out-common-python-bindings-option.patch (100%) rename pkgs/development/cuda-modules/{ => packages}/cudnn-frontend/0002-cmake-add-config-so-headers-can-be-discovered-when-i.patch (100%) rename pkgs/development/cuda-modules/{ => packages}/cudnn-frontend/0003-cmake-install-samples-and-tests-when-built.patch (100%) rename pkgs/development/cuda-modules/{ => packages}/cudnn-frontend/0004-samples-fix-instances-of-maybe-uninitialized.patch (100%) rename pkgs/development/cuda-modules/{ => packages}/cudnn-frontend/CMakeLists.txt (100%) rename pkgs/development/cuda-modules/{ => packages}/cudnn-frontend/cudnn_frontend-config.cmake.in (100%) rename pkgs/development/cuda-modules/{cudnn-frontend/default.nix => packages/cudnn-frontend/package.nix} (100%) rename pkgs/development/cuda-modules/{setup-hooks => packages/markForCudatoolkitRootHook}/mark-for-cudatoolkit-root-hook.sh (100%) create mode 100644 pkgs/development/cuda-modules/packages/markForCudatoolkitRootHook/package.nix rename pkgs/development/cuda-modules/{nccl-tests/default.nix => packages/nccl-tests.nix} (100%) rename pkgs/development/cuda-modules/{nccl/default.nix => packages/nccl.nix} (100%) rename pkgs/development/cuda-modules/{saxpy/default.nix => packages/saxpy/package.nix} (100%) rename pkgs/development/cuda-modules/{ => packages}/saxpy/src/CMakeLists.txt (100%) rename pkgs/development/cuda-modules/{ => packages}/saxpy/src/saxpy.cu (100%) create mode 100644 pkgs/development/cuda-modules/packages/setupCudaHook/package.nix rename pkgs/development/cuda-modules/{setup-hooks => packages/setupCudaHook}/setup-cuda-hook.sh (100%) rename pkgs/development/cuda-modules/{write-gpu-test-python.nix => packages/writeGpuTestPython.nix} (100%) delete mode 100644 pkgs/development/cuda-modules/setup-hooks/extension.nix diff --git a/pkgs/development/cuda-modules/setup-hooks/auto-add-cuda-compat-runpath.sh b/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/auto-add-cuda-compat-runpath.sh similarity index 100% rename from pkgs/development/cuda-modules/setup-hooks/auto-add-cuda-compat-runpath.sh rename to pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/auto-add-cuda-compat-runpath.sh diff --git a/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/package.nix b/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/package.nix new file mode 100644 index 000000000000..e94fbe485283 --- /dev/null +++ b/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/package.nix @@ -0,0 +1,27 @@ +# autoAddCudaCompatRunpath hook must be added AFTER `setupCudaHook`. Both +# hooks prepend a path with `libcuda.so` to the `DT_RUNPATH` section of +# patched elf files, but `cuda_compat` path must take precedence (otherwise, +# it doesn't have any effect) and thus appear first. Meaning this hook must be +# executed last. +{ + autoFixElfFiles, + cuda_compat ? null, + flags, + lib, + makeSetupHook, +}: +makeSetupHook { + name = "auto-add-cuda-compat-runpath-hook"; + propagatedBuildInputs = [ autoFixElfFiles ]; + + substitutions = { + # Hotfix Ofborg evaluation + libcudaPath = if flags.isJetsonBuild then "${cuda_compat}/compat" else null; + }; + + meta.broken = !flags.isJetsonBuild; + + # Pre-cuda_compat CUDA release: + meta.badPlatforms = lib.optionals (cuda_compat == null) lib.platforms.all; + meta.platforms = cuda_compat.meta.platforms or [ ]; +} ./auto-add-cuda-compat-runpath.sh diff --git a/pkgs/development/cuda-modules/backend-stdenv.nix b/pkgs/development/cuda-modules/packages/backendStdenv.nix similarity index 63% rename from pkgs/development/cuda-modules/backend-stdenv.nix rename to pkgs/development/cuda-modules/packages/backendStdenv.nix index 57219ad607c0..9fd705f98193 100644 --- a/pkgs/development/cuda-modules/backend-stdenv.nix +++ b/pkgs/development/cuda-modules/packages/backendStdenv.nix @@ -1,3 +1,11 @@ +# Exposed as cudaPackages.backendStdenv. +# This is what nvcc uses as a backend, +# and it has to be an officially supported one (e.g. gcc11 for cuda11). +# +# It, however, propagates current stdenv's libstdc++ to avoid "GLIBCXX_* not found errors" +# when linked with other C++ libraries. +# E.g. for cudaPackages_11_8 we use gcc11 with gcc12's libstdc++ +# Cf. https://github.com/NixOS/nixpkgs/pull/218265 for context { cudaVersion, lib, diff --git a/pkgs/development/cuda-modules/cudnn-frontend/0001-cmake-float-out-common-python-bindings-option.patch b/pkgs/development/cuda-modules/packages/cudnn-frontend/0001-cmake-float-out-common-python-bindings-option.patch similarity index 100% rename from pkgs/development/cuda-modules/cudnn-frontend/0001-cmake-float-out-common-python-bindings-option.patch rename to pkgs/development/cuda-modules/packages/cudnn-frontend/0001-cmake-float-out-common-python-bindings-option.patch diff --git a/pkgs/development/cuda-modules/cudnn-frontend/0002-cmake-add-config-so-headers-can-be-discovered-when-i.patch b/pkgs/development/cuda-modules/packages/cudnn-frontend/0002-cmake-add-config-so-headers-can-be-discovered-when-i.patch similarity index 100% rename from pkgs/development/cuda-modules/cudnn-frontend/0002-cmake-add-config-so-headers-can-be-discovered-when-i.patch rename to pkgs/development/cuda-modules/packages/cudnn-frontend/0002-cmake-add-config-so-headers-can-be-discovered-when-i.patch diff --git a/pkgs/development/cuda-modules/cudnn-frontend/0003-cmake-install-samples-and-tests-when-built.patch b/pkgs/development/cuda-modules/packages/cudnn-frontend/0003-cmake-install-samples-and-tests-when-built.patch similarity index 100% rename from pkgs/development/cuda-modules/cudnn-frontend/0003-cmake-install-samples-and-tests-when-built.patch rename to pkgs/development/cuda-modules/packages/cudnn-frontend/0003-cmake-install-samples-and-tests-when-built.patch diff --git a/pkgs/development/cuda-modules/cudnn-frontend/0004-samples-fix-instances-of-maybe-uninitialized.patch b/pkgs/development/cuda-modules/packages/cudnn-frontend/0004-samples-fix-instances-of-maybe-uninitialized.patch similarity index 100% rename from pkgs/development/cuda-modules/cudnn-frontend/0004-samples-fix-instances-of-maybe-uninitialized.patch rename to pkgs/development/cuda-modules/packages/cudnn-frontend/0004-samples-fix-instances-of-maybe-uninitialized.patch diff --git a/pkgs/development/cuda-modules/cudnn-frontend/CMakeLists.txt b/pkgs/development/cuda-modules/packages/cudnn-frontend/CMakeLists.txt similarity index 100% rename from pkgs/development/cuda-modules/cudnn-frontend/CMakeLists.txt rename to pkgs/development/cuda-modules/packages/cudnn-frontend/CMakeLists.txt diff --git a/pkgs/development/cuda-modules/cudnn-frontend/cudnn_frontend-config.cmake.in b/pkgs/development/cuda-modules/packages/cudnn-frontend/cudnn_frontend-config.cmake.in similarity index 100% rename from pkgs/development/cuda-modules/cudnn-frontend/cudnn_frontend-config.cmake.in rename to pkgs/development/cuda-modules/packages/cudnn-frontend/cudnn_frontend-config.cmake.in diff --git a/pkgs/development/cuda-modules/cudnn-frontend/default.nix b/pkgs/development/cuda-modules/packages/cudnn-frontend/package.nix similarity index 100% rename from pkgs/development/cuda-modules/cudnn-frontend/default.nix rename to pkgs/development/cuda-modules/packages/cudnn-frontend/package.nix diff --git a/pkgs/development/cuda-modules/setup-hooks/mark-for-cudatoolkit-root-hook.sh b/pkgs/development/cuda-modules/packages/markForCudatoolkitRootHook/mark-for-cudatoolkit-root-hook.sh similarity index 100% rename from pkgs/development/cuda-modules/setup-hooks/mark-for-cudatoolkit-root-hook.sh rename to pkgs/development/cuda-modules/packages/markForCudatoolkitRootHook/mark-for-cudatoolkit-root-hook.sh diff --git a/pkgs/development/cuda-modules/packages/markForCudatoolkitRootHook/package.nix b/pkgs/development/cuda-modules/packages/markForCudatoolkitRootHook/package.nix new file mode 100644 index 000000000000..86ff28d6c41a --- /dev/null +++ b/pkgs/development/cuda-modules/packages/markForCudatoolkitRootHook/package.nix @@ -0,0 +1,4 @@ +# Internal hook, used by cudatoolkit and cuda redist packages +# to accommodate automatic CUDAToolkit_ROOT construction +{ makeSetupHook }: +makeSetupHook { name = "mark-for-cudatoolkit-root-hook"; } ./mark-for-cudatoolkit-root-hook.sh diff --git a/pkgs/development/cuda-modules/nccl-tests/default.nix b/pkgs/development/cuda-modules/packages/nccl-tests.nix similarity index 100% rename from pkgs/development/cuda-modules/nccl-tests/default.nix rename to pkgs/development/cuda-modules/packages/nccl-tests.nix diff --git a/pkgs/development/cuda-modules/nccl/default.nix b/pkgs/development/cuda-modules/packages/nccl.nix similarity index 100% rename from pkgs/development/cuda-modules/nccl/default.nix rename to pkgs/development/cuda-modules/packages/nccl.nix diff --git a/pkgs/development/cuda-modules/saxpy/default.nix b/pkgs/development/cuda-modules/packages/saxpy/package.nix similarity index 100% rename from pkgs/development/cuda-modules/saxpy/default.nix rename to pkgs/development/cuda-modules/packages/saxpy/package.nix diff --git a/pkgs/development/cuda-modules/saxpy/src/CMakeLists.txt b/pkgs/development/cuda-modules/packages/saxpy/src/CMakeLists.txt similarity index 100% rename from pkgs/development/cuda-modules/saxpy/src/CMakeLists.txt rename to pkgs/development/cuda-modules/packages/saxpy/src/CMakeLists.txt diff --git a/pkgs/development/cuda-modules/saxpy/src/saxpy.cu b/pkgs/development/cuda-modules/packages/saxpy/src/saxpy.cu similarity index 100% rename from pkgs/development/cuda-modules/saxpy/src/saxpy.cu rename to pkgs/development/cuda-modules/packages/saxpy/src/saxpy.cu diff --git a/pkgs/development/cuda-modules/packages/setupCudaHook/package.nix b/pkgs/development/cuda-modules/packages/setupCudaHook/package.nix new file mode 100644 index 000000000000..d7560f132c4c --- /dev/null +++ b/pkgs/development/cuda-modules/packages/setupCudaHook/package.nix @@ -0,0 +1,14 @@ +# Currently propagated by cuda_nvcc or cudatoolkit, rather than used directly +{ makeSetupHook, backendStdenv }: +makeSetupHook { + name = "setup-cuda-hook"; + + substitutions.setupCudaHook = placeholder "out"; + + # Point NVCC at a compatible compiler + substitutions.ccRoot = "${backendStdenv.cc}"; + + # Required in addition to ccRoot as otherwise bin/gcc is looked up + # when building CMakeCUDACompilerId.cu + substitutions.ccFullPath = "${backendStdenv.cc}/bin/${backendStdenv.cc.targetPrefix}c++"; +} ./setup-cuda-hook.sh diff --git a/pkgs/development/cuda-modules/setup-hooks/setup-cuda-hook.sh b/pkgs/development/cuda-modules/packages/setupCudaHook/setup-cuda-hook.sh similarity index 100% rename from pkgs/development/cuda-modules/setup-hooks/setup-cuda-hook.sh rename to pkgs/development/cuda-modules/packages/setupCudaHook/setup-cuda-hook.sh diff --git a/pkgs/development/cuda-modules/write-gpu-test-python.nix b/pkgs/development/cuda-modules/packages/writeGpuTestPython.nix similarity index 100% rename from pkgs/development/cuda-modules/write-gpu-test-python.nix rename to pkgs/development/cuda-modules/packages/writeGpuTestPython.nix diff --git a/pkgs/development/cuda-modules/setup-hooks/extension.nix b/pkgs/development/cuda-modules/setup-hooks/extension.nix deleted file mode 100644 index 327f335f1890..000000000000 --- a/pkgs/development/cuda-modules/setup-hooks/extension.nix +++ /dev/null @@ -1,55 +0,0 @@ -final: _: { - # Internal hook, used by cudatoolkit and cuda redist packages - # to accommodate automatic CUDAToolkit_ROOT construction - markForCudatoolkitRootHook = final.callPackage ( - { makeSetupHook }: - makeSetupHook { name = "mark-for-cudatoolkit-root-hook"; } ./mark-for-cudatoolkit-root-hook.sh - ) { }; - - # Currently propagated by cuda_nvcc or cudatoolkit, rather than used directly - setupCudaHook = ( - final.callPackage ( - { makeSetupHook, backendStdenv }: - makeSetupHook { - name = "setup-cuda-hook"; - - substitutions.setupCudaHook = placeholder "out"; - - # Point NVCC at a compatible compiler - substitutions.ccRoot = "${backendStdenv.cc}"; - - # Required in addition to ccRoot as otherwise bin/gcc is looked up - # when building CMakeCUDACompilerId.cu - substitutions.ccFullPath = "${backendStdenv.cc}/bin/${backendStdenv.cc.targetPrefix}c++"; - } ./setup-cuda-hook.sh - ) { } - ); - - # autoAddCudaCompatRunpath hook must be added AFTER `setupCudaHook`. Both - # hooks prepend a path with `libcuda.so` to the `DT_RUNPATH` section of - # patched elf files, but `cuda_compat` path must take precedence (otherwise, - # it doesn't have any effect) and thus appear first. Meaning this hook must be - # executed last. - autoAddCudaCompatRunpath = final.callPackage ( - { - makeSetupHook, - autoFixElfFiles, - cuda_compat ? null, - }: - makeSetupHook { - name = "auto-add-cuda-compat-runpath-hook"; - propagatedBuildInputs = [ autoFixElfFiles ]; - - substitutions = { - # Hotfix Ofborg evaluation - libcudaPath = if final.flags.isJetsonBuild then "${cuda_compat}/compat" else null; - }; - - meta.broken = !final.flags.isJetsonBuild; - - # Pre-cuda_compat CUDA release: - meta.badPlatforms = final.lib.optionals (cuda_compat == null) final.lib.platforms.all; - meta.platforms = cuda_compat.meta.platforms or [ ]; - } ./auto-add-cuda-compat-runpath.sh - ) { }; -} diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix index 3770aee3bae7..4f44a495fd52 100644 --- a/pkgs/top-level/cuda-packages.nix +++ b/pkgs/top-level/cuda-packages.nix @@ -35,14 +35,13 @@ let fixedPoints lists strings - trivial versions ; # Backbone gpus = builtins.import ../development/cuda-modules/gpus.nix; nvccCompatibilities = builtins.import ../development/cuda-modules/nvcc-compatibilities.nix; flags = callPackage ../development/cuda-modules/flags.nix { inherit cudaVersion gpus; }; - passthruFunction = final: ({ + passthruFunction = final: { inherit cudaVersion lib pkgs; inherit gpus nvccCompatibilities flags; cudaMajorVersion = versions.major cudaVersion; @@ -63,27 +62,15 @@ let # TODO(@connorbaker): `cudaFlags` is an alias for `flags` which should be removed in the future. cudaFlags = flags; - # Exposed as cudaPackages.backendStdenv. - # This is what nvcc uses as a backend, - # and it has to be an officially supported one (e.g. gcc11 for cuda11). - # - # It, however, propagates current stdenv's libstdc++ to avoid "GLIBCXX_* not found errors" - # when linked with other C++ libraries. - # E.g. for cudaPackages_11_8 we use gcc11 with gcc12's libstdc++ - # Cf. https://github.com/NixOS/nixpkgs/pull/218265 for context - backendStdenv = final.callPackage ../development/cuda-modules/backend-stdenv.nix { }; - # Loose packages + # Barring packages which share a home (e.g., cudatoolkit and cudatoolkit-legacy-runfile), new packages + # should be added to ../development/cuda-modules/packages in "by-name" style, where they will be automatically + # discovered and added to the package set. # TODO: Move to aliases.nix once all Nixpkgs has migrated to the splayed CUDA packages cudatoolkit = final.callPackage ../development/cuda-modules/cudatoolkit/redist-wrapper.nix { }; cudatoolkit-legacy-runfile = final.callPackage ../development/cuda-modules/cudatoolkit { }; - cudnn-frontend = final.callPackage ../development/cuda-modules/cudnn-frontend/default.nix { }; - saxpy = final.callPackage ../development/cuda-modules/saxpy { }; - nccl = final.callPackage ../development/cuda-modules/nccl { }; - nccl-tests = final.callPackage ../development/cuda-modules/nccl-tests { }; - tests = let bools = [ @@ -122,9 +109,7 @@ let }; in attrsets.listToAttrs (attrsets.mapCartesianProduct builder configs); - - writeGpuTestPython = final.callPackage ../development/cuda-modules/write-gpu-test-python.nix { }; - }); + }; mkVersionedPackageName = name: version: @@ -135,7 +120,13 @@ let composedExtension = fixedPoints.composeManyExtensions ( [ - (import ../development/cuda-modules/setup-hooks/extension.nix) + ( + final: _: + lib.packagesFromDirectoryRecursive { + inherit (final) callPackage; + directory = ../development/cuda-modules/packages; + } + ) (callPackage ../development/cuda-modules/cuda/extension.nix { inherit cudaVersion; }) (import ../development/cuda-modules/cuda/overrides.nix) (callPackage ../development/cuda-modules/generic-builders/multiplex.nix { From 55850e34e48373c2c7c4ae8ce8a8c7903e9e8c44 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 6 May 2025 20:17:21 +0200 Subject: [PATCH 18/94] applyPatches: passthru common src attributes This should enable tools like nix-update to update a patched src derivation. --- .../trivial-builders/default.nix | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index c8a3e4a3a733..9079cff7bb1a 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -1028,6 +1028,16 @@ rec { if patches == [ ] && prePatch == "" && postPatch == "" then src # nothing to do, so use original src to avoid additional drv else + let + keepAttrs = names: lib.filterAttrs (name: val: lib.elem name names); + # enables tools like nix-update to determine what src attributes to replace + extraPassthru = keepAttrs [ + "rev" + "tag" + "url" + "outputHash" + ] src; + in stdenvNoCC.mkDerivation ( { inherit @@ -1042,11 +1052,19 @@ rec { phases = "unpackPhase patchPhase installPhase"; installPhase = "cp -R ./ $out"; } - # Carry `meta` information from the underlying `src` if present. - // (optionalAttrs (src ? meta) { inherit (src) meta; }) + # Carry and merge information from the underlying `src` if present. + // (optionalAttrs (src ? meta || args ? meta) { + meta = src.meta or { } // args.meta or { }; + }) + // (optionalAttrs (extraPassthru != { } || src ? passthru || args ? passthru) { + passthru = extraPassthru // src.passthru or { } // args.passthru or { }; + }) + # Forward any additional arguments to the derviation // (removeAttrs args [ "src" "name" + "meta" + "passthru" "patches" "prePatch" "postPatch" From 76af601d2af4733d7a9a3091289e15f25f4f2e05 Mon Sep 17 00:00:00 2001 From: Adam Mitha Date: Tue, 6 May 2025 11:42:12 -0700 Subject: [PATCH 19/94] python312Packages.llm-gemini: 0.18.1 -> 0.19 --- pkgs/development/python-modules/llm-gemini/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llm-gemini/default.nix b/pkgs/development/python-modules/llm-gemini/default.nix index 5dac4fe11d96..a506251e7850 100644 --- a/pkgs/development/python-modules/llm-gemini/default.nix +++ b/pkgs/development/python-modules/llm-gemini/default.nix @@ -15,14 +15,14 @@ }: buildPythonPackage rec { pname = "llm-gemini"; - version = "0.18.1"; + version = "0.19"; pyproject = true; src = fetchFromGitHub { owner = "simonw"; repo = "llm-gemini"; tag = version; - hash = "sha256-kQVqMB8uf8tT4lTbyvX5tByUzD2yO1h7hIDhUTycX2A="; + hash = "sha256-+Ax2NQkWzVTImlOzdcgkUNgVTZklHHQkKAV55DCBAP8="; }; build-system = [ From 4b9fb45296acd93f272bcdff2150ec3200baf252 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 6 May 2025 18:44:38 +0000 Subject: [PATCH 20/94] cryptomator: 1.16.0 -> 1.16.1 --- pkgs/by-name/cr/cryptomator/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cr/cryptomator/package.nix b/pkgs/by-name/cr/cryptomator/package.nix index 42a4c1827c17..8d57fe9d2531 100644 --- a/pkgs/by-name/cr/cryptomator/package.nix +++ b/pkgs/by-name/cr/cryptomator/package.nix @@ -17,13 +17,13 @@ let in maven.buildMavenPackage rec { pname = "cryptomator"; - version = "1.16.0"; + version = "1.16.1"; src = fetchFromGitHub { owner = "cryptomator"; repo = "cryptomator"; tag = version; - hash = "sha256-v4UCNUbnCCccwmRMtHbN8BEHlzLcAcJ9HIU5Ak94FS8="; + hash = "sha256-gATygecFVUOvJXtq/0R7nqLCvR2UErFlQ0oeFwBoNGM="; }; mvnJdk = jdk; From 23cfa789e4b8d400aaa4315157f2664d9db44c49 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 6 May 2025 18:52:09 +0000 Subject: [PATCH 21/94] python3Packages.whenever: 0.7.3 -> 0.8.0 --- pkgs/development/python-modules/whenever/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/whenever/default.nix b/pkgs/development/python-modules/whenever/default.nix index 48ec0bca95f1..4640e150b0b4 100644 --- a/pkgs/development/python-modules/whenever/default.nix +++ b/pkgs/development/python-modules/whenever/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "whenever"; - version = "0.7.3"; + version = "0.8.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,12 +29,12 @@ buildPythonPackage rec { owner = "ariebovenberg"; repo = "whenever"; tag = version; - hash = "sha256-J5FpY/vmaZ5TGQEPi+pQFz295tb02BZcCOvlX6zqM6o="; + hash = "sha256-HeEuzOHT0EbmkbIH/yejKu54943ItUy8oY2ZlnEwgBA="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-LUzb2cTnJIlL9USAJv8eZ56TpWuoUjYepRps6SV+mBo="; + hash = "sha256-szNRzaswILPjMJ+QFUWSJPfB6mF+o78Qg6AWkkancuU="; }; build-system = [ From b777b43d32b37dd7b9a9178a910f1ae3cab14de4 Mon Sep 17 00:00:00 2001 From: Amadej Kastelic Date: Tue, 6 May 2025 21:05:01 +0200 Subject: [PATCH 22/94] postman: 11.32.2 -> 11.44.0 https://www.postman.com/release-notes/postman-app/#v11-44-0 --- pkgs/by-name/po/postman/darwin.nix | 4 ++-- pkgs/by-name/po/postman/linux.nix | 4 ++-- pkgs/by-name/po/postman/package.nix | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/po/postman/darwin.nix b/pkgs/by-name/po/postman/darwin.nix index 6eeb1104f6d3..bc7ce9fe2775 100644 --- a/pkgs/by-name/po/postman/darwin.nix +++ b/pkgs/by-name/po/postman/darwin.nix @@ -13,12 +13,12 @@ let { aarch64-darwin = { arch = "arm64"; - sha256 = "sha256-tp8qKk06HvSVY1GggOv9VYH+1Ntlirf8Pf2FY0Qhksk="; + sha256 = "sha256-uhhrJk/WtM4tKsrBAn1IjHx0OeR/SpdOzy2XhoUP4sY="; }; x86_64-darwin = { arch = "64"; - sha256 = "sha256-8hSxtLGoAcTLmUpr3Il/1wii2MgLqOJ3oAYSSPq7a1o="; + sha256 = "sha256-NYxcZoQYDyn85RkUz57b5yhzpeAK5xyyJF/7L2+3tt4="; }; } .${stdenvNoCC.hostPlatform.system} diff --git a/pkgs/by-name/po/postman/linux.nix b/pkgs/by-name/po/postman/linux.nix index 4549c027948a..763330f35e03 100644 --- a/pkgs/by-name/po/postman/linux.nix +++ b/pkgs/by-name/po/postman/linux.nix @@ -56,12 +56,12 @@ let { aarch64-linux = { arch = "arm64"; - sha256 = "sha256-JKE6riUJXAiCwT0yp5ncoExiRAnFmuefmPkwWmvRjV4="; + sha256 = "sha256-/Qfd/xn+FwYLPSWssP5JFfjMdICz6HDg30edl/Fme5A="; }; x86_64-linux = { arch = "64"; - sha256 = "sha256-w7R4IsWMtW37BwGHBY9UweMR6PaZpkya401ARGeR1wY="; + sha256 = "sha256-BbTYT0GHU+BmWFXG2TU8PL90eTpLcyLgnwSw9YyWT0g="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/po/postman/package.nix b/pkgs/by-name/po/postman/package.nix index d883696aa9da..3415c93e28e8 100644 --- a/pkgs/by-name/po/postman/package.nix +++ b/pkgs/by-name/po/postman/package.nix @@ -6,7 +6,7 @@ let pname = "postman"; - version = "11.32.2"; + version = "11.44.0"; meta = with lib; { homepage = "https://www.getpostman.com"; description = "API Development Environment"; From 4093ec8f8c6c104fcfe9f8a440df878f189b5aeb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 6 May 2025 19:38:09 +0000 Subject: [PATCH 23/94] centrifugo: 6.1.0 -> 6.2.0 --- pkgs/by-name/ce/centrifugo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ce/centrifugo/package.nix b/pkgs/by-name/ce/centrifugo/package.nix index 9a74648e6efa..3af99ba44ff5 100644 --- a/pkgs/by-name/ce/centrifugo/package.nix +++ b/pkgs/by-name/ce/centrifugo/package.nix @@ -16,16 +16,16 @@ let in buildGoModule rec { pname = "centrifugo"; - version = "6.1.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "centrifugal"; repo = "centrifugo"; rev = "v${version}"; - hash = "sha256-7hh9wcM9cMfQ2W2PlDitTdJD9ftZt/KO/B+wV/c588U="; + hash = "sha256-DCtUw/0EWJcgQSBd/csbgoi1ncN1LnLJZvfv3AZyW0o="; }; - vendorHash = "sha256-hl1BznajnaOXMrlSqksqPdJih29yRDYW9IsyV9mSN20="; + vendorHash = "sha256-35RmwI5Qy50jgUAjOz0UlE7CgjVuDiwFfG3uYafr1O4="; ldflags = [ "-s" From a5766a100cc12f84972258586cf4d7d04b7ee086 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Fri, 2 May 2025 17:16:03 -0700 Subject: [PATCH 24/94] premake5: fix build on Darwin and arm64 --- pkgs/development/tools/misc/premake/5.nix | 36 ++++++++++++++++------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/misc/premake/5.nix b/pkgs/development/tools/misc/premake/5.nix index 9e7497fde4bf..56cf1062c7fd 100644 --- a/pkgs/development/tools/misc/premake/5.nix +++ b/pkgs/development/tools/misc/premake/5.nix @@ -2,24 +2,30 @@ lib, stdenv, fetchFromGitHub, - libuuid, + + # build inputs cacert, + libuuid, + + # build inputs (darwin) readline, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "premake5"; version = "5.0.0-beta4"; src = fetchFromGitHub { owner = "premake"; repo = "premake-core"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-sNLCyIHWDW/8jIrMFCZAqtWsh4SRugqtPR4HaoW/Vzk="; }; buildInputs = - [ libuuid ] + [ + libuuid + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ readline ]; @@ -28,11 +34,10 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace contrib/curl/premake5.lua \ - --replace "ca = nil" "ca = '${cacert}/etc/ssl/certs/ca-bundle.crt'" + --replace-fail "ca = nil" "ca = '${cacert}/etc/ssl/certs/ca-bundle.crt'" '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace premake5.lua \ - --replace -mmacosx-version-min=10.4 -mmacosx-version-min=10.5 \ --replace-fail '"-arch arm64"' '""' \ --replace-fail '"-arch x86_64"' '""' '' @@ -40,17 +45,21 @@ stdenv.mkDerivation rec { substituteInPlace \ binmodules/example/premake5.lua \ binmodules/luasocket/premake5.lua \ - --replace SharedLib StaticLib + --replace-fail SharedLib StaticLib ''; buildPhase = if stdenv.hostPlatform.isDarwin then + # Error compiling the builtin zlib source, but it's not used currently '' - make -f Bootstrap.mak osx + make PREMAKE_OPTS="--zlib-src=none" \ + PLATFORM="Universal" \ + -f Bootstrap.mak osx '' else '' - make -f Bootstrap.mak linux + make PLATFORM=${stdenv.hostPlatform.linuxArch} \ + -f Bootstrap.mak linux ''; env.NIX_CFLAGS_COMPILE = toString ( @@ -71,6 +80,11 @@ stdenv.mkDerivation rec { description = "Simple build configuration and project generation tool using lua"; mainProgram = "premake5"; license = lib.licenses.bsd3; - platforms = lib.platforms.darwin ++ lib.platforms.linux; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; }; -} +}) From 5471af1bc7b07948f5df64cb162320764c9a68a1 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Tue, 6 May 2025 13:15:01 -0700 Subject: [PATCH 25/94] premake5: addd sarahec as maintainer --- pkgs/development/tools/misc/premake/5.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/misc/premake/5.nix b/pkgs/development/tools/misc/premake/5.nix index 56cf1062c7fd..8a60b708fc78 100644 --- a/pkgs/development/tools/misc/premake/5.nix +++ b/pkgs/development/tools/misc/premake/5.nix @@ -80,6 +80,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Simple build configuration and project generation tool using lua"; mainProgram = "premake5"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.sarahec ]; platforms = [ "x86_64-linux" "aarch64-linux" From 447ec64d2859e252c1b7edd4c83f0325b1943ed8 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Mon, 5 May 2025 13:16:04 -0700 Subject: [PATCH 26/94] python3Packages.google-cloud-error-reporting: relax dependency on protobuf --- .../google-cloud-error-reporting/default.nix | 34 +++++++++++-------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index 503cb06d33f8..845c16d01984 100644 --- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -1,17 +1,22 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies google-api-core, google-cloud-logging, - google-cloud-testutils, - mock, proto-plus, protobuf, + + # testing + google-cloud-testutils, + mock, pytest-asyncio, pytestCheckHook, - pythonOlder, - setuptools, }: buildPythonPackage rec { @@ -19,16 +24,17 @@ buildPythonPackage rec { version = "1.11.1"; pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - pname = "google_cloud_error_reporting"; - inherit version; - hash = "sha256-1ir8o3jwzmfi7E8QPTn3E6RGtTOL9KM05NRaMRYzh5A="; + src = fetchFromGitHub { + owner = "googleapis"; + repo = "python-error-reporting"; + tag = "v${version}"; + hash = "sha256-z1ogY4W4RGKv0h2jW0jVpIHUY1X3P0Vw++3jYtnYTRA="; }; build-system = [ setuptools ]; + pythonRelaxDeps = [ "protobuf" ]; + dependencies = [ google-api-core google-cloud-logging @@ -61,11 +67,11 @@ buildPythonPackage rec { "google.cloud.errorreporting_v1beta1" ]; - meta = with lib; { + meta = { description = "Stackdriver Error Reporting API client library"; homepage = "https://github.com/googleapis/python-error-reporting"; changelog = "https://github.com/googleapis/python-error-reporting/blob/v${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = [ ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.sarahec ]; }; } From 9041615e2fc17b892208a200d02e4d9553308ceb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 6 May 2025 21:00:59 +0000 Subject: [PATCH 27/94] tabiew: 0.9.0 -> 0.9.4 --- pkgs/by-name/ta/tabiew/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ta/tabiew/package.nix b/pkgs/by-name/ta/tabiew/package.nix index 2ff18651d061..d34cdfa877a1 100644 --- a/pkgs/by-name/ta/tabiew/package.nix +++ b/pkgs/by-name/ta/tabiew/package.nix @@ -6,17 +6,17 @@ }: rustPlatform.buildRustPackage rec { pname = "tabiew"; - version = "0.9.0"; + version = "0.9.4"; src = fetchFromGitHub { owner = "shshemi"; repo = "tabiew"; tag = "v${version}"; - hash = "sha256-eGSlRFcSkQPXmnHQM81UYBokvH6dIn9EhrFbSfsJ22I="; + hash = "sha256-5zeYqSWM/EbwjX7nHqMhERivk0gVra0QntYNh1dIp5Y="; }; useFetchCargoVendor = true; - cargoHash = "sha256-xzdi3LGVC0/GxE+fmQZ9VsnCreU9tEGvDa97l9TRtfY="; + cargoHash = "sha256-Yic8maNIjo4Kg6nZ29dtN2PougtOa2WCMMMUiIt9iEs="; nativeBuildInputs = [ installShellFiles ]; From c245a640503b136e48eef39f175a48e4fb5311b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 6 May 2025 21:49:02 +0000 Subject: [PATCH 28/94] cargo-shear: 1.2.5 -> 1.2.6 --- pkgs/by-name/ca/cargo-shear/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix index 90dc4adce2a4..3f7fb5c9ec44 100644 --- a/pkgs/by-name/ca/cargo-shear/package.nix +++ b/pkgs/by-name/ca/cargo-shear/package.nix @@ -6,7 +6,7 @@ cargo-shear, }: let - version = "1.2.5"; + version = "1.2.6"; in rustPlatform.buildRustPackage { pname = "cargo-shear"; @@ -16,11 +16,11 @@ rustPlatform.buildRustPackage { owner = "Boshen"; repo = "cargo-shear"; rev = "v${version}"; - hash = "sha256-MOjGc0ji4r7thogj+xar9O8Hesd+WoNqV1dwjnL4/Bk="; + hash = "sha256-BLBC4L3GropYXANTKXwOYwp1my6p0L0fZ4YN9aF4HaA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-QEKJmhrOj8L9fa+k7ADux2ynpoMPbqLLAhZaKemk6sQ="; + cargoHash = "sha256-Fd1Rw2LeONIJCrvyNKBpTquUKAMLPcaAcWI7N8Ii6Bs="; # https://github.com/Boshen/cargo-shear/blob/a0535415a3ea94c86642f39f343f91af5cdc3829/src/lib.rs#L20-L23 SHEAR_VERSION = version; From d87e1af0705c23bf060aa171b42105444fe7bd95 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 6 May 2025 21:57:28 +0000 Subject: [PATCH 29/94] python3Packages.commitizen: 4.6.0 -> 4.6.2 --- pkgs/development/python-modules/commitizen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/commitizen/default.nix b/pkgs/development/python-modules/commitizen/default.nix index dab1786c7349..7ea7661dfb09 100644 --- a/pkgs/development/python-modules/commitizen/default.nix +++ b/pkgs/development/python-modules/commitizen/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "commitizen"; - version = "4.6.0"; + version = "4.6.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "commitizen-tools"; repo = "commitizen"; tag = "v${version}"; - hash = "sha256-tn87aMJf6UeiTaMmG7Yr+1MenGBTSWrNRIM+QME+8uI="; + hash = "sha256-RJf1lxuti9mAEPBgRr3fH75hb3bc4NsK64HpHAJCNhI="; }; pythonRelaxDeps = [ From d7c68e6b1456efd75f2a64db1a50f44b4f641dfb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 6 May 2025 22:32:29 +0000 Subject: [PATCH 30/94] terraform-providers.cloudamqp: 1.33.0 -> 1.34.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index fe5968e200a1..a0696f4d0a79 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -243,13 +243,13 @@ "vendorHash": null }, "cloudamqp": { - "hash": "sha256-nUzWtow4FLQzGoxGWA68LAs4Nau7xTdtxATSwsF6s9c=", + "hash": "sha256-jB2tR53z9/ZHe/oI1TH4tQ0YrJmK7HiFCSzeI3brnRI=", "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp", "owner": "cloudamqp", "repo": "terraform-provider-cloudamqp", - "rev": "v1.33.0", + "rev": "v1.34.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-nbz0QEIfnLnMOE/zGILMVBK+/hjYLlWeIqiwOLP6ebQ=" + "vendorHash": "sha256-f6sqKzoQAUpCDrpQdMuK1SuLTKrd2PUn/J6VuKxXGZI=" }, "cloudflare": { "hash": "sha256-FPZBU93x82+szFCC8djO88WFedbsVRFlVxZfTf4uAxI=", From c84cb81bdc97777668501b66ea854fddb4a6236a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 6 May 2025 23:03:18 +0000 Subject: [PATCH 31/94] frp: 0.62.0 -> 0.62.1 --- pkgs/by-name/fr/frp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fr/frp/package.nix b/pkgs/by-name/fr/frp/package.nix index 186bd32ac24a..748ccb298547 100644 --- a/pkgs/by-name/fr/frp/package.nix +++ b/pkgs/by-name/fr/frp/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "frp"; - version = "0.62.0"; + version = "0.62.1"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - hash = "sha256-ZzNn2iYrj0FZmZm0aQdbCeS3fCnwqqSCh2mVfjO9d5Q="; + hash = "sha256-es8xngdSLLQ3/S0xdFGW7Pa4BJISo51oWPl1GE+7tBo="; }; vendorHash = "sha256-koeOCkqYy1TUYXp2I7M+BIjmQEJGXtizOnqJuvzhHJM="; From 89617c0cde7d82295d43b74cbc0bb5a49e670047 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 00:06:44 +0000 Subject: [PATCH 32/94] rqlite: 8.36.18 -> 8.37.0 --- pkgs/by-name/rq/rqlite/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/rq/rqlite/package.nix b/pkgs/by-name/rq/rqlite/package.nix index 0e5969af9be2..38012ae4f93b 100644 --- a/pkgs/by-name/rq/rqlite/package.nix +++ b/pkgs/by-name/rq/rqlite/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "rqlite"; - version = "8.36.18"; + version = "8.37.0"; src = fetchFromGitHub { owner = "rqlite"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jyTiDfgfgae7tzlqgVddLnt0qtnRg7k9YdacLAoGPZw="; + sha256 = "sha256-a5A6tcoMKaA0oRZQpmurQxlIvTdtcih/6rnM3p4awW8="; }; vendorHash = "sha256-jvZ2ZRA/DkjDNnYauS9sJLE8KROS197kSeNVZ363Htk="; From e05c4da3ddaf583479064fe99414474d8b0accfc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 00:48:27 +0000 Subject: [PATCH 33/94] python3Packages.marimo: 0.13.4 -> 0.13.6 --- pkgs/development/python-modules/marimo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index 3d5de208c7d9..631388c4f32b 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -33,13 +33,13 @@ buildPythonPackage rec { pname = "marimo"; - version = "0.13.4"; + version = "0.13.6"; pyproject = true; # The github archive does not include the static assets src = fetchPypi { inherit pname version; - hash = "sha256-Lm1WsYCoMne7/L78throAHSfe64FnlLDicTTi9lJQA4="; + hash = "sha256-Qsz0SJvWOJ/MH9eIMyBODCBCGC7vp2lzPsq+32tRKU8="; }; build-system = [ hatchling ]; From 7e22e81c3a9a92ab40639aec0eada18ea8fefd98 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 01:37:13 +0000 Subject: [PATCH 34/94] heimdall-proxy: 0.16.0 -> 0.16.1 --- pkgs/by-name/he/heimdall-proxy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/he/heimdall-proxy/package.nix b/pkgs/by-name/he/heimdall-proxy/package.nix index 6289325dcc78..4f5f01e4d3d3 100644 --- a/pkgs/by-name/he/heimdall-proxy/package.nix +++ b/pkgs/by-name/he/heimdall-proxy/package.nix @@ -4,7 +4,7 @@ lib, }: let - version = "0.16.0"; + version = "0.16.1"; in buildGoModule { pname = "heimdall-proxy"; @@ -15,10 +15,10 @@ buildGoModule { owner = "dadrus"; repo = "heimdall"; tag = "v${version}"; - hash = "sha256-50LLclXdSIJ03zQ3qqF+2LlPAeIyZFaa2U2tJGFLpuk="; + hash = "sha256-HP2YuipqqToTD44FreKtdJErtF4CWxnMf2JRmjgLuv0="; }; - vendorHash = "sha256-MFlRjTlaD6pppk5Dx0+EAtRSlVH/EOp3NKQgHbtQdRA="; + vendorHash = "sha256-9AOUgQEhOUzzT+qJLE7NlPqiQDQHJnLOT9JSwpetQXA="; tags = [ "sqlite" ]; From f4fce441abef21e1954d2d60f4190ff857438135 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 01:48:08 +0000 Subject: [PATCH 35/94] google-java-format: 1.26.0 -> 1.27.0 --- pkgs/by-name/go/google-java-format/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/google-java-format/package.nix b/pkgs/by-name/go/google-java-format/package.nix index 3fbea152a7de..13f9d2117e26 100644 --- a/pkgs/by-name/go/google-java-format/package.nix +++ b/pkgs/by-name/go/google-java-format/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "google-java-format"; - version = "1.26.0"; + version = "1.27.0"; src = fetchurl { url = "https://github.com/google/google-java-format/releases/download/v${version}/google-java-format-${version}-all-deps.jar"; - sha256 = "sha256-AqNhNXKX+pYpGMHQiDDVCxfWKYTSqGSRWblbmm2fgrI="; + sha256 = "sha256-7Qcjnzy3LiW/Kg6uY+doMfnxGWO9Gfw2pvHYcBasF2M="; }; dontUnpack = true; From 22071314a8d040380550a3b963038bbbd64bbd21 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Tue, 6 May 2025 21:54:41 -0400 Subject: [PATCH 36/94] python312Packages.throttler: disable flaky tests As can be observed in: https://hydra.nixos.org/build/295931321 Signed-off-by: Ihar Hrachyshka --- pkgs/development/python-modules/throttler/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/throttler/default.nix b/pkgs/development/python-modules/throttler/default.nix index 42e006f77b45..1e8983a02103 100644 --- a/pkgs/development/python-modules/throttler/default.nix +++ b/pkgs/development/python-modules/throttler/default.nix @@ -33,6 +33,11 @@ buildPythonPackage rec { pytestFlagsArray = [ "tests/" ]; + disabledTestPaths = [ + # time sensitive tests + "tests/test_execution_timer.py" + ]; + meta = with lib; { description = "Zero-dependency Python package for easy throttling with asyncio support"; homepage = "https://github.com/uburuntu/throttler"; From e1a91eff551fdf4722eb34735a9d4adebe4ba802 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?= Date: Tue, 6 May 2025 21:59:02 -0400 Subject: [PATCH 37/94] pritunl-client: 1.3.4099.99 -> 1.3.4220.57 --- pkgs/by-name/pr/pritunl-client/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/pritunl-client/package.nix b/pkgs/by-name/pr/pritunl-client/package.nix index 37ea802f59e2..d4177d008d9b 100644 --- a/pkgs/by-name/pr/pritunl-client/package.nix +++ b/pkgs/by-name/pr/pritunl-client/package.nix @@ -19,12 +19,12 @@ electron, }: let - version = "1.3.4099.99"; + version = "1.3.4220.57"; src = fetchFromGitHub { owner = "pritunl"; repo = "pritunl-client-electron"; rev = version; - sha256 = "sha256-bxCGZ2Jm2rPKRH6Uj0JmQ3MQ3zRd6kXjOVeAOHBl1lA="; + sha256 = "sha256-AqolwsGHDxVQMjgQdWz24BmM+uMT/XII1vtDjA3fFcQ="; }; cli = buildGoModule { @@ -45,7 +45,7 @@ let inherit version src; modRoot = "service"; - vendorHash = "sha256-uy8+R4l3e4YAWMxWWbVHhkwxvbOsY5PF7fs1dVyMIAg="; + vendorHash = "sha256-WWvROYvw8JuidZHKOO0xiNcxlyRCZkw9j/eI6C5HJhU="; nativeBuildInputs = [ makeWrapper ]; From 482cfb2376800707d73bc9619029b87f6ee856f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 05:15:05 +0000 Subject: [PATCH 38/94] libmsquic: 2.4.10 -> 2.4.11 --- pkgs/by-name/li/libmsquic/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libmsquic/package.nix b/pkgs/by-name/li/libmsquic/package.nix index 48bce894edfb..4a50af07996c 100644 --- a/pkgs/by-name/li/libmsquic/package.nix +++ b/pkgs/by-name/li/libmsquic/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libmsquic"; - version = "2.4.10"; + version = "2.4.11"; src = fetchFromGitHub { owner = "microsoft"; repo = "msquic"; tag = "v${finalAttrs.version}"; - hash = "sha256-lAiBS5DQISeu9ZbBOAxBSlAJ9Xn0kq7HI+eMw4nHt/E="; + hash = "sha256-ZI5tutVYs3myjRdsXGOq48F9fce2YUsMcI1Sqg7nyh0="; fetchSubmodules = true; }; From cc20c0a8000294f7f06871619efd987fd590a743 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 05:44:59 +0000 Subject: [PATCH 39/94] nufmt: 0-unstable-2025-04-09 -> 0-unstable-2025-04-28 --- pkgs/by-name/nu/nufmt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nu/nufmt/package.nix b/pkgs/by-name/nu/nufmt/package.nix index 33cafd689865..04f4046be16d 100644 --- a/pkgs/by-name/nu/nufmt/package.nix +++ b/pkgs/by-name/nu/nufmt/package.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage { pname = "nufmt"; - version = "0-unstable-2025-04-09"; + version = "0-unstable-2025-04-28"; src = fetchFromGitHub { owner = "nushell"; repo = "nufmt"; - rev = "8a29b3a1e3b8009c0c2430d5158ac3ddb7f9e023"; - hash = "sha256-aUaM/haZZOagG8/e4eUFsZJ1bhwAaS7fwNoCFUFYEAg="; + rev = "feafe695659c4d5153018a78fad949d088d8a480"; + hash = "sha256-4FnZIlZWuvSAXMQbdyONNrgIuMxH5Vq3MFbb8J2CnHM="; }; nativeBuildInputs = [ From ec307e3e4e43d454055f4344c6acb9ee3a327134 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 06:08:29 +0000 Subject: [PATCH 40/94] nu_scripts: 0-unstable-2025-04-23 -> 0-unstable-2025-05-05 --- pkgs/by-name/nu/nu_scripts/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nu/nu_scripts/package.nix b/pkgs/by-name/nu/nu_scripts/package.nix index 3c96e4592374..18faafa763c6 100644 --- a/pkgs/by-name/nu/nu_scripts/package.nix +++ b/pkgs/by-name/nu/nu_scripts/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "nu_scripts"; - version = "0-unstable-2025-04-23"; + version = "0-unstable-2025-05-05"; src = fetchFromGitHub { owner = "nushell"; repo = "nu_scripts"; - rev = "9560df937090b640ed04aa270641a77b8d5f991c"; - hash = "sha256-Zw6eIo9BTn6/4qd03Jca3Kp3KZwHJEwEoUcnuS3Z9NM="; + rev = "4ecbb0e04e0a944145c86ec8bf3e4fc7ca3958a5"; + hash = "sha256-ssqSZnc8YnCB/62eN9KQzf+cm686/NFKcj4M2sd0XxM="; }; installPhase = '' From fb0f5e5f7617c63e07f84bc282e5f662bf52e2e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 06:46:37 +0000 Subject: [PATCH 41/94] prometheus-squid-exporter: 1.12.0 -> 1.13.0 --- pkgs/by-name/pr/prometheus-squid-exporter/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/prometheus-squid-exporter/package.nix b/pkgs/by-name/pr/prometheus-squid-exporter/package.nix index 9073641c66e1..5e98de190317 100644 --- a/pkgs/by-name/pr/prometheus-squid-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-squid-exporter/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "squid-exporter"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "boynux"; repo = "squid-exporter"; rev = "v${version}"; - hash = "sha256-low1nIL7FbIYfIP7KWPskAQ50Hh+d7JI+ryYoR+mP10="; + hash = "sha256-UH/+YbUiAqgAJ8Xm/6cZg5imFSgA6LHU6+SHseq5IPw="; }; - vendorHash = "sha256-0BNhjNveUDd0+X0do4Md58zJjXe3+KN27MPEviNuF3g="; + vendorHash = "sha256-aY0tW4OH8OHEMF3cLYTAeOd0VItSP0cTCwF4s7wdqTk="; meta = { description = "Squid Prometheus exporter"; From b7812015f97fc4999375b28145882c56ce10bbc6 Mon Sep 17 00:00:00 2001 From: kilianar Date: Wed, 7 May 2025 09:22:08 +0200 Subject: [PATCH 42/94] portfolio: 0.76.0 -> 0.76.1 https://github.com/portfolio-performance/portfolio/releases/tag/0.76.1 --- pkgs/by-name/po/portfolio/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/portfolio/package.nix b/pkgs/by-name/po/portfolio/package.nix index 382fd2a2a905..324df3cc7585 100644 --- a/pkgs/by-name/po/portfolio/package.nix +++ b/pkgs/by-name/po/portfolio/package.nix @@ -34,11 +34,11 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "PortfolioPerformance"; - version = "0.76.0"; + version = "0.76.1"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${finalAttrs.version}/PortfolioPerformance-${finalAttrs.version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-F3U6CU6hZktN2Lq9pPRAw7OSLubEz6ddTAym5azRj1c="; + hash = "sha256-e4ZdygS7x5cD9SD9+n7fBWAfAPiJLwQXlApTR8OkXeI="; }; nativeBuildInputs = [ From 1a87d4612eeabe036fb35722419967b75e7a1d65 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 10:31:49 +0000 Subject: [PATCH 43/94] hcp: 0.9.0 -> 0.9.1 --- pkgs/by-name/hc/hcp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hc/hcp/package.nix b/pkgs/by-name/hc/hcp/package.nix index 063d95bf4899..5fd6b98162c2 100644 --- a/pkgs/by-name/hc/hcp/package.nix +++ b/pkgs/by-name/hc/hcp/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "hcp"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "hcp"; tag = "v${version}"; - hash = "sha256-DyfrT4Z4pF7o6nBoacpEE0jT/dxRRm7nr3KsXJTwtOQ="; + hash = "sha256-53UTxf83jc2tyWJe+BHSitwpQVc6Ecq0wsf8avGPJcM="; }; vendorHash = "sha256-Tq7Lu9rZCLpy7CiZQey5/y1hZPEvdSsy1BgEFWNVeAk="; From db9d1d52676461447b33edb2a925cf0c9036305a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 12:03:27 +0000 Subject: [PATCH 44/94] python3Packages.linuxpy: 0.20.0 -> 0.21.0 --- pkgs/development/python-modules/linuxpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/linuxpy/default.nix b/pkgs/development/python-modules/linuxpy/default.nix index 8668b3a1b288..4b96e11e019f 100644 --- a/pkgs/development/python-modules/linuxpy/default.nix +++ b/pkgs/development/python-modules/linuxpy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "linuxpy"; - version = "0.20.0"; + version = "0.21.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-mNWmzl52GEZUEL3q8cP59qxMduG1ijgsvGoD5ddSG94="; + sha256 = "sha256-13TWyTM1FvyAPNUQ4o3yTQHh7ezxysVMiEl+eLDkHGo="; }; pythonImportsCheck = [ "linuxpy" ]; From 66fbe09a1883a8a0d82379212c4ef9484ec5a5af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 12:36:29 +0000 Subject: [PATCH 45/94] kubevpn: 2.7.2 -> 2.7.5 --- pkgs/by-name/ku/kubevpn/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ku/kubevpn/package.nix b/pkgs/by-name/ku/kubevpn/package.nix index ec1d22e0f3bb..3a24c32e271a 100644 --- a/pkgs/by-name/ku/kubevpn/package.nix +++ b/pkgs/by-name/ku/kubevpn/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "kubevpn"; - version = "2.7.2"; + version = "2.7.5"; src = fetchFromGitHub { owner = "KubeNetworks"; repo = "kubevpn"; rev = "v${version}"; - hash = "sha256-WMK/PraPIgX20HIKnbvzz+k6a7uJS45aPAgOUPfTXJM="; + hash = "sha256-WB3Qths9Lg48KfmRYg6O+fZIQ97n+Q7LgudT4Npqnl8="; }; vendorHash = null; From 44c66ee92de591900a2de4969d51a8b5b1a85696 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 12:41:26 +0000 Subject: [PATCH 46/94] libfive: 0-unstable-2024-10-10 -> 0-unstable-2025-05-04 --- pkgs/development/libraries/libfive/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix index 9a21859815eb..d53e7db1f763 100644 --- a/pkgs/development/libraries/libfive/default.nix +++ b/pkgs/development/libraries/libfive/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation { pname = "libfive"; - version = "0-unstable-2024-10-10"; + version = "0-unstable-2025-05-04"; src = fetchFromGitHub { owner = "libfive"; repo = "libfive"; - rev = "71899313d36ce14de6646ef760fa6bbc5c0cc067"; - hash = "sha256-bA+4wGAygdbHcOMGFwNyzn2daQ8E7NeOTUF2Tr3RQww="; + rev = "e704d1096f00bdfde1d1766f40dcae79f6fe5082"; + hash = "sha256-Yu4LGf5nx9dF+8WXyQQycqFfIq4AZdEnHaekhDSWEpw="; }; nativeBuildInputs = [ From d71e6d40b1ee72573296cf5145355729c6e3b00b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 13:05:09 +0000 Subject: [PATCH 47/94] powerstat: 0.04.04 -> 0.04.05 --- pkgs/by-name/po/powerstat/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/powerstat/package.nix b/pkgs/by-name/po/powerstat/package.nix index 8211ec02bb45..33c67eec967c 100644 --- a/pkgs/by-name/po/powerstat/package.nix +++ b/pkgs/by-name/po/powerstat/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "powerstat"; - version = "0.04.04"; + version = "0.04.05"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = "powerstat"; rev = "V${version}"; - hash = "sha256-M0DgY70EDGPOyLHVTEgLFJ1k9qoi2hgVV0WryIJeGOI="; + hash = "sha256-KR+Nzm9uRISNuqqnlTwfQP1jvSK4lAy//zdn7M8HPLk="; }; installFlags = [ From d456546008ba87c601d2135580bf8388b2e75a43 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 13:21:19 +0000 Subject: [PATCH 48/94] okteto: 3.6.0 -> 3.7.0 --- pkgs/by-name/ok/okteto/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ok/okteto/package.nix b/pkgs/by-name/ok/okteto/package.nix index 9fe02312a2e4..db9349c040ae 100644 --- a/pkgs/by-name/ok/okteto/package.nix +++ b/pkgs/by-name/ok/okteto/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "okteto"; - version = "3.6.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = finalAttrs.version; - hash = "sha256-EPo8pSGh6NHeVrVwHkLUfmpB/O4aqtlC7SrPKnMz05Q="; + hash = "sha256-xJdG5BHlVkK+wGn4ZNFfRoPimnlZrQOLbtKvCnBewqw="; }; - vendorHash = "sha256-1psVUpfRRg+86gniVg1i7RsgmEO12o0pCIQZ0roDDFc="; + vendorHash = "sha256-zfY/AfSo8f9LALf0FRAdd26Q9xGcKvVAnK3rnACCW4s="; postPatch = '' # Disable some tests that need file system & network access. From 91ed0b2c85518bcc60879787d76615eadf379543 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 7 May 2025 21:30:17 +0800 Subject: [PATCH 49/94] bingo: use finalAttrs --- pkgs/by-name/bi/bingo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bi/bingo/package.nix b/pkgs/by-name/bi/bingo/package.nix index 10da22668ad9..b5c7235b9367 100644 --- a/pkgs/by-name/bi/bingo/package.nix +++ b/pkgs/by-name/bi/bingo/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "bingo"; version = "0.9.0"; src = fetchFromGitHub { owner = "bwplotka"; repo = "bingo"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-bzh6P+J8EoewjOofwWXMgtSXAhESetD3y9EiqLNOT54="; }; @@ -35,4 +35,4 @@ buildGoModule rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ aaronjheng ]; }; -} +}) From 18690c27d7f80fb8d915b9e11bdea10c6c812b3f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 13:35:57 +0000 Subject: [PATCH 50/94] lprobe: 0.1.5 -> 0.1.6 --- pkgs/by-name/lp/lprobe/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lp/lprobe/package.nix b/pkgs/by-name/lp/lprobe/package.nix index 0e5ba650733d..2aacf60ec18b 100644 --- a/pkgs/by-name/lp/lprobe/package.nix +++ b/pkgs/by-name/lp/lprobe/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "lprobe"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "fivexl"; repo = "lprobe"; tag = "v${version}"; - hash = "sha256-1VoZIZQDEYVQg8cMacpHPRUffu+1+bAt7O3MZSi6+2A="; + hash = "sha256-Cb6jzL/BAhfwvGENLFfphATDz0EjFFT7qeHFiZCrvBk="; }; - vendorHash = "sha256-wrxIHb296YOszgK9GnCTpSHz2kSd89zT/90/CrPely8="; + vendorHash = "sha256-wQrbRch+5srZfQgEz7aacfbUXJfHeDCz52pPrgDFaNg="; buildInputs = [ libpcap From 25be8c1a4f6e25ebc16bac7ed2b88e64e7770c15 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 14:22:39 +0000 Subject: [PATCH 51/94] lomiri.lomiri-telephony-service: 0.6.0 -> 0.6.1 --- .../lomiri/services/lomiri-telephony-service/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lomiri/services/lomiri-telephony-service/default.nix b/pkgs/desktops/lomiri/services/lomiri-telephony-service/default.nix index a34921640799..464833d7dfda 100644 --- a/pkgs/desktops/lomiri/services/lomiri-telephony-service/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-telephony-service/default.nix @@ -43,13 +43,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "lomiri-telephony-service"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-telephony-service"; tag = finalAttrs.version; - hash = "sha256-vEMTnflHszgANSZHcVGx1goMWVe7/6eZLYCIxq8aMt4="; + hash = "sha256-7WKKRUEEF3NL8S1xg8E1WcD3dGasrw49pydeC4CyL+c="; }; postPatch = From e7fcda1e172879ef5420ec38d01fe30f75827e0b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 14:34:45 +0000 Subject: [PATCH 52/94] terraform-providers.talos: 0.7.1 -> 0.8.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 7fba10a8a18a..8ccb0ebd3527 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1291,13 +1291,13 @@ "vendorHash": "sha256-X2YjJvMboS04ViaIP1ebzIX8txumlvTEpGmEAlZNV9E=" }, "talos": { - "hash": "sha256-49woELLSpheuyGnXuwamZwsHdOfjwSB4v8/INzSrMRU=", + "hash": "sha256-kGAzJtc09wL9hvu13rqZnFWdwu6mrfdxgm8XxigKzK4=", "homepage": "https://registry.terraform.io/providers/siderolabs/talos", "owner": "siderolabs", "repo": "terraform-provider-talos", - "rev": "v0.7.1", + "rev": "v0.8.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-iEi3zkr4kIZ1FTAft/Fy//v7xtlX/8uSrnbuxgFTDyA=" + "vendorHash": "sha256-V0dK5G3zheyyqexBud+9Hg9ExYI/9X1wuYx+lEn6pVg=" }, "temporalcloud": { "hash": "sha256-scM3cz4DVv66+VyLKWSjNbGFRcbUt9uZU4QooWQPioI=", From cc97f27d66cb8c2a7a43611a6b19dc3f01123fc3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 15:54:56 +0000 Subject: [PATCH 53/94] penpot-desktop: 0.13.0 -> 0.13.1 --- pkgs/by-name/pe/penpot-desktop/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pe/penpot-desktop/package.nix b/pkgs/by-name/pe/penpot-desktop/package.nix index f6db3d0146e4..ea24c174e939 100644 --- a/pkgs/by-name/pe/penpot-desktop/package.nix +++ b/pkgs/by-name/pe/penpot-desktop/package.nix @@ -19,13 +19,13 @@ let in buildNpmPackage rec { pname = "penpot-desktop"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "author-more"; repo = "penpot-desktop"; tag = "v${version}"; - hash = "sha256-ZN0SoPvzZlCGrWOfYw/ain+3+IWLwl6mKLhhArf4MIg="; + hash = "sha256-ztvwabsy7PiT8m0+DDehvwV8oclJCb1BymEpkjTPtZ8="; }; makeCacheWritable = true; @@ -33,7 +33,7 @@ buildNpmPackage rec { "--engine-strict" "--legacy-peer-deps" ]; - npmDepsHash = "sha256-wJpcgSp9V0GJm8I+3LgFwo2Nq/Hu5qW24peKBwNvzMo="; + npmDepsHash = "sha256-aRdqq0tMuNXkSy/NYdwir+LfwAr466dLi2b4vO/yjdg="; # Do not run the default build script as it leads to errors caused by the electron-builder configuration dontNpmBuild = true; From 04210b8085c335317c16ad42f18a10f4fce34a01 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 16:05:12 +0000 Subject: [PATCH 54/94] mongodb-atlas-cli: 1.42.1 -> 1.42.2 --- pkgs/by-name/mo/mongodb-atlas-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/mongodb-atlas-cli/package.nix b/pkgs/by-name/mo/mongodb-atlas-cli/package.nix index 0584fefec14e..2c00474a9587 100644 --- a/pkgs/by-name/mo/mongodb-atlas-cli/package.nix +++ b/pkgs/by-name/mo/mongodb-atlas-cli/package.nix @@ -10,15 +10,15 @@ buildGoModule rec { pname = "mongodb-atlas-cli"; - version = "1.42.1"; + version = "1.42.2"; - vendorHash = "sha256-BYeNYL4W1ufv9pCSDVNL8p69DGgQM+noaDtfwZFBeTk="; + vendorHash = "sha256-oWn8vEwhcrGsytou+xIKOrM1kO0gIvU3X/aIWavhh2w="; src = fetchFromGitHub { owner = "mongodb"; repo = "mongodb-atlas-cli"; rev = "refs/tags/atlascli/v${version}"; - sha256 = "sha256-8fkdocpySd+cXwp2txec+fNQAdXlJlLhTpLQnyRMtZ0="; + sha256 = "sha256-RJMcVOP94eFxbvYF20/X+wkf5+/DWSEQ4+dt/LxcDro="; }; nativeBuildInputs = [ installShellFiles ]; From 1767ea143e5c20943a21c093b1e4b7fca76b4755 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 16:47:33 +0000 Subject: [PATCH 55/94] ibus-engines.table: 1.17.11 -> 1.17.12 --- pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix index 0a938c0ef170..08e8ad917e8f 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "ibus-table"; - version = "1.17.11"; + version = "1.17.12"; src = fetchFromGitHub { owner = "kaio"; repo = "ibus-table"; rev = version; - sha256 = "sha256-0322G1cmiISkFaCq5RVFLRdWRUxS66B7E4omxB+7ntE="; + sha256 = "sha256-ecs99Y7NctnKTdRT9UHiDqliinvPNMHIyb5mwT7dDL8="; }; postPatch = '' From cd92df7002e76d5657d6c5800ebe285482f616a0 Mon Sep 17 00:00:00 2001 From: patka Date: Wed, 7 May 2025 19:11:07 +0200 Subject: [PATCH 56/94] ltwheelconf: drop Upstream is gone, the code was ancient and the readme contained a message stating that all wheels are now (13 years ago) supported directly by the kernel --- pkgs/by-name/lt/ltwheelconf/package.nix | 36 ------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 pkgs/by-name/lt/ltwheelconf/package.nix diff --git a/pkgs/by-name/lt/ltwheelconf/package.nix b/pkgs/by-name/lt/ltwheelconf/package.nix deleted file mode 100644 index fef9f7445b81..000000000000 --- a/pkgs/by-name/lt/ltwheelconf/package.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - lib, - stdenv, - libusb1, - pkg-config, - fetchFromGitHub, -}: - -stdenv.mkDerivation { - pname = "ltwheelconf"; - version = "0.2.7"; - - src = fetchFromGitHub { - owner = "thk"; - repo = "ltwheelconf"; - rev = "df55451f059d593b0259431662612ab5c2bef859"; - sha256 = "1fsz7k73yln987gcx1jvb5irxfbp1x2c457a60a8yap27nkp5y2w"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libusb1 ]; - - installPhase = '' - mkdir -p $out/bin - cp ltwheelconf $out/bin - ''; - - meta = with lib; { - homepage = "https://github.com/thk/LTWheelConf"; - description = "Logitech wheels configuration tool"; - license = licenses.gpl3; - maintainers = [ maintainers.ebzzry ]; - platforms = platforms.linux; - mainProgram = "ltwheelconf"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ca3b4c3a7efe..0ac8fb0d20e8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1104,6 +1104,7 @@ mapAliases { loc = throw "'loc' has been removed due to lack of upstream maintenance. Consider 'tokei' as an alternative."; # Added 2025-01-25 loco-cli = loco; # Added 2025-02-24 loop = throw "'loop' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 + ltwheelconf = throw "'ltwheelconf' has been removed because it is obsolete"; # Added 2025-05-07 luna-icons = throw "luna-icons has been removed as it was removed upstream"; # Added 2024-10-29 lucene = throw "lucene has been removed since it was both wildly out of date and was not even built properly for 4 years"; # Added 2025-04-10 lv_img_conv = throw "'lv_img_conv' has been removed from nixpkgs as it is broken"; # Added 2024-06-18 From 0766c3d82f04ba4aab95d4f6e33ade9f29ceccf5 Mon Sep 17 00:00:00 2001 From: patka Date: Wed, 7 May 2025 18:32:48 +0200 Subject: [PATCH 57/94] await: fix homepage url --- pkgs/by-name/aw/await/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/aw/await/package.nix b/pkgs/by-name/aw/await/package.nix index 5f412c36b8e6..dea61fe0fc3d 100644 --- a/pkgs/by-name/aw/await/package.nix +++ b/pkgs/by-name/aw/await/package.nix @@ -43,8 +43,9 @@ stdenv.mkDerivation rec { versionCheckProgramArg = "--version"; meta = with lib; { + changelog = "https://github.com/slavaGanzin/await/releases/tag/${version}"; description = "Small binary that runs a list of commands in parallel and awaits termination"; - homepage = "https://await-cli.app"; + homepage = "https://github.com/slavaGanzin/await"; license = licenses.mit; maintainers = with maintainers; [ chewblacka ]; platforms = platforms.all; From 8df7737bbfbcf191811bb4357aed49962b10582d Mon Sep 17 00:00:00 2001 From: Vladyslav Pekker Date: Wed, 7 May 2025 14:35:33 -0300 Subject: [PATCH 58/94] bloop: 2.0.9 -> 2.0.10 --- pkgs/by-name/bl/bloop/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/bl/bloop/package.nix b/pkgs/by-name/bl/bloop/package.nix index b794a28a68c0..ab2b5897d490 100644 --- a/pkgs/by-name/bl/bloop/package.nix +++ b/pkgs/by-name/bl/bloop/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "bloop"; - version = "2.0.9"; + version = "2.0.10"; platform = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}"; sha256 = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then - "sha256-mslCzvJ+z5VNQkVa9HXjw2bUBprMgs3bAy3RmEt8OlI=" + "sha256-GoWHVYIA98YMMmhYj1bBysABBq2UxEcELXqDi+XRnQ4=" else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then - "sha256-XdMPo9O7ADhInmGFIOHihl1z4yPKAyDjCH7m3tCtKNo=" + "sha256-hE54Z2QLlAt4S+LQOAD0jLf1y2/PkKO9JAT2L6M8lWA=" else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then - "sha256-sJM00f2KBI6fnVj3U/h/pYAFT7QjZkfJ7ubDfFlRJ0Q=" + "sha256-8gtaiSilf1yL50QSsy4K686R1J9W5NL1JyB7onMSTOw=" else throw "unsupported platform"; }; From b5cc0da768d2e95da5d9ba9bacdeb3f83ec9b4d9 Mon Sep 17 00:00:00 2001 From: PhiliPdB Date: Tue, 6 May 2025 20:20:11 +0200 Subject: [PATCH 59/94] python3Packages.pybind11-protobuf: unbreak --- pkgs/by-name/or/or-tools/package.nix | 2 +- pkgs/development/python-modules/pybind11-protobuf/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/or/or-tools/package.nix b/pkgs/by-name/or/or-tools/package.nix index 4b354c66fd6d..f391bafc6492 100644 --- a/pkgs/by-name/or/or-tools/package.nix +++ b/pkgs/by-name/or/or-tools/package.nix @@ -28,7 +28,7 @@ let abseil-cpp = abseil-cpp_202407; protobuf = protobuf_29.override { inherit abseil-cpp; }; python-protobuf = python3.pkgs.protobuf5.override { inherit protobuf; }; - pybind11-protobuf = python3.pkgs.pybind11-protobuf.override { inherit protobuf; }; + pybind11-protobuf = python3.pkgs.pybind11-protobuf.override { protobuf_29 = protobuf; }; in stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/development/python-modules/pybind11-protobuf/default.nix b/pkgs/development/python-modules/pybind11-protobuf/default.nix index 60318f12f221..99dcb8e5bc45 100644 --- a/pkgs/development/python-modules/pybind11-protobuf/default.nix +++ b/pkgs/development/python-modules/pybind11-protobuf/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, cmake, abseil-cpp, - protobuf, + protobuf_29, pybind11, zlib, }: @@ -32,7 +32,7 @@ buildPythonPackage { buildInputs = [ abseil-cpp - protobuf + protobuf_29 pybind11 zlib ]; From 1131a6cd5b2d1985a4c72e7faf0490d094f08bf2 Mon Sep 17 00:00:00 2001 From: Vladyslav Pekker Date: Wed, 7 May 2025 14:54:14 -0300 Subject: [PATCH 60/94] ammonite: 3.0.0-M1 -> 3.0.2 --- pkgs/development/tools/ammonite/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 5e550fec189a..7573c528e305 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -19,7 +19,7 @@ let { scalaVersion, sha256 }: stdenv.mkDerivation rec { pname = "ammonite"; - version = "3.0.0-M1"; + version = "3.0.2"; src = fetchurl { url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}"; @@ -92,14 +92,14 @@ in { ammonite_2_12 = common { scalaVersion = "2.12"; - sha256 = "sha256-SlweOVHudknbInM4rfEPJ9bLd3Z/EImLhVLzeKfjfMQ="; + sha256 = "sha256-wPVvLMuc8EjTqaHY4VcP1gd4DVJQhQm0uS2f+HFuTls="; }; ammonite_2_13 = common { scalaVersion = "2.13"; - sha256 = "sha256-2BydXmF6AkWDdG5rbRLD2I/6z3w3UD0dCd5Tp+3lU7c="; + sha256 = "sha256-OU3lAls2n4dMONIogg/qAFj5OhzqR6rBF3Hay4Onwxg="; }; ammonite_3_3 = common { scalaVersion = "3.3"; - sha256 = "sha256-EL8mTUmbcetVIVOHjd/JvO8NsXnb3EtYK2+itZwOsDI="; + sha256 = "sha256-M1Pg+HsWSkk60NUzNQXxOijnfFxX5ijao76Phaz7ykQ="; }; } From 0245105e541d86179775f8d5d07bb144dfda435a Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 7 May 2025 18:33:16 +0200 Subject: [PATCH 61/94] .editorconfig: fix moved folders --- .editorconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.editorconfig b/.editorconfig index 8b76069e8ad9..395bb435bf66 100644 --- a/.editorconfig +++ b/.editorconfig @@ -88,7 +88,7 @@ trim_trailing_whitespace = unset [nixos/modules/services/networking/ircd-hybrid/*.{conf,in}] trim_trailing_whitespace = unset -[pkgs/build-support/dotnetenv/Wrapper/**] +[pkgs/build-support/dotnet/dotnetenv/Wrapper/**] end_of_line = unset indent_style = unset insert_final_newline = unset @@ -116,7 +116,7 @@ end_of_line = unset insert_final_newline = unset trim_trailing_whitespace = unset -[pkgs/tools/virtualization/ovftool/*.ova] +[pkgs/by-name/ov/ovftool/*.ova] end_of_line = unset insert_final_newline = unset trim_trailing_whitespace = unset From c8d2eca963370b84f8a5cbc8e11628f1f0602876 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 7 May 2025 18:44:47 +0200 Subject: [PATCH 62/94] .editorconfig: move subfolder config into separate .editorconfig files This avoids paths in the top-level file getting out-of-sync, because the .editorconfig files would be moved together with the files they target. --- .editorconfig | 43 ++----------------- lib/tests/.editorconfig | 3 ++ .../networking/ircd-hybrid/.editorconfig | 2 + .../dotnet/dotnetenv/Wrapper/.editorconfig | 5 +++ pkgs/by-name/ov/ovftool/.editorconfig | 5 +++ pkgs/by-name/ti/timidity/.editorconfig | 2 + .../development/haskell-modules/.editorconfig | 3 ++ pkgs/kde/generated/.editorconfig | 3 ++ .../documentation-highlighter/.editorconfig | 2 + pkgs/servers/dict/.editorconfig | 2 + .../security/qdigidoc/vendor/.editorconfig | 4 ++ 11 files changed, 34 insertions(+), 40 deletions(-) create mode 100644 lib/tests/.editorconfig create mode 100644 nixos/modules/services/networking/ircd-hybrid/.editorconfig create mode 100644 pkgs/build-support/dotnet/dotnetenv/Wrapper/.editorconfig create mode 100644 pkgs/by-name/ov/ovftool/.editorconfig create mode 100644 pkgs/by-name/ti/timidity/.editorconfig create mode 100644 pkgs/development/haskell-modules/.editorconfig create mode 100644 pkgs/kde/generated/.editorconfig create mode 100644 pkgs/misc/documentation-highlighter/.editorconfig create mode 100644 pkgs/servers/dict/.editorconfig create mode 100644 pkgs/tools/security/qdigidoc/vendor/.editorconfig diff --git a/.editorconfig b/.editorconfig index 395bb435bf66..9f0706d981a5 100644 --- a/.editorconfig +++ b/.editorconfig @@ -85,47 +85,10 @@ charset = unset [eggs.nix] trim_trailing_whitespace = unset -[nixos/modules/services/networking/ircd-hybrid/*.{conf,in}] -trim_trailing_whitespace = unset - -[pkgs/build-support/dotnet/dotnetenv/Wrapper/**] -end_of_line = unset -indent_style = unset -insert_final_newline = unset -trim_trailing_whitespace = unset - [registry.dat] end_of_line = unset insert_final_newline = unset -[pkgs/development/haskell-modules/hackage-packages.nix] -indent_style = unset -trim_trailing_whitespace = unset - -[pkgs/misc/documentation-highlighter/**] -insert_final_newline = unset - -[pkgs/servers/dict/wordnet_structures.py] -trim_trailing_whitespace = unset - -[pkgs/by-name/ti/timidity/timidity.cfg] -trim_trailing_whitespace = unset - -[pkgs/tools/security/qdigidoc/vendor/*] -end_of_line = unset -insert_final_newline = unset -trim_trailing_whitespace = unset - -[pkgs/by-name/ov/ovftool/*.ova] -end_of_line = unset -insert_final_newline = unset -trim_trailing_whitespace = unset -charset = unset - -[lib/tests/*.plist] -indent_style = tab -insert_final_newline = unset - -[pkgs/kde/generated/**] -insert_final_newline = unset -end_of_line = unset +# Keep this hint at the bottom: +# Please don't add entries for subfolders here. +# Create /.editorconfig instead. diff --git a/lib/tests/.editorconfig b/lib/tests/.editorconfig new file mode 100644 index 000000000000..7853c13cecf3 --- /dev/null +++ b/lib/tests/.editorconfig @@ -0,0 +1,3 @@ +[*.plist] +indent_style = tab +insert_final_newline = unset diff --git a/nixos/modules/services/networking/ircd-hybrid/.editorconfig b/nixos/modules/services/networking/ircd-hybrid/.editorconfig new file mode 100644 index 000000000000..de54d884adbd --- /dev/null +++ b/nixos/modules/services/networking/ircd-hybrid/.editorconfig @@ -0,0 +1,2 @@ +[*.{conf,in}] +trim_trailing_whitespace = unset diff --git a/pkgs/build-support/dotnet/dotnetenv/Wrapper/.editorconfig b/pkgs/build-support/dotnet/dotnetenv/Wrapper/.editorconfig new file mode 100644 index 000000000000..15ffe1f4b563 --- /dev/null +++ b/pkgs/build-support/dotnet/dotnetenv/Wrapper/.editorconfig @@ -0,0 +1,5 @@ +[*] +end_of_line = unset +indent_style = unset +insert_final_newline = unset +trim_trailing_whitespace = unset diff --git a/pkgs/by-name/ov/ovftool/.editorconfig b/pkgs/by-name/ov/ovftool/.editorconfig new file mode 100644 index 000000000000..1eadccb7c232 --- /dev/null +++ b/pkgs/by-name/ov/ovftool/.editorconfig @@ -0,0 +1,5 @@ +[*.ova] +end_of_line = unset +insert_final_newline = unset +trim_trailing_whitespace = unset +charset = unset diff --git a/pkgs/by-name/ti/timidity/.editorconfig b/pkgs/by-name/ti/timidity/.editorconfig new file mode 100644 index 000000000000..000113a94410 --- /dev/null +++ b/pkgs/by-name/ti/timidity/.editorconfig @@ -0,0 +1,2 @@ +[timidity.cfg] +trim_trailing_whitespace = unset diff --git a/pkgs/development/haskell-modules/.editorconfig b/pkgs/development/haskell-modules/.editorconfig new file mode 100644 index 000000000000..de310be0cf85 --- /dev/null +++ b/pkgs/development/haskell-modules/.editorconfig @@ -0,0 +1,3 @@ +[hackage-packages.nix] +indent_style = unset +trim_trailing_whitespace = unset diff --git a/pkgs/kde/generated/.editorconfig b/pkgs/kde/generated/.editorconfig new file mode 100644 index 000000000000..f3dddf6df2e6 --- /dev/null +++ b/pkgs/kde/generated/.editorconfig @@ -0,0 +1,3 @@ +[*] +insert_final_newline = unset +end_of_line = unset diff --git a/pkgs/misc/documentation-highlighter/.editorconfig b/pkgs/misc/documentation-highlighter/.editorconfig new file mode 100644 index 000000000000..9ccdc724d4f3 --- /dev/null +++ b/pkgs/misc/documentation-highlighter/.editorconfig @@ -0,0 +1,2 @@ +[*] +insert_final_newline = unset diff --git a/pkgs/servers/dict/.editorconfig b/pkgs/servers/dict/.editorconfig new file mode 100644 index 000000000000..cd4aff0e2b1a --- /dev/null +++ b/pkgs/servers/dict/.editorconfig @@ -0,0 +1,2 @@ +[wordnet_structures.py] +trim_trailing_whitespace = unset diff --git a/pkgs/tools/security/qdigidoc/vendor/.editorconfig b/pkgs/tools/security/qdigidoc/vendor/.editorconfig new file mode 100644 index 000000000000..b64983d0d5bb --- /dev/null +++ b/pkgs/tools/security/qdigidoc/vendor/.editorconfig @@ -0,0 +1,4 @@ +[*] +end_of_line = unset +insert_final_newline = unset +trim_trailing_whitespace = unset From f2a9d17b7a4e1941750d24b50ac6c08a10e3e3ef Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 7 May 2025 18:48:39 +0200 Subject: [PATCH 63/94] xbindkeys-config: add .editorconfig for generated file --- pkgs/tools/X11/xbindkeys-config/.editorconfig | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 pkgs/tools/X11/xbindkeys-config/.editorconfig diff --git a/pkgs/tools/X11/xbindkeys-config/.editorconfig b/pkgs/tools/X11/xbindkeys-config/.editorconfig new file mode 100644 index 000000000000..40706d3ac28e --- /dev/null +++ b/pkgs/tools/X11/xbindkeys-config/.editorconfig @@ -0,0 +1,2 @@ +[xbindkeys-config.1] +trim_trailing_whitespace = unset From 5d14516619b4356bbffb95b5f31a59462fe9a6ad Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 7 May 2025 18:51:49 +0200 Subject: [PATCH 64/94] various: remove trailing whitespace Running editorconfig-checker on all files complains about those, so let's fix them. --- .../bin/extractWinRscIconsToStdFreeDesktopDir.sh | 6 +++--- pkgs/by-name/il/ilbc/extract-cfile.awk | 2 +- .../by-name/ni/nix-binary-cache/nix-binary-cache-start.in | 8 ++++---- .../perl-modules/expression-generator/make-clean-dir.sh | 2 +- .../perl-modules/expression-generator/usage.txt | 6 +++--- .../perl-modules/perl-opengl-gl-extensions.txt | 4 ++-- pkgs/tools/typesetting/tex/nix/copy-includes.pl | 4 ++-- pkgs/tools/typesetting/tex/nix/find-includes.pl | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/ic/iconConvTools/bin/extractWinRscIconsToStdFreeDesktopDir.sh b/pkgs/by-name/ic/iconConvTools/bin/extractWinRscIconsToStdFreeDesktopDir.sh index 994adbd91dae..3fdfa7e0d11a 100755 --- a/pkgs/by-name/ic/iconConvTools/bin/extractWinRscIconsToStdFreeDesktopDir.sh +++ b/pkgs/by-name/ic/iconConvTools/bin/extractWinRscIconsToStdFreeDesktopDir.sh @@ -1,7 +1,7 @@ #!/bin/sh # The file from which to extract *.ico files or a particular *.ico file. -# (e.g.: './KeePass.exe', './myLibrary.dll', './my/path/to/app.ico'). +# (e.g.: './KeePass.exe', './myLibrary.dll', './my/path/to/app.ico'). # As you notived, the utility can extract icons from a windows executable or # dll. rscFile=$1 @@ -28,7 +28,7 @@ nameRegex=$4 # fancy, it will usually be '\1'. nameReplaceExp=$5 -# The +# The # out=./myOut out=$6 @@ -52,7 +52,7 @@ if [ "ico" = "$rscFileExt" ]; then else wrestool -x --output=$tmp/ico -t14 $rscFile fi - + icotool --icon -x --palette-size=0 -o $tmp/png $tmp/ico/*.ico mkdir -p $out diff --git a/pkgs/by-name/il/ilbc/extract-cfile.awk b/pkgs/by-name/il/ilbc/extract-cfile.awk index e4b07bc08963..54fd2bbf7651 100644 --- a/pkgs/by-name/il/ilbc/extract-cfile.awk +++ b/pkgs/by-name/il/ilbc/extract-cfile.awk @@ -5,7 +5,7 @@ BEGIN { srcname = "nothing"; } srcname = $2; printf("creating source file %s\n", srcname); }else if (srcname != "nothing") { - if (/Andersen,* *et* *al\./) + if (/Andersen,* *et* *al\./) printf("skipping %s\n", $0); else if (/ /) printf("skipping2 %s\n", $0); diff --git a/pkgs/by-name/ni/nix-binary-cache/nix-binary-cache-start.in b/pkgs/by-name/ni/nix-binary-cache/nix-binary-cache-start.in index 13b62a8829da..e5848dcb28ad 100644 --- a/pkgs/by-name/ni/nix-binary-cache/nix-binary-cache-start.in +++ b/pkgs/by-name/ni/nix-binary-cache/nix-binary-cache-start.in @@ -1,7 +1,7 @@ #! @shell@ parse_opts () { - while @coreutils@/test -n "$1" && @coreutils@/test "x$1" != x-- ; do + while @coreutils@/test -n "$1" && @coreutils@/test "x$1" != x-- ; do case "$1" in --store-dir) shift; @@ -76,7 +76,7 @@ workingdir="$(@coreutils@/mktemp -d)" cd "$workingdir" PORT=8080 -(echo "STORE_DIR=${NIX_STORE_DIR:-/nix/store}"; parse_opts "$@" +(echo "STORE_DIR=${NIX_STORE_DIR:-/nix/store}"; parse_opts "$@" ) > nix-binary-cache.conf || exit . "$workingdir/nix-binary-cache.conf" @@ -94,8 +94,8 @@ server.use-ipv6 = \"enable\" } " >> lighttpd.conf -cp @out@/nix-binary-cache.cgi . -cp @out@/nix-binary-cache.cgi ./nix-bc.cgi +cp @out@/nix-binary-cache.cgi . +cp @out@/nix-binary-cache.cgi ./nix-bc.cgi ip="$(@iproute@/ip a | @gnugrep@/grep 'inet .* scope global' | @coreutils@/head -n 1)" ip="${ip%%/*}" diff --git a/pkgs/development/perl-modules/expression-generator/make-clean-dir.sh b/pkgs/development/perl-modules/expression-generator/make-clean-dir.sh index 996cb92e6958..3a7cf13c26f8 100755 --- a/pkgs/development/perl-modules/expression-generator/make-clean-dir.sh +++ b/pkgs/development/perl-modules/expression-generator/make-clean-dir.sh @@ -1,5 +1,5 @@ #! /bin/sh rm -rf test; -mkdir test; +mkdir test; for i in *.sh; do ln -s ../$i test; done; diff --git a/pkgs/development/perl-modules/expression-generator/usage.txt b/pkgs/development/perl-modules/expression-generator/usage.txt index 1aa0737afdbd..c875c1059411 100644 --- a/pkgs/development/perl-modules/expression-generator/usage.txt +++ b/pkgs/development/perl-modules/expression-generator/usage.txt @@ -1,10 +1,10 @@ /path/to/write-nix-expression.sh Group::Module::Submodule -It will output Nix assignment formatted for placing into +It will output Nix assignment formatted for placing into all-packages.nix amongst all the perl packages, like perlAlgorithmDiff. Actually it will grab distribution unit Group-Module-Submodule via search.cpan.org, and make some effort to write correct dependencies. -If among requirements there are some that have empty META.yml, or if +If among requirements there are some that have empty META.yml, or if any of requirements acannot be installed by just getting distribution unit whose name can be guessed by replacing :: with -, manual editing -will be needed. +will be needed. diff --git a/pkgs/development/perl-modules/perl-opengl-gl-extensions.txt b/pkgs/development/perl-modules/perl-opengl-gl-extensions.txt index 42df14c40960..5b5a9a911f45 100644 --- a/pkgs/development/perl-modules/perl-opengl-gl-extensions.txt +++ b/pkgs/development/perl-modules/perl-opengl-gl-extensions.txt @@ -1,5 +1,5 @@ GLUT=20801 VERSION=3.0 Mesa 10.2.6 VENDOR=Intel Open Source Technology Center -RENDERER=Mesa DRI Intel(R) Ivybridge Mobile -EXTENSIONS=GL_ARB_multisample GL_EXT_abgr GL_EXT_bgra GL_EXT_blend_color GL_EXT_blend_minmax GL_EXT_blend_subtract GL_EXT_copy_texture GL_EXT_polygon_offset GL_EXT_subtexture GL_EXT_texture_object GL_EXT_vertex_array GL_EXT_compiled_vertex_array GL_EXT_texture GL_EXT_texture3D GL_IBM_rasterpos_clip GL_ARB_point_parameters GL_EXT_draw_range_elements GL_EXT_packed_pixels GL_EXT_point_parameters GL_EXT_rescale_normal GL_EXT_separate_specular_color GL_EXT_texture_edge_clamp GL_SGIS_generate_mipmap GL_SGIS_texture_border_clamp GL_SGIS_texture_edge_clamp GL_SGIS_texture_lod GL_ARB_framebuffer_sRGB GL_ARB_multitexture GL_EXT_framebuffer_sRGB GL_IBM_multimode_draw_arrays GL_IBM_texture_mirrored_repeat GL_3DFX_texture_compression_FXT1 GL_ARB_texture_cube_map GL_ARB_texture_env_add GL_ARB_transpose_matrix GL_EXT_blend_func_separate GL_EXT_fog_coord GL_EXT_multi_draw_arrays GL_EXT_secondary_color GL_EXT_texture_env_add GL_EXT_texture_filter_anisotropic GL_EXT_texture_lod_bias GL_INGR_blend_func_separate GL_NV_blend_square GL_NV_light_max_exponent GL_NV_texgen_reflection GL_NV_texture_env_combine4 GL_S3_s3tc GL_SUN_multi_draw_arrays GL_ARB_texture_border_clamp GL_ARB_texture_compression GL_EXT_framebuffer_object GL_EXT_texture_compression_s3tc GL_EXT_texture_env_combine GL_EXT_texture_env_dot3 GL_MESA_window_pos GL_NV_packed_depth_stencil GL_NV_texture_rectangle GL_ARB_depth_texture GL_ARB_occlusion_query GL_ARB_shadow GL_ARB_texture_env_combine GL_ARB_texture_env_crossbar GL_ARB_texture_env_dot3 GL_ARB_texture_mirrored_repeat GL_ARB_window_pos GL_ATI_envmap_bumpmap GL_EXT_stencil_two_side GL_EXT_texture_cube_map GL_NV_depth_clamp GL_APPLE_packed_pixels GL_APPLE_vertex_array_object GL_ARB_draw_buffers GL_ARB_fragment_program GL_ARB_fragment_shader GL_ARB_shader_objects GL_ARB_vertex_program GL_ARB_vertex_shader GL_ATI_draw_buffers GL_ATI_texture_env_combine3 GL_ATI_texture_float GL_EXT_shadow_funcs GL_EXT_stencil_wrap GL_MESA_pack_invert GL_NV_primitive_restart GL_ARB_depth_clamp GL_ARB_fragment_program_shadow GL_ARB_half_float_pixel GL_ARB_occlusion_query2 GL_ARB_point_sprite GL_ARB_shading_language_100 GL_ARB_sync GL_ARB_texture_non_power_of_two GL_ARB_vertex_buffer_object GL_ATI_blend_equation_separate GL_EXT_blend_equation_separate GL_OES_read_format GL_ARB_color_buffer_float GL_ARB_pixel_buffer_object GL_ARB_texture_compression_rgtc GL_ARB_texture_float GL_ARB_texture_rectangle GL_EXT_packed_float GL_EXT_pixel_buffer_object GL_EXT_texture_compression_dxt1 GL_EXT_texture_compression_rgtc GL_EXT_texture_rectangle GL_EXT_texture_sRGB GL_EXT_texture_shared_exponent GL_ARB_framebuffer_object GL_EXT_framebuffer_blit GL_EXT_framebuffer_multisample GL_EXT_packed_depth_stencil GL_APPLE_object_purgeable GL_ARB_vertex_array_object GL_ATI_separate_stencil GL_EXT_draw_buffers2 GL_EXT_draw_instanced GL_EXT_gpu_program_parameters GL_EXT_texture_array GL_EXT_texture_integer GL_EXT_texture_sRGB_decode GL_EXT_timer_query GL_OES_EGL_image GL_AMD_performance_monitor GL_ARB_copy_buffer GL_ARB_depth_buffer_float GL_ARB_draw_instanced GL_ARB_half_float_vertex GL_ARB_instanced_arrays GL_ARB_map_buffer_range GL_ARB_texture_rg GL_ARB_texture_swizzle GL_ARB_vertex_array_bgra GL_EXT_texture_swizzle GL_EXT_vertex_array_bgra GL_NV_conditional_render GL_AMD_conservative_depth GL_AMD_draw_buffers_blend GL_AMD_seamless_cubemap_per_texture GL_ARB_ES2_compatibility GL_ARB_blend_func_extended GL_ARB_debug_output GL_ARB_draw_buffers_blend GL_ARB_draw_elements_base_vertex GL_ARB_explicit_attrib_location GL_ARB_fragment_coord_conventions GL_ARB_provoking_vertex GL_ARB_sample_shading GL_ARB_sampler_objects GL_ARB_seamless_cube_map GL_ARB_shader_texture_lod GL_ARB_texture_cube_map_array GL_ARB_texture_gather GL_ARB_texture_multisample GL_ARB_texture_query_lod GL_ARB_texture_rgb10_a2ui GL_ARB_uniform_buffer_object GL_ARB_vertex_type_2_10_10_10_rev GL_EXT_provoking_vertex GL_EXT_texture_snorm GL_MESA_texture_signed_rgba GL_ARB_get_program_binary GL_ARB_robustness GL_ARB_separate_shader_objects GL_ARB_shader_bit_encoding GL_ARB_timer_query GL_ARB_transform_feedback2 GL_ARB_transform_feedback3 GL_ANGLE_texture_compression_dxt3 GL_ANGLE_texture_compression_dxt5 GL_ARB_conservative_depth GL_ARB_internalformat_query GL_ARB_map_buffer_alignment GL_ARB_shader_atomic_counters GL_ARB_shading_language_420pack GL_ARB_shading_language_packing GL_ARB_texture_storage GL_ARB_transform_feedback_instanced GL_EXT_framebuffer_multisample_blit_scaled GL_EXT_transform_feedback GL_AMD_shader_trinary_minmax GL_ARB_ES3_compatibility GL_ARB_clear_buffer_object GL_ARB_invalidate_subdata GL_ARB_texture_query_levels GL_ARB_texture_storage_multisample GL_ARB_texture_view GL_ARB_vertex_attrib_binding GL_KHR_debug GL_ARB_buffer_storage GL_ARB_multi_bind GL_ARB_texture_mirror_clamp_to_edge GL_ARB_vertex_type_10f_11f_11f_rev GL_EXT_shader_integer_mix GL_INTEL_performance_query +RENDERER=Mesa DRI Intel(R) Ivybridge Mobile +EXTENSIONS=GL_ARB_multisample GL_EXT_abgr GL_EXT_bgra GL_EXT_blend_color GL_EXT_blend_minmax GL_EXT_blend_subtract GL_EXT_copy_texture GL_EXT_polygon_offset GL_EXT_subtexture GL_EXT_texture_object GL_EXT_vertex_array GL_EXT_compiled_vertex_array GL_EXT_texture GL_EXT_texture3D GL_IBM_rasterpos_clip GL_ARB_point_parameters GL_EXT_draw_range_elements GL_EXT_packed_pixels GL_EXT_point_parameters GL_EXT_rescale_normal GL_EXT_separate_specular_color GL_EXT_texture_edge_clamp GL_SGIS_generate_mipmap GL_SGIS_texture_border_clamp GL_SGIS_texture_edge_clamp GL_SGIS_texture_lod GL_ARB_framebuffer_sRGB GL_ARB_multitexture GL_EXT_framebuffer_sRGB GL_IBM_multimode_draw_arrays GL_IBM_texture_mirrored_repeat GL_3DFX_texture_compression_FXT1 GL_ARB_texture_cube_map GL_ARB_texture_env_add GL_ARB_transpose_matrix GL_EXT_blend_func_separate GL_EXT_fog_coord GL_EXT_multi_draw_arrays GL_EXT_secondary_color GL_EXT_texture_env_add GL_EXT_texture_filter_anisotropic GL_EXT_texture_lod_bias GL_INGR_blend_func_separate GL_NV_blend_square GL_NV_light_max_exponent GL_NV_texgen_reflection GL_NV_texture_env_combine4 GL_S3_s3tc GL_SUN_multi_draw_arrays GL_ARB_texture_border_clamp GL_ARB_texture_compression GL_EXT_framebuffer_object GL_EXT_texture_compression_s3tc GL_EXT_texture_env_combine GL_EXT_texture_env_dot3 GL_MESA_window_pos GL_NV_packed_depth_stencil GL_NV_texture_rectangle GL_ARB_depth_texture GL_ARB_occlusion_query GL_ARB_shadow GL_ARB_texture_env_combine GL_ARB_texture_env_crossbar GL_ARB_texture_env_dot3 GL_ARB_texture_mirrored_repeat GL_ARB_window_pos GL_ATI_envmap_bumpmap GL_EXT_stencil_two_side GL_EXT_texture_cube_map GL_NV_depth_clamp GL_APPLE_packed_pixels GL_APPLE_vertex_array_object GL_ARB_draw_buffers GL_ARB_fragment_program GL_ARB_fragment_shader GL_ARB_shader_objects GL_ARB_vertex_program GL_ARB_vertex_shader GL_ATI_draw_buffers GL_ATI_texture_env_combine3 GL_ATI_texture_float GL_EXT_shadow_funcs GL_EXT_stencil_wrap GL_MESA_pack_invert GL_NV_primitive_restart GL_ARB_depth_clamp GL_ARB_fragment_program_shadow GL_ARB_half_float_pixel GL_ARB_occlusion_query2 GL_ARB_point_sprite GL_ARB_shading_language_100 GL_ARB_sync GL_ARB_texture_non_power_of_two GL_ARB_vertex_buffer_object GL_ATI_blend_equation_separate GL_EXT_blend_equation_separate GL_OES_read_format GL_ARB_color_buffer_float GL_ARB_pixel_buffer_object GL_ARB_texture_compression_rgtc GL_ARB_texture_float GL_ARB_texture_rectangle GL_EXT_packed_float GL_EXT_pixel_buffer_object GL_EXT_texture_compression_dxt1 GL_EXT_texture_compression_rgtc GL_EXT_texture_rectangle GL_EXT_texture_sRGB GL_EXT_texture_shared_exponent GL_ARB_framebuffer_object GL_EXT_framebuffer_blit GL_EXT_framebuffer_multisample GL_EXT_packed_depth_stencil GL_APPLE_object_purgeable GL_ARB_vertex_array_object GL_ATI_separate_stencil GL_EXT_draw_buffers2 GL_EXT_draw_instanced GL_EXT_gpu_program_parameters GL_EXT_texture_array GL_EXT_texture_integer GL_EXT_texture_sRGB_decode GL_EXT_timer_query GL_OES_EGL_image GL_AMD_performance_monitor GL_ARB_copy_buffer GL_ARB_depth_buffer_float GL_ARB_draw_instanced GL_ARB_half_float_vertex GL_ARB_instanced_arrays GL_ARB_map_buffer_range GL_ARB_texture_rg GL_ARB_texture_swizzle GL_ARB_vertex_array_bgra GL_EXT_texture_swizzle GL_EXT_vertex_array_bgra GL_NV_conditional_render GL_AMD_conservative_depth GL_AMD_draw_buffers_blend GL_AMD_seamless_cubemap_per_texture GL_ARB_ES2_compatibility GL_ARB_blend_func_extended GL_ARB_debug_output GL_ARB_draw_buffers_blend GL_ARB_draw_elements_base_vertex GL_ARB_explicit_attrib_location GL_ARB_fragment_coord_conventions GL_ARB_provoking_vertex GL_ARB_sample_shading GL_ARB_sampler_objects GL_ARB_seamless_cube_map GL_ARB_shader_texture_lod GL_ARB_texture_cube_map_array GL_ARB_texture_gather GL_ARB_texture_multisample GL_ARB_texture_query_lod GL_ARB_texture_rgb10_a2ui GL_ARB_uniform_buffer_object GL_ARB_vertex_type_2_10_10_10_rev GL_EXT_provoking_vertex GL_EXT_texture_snorm GL_MESA_texture_signed_rgba GL_ARB_get_program_binary GL_ARB_robustness GL_ARB_separate_shader_objects GL_ARB_shader_bit_encoding GL_ARB_timer_query GL_ARB_transform_feedback2 GL_ARB_transform_feedback3 GL_ANGLE_texture_compression_dxt3 GL_ANGLE_texture_compression_dxt5 GL_ARB_conservative_depth GL_ARB_internalformat_query GL_ARB_map_buffer_alignment GL_ARB_shader_atomic_counters GL_ARB_shading_language_420pack GL_ARB_shading_language_packing GL_ARB_texture_storage GL_ARB_transform_feedback_instanced GL_EXT_framebuffer_multisample_blit_scaled GL_EXT_transform_feedback GL_AMD_shader_trinary_minmax GL_ARB_ES3_compatibility GL_ARB_clear_buffer_object GL_ARB_invalidate_subdata GL_ARB_texture_query_levels GL_ARB_texture_storage_multisample GL_ARB_texture_view GL_ARB_vertex_attrib_binding GL_KHR_debug GL_ARB_buffer_storage GL_ARB_multi_bind GL_ARB_texture_mirror_clamp_to_edge GL_ARB_vertex_type_10f_11f_11f_rev GL_EXT_shader_integer_mix GL_INTEL_performance_query diff --git a/pkgs/tools/typesetting/tex/nix/copy-includes.pl b/pkgs/tools/typesetting/tex/nix/copy-includes.pl index 2cec62fc7cb6..7d7846d2a7f1 100644 --- a/pkgs/tools/typesetting/tex/nix/copy-includes.pl +++ b/pkgs/tools/typesetting/tex/nix/copy-includes.pl @@ -18,7 +18,7 @@ for (my $n = 0; $n < @ARGV; $n += 2) { my $relPath = $ARGV[$n + 1]; my $parents = 0; foreach my $comp (split /\//, $relPath) { - $parents++ if ($comp eq "..") + $parents++ if ($comp eq "..") } $maxParents = $parents if $parents > $maxParents; } @@ -36,7 +36,7 @@ for (my $n = 0; $n < @ARGV; $n += 2) { my $relPath = $ARGV[$n + 1]; createDirs $relPath; - + symlink $fullPath, $relPath or die "cannot create symlink `$relPath'"; } diff --git a/pkgs/tools/typesetting/tex/nix/find-includes.pl b/pkgs/tools/typesetting/tex/nix/find-includes.pl index 41675e939f60..c8cb033f4a69 100644 --- a/pkgs/tools/typesetting/tex/nix/find-includes.pl +++ b/pkgs/tools/typesetting/tex/nix/find-includes.pl @@ -14,7 +14,7 @@ sub addName { my ($type, $name) = @_; print OUT "{ type = \"$type\"; name = \"$name\"; }\n"; } - + while () { if (/\\input\{(.*)\}/) { my $fn2 = $1; From a70d047c15924eb72388dd35b2826e34c3f69872 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 7 May 2025 18:54:27 +0200 Subject: [PATCH 65/94] workflows/editorconfig.editorconfig-checker: 2.4.0 -> 3.2.0 We have a pinned nixpkgs revision for all our CI tools, but we're not making use of it for editorconfig-checker. Instead, it has it's own, unmaintained, pin. Let's fix that. On the way, we're upgrading the tool to 3.2.1, which requires adjusting our .editorconfig file slightly to ignore auto-generated package-lock.json files. --- .editorconfig | 5 +++-- .github/workflows/editorconfig-v2.yml | 11 ++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.editorconfig b/.editorconfig index 9f0706d981a5..020db105c04a 100644 --- a/.editorconfig +++ b/.editorconfig @@ -48,9 +48,10 @@ indent_size = 4 indent_size = 2 indent_style = space -# Match package.json, which are generally pulled from upstream and accept them as they are -[package.json] +# Match package.json and package-lock.json, which are generally pulled from upstream and accept them as they are +[package{,-lock}.json] indent_style = unset +insert_final_newline = unset # Disable file types or individual files # some of these files may be auto-generated and/or require significant changes diff --git a/.github/workflows/editorconfig-v2.yml b/.github/workflows/editorconfig-v2.yml index c2428ce64e29..68d780f2190f 100644 --- a/.github/workflows/editorconfig-v2.yml +++ b/.github/workflows/editorconfig-v2.yml @@ -32,11 +32,16 @@ jobs: with: ref: ${{ needs.get-merge-commit.outputs.mergedSha }} + - name: Get Nixpkgs revision for editorconfig-checker + run: | + # Pin to a commit from nixpkgs-unstable to avoid building from e.g. staging. + # This should not be a URL, because it would allow PRs to run arbitrary code in CI! + rev=$(jq -r .rev ci/pinned-nixpkgs.json) + echo "url=https://github.com/NixOS/nixpkgs/archive/$rev.tar.gz" >> "$GITHUB_ENV" + - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31 with: - # nixpkgs commit is pinned so that it doesn't break - # editorconfig-checker 2.4.0 - nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/c473cc8714710179df205b153f4e9fa007107ff9.tar.gz + nix_path: nixpkgs=${{ env.url }} - name: Checking EditorConfig run: | From 0552a5b5a99c18a350e0149528a5f35e78eeca76 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 6 May 2025 08:26:38 +0200 Subject: [PATCH 66/94] postgresql_13: 13.20 -> 13.21 --- pkgs/servers/sql/postgresql/13.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/13.nix b/pkgs/servers/sql/postgresql/13.nix index 86a5d5156421..45a38d9ff765 100644 --- a/pkgs/servers/sql/postgresql/13.nix +++ b/pkgs/servers/sql/postgresql/13.nix @@ -1,7 +1,7 @@ import ./generic.nix { - version = "13.20"; - rev = "refs/tags/REL_13_20"; - hash = "sha256-GkDtzqwjMJipvr0wykM9Z5Tb0R7WgJA/PGPTVUXxf7Q="; + version = "13.21"; + rev = "refs/tags/REL_13_21"; + hash = "sha256-je3nC8zymK9pIISWSv/hMNeloYuiB7ulLinWFzqAWFc="; muslPatches = { disable-test-collate-icu-utf8 = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql13/disable-test-collate.icu.utf8.patch?id=69faa146ec9fff3b981511068f17f9e629d4688b"; From 02f2714c55d44b9fb949386811b123407f9da963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 7 May 2025 11:09:05 -0700 Subject: [PATCH 67/94] workflows/no-channel: fix typo --- .github/workflows/no-channel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/no-channel.yml b/.github/workflows/no-channel.yml index 8a0d78114613..ce0d50fed15d 100644 --- a/.github/workflows/no-channel.yml +++ b/.github/workflows/no-channel.yml @@ -12,7 +12,7 @@ jobs: if: | startsWith(github.event.pull_request.base.ref, 'nixos-') || startsWith(github.event.pull_request.base.ref, 'nixpkgs-') - name: "This PR is is targeting a channel branch" + name: "This PR is targeting a channel branch" runs-on: ubuntu-24.04 steps: - run: | From 43873fd4aac2dec9749486e5a05de7ece195d711 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 6 May 2025 08:26:56 +0200 Subject: [PATCH 68/94] postgresql_14: 14.17 -> 14.18 --- pkgs/servers/sql/postgresql/14.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/14.nix b/pkgs/servers/sql/postgresql/14.nix index 0268d59f5188..c543e329dffc 100644 --- a/pkgs/servers/sql/postgresql/14.nix +++ b/pkgs/servers/sql/postgresql/14.nix @@ -1,7 +1,7 @@ import ./generic.nix { - version = "14.17"; - rev = "refs/tags/REL_14_17"; - hash = "sha256-BvmfxHHTcxRkWZoawvHanQeAuqHnQIh77RQjxPo5fuI="; + version = "14.18"; + rev = "refs/tags/REL_14_18"; + hash = "sha256-pGPTq4I8WQnysVh3hHi/1Fto5vqtIbdGBu7EyBonIoo="; muslPatches = { disable-test-collate-icu-utf8 = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/disable-test-collate.icu.utf8.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7"; From 4003ab6564b7e2c4480c018308a012b59b4a9c2e Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 6 May 2025 08:27:04 +0200 Subject: [PATCH 69/94] postgresql_15: 15.12 -> 15.13 --- pkgs/servers/sql/postgresql/15.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/15.nix b/pkgs/servers/sql/postgresql/15.nix index 1144b4d37a84..7af553659b5e 100644 --- a/pkgs/servers/sql/postgresql/15.nix +++ b/pkgs/servers/sql/postgresql/15.nix @@ -1,7 +1,7 @@ import ./generic.nix { - version = "15.12"; - rev = "refs/tags/REL_15_12"; - hash = "sha256-6my9UzW05iYwTWR9y/VTZ1RQVNudavMFfUT9dpUQ15o="; + version = "15.13"; + rev = "refs/tags/REL_15_13"; + hash = "sha256-6guX2ms54HhJJ0MoHfQb5MI9qrcA0niJ06oa1glsFuY="; muslPatches = { dont-use-locale-a = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql15/dont-use-locale-a-on-musl.patch?id=f424e934e6d076c4ae065ce45e734aa283eecb9c"; From 6de66bc0be67ec82b9102c223f3dc85201236dfb Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 6 May 2025 08:27:17 +0200 Subject: [PATCH 70/94] postgresql_16: 16.8 -> 16.9 --- pkgs/servers/sql/postgresql/16.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/16.nix b/pkgs/servers/sql/postgresql/16.nix index 55deb96593b4..aa53cd825498 100644 --- a/pkgs/servers/sql/postgresql/16.nix +++ b/pkgs/servers/sql/postgresql/16.nix @@ -1,7 +1,7 @@ import ./generic.nix { - version = "16.8"; - rev = "refs/tags/REL_16_8"; - hash = "sha256-nVUGBuvCDFXozTyEDAAQa+IR3expCdztH90J68FhAXQ="; + version = "16.9"; + rev = "refs/tags/REL_16_9"; + hash = "sha256-CLLCT4wiCWeLqMdtGdXM2/DtlENLWSey6nNtOcfNPRw="; muslPatches = { dont-use-locale-a = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql16/dont-use-locale-a-on-musl.patch?id=08a24be262339fd093e641860680944c3590238e"; From d7ea3c4fd4ce10341bad331339628d75732cbc77 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 6 May 2025 08:27:30 +0200 Subject: [PATCH 71/94] postgresql_17: 17.4 -> 17.5 --- pkgs/servers/sql/postgresql/17.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/17.nix b/pkgs/servers/sql/postgresql/17.nix index 2a92b186741c..e65dc8579ece 100644 --- a/pkgs/servers/sql/postgresql/17.nix +++ b/pkgs/servers/sql/postgresql/17.nix @@ -1,7 +1,7 @@ import ./generic.nix { - version = "17.4"; - rev = "refs/tags/REL_17_4"; - hash = "sha256-TEpvX28chR3CXiOQsNY12t8WfM9ywoZVX1e/6mj9DqE="; + version = "17.5"; + rev = "refs/tags/REL_17_5"; + hash = "sha256-jWV7hglu7IPMZbqHrZVZHLbZYjVuDeut7nH50aSQIBc="; muslPatches = { dont-use-locale-a = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql17/dont-use-locale-a-on-musl.patch?id=d69ead2c87230118ae7f72cef7d761e761e1f37e"; From a7f22e88264985d703ef4a187c1c8cd8e7fbf3ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francis=20Gagn=C3=A9?= Date: Mon, 17 Feb 2025 21:04:00 -0500 Subject: [PATCH 72/94] vscode-extensions.vadimcn.vscode-lldb: Fix update.sh - Fix nix-shell invocation (`-p packages` and `path` are mutually exclusive) - Patch hashes in the correct files - Use nurl instead of nix-prefetch (the latter currently fails due to ) - Update GitHub repo name Fixes #204311 --- .../vadimcn.vscode-lldb/update-shell.nix | 17 +++++++++++++++++ .../extensions/vadimcn.vscode-lldb/update.sh | 14 ++++++++------ 2 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/update-shell.nix diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/update-shell.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/update-shell.nix new file mode 100644 index 000000000000..a10cfb9d366e --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/update-shell.nix @@ -0,0 +1,17 @@ +{ + pkgs ? import ../../../../../.. { }, +}: + +# Ideally, pkgs points to default.nix file of Nixpkgs official tree +with pkgs; + +mkShell { + inputsFrom = [ + (import ../../update-shell.nix { inherit pkgs; }) + ]; + packages = [ + nix-prefetch-github + nurl + prefetch-npm-deps + ]; +} diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/update.sh b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/update.sh index c6cce01e6d3a..27269014a6c6 100755 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/update.sh +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/update.sh @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell ../../update-shell.nix -i bash -p nix-prefetch-github prefetch-npm-deps +#! nix-shell update-shell.nix -i bash set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" @@ -12,8 +12,10 @@ of https://github.com/vadimcn/llvm-project and update lldb with correct version # Ideally, nixpkgs points to default.nix file of Nixpkgs official tree nixpkgs=../../../../../.. nixFile=./default.nix +adapterNixFile=./adapter.nix +nodeDepsNixFile=./node_deps.nix owner=vadimcn -repo=vscode-lldb +repo=codelldb version="$1" if [[ $# -ne 1 ]]; then # no version specified, find the newest one @@ -34,14 +36,14 @@ echo "$old_version -> $version" # update hashes sed -E 's/\bversion = ".*?"/version = "'$version'"/' --in-place "$nixFile" -srcHash=$(nix-prefetch-github vadimcn vscode-lldb --rev "v$version" | jq --raw-output .hash) +srcHash=$(nix-prefetch-github vadimcn codelldb --rev "v$version" | jq --raw-output .hash) sed -E 's#\bhash = ".*?"#hash = "'$srcHash'"#' --in-place "$nixFile" -cargoHash=$(nix-prefetch "{ sha256 }: (import $nixpkgs {}).vscode-extensions.vadimcn.vscode-lldb.adapter.cargoDeps.overrideAttrs (_: { outputHash = sha256; })") -sed -E 's#\bcargoHash = ".*?"#cargoHash = "'$cargoHash'"#' --in-place "$nixFile" +cargoHash=$(nurl --expr "(import $nixpkgs {}).vscode-extensions.vadimcn.vscode-lldb.adapter.cargoDeps.vendorStaging") +sed -E 's#\bcargoHash = ".*?"#cargoHash = "'$cargoHash'"#' --in-place "$adapterNixFile" pushd $TMPDIR curl -LO https://raw.githubusercontent.com/$owner/$repo/v${version}/package-lock.json npmDepsHash=$(prefetch-npm-deps ./package-lock.json) popd -sed -E 's#\bnpmDepsHash = ".*?"#npmDepsHash = "'$npmDepsHash'"#' --in-place "$nixFile" +sed -E 's#\bnpmDepsHash = ".*?"#npmDepsHash = "'$npmDepsHash'"#' --in-place "$nodeDepsNixFile" From d8b50484d3724f0891c3fda1c738f103ae132d33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francis=20Gagn=C3=A9?= Date: Mon, 17 Feb 2025 23:02:48 -0500 Subject: [PATCH 73/94] vscode-extensions.vadimcn.vscode-lldb: 1.10.0 -> 1.11.4 - Remove custom lldb. The extension uses stock lldb since 1.11.0. - Build the adapter with clang++. - Build the adapter without weak linkage. - Fix tools/prep-package.js failing due to missing devDependencies. - Update GitHub repo name. - Make various adjustments after upstream reorg. --- .../editors/vscode/extensions/default.nix | 18 ++++++++-- .../vadimcn.vscode-lldb/adapter.nix | 33 +++++++++-------- .../vadimcn.vscode-lldb/default.nix | 18 +++++----- .../extensions/vadimcn.vscode-lldb/lldb.nix | 35 ------------------- .../vadimcn.vscode-lldb/node_deps.nix | 2 +- .../adapter-output-shared_object.patch | 22 ------------ .../patches/cmake-build-extension-only.patch | 15 ++++---- 7 files changed, 49 insertions(+), 94 deletions(-) delete mode 100644 pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/lldb.nix delete mode 100644 pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/patches/adapter-output-shared_object.patch diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 90531ba32cb2..bd964fc6dc5c 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3,16 +3,20 @@ { autoPatchelfHook, callPackage, + cargo, config, fetchurl, jdk, jq, lib, + libcxxStdenv, llvmPackages, - llvmPackages_14, + llvmPackages_19, + makeRustPlatform, moreutils, protobuf, python3Packages, + rustc, stdenv, vscode-utils, zlib, @@ -5119,7 +5123,17 @@ let }; }; - vadimcn.vscode-lldb = callPackage ./vadimcn.vscode-lldb { llvmPackages = llvmPackages_14; }; + vadimcn.vscode-lldb = callPackage ./vadimcn.vscode-lldb { + llvmPackages = llvmPackages_19; + # The adapter is meant to be compiled with clang++, + # based on the provided CMake toolchain files. + # + rustPlatform = makeRustPlatform { + stdenv = libcxxStdenv; + inherit cargo rustc; + }; + stdenv = libcxxStdenv; + }; valentjn.vscode-ltex = vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/adapter.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/adapter.nix index 884742352743..7ba5ee0e0aff 100644 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/adapter.nix +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/adapter.nix @@ -17,48 +17,47 @@ let if stdenv.hostPlatform.isDarwin then "/Applications/Xcode.app/Contents/SharedFrameworks/LLDB.framework/Versions/A/Resources/debugserver" else - "${lldb.out}/bin/lldb-server"; + "${lib.getBin lldb}/bin/lldb-server"; + LLVM_TRIPLE = stdenv.hostPlatform.config; in rustPlatform.buildRustPackage { pname = "${pname}-adapter"; inherit version src; useFetchCargoVendor = true; - cargoHash = "sha256-7tGX8wt2bb1segoWbBEBwZbznOaAiAyh9i/JC5FKUBU="; + cargoHash = "sha256-Nh4YesgWa1JR8tLfrIRps9TBdsAfilXu6G2/kB08co8="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ lldb ]; + # Environment variables, based on + # The LLDB_* variables are used in adapter/lldb/build.rs. + "CC_${LLVM_TRIPLE}" = "${stdenv.cc}/bin/cc"; + "CXX_${LLVM_TRIPLE}" = "${stdenv.cc}/bin/c++"; + LLDB_INCLUDE = "${lib.getDev lldb}/include"; + LLDB_LINK_LIB = "lldb"; + LLDB_LINK_SEARCH = "${lib.getLib lldb}/lib"; nativeBuildInputs = [ makeWrapper ]; - env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_LDFLAGS = "-llldb -lc++abi"; }; - buildAndTestSubdir = "adapter"; - buildFeatures = [ "weak-linkage" ]; + # There's isn't much point in enabling the `weaklink` feature + # when we provide lldb via Nix. + # buildFeatures = [ "weaklink" ]; cargoBuildFlags = [ - "--lib" "--bin=codelldb" ]; postFixup = '' - mkdir -p $out/share/{adapter,formatters} - # codelldb expects libcodelldb.so to be in the same - # directory as the executable, and can't find it in $out/lib. - # To make codelldb executable as a standalone, - # we put all files in $out/share, and then wrap the binary in $out/bin. + mkdir -p $out/share/{adapter,lang_support} mv $out/bin/* $out/share/adapter - cp $out/lib/* $out/share/adapter cp -r adapter/scripts $out/share/adapter - cp -t $out/share/formatters formatters/*.py + cp -t $out/share/lang_support lang_support/*.py ln -s ${lib.getLib lldb} $out/share/lldb makeWrapper $out/share/adapter/codelldb $out/bin/codelldb \ --set-default LLDB_DEBUGSERVER_PATH "${lldbServer}" ''; - patches = [ ./patches/adapter-output-shared_object.patch ]; - - # Tests are linked to liblldb but it is not available here. + # Tests fail to build (as of version 1.11.4). doCheck = false; passthru = { inherit lldbServer; }; diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix index 590c03c26115..5e4e6e24702a 100644 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix @@ -17,7 +17,7 @@ assert lib.versionAtLeast python3.version "3.5"; let publisher = "vadimcn"; pname = "vscode-lldb"; - version = "1.10.0"; + version = "1.11.4"; vscodeExtUniqueId = "${publisher}.${pname}"; vscodeExtPublisher = publisher; @@ -25,13 +25,12 @@ let src = fetchFromGitHub { owner = "vadimcn"; - repo = "vscode-lldb"; + repo = "codelldb"; rev = "v${version}"; - hash = "sha256-ExSS5HxDmJJtYypRYJNz7nY0D50gjoDBc4CnJMfgVw8="; + hash = "sha256-+Pe7ij5ukF5pLgwvr+HOHjIv1TQDiPOEeJtkpIW9XWI="; }; - # need to build a custom version of lldb and llvm for enhanced rust support - lldb = (import ./lldb.nix { inherit fetchFromGitHub llvmPackages; }); + lldb = llvmPackages.lldb; adapter = ( import ./adapter.nix { @@ -86,10 +85,9 @@ stdenv.mkDerivation { patches = [ ./patches/cmake-build-extension-only.patch ]; - postPatch = '' - # temporary patch for forgotten version updates - substituteInPlace CMakeLists.txt \ - --replace-fail "1.9.2" ${version} + # Make devDependencies available to tools/prep-package.js + preConfigure = '' + cp -r ${nodeDeps}/lib/node_modules . ''; postConfigure = @@ -117,7 +115,7 @@ stdenv.mkDerivation { unzip ./codelldb-bootstrap.vsix 'extension/*' -d ./vsix-extracted - mkdir -p $ext/{adapter,formatters} + mkdir -p $ext/adapter mv -t $ext vsix-extracted/extension/* cp -t $ext/ -r ${adapter}/share/* wrapProgram $ext/adapter/codelldb \ diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/lldb.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/lldb.nix deleted file mode 100644 index 5a17141bf933..000000000000 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/lldb.nix +++ /dev/null @@ -1,35 +0,0 @@ -# Patched lldb for Rust language support. -{ - fetchFromGitHub, - llvmPackages, -}: -let - llvmSrc = fetchFromGitHub { - owner = "vadimcn"; - repo = "llvm-project"; - # codelldb/14.x branch - rev = "4c267c83cbb55fedf2e0b89644dc1db320fdfde7"; - hash = "sha256-jM//ej6AxnRYj+8BAn4QrxHPT6HiDzK5RqHPSg3dCcw="; - }; - - lldbDrv = llvmPackages.lldb.overrideAttrs (oldAttrs: { - passthru = (oldAttrs.passthru or { }) // { - inherit llvmSrc; - }; - - doInstallCheck = true; - - # installCheck for lldb_14 currently broken - # https://github.com/NixOS/nixpkgs/issues/166604#issuecomment-1086103692 - # ignore the oldAttrs installCheck - installCheckPhase = '' - versionOutput="$($out/bin/lldb --version)" - echo "'lldb --version' returns: $versionOutput" - echo "$versionOutput" | grep -q 'rust-enabled' - ''; - }); -in -lldbDrv.override { - monorepoSrc = llvmSrc; - libllvm = llvmPackages.libllvm.override { monorepoSrc = llvmSrc; }; -} diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/node_deps.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/node_deps.nix index 08dd9dc7e558..7e808175ee9c 100644 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/node_deps.nix +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/node_deps.nix @@ -13,7 +13,7 @@ buildNpmPackage { pname = "${pname}-node-deps"; inherit version src; - npmDepsHash = "sha256-fMKGi+AJTMlWl7SQtZ21hUwOLgqlFYDhwLvEergQLfI="; + npmDepsHash = "sha256-Efeun7AFMAnoNXLbTGH7OWHaBHT2tO9CodfjKrIYw40="; nativeBuildInputs = [ python3 diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/patches/adapter-output-shared_object.patch b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/patches/adapter-output-shared_object.patch deleted file mode 100644 index aedbe59c3677..000000000000 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/patches/adapter-output-shared_object.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 4f64ad191ec79b9f40843f88e3ac5910720636da Mon Sep 17 00:00:00 2001 -From: Changsheng Wu -Date: Fri, 9 Jun 2023 15:41:53 -0400 -Subject: [PATCH] Update Cargo.toml - ---- - adapter/Cargo.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/adapter/Cargo.toml b/adapter/Cargo.toml -index bc86723..f5f26ce 100644 ---- a/adapter/Cargo.toml -+++ b/adapter/Cargo.toml -@@ -39,7 +39,7 @@ winapi = { version = "0.3.8", features = ["std", "wincon", "namedpipeapi"] } - winreg = "0.6.2" - - [lib] --crate-type = ["staticlib"] -+crate-type = ["dylib", "rlib"] - - [[bin]] - name = "codelldb" diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/patches/cmake-build-extension-only.patch b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/patches/cmake-build-extension-only.patch index 4fc612642a0c..da71f77a45c6 100644 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/patches/cmake-build-extension-only.patch +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/patches/cmake-build-extension-only.patch @@ -1,7 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5cab8b1..0b500d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -16,13 +16,6 @@ +@@ -16,13 +16,6 @@ endif() set(VERSION "${VERSION}${VERSION_SUFFIX}") message("Version ${VERSION}") @@ -15,24 +16,24 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt if (CMAKE_SYSROOT) set(CMAKE_C_FLAGS "--sysroot=${CMAKE_SYSROOT} ${CMAKE_C_FLAGS}") set(CMAKE_CXX_FLAGS "--sysroot=${CMAKE_SYSROOT} ${CMAKE_CXX_FLAGS}") -@@ -102,16 +95,6 @@ - configure_file(webpack.config.js ${CMAKE_CURRENT_BINARY_DIR}/webpack.config.js @ONLY) +@@ -116,16 +109,6 @@ configure_file(package.json ${CMAKE_CURRENT_BINARY_DIR}/package.json @ONLY) + configure_file(webpack.config.js ${CMAKE_CURRENT_BINARY_DIR}/webpack.config.js) file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/package-lock.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) -# Install node_modules -execute_process( -- COMMAND ${NPM} ci # like install, but actually respects package-lock file. +- COMMAND ${NPM} --loglevel verbose ci # like install, but actually respects package-lock file. - WORKING_DIRECTORY ${CMAKE_BINARY_DIR} - RESULT_VARIABLE Result -) -if (NOT ${Result} EQUAL 0) -- message(FATAL_ERROR "npm intall failed: ${Result}") +- message(FATAL_ERROR "npm install failed: ${Result}") -endif() - # Resolve $refs execute_process( COMMAND ${WithEnv} NODE_PATH=${CMAKE_CURRENT_BINARY_DIR}/node_modules node ${CMAKE_CURRENT_SOURCE_DIR}/tools/prep-package.js ${CMAKE_CURRENT_BINARY_DIR}/package.json ${CMAKE_CURRENT_BINARY_DIR}/package.json -@@ -169,6 +152,7 @@ +@@ -183,6 +166,7 @@ add_custom_target(adapter_tests add_copy_file(PackageFiles ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_BINARY_DIR}/README.md) add_copy_file(PackageFiles ${CMAKE_CURRENT_SOURCE_DIR}/CHANGELOG.md ${CMAKE_CURRENT_BINARY_DIR}/CHANGELOG.md) @@ -40,7 +41,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt add_copy_file(PackageFiles ${CMAKE_CURRENT_SOURCE_DIR}/images/lldb.png ${CMAKE_CURRENT_BINARY_DIR}/images/lldb.png) add_copy_file(PackageFiles ${CMAKE_CURRENT_SOURCE_DIR}/images/user.svg ${CMAKE_CURRENT_BINARY_DIR}/images/user.svg) add_copy_file(PackageFiles ${CMAKE_CURRENT_SOURCE_DIR}/images/users.svg ${CMAKE_CURRENT_BINARY_DIR}/images/users.svg) -@@ -185,6 +169,7 @@ +@@ -199,6 +183,7 @@ add_custom_target(dev_debugging set(PackagedFilesBootstrap README.md CHANGELOG.md From 47c82b0cf53c12c190b5c9badfd7554e82e6ddc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francis=20Gagn=C3=A9?= Date: Mon, 31 Mar 2025 01:24:27 -0400 Subject: [PATCH 74/94] vscode-extensions.vadimcn.vscode-lldb: various adjustments following review - Use `callPackage` instead of `import` for inner packages - Change `libcxxStdenv` to `llvmPackages_19.libcxxStdenv` - Move overrides from `.../vscode/extensions/default.nix` to `.../vscode/extensions/vadimcn.vscode-lldb/default.nix` - adapter: Fix LLVM_TRIPLE --- .../editors/vscode/extensions/default.nix | 17 +------ .../vadimcn.vscode-lldb/adapter.nix | 2 +- .../vadimcn.vscode-lldb/default.nix | 46 +++++++++---------- 3 files changed, 24 insertions(+), 41 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index bd964fc6dc5c..3e6801d29efb 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3,20 +3,15 @@ { autoPatchelfHook, callPackage, - cargo, config, fetchurl, jdk, jq, lib, - libcxxStdenv, llvmPackages, - llvmPackages_19, - makeRustPlatform, moreutils, protobuf, python3Packages, - rustc, stdenv, vscode-utils, zlib, @@ -5123,17 +5118,7 @@ let }; }; - vadimcn.vscode-lldb = callPackage ./vadimcn.vscode-lldb { - llvmPackages = llvmPackages_19; - # The adapter is meant to be compiled with clang++, - # based on the provided CMake toolchain files. - # - rustPlatform = makeRustPlatform { - stdenv = libcxxStdenv; - inherit cargo rustc; - }; - stdenv = libcxxStdenv; - }; + vadimcn.vscode-lldb = callPackage ./vadimcn.vscode-lldb { }; valentjn.vscode-ltex = vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/adapter.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/adapter.nix index 7ba5ee0e0aff..2acd09bd9248 100644 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/adapter.nix +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/adapter.nix @@ -18,7 +18,7 @@ let "/Applications/Xcode.app/Contents/SharedFrameworks/LLDB.framework/Versions/A/Resources/debugserver" else "${lib.getBin lldb}/bin/lldb-server"; - LLVM_TRIPLE = stdenv.hostPlatform.config; + LLVM_TRIPLE = stdenv.buildPlatform.rust.rustcTarget; in rustPlatform.buildRustPackage { pname = "${pname}-adapter"; diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix index 5e4e6e24702a..d3ff70cca2f6 100644 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix @@ -1,17 +1,17 @@ { - lib, - stdenv, - fetchFromGitHub, - rustPlatform, - makeWrapper, - llvmPackages, - buildNpmPackage, + callPackage, + cargo, cmake, + fetchFromGitHub, + lib, + llvmPackages_19, + makeRustPlatform, + makeWrapper, nodejs, - unzip, python3, - pkg-config, - libsecret, + rustc, + stdenv, + unzip, }: assert lib.versionAtLeast python3.version "3.5"; let @@ -30,17 +30,20 @@ let hash = "sha256-+Pe7ij5ukF5pLgwvr+HOHjIv1TQDiPOEeJtkpIW9XWI="; }; - lldb = llvmPackages.lldb; + lldb = llvmPackages_19.lldb; adapter = ( - import ./adapter.nix { - inherit - lib - lldb - makeWrapper - rustPlatform - stdenv + callPackage ./adapter.nix { + # The adapter is meant to be compiled with clang++, + # based on the provided CMake toolchain files. + # + rustPlatform = makeRustPlatform { + stdenv = llvmPackages_19.libcxxStdenv; + inherit cargo rustc; + }; + stdenv = llvmPackages_19.libcxxStdenv; + inherit pname src version @@ -49,13 +52,8 @@ let ); nodeDeps = ( - import ./node_deps.nix { + callPackage ./node_deps.nix { inherit - buildNpmPackage - libsecret - pkg-config - python3 - pname src version From 78a7b8d69306795d9c0eb3d84259ffc14cd63097 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 7 May 2025 20:29:14 +0200 Subject: [PATCH 75/94] typstyle: 0.13.4 -> 0.13.5 Diff: https://github.com/Enter-tainer/typstyle/compare/refs/tags/v0.13.4...refs/tags/v0.13.5 Changelog: https://github.com/Enter-tainer/typstyle/blob/v0.13.5/CHANGELOG.md --- pkgs/by-name/ty/typstyle/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix index 325b4803f6bb..93edc2f623df 100644 --- a/pkgs/by-name/ty/typstyle/package.nix +++ b/pkgs/by-name/ty/typstyle/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "typstyle"; - version = "0.13.4"; + version = "0.13.5"; src = fetchFromGitHub { owner = "Enter-tainer"; repo = "typstyle"; tag = "v${finalAttrs.version}"; - hash = "sha256-8CSlxkF60OH1uJz7kCPhmHrSXo9C2mlkw0DxO7gUKVk="; + hash = "sha256-BrNPtdU8Y9lN6LCws+anvrMgmnXRsuglCE2iiBRNmh8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Z0+c2+87rhkiRUVr5udS1iJjMoEUlxsPR4KLjqGmlHs="; + cargoHash = "sha256-ShjyRG/s+M+3HiJgkl1RZbPNE0GD6e/BEJK1PyB2VVM="; # Disabling tests requiring network access checkFlags = [ From aa8b531b90743a37ea0ab5558ba941251f5e149d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 18:49:15 +0000 Subject: [PATCH 76/94] flyctl: 0.3.110 -> 0.3.116 --- pkgs/by-name/fl/flyctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix index 9930434671c1..bc17aaa17cd7 100644 --- a/pkgs/by-name/fl/flyctl/package.nix +++ b/pkgs/by-name/fl/flyctl/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.3.110"; + version = "0.3.116"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-zZlTVpqW96SSY1Lsgyax8bJ1VfErPet8YX5nUep8Auo="; + hash = "sha256-IUp2veKRSmxPqADQfE82htwphaiHQZWvwqGufnYdipU="; }; - vendorHash = "sha256-QrjK5p5eCfQ4eEgaUhUq4Ps1E8ZPee0698a7tGZYHWo="; + vendorHash = "sha256-dLfP1UXE4J6iGlQrhl3wik5TPqsqdhKv4iScMxzOb1A="; subPackages = [ "." ]; From f3569bc16e9c85d75766450572bc9dcaa1531c35 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 19:07:32 +0000 Subject: [PATCH 77/94] surrealdb: 2.3.0 -> 2.3.1 --- pkgs/by-name/su/surrealdb/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/surrealdb/package.nix b/pkgs/by-name/su/surrealdb/package.nix index dbcf1e5d5248..cab4d40841bb 100644 --- a/pkgs/by-name/su/surrealdb/package.nix +++ b/pkgs/by-name/su/surrealdb/package.nix @@ -11,17 +11,17 @@ }: rustPlatform.buildRustPackage rec { pname = "surrealdb"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "surrealdb"; repo = "surrealdb"; tag = "v${version}"; - hash = "sha256-7/R3iYAkpCyAiHGp4EyvWU4kIO//5+0LUpO92KmQ9uE="; + hash = "sha256-cseTLVs3LXksajOq9TULUbofwG/kp29sgulZ83QUXYk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-zG1BdGyvGL7qEPg+a6fAP3Yn1X0lc6+wDpOqObmL7PQ="; + cargoHash = "sha256-y5hzOGTJeOZ1JjJNsxo80KL1DnWL87DU1M1yxiOkeb0="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' From 5c28ddb1e5db6e5be108e6e4751b0803a96ffe96 Mon Sep 17 00:00:00 2001 From: Sam Estep Date: Thu, 1 May 2025 18:01:52 -0400 Subject: [PATCH 78/94] jai: init at 0.2.010 --- pkgs/by-name/ja/jai/package.nix | 50 +++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 pkgs/by-name/ja/jai/package.nix diff --git a/pkgs/by-name/ja/jai/package.nix b/pkgs/by-name/ja/jai/package.nix new file mode 100644 index 000000000000..6ca0060f3c64 --- /dev/null +++ b/pkgs/by-name/ja/jai/package.nix @@ -0,0 +1,50 @@ +{ + buildFHSEnv, + lib, + requireFile, + runCommand, + stdenv, + unzip, +}: +let + pname = "jai"; + minor = "2"; + patch = "010"; + version = "0.${minor}.${patch}"; + zipName = "jai-beta-${minor}-${patch}.zip"; + jai = stdenv.mkDerivation { + name = "jai"; + src = requireFile { + message = '' + The language is not yet public. If you are in the closed beta, download the zip file and run the following command: + nix-store --add-fixed sha256 ${zipName} + ''; + name = zipName; + sha256 = "sha256-7S0DFvmiKEvmCT12ukwLu+SSitk4y6BuS6WWCImeOhc="; + }; + nativeBuildInputs = [ unzip ]; + buildCommand = "unzip $src -d $out"; + }; + meta = { + description = "Powerful language to write efficient reliable software in simple ways"; + license = lib.licenses.unfree; + mainProgram = "jai"; + maintainers = with lib.maintainers; [ samestep ]; + platforms = [ + "x86_64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + }; +in +if stdenv.isLinux then + buildFHSEnv { + inherit meta pname version; + targetPkgs = pkgs: [ pkgs.zlib ]; + runScript = "${jai}/jai/bin/jai-linux"; + } +else + runCommand "jai" { inherit meta pname version; } '' + mkdir -p $out/bin + ln -s ${jai}/jai/bin/jai-macos $out/bin/jai + '' From 2fb4be99f358507c8ee496ecf99fbb147357d464 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 19:20:46 +0000 Subject: [PATCH 79/94] python3Packages.frigidaire: 0.18.23 -> 0.18.24 --- pkgs/development/python-modules/frigidaire/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/frigidaire/default.nix b/pkgs/development/python-modules/frigidaire/default.nix index 72344595685f..5ea688a51cf3 100644 --- a/pkgs/development/python-modules/frigidaire/default.nix +++ b/pkgs/development/python-modules/frigidaire/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "frigidaire"; - version = "0.18.23"; + version = "0.18.24"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bm1549"; repo = "frigidaire"; tag = version; - hash = "sha256-RzwTQRo5cIh6I8VQAJNcLg5TBiF6dAnZICGfvwCvx5Y="; + hash = "sha256-lpwzXeuFPvWV26AIAfzBHY3IiwEc8vThTXc/F0iyV1o="; }; postPatch = '' @@ -48,7 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for the Frigidaire devices"; homepage = "https://github.com/bm1549/frigidaire"; - changelog = "https://github.com/bm1549/frigidaire/releases/tag/${version}"; + changelog = "https://github.com/bm1549/frigidaire/releases/tag/${src.tag}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 41e370ecfbb0edec763458212a59cbf30a9dde23 Mon Sep 17 00:00:00 2001 From: patka Date: Wed, 7 May 2025 21:29:43 +0200 Subject: [PATCH 80/94] lumail: drop Upstream is gone and has turned into some AI slop news page around 2021. There seems to be a legit github upstream that looks like it belonged to lumail and that was archived in 2020. It is very dead --- .../networking/mailreaders/lumail/default.nix | 109 ------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 - 3 files changed, 1 insertion(+), 113 deletions(-) delete mode 100644 pkgs/applications/networking/mailreaders/lumail/default.nix diff --git a/pkgs/applications/networking/mailreaders/lumail/default.nix b/pkgs/applications/networking/mailreaders/lumail/default.nix deleted file mode 100644 index 6bdd54302517..000000000000 --- a/pkgs/applications/networking/mailreaders/lumail/default.nix +++ /dev/null @@ -1,109 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - pkg-config, - lua, - file, - ncurses, - gmime, - pcre-cpp, - perl, - perlPackages, - makeWrapper, - debugBuild ? false, - alternativeGlobalConfigFilePath ? null, -}: - -let - version = "3.1"; - binaryName = if debugBuild then "lumail2-debug" else "lumail2"; - alternativeConfig = builtins.toFile "lumail2.lua" ( - builtins.readFile alternativeGlobalConfigFilePath - ); - - globalConfig = - if alternativeGlobalConfigFilePath == null then - '' - mkdir -p $out/etc/lumail2 - cp global.config.lua $out/etc/lumail2.lua - for n in ./lib/*.lua; do - cp "$n" $out/etc/lumail2/ - done - '' - else - '' - ln -s ${alternativeConfig} $out/etc/lumail2.lua - ''; - - getPath = type: "${lua}/lib/?.${type};"; - luaPath = getPath "lua"; - luaCPath = getPath "so"; -in -stdenv.mkDerivation { - pname = "lumail"; - inherit version; - - src = fetchurl { - url = "https://lumail.org/download/lumail-${version}.tar.gz"; - sha256 = "0vj7p7f02m3w8wb74ilajcwznc4ai4h2ikkz9ildy0c00aqsi5w4"; - }; - - enableParallelBuilding = true; - - nativeBuildInputs = [ - pkg-config - makeWrapper - ]; - buildInputs = [ - lua - file - ncurses - gmime - pcre-cpp - perl - perlPackages.JSON - perlPackages.NetIMAPClient - ]; - - preConfigure = '' - sed -e 's|"/etc/lumail2|LUMAIL_LUAPATH"/..|' -i src/lumail2.cc src/imap_proxy.cc - - perlFlags= - for i in $(IFS=:; echo $PERL5LIB); do - perlFlags="$perlFlags -I$i" - done - - sed -e "s|^#\!\(.*/perl.*\)$|#\!\1$perlFlags|" -i perl.d/imap-proxy - ''; - - buildFlags = lib.optional debugBuild "lumail2-debug"; - - installPhase = - '' - mkdir -p $out/bin || true - install -m755 ${binaryName} $out/bin/ - '' - + globalConfig - + '' - wrapProgram $out/bin/${binaryName} \ - --prefix LUA_PATH : "${luaPath}" \ - --prefix LUA_CPATH : "${luaCPath}" - ''; - - makeFlags = [ - "LVER=lua" - "PREFIX=$(out)" - "SYSCONFDIR=$(out)/etc" - "LUMAIL_LIBS=$(out)/etc/lumail2" - ]; - - meta = with lib; { - description = "Console-based email client"; - mainProgram = "lumail2"; - homepage = "https://lumail.org/"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ orivej ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ca3b4c3a7efe..f9a56e36d246 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1106,6 +1106,7 @@ mapAliases { loop = throw "'loop' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 luna-icons = throw "luna-icons has been removed as it was removed upstream"; # Added 2024-10-29 lucene = throw "lucene has been removed since it was both wildly out of date and was not even built properly for 4 years"; # Added 2025-04-10 + lumail = throw "'lumail' has been removed since its upstream is unavailable"; # Added 2025-05-07 lv_img_conv = throw "'lv_img_conv' has been removed from nixpkgs as it is broken"; # Added 2024-06-18 lxd = lib.warnOnInstantiate "lxd has been renamed to lxd-lts" lxd-lts; # Added 2024-04-01 lxd-unwrapped = lib.warnOnInstantiate "lxd-unwrapped has been renamed to lxd-unwrapped-lts" lxd-unwrapped-lts; # Added 2024-04-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd8561acc5ee..6b03259735be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13287,10 +13287,6 @@ with pkgs; luddite = with python3Packages; toPythonApplication luddite; - lumail = callPackage ../applications/networking/mailreaders/lumail { - lua = lua5_1; - }; - lutris-unwrapped = python3.pkgs.callPackage ../applications/misc/lutris { }; lutris = callPackage ../applications/misc/lutris/fhsenv.nix { }; lutris-free = lutris.override { From f5c6c167f1c278acba071a03309ffc3782e7759f Mon Sep 17 00:00:00 2001 From: SomeoneSerge Date: Wed, 7 May 2025 19:05:46 +0000 Subject: [PATCH 81/94] cudaPackages.autoAddCudaCompatRunpath: badPlatforms broken For consistency with other packages and for meta.unsupported --- .../autoAddCudaCompatRunpath/package.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/package.nix b/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/package.nix index e94fbe485283..5dc6d64e6551 100644 --- a/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/package.nix +++ b/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/package.nix @@ -6,8 +6,6 @@ { autoFixElfFiles, cuda_compat ? null, - flags, - lib, makeSetupHook, }: makeSetupHook { @@ -15,13 +13,17 @@ makeSetupHook { propagatedBuildInputs = [ autoFixElfFiles ]; substitutions = { - # Hotfix Ofborg evaluation - libcudaPath = if flags.isJetsonBuild then "${cuda_compat}/compat" else null; + libcudaPath = "${cuda_compat}/compat"; }; - meta.broken = !flags.isJetsonBuild; - - # Pre-cuda_compat CUDA release: - meta.badPlatforms = lib.optionals (cuda_compat == null) lib.platforms.all; - meta.platforms = cuda_compat.meta.platforms or [ ]; + meta = + let + # Handle `null`s in pre-`cuda_compat` releases, + # and `badPlatform`s for `!isJetsonBuild`. + platforms = cuda_compat.meta.platforms or [ ]; + badPlatforms = cuda_compat.meta.badPlatforms or platforms; + in + { + inherit badPlatforms platforms; + }; } ./auto-add-cuda-compat-runpath.sh From dd7cec7ce4f0ccad8a47cdd46dbfa0fcc8522e1c Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Wed, 7 May 2025 20:17:08 +0000 Subject: [PATCH 82/94] uv: 0.7.2 -> 0.7.3 --- pkgs/by-name/uv/uv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 3114f588d79d..b17bd68c33bd 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -20,17 +20,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uv"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = finalAttrs.version; - hash = "sha256-XHCKM/A7vV9rbSuzIgnL48+IFqUr8m8JyxQvktxtt8c="; + hash = "sha256-8yQnBAAzt6kjg1F1AVdLX4z4at8+vCA4lcSclkzXXGw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-PVM04Qm9Y1zWpqRLSVvx954Wh4lEXeFdoKSYxtpfodY="; + cargoHash = "sha256-kPJrVHFJcw3tHvLm0ddn4iBoBNK1MDDF0WNcqFfmA4o="; buildInputs = [ rust-jemalloc-sys From 7c8de8123bf4c9bd887e6e40b15112933e9e2f7e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 20:38:17 +0000 Subject: [PATCH 83/94] intentrace: 0.9.5 -> 0.9.7 --- pkgs/by-name/in/intentrace/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/in/intentrace/package.nix b/pkgs/by-name/in/intentrace/package.nix index a88cb4f75eed..7584a1f59456 100644 --- a/pkgs/by-name/in/intentrace/package.nix +++ b/pkgs/by-name/in/intentrace/package.nix @@ -5,7 +5,7 @@ }: let - version = "0.9.5"; + version = "0.9.7"; in rustPlatform.buildRustPackage { inherit version; @@ -15,11 +15,11 @@ rustPlatform.buildRustPackage { owner = "sectordistrict"; repo = "intentrace"; tag = "v${version}"; - hash = "sha256-9frNVC9jSWYiElTP6z+xoU5GW9QKxfxvt2v5jkhyH9I="; + hash = "sha256-24w5EQ3LQ7OxuVaqoLlUrYi2TmSLAfWGLNrkPcxMQMM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-SinuOXJ9Z+HQMTAKm+pUzx6jrLMypoK3f2DLmRaI70E="; + cargoHash = "sha256-pLGWXwpgTh/7SaDhs63jr+5Fpsiep1tfl9VlCEBrK1s="; meta = { description = "Prettified Linux syscall tracing tool (like strace)"; From 5fe815c93ee1bf0df8e96922c4ded30e68582e51 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 7 May 2025 11:11:58 -0700 Subject: [PATCH 84/94] python3Packages.webdataset: disable tests that hang on Darwin tests/webdataset/test_loaders.py causes the build to hang at the end of checkPhase on Darwin. --- pkgs/development/python-modules/webdataset/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/webdataset/default.nix b/pkgs/development/python-modules/webdataset/default.nix index 77236a576649..bf7794d33608 100644 --- a/pkgs/development/python-modules/webdataset/default.nix +++ b/pkgs/development/python-modules/webdataset/default.nix @@ -93,6 +93,8 @@ buildPythonPackage rec { disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ # Issue with creating a temp file in the sandbox "tests/wids/test_wids_mmtar.py" + # hangs the build *after* the tests + "tests/webdataset/test_loaders.py" ]; meta = { From ca69ed4bc6e2cdf282eabda0cd665738d65821bc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 20:53:28 +0000 Subject: [PATCH 85/94] terraform-providers.btp: 1.11.0 -> 1.12.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 7fba10a8a18a..675c82694635 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -198,13 +198,13 @@ "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8=" }, "btp": { - "hash": "sha256-fny/kOPCJFySYPJwKpU5eCB6IClBE4KIjZoHpQplZHA=", + "hash": "sha256-c2nYUsjErdjxk6IyqpcDxExLLNjxh5A7Mq7WW2BWviw=", "homepage": "https://registry.terraform.io/providers/SAP/btp", "owner": "SAP", "repo": "terraform-provider-btp", - "rev": "v1.11.0", + "rev": "v1.12.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-DUc06D22wqYG/O27NkOxJ2bu+dwirReAq9Y6p135ICY=" + "vendorHash": "sha256-arLGaa/o9X0MYg/qIl6qhpBqcduu5Bu06FteR5KGSPw=" }, "buildkite": { "hash": "sha256-i16wgxO2rhs/wg1In+3VYstuUrfuj/ChVO4un5wDmgk=", From 60c0d9a6438f34f1e7f49fae9cf31b7e2b177eba Mon Sep 17 00:00:00 2001 From: networkException Date: Wed, 7 May 2025 23:03:10 +0200 Subject: [PATCH 86/94] ungoogled-chromium: 136.0.7103.59-1 -> 136.0.7103.92-1 https://chromereleases.googleblog.com/2025/05/stable-channel-update-for-desktop.html This update includes 2 security fixes. CVEs: CVE-2025-4372 --- .../networking/browsers/chromium/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index 2d1d17ba5c43..c6a08a161f98 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -797,7 +797,7 @@ } }, "ungoogled-chromium": { - "version": "136.0.7103.59", + "version": "136.0.7103.92", "deps": { "depot_tools": { "rev": "f40ddcd8d51626fb7be3ab3c418b3f3be801623f", @@ -808,16 +808,16 @@ "hash": "sha256-vDKMt23RMDI+KX6CmjfeOhRv2haf/mDOuHpWKnlODcg=" }, "ungoogled-patches": { - "rev": "136.0.7103.59-1", - "hash": "sha256-wUxcLssPyiVP+YErykRrLn4Nx24z224pW+dCigaBn4Q=" + "rev": "136.0.7103.92-1", + "hash": "sha256-mZ/qG7tWKJH1pGE4Onw9P50/WBYva7bvKeAiy4Ckjd0=" }, "npmHash": "sha256-QRjk9X4rJW3ofizK33R4T1qym1riqcnpBhDF+FfNZLo=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "d4b493843f5f23217df99a83aa28747602841382", - "hash": "sha256-5SKNNEPYSAxQUWtcCq/LW7gxGjjEhuw0Uxo1ob+F7to=", + "rev": "cb81a4cc5087a8303a6c8827ee2b80b71d26e334", + "hash": "sha256-mySbSMnbM/KBEGnOyJKJMr4WD4PNgIDDeNK0fTPfcnI=", "recompress": true }, "src/third_party/clang-format/script": { @@ -1437,8 +1437,8 @@ }, "src/third_party/sqlite/src": { "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git", - "rev": "567495a62a62dc013888500526e82837d727fe01", - "hash": "sha256-ltl3OTk/wZPSj3yYthNlKd3mBxef6l5uW6UYTwebNek=" + "rev": "8a22b25ad7244abaf07e372cc6dc97e041d663a9", + "hash": "sha256-1vAGAF3idxgHGaqb5gT5k3KIGC2H3gqC3RTVU2ZRf4A=" }, "src/third_party/swiftshader": { "url": "https://swiftshader.googlesource.com/SwiftShader.git", From e3456013d015124238a1b444bdb2dc84661b26d1 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Wed, 7 May 2025 23:03:32 +0200 Subject: [PATCH 87/94] python313Packages.django_5: 5.1.8 -> 5.1.9 Fixes CVE-2025-32873. https://www.djangoproject.com/weblog/2025/may/07/security-releases/ https://docs.djangoproject.com/en/dev/releases/5.1.9/ --- pkgs/development/python-modules/django/5.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/django/5.nix b/pkgs/development/python-modules/django/5.nix index 29513cee0ea7..e65c39cf0549 100644 --- a/pkgs/development/python-modules/django/5.nix +++ b/pkgs/development/python-modules/django/5.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pname = "django"; - version = "5.1.8"; + version = "5.1.9"; pyproject = true; disabled = pythonOlder "3.10"; @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = "django"; repo = "django"; rev = "refs/tags/${version}"; - hash = "sha256-TZjqB9khEHnkkxYvAC/RzAvOIwdemh0uT4UVdosMq6M="; + hash = "sha256-uBP6MoVjPUtNu6KxLjaYmKTN42JIUCTJSuSnQWSxyQU="; }; patches = @@ -82,9 +82,6 @@ buildPythonPackage rec { ]; postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "setuptools>=61.0.0,<69.3.0" setuptools - substituteInPlace tests/utils_tests/test_autoreload.py \ --replace-fail "/usr/bin/python" "${python.interpreter}" ''; From 13de4b2b669eb5480b15988375a28b9f176cf37b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 21:10:39 +0000 Subject: [PATCH 88/94] vacuum-go: 0.16.6 -> 0.16.8 --- pkgs/by-name/va/vacuum-go/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/va/vacuum-go/package.nix b/pkgs/by-name/va/vacuum-go/package.nix index e3fddf402ba9..8ebeb4274f00 100644 --- a/pkgs/by-name/va/vacuum-go/package.nix +++ b/pkgs/by-name/va/vacuum-go/package.nix @@ -7,17 +7,17 @@ buildGoModule (finalAttrs: { pname = "vacuum-go"; - version = "0.16.6"; + version = "0.16.8"; src = fetchFromGitHub { owner = "daveshanley"; repo = "vacuum"; # using refs/tags because simple version gives: 'the given path has multiple possibilities' error tag = "v${finalAttrs.version}"; - hash = "sha256-20Ty0j0oRtMY6FLCCfu4o+qeDDMnjgEvUCUaWlqJ5dU="; + hash = "sha256-I80nJ8RcC1nicMfi7tcMfyi63zZ9L5zaOCCu72j5G5A="; }; - vendorHash = "sha256-ClocrabgCfizLVr+/O96qpiwAq7TxYB4uM9gtjeKbQA="; + vendorHash = "sha256-sy9BfD05KEMnRMYbgcmHqNeW/vDuk0FTVjhk14RH8+o="; env.CGO_ENABLED = 0; ldflags = [ From 14e70b59218155f93b2df33906083d87cb3bb374 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 21:10:49 +0000 Subject: [PATCH 89/94] python3Packages.coqpit: 0.1.2 -> 0.2.0 --- pkgs/development/python-modules/coqpit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coqpit/default.nix b/pkgs/development/python-modules/coqpit/default.nix index 13ae9cc41c50..f183d31fcb50 100644 --- a/pkgs/development/python-modules/coqpit/default.nix +++ b/pkgs/development/python-modules/coqpit/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "coqpit-config"; - version = "0.1.2"; + version = "0.2.0"; format = "pyproject"; src = fetchFromGitHub { owner = "idiap"; repo = "coqui-ai-coqpit"; tag = "v${version}"; - hash = "sha256-3LZxoj2aFTpezakBymogkNPCaEBBaaUmyIa742cSMgU="; + hash = "sha256-iitAq+sOPFQqKiwwnPnWheZ+0+OLznu3G9Ncf18s4VQ="; }; nativeCheckInputs = [ pytestCheckHook ]; From a45cba95978c3fd4df507a4fd1da93b52e9fe62c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 21:24:33 +0000 Subject: [PATCH 90/94] pkgsite: 0-unstable-2025-04-24 -> 0-unstable-2025-05-06 --- pkgs/by-name/pk/pkgsite/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix index 0daa8ae0fc98..67add1f5ad3a 100644 --- a/pkgs/by-name/pk/pkgsite/package.nix +++ b/pkgs/by-name/pk/pkgsite/package.nix @@ -7,16 +7,16 @@ buildGoModule { pname = "pkgsite"; - version = "0-unstable-2025-04-24"; + version = "0-unstable-2025-05-06"; src = fetchFromGitHub { owner = "golang"; repo = "pkgsite"; - rev = "e863a039941fdd1a92fb694c3d9b3bb0ea0ba257"; - hash = "sha256-wb451BDpKT404oMmyOXuZBGM7rWLiWJHTRTtphOgx9g="; + rev = "1bc9132f566501f5f66bfcb147479cf741704cf4"; + hash = "sha256-FfgwHiqbDhVp31YQzalveG+JVe93gXUq/XvTwPV7zsI="; }; - vendorHash = "sha256-JoPuNktN4OsdNJ0e8BRuuD0CKuWiFsAcLAS5h9rH/Z0="; + vendorHash = "sha256-s8uYvMQENqeUN8DbZ/jNhcTe2dJeiE9UYPCPGeScO10="; subPackages = [ "cmd/pkgsite" ]; From 51a9830754c59eb53a3cffbcf9e588db5dbc1b4c Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Wed, 7 May 2025 19:15:11 +0200 Subject: [PATCH 91/94] pysdl2: exclude failing tests --- .../python-modules/pysdl2/default.nix | 27 +++---------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/pkgs/development/python-modules/pysdl2/default.nix index b362bb1861e1..41320ca8b5b8 100644 --- a/pkgs/development/python-modules/pysdl2/default.nix +++ b/pkgs/development/python-modules/pysdl2/default.nix @@ -82,29 +82,10 @@ buildPythonPackage rec { # GetPrefPath for OrgName/AppName is None "test_SDL_GetPrefPath" - # broken with sdl2-compat - "test_SDL_AddDelHintCallback" - "test_SDL_HasIntersectionF" - "test_SDL_IntersectFRect" - "test_SDL_UnionFRect" - "test_SDL_EncloseFPoints" - "test_SDL_IntersectFRectAndLine" - "test_SDL_GetSetTextureScaleMode" - "test_init" - "test_logical_size" - "test_copy" - - # sdl2-compat fails on these in our build sandbox - "test_create_sprite" - "test_create_software_sprite" - "test_create_texture_sprite" - "test_from_image" - "test_from_surface" - "test_from_text" - - "test_SDL_Init" - "test_SDL_InitSubSystem" - "test_SDL_SetWindowIcon" + # TODO: Remove once sdl2-compat is updated to 2.32.56 + "test_SDL_SetWindowDisplayMode" + "test_SDL_SetWindowFullscreen" + "test_SDL_GetPlatform" ]; meta = { From a386622c94990024546ceec5eff6448ad8a6c0d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 23:14:30 +0000 Subject: [PATCH 92/94] xan: 0.49.3 -> 0.50.0 --- pkgs/by-name/xa/xan/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/xa/xan/package.nix b/pkgs/by-name/xa/xan/package.nix index f029cb82fea7..4e643c5d6f12 100644 --- a/pkgs/by-name/xa/xan/package.nix +++ b/pkgs/by-name/xa/xan/package.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage rec { pname = "xan"; - version = "0.49.3"; + version = "0.50.0"; src = fetchFromGitHub { owner = "medialab"; repo = "xan"; tag = version; - hash = "sha256-2BEwMpI9vmhyZFZiEj8sHnVqCYGBULFORGxZgxdmr7M="; + hash = "sha256-wPzseazDTxsQ9zki4oDiAYT7sRRcIln3b9f5FC2t2Ko="; }; - cargoHash = "sha256-spKgZ8T94zhLIDhym5wQrhnW74KPgCMy5Y+3m/pX9/o="; + cargoHash = "sha256-BagQNDWOhyz2x2TvwYvlE07rU9RuHQHGAVAZu0JbfgE="; useFetchCargoVendor = true; # FIXME: tests fail and I do not have the time to investigate. Temporarily disable From 7cd4f7897f44edb5686ab0820bf5cf8b666df360 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 8 May 2025 01:31:08 +0200 Subject: [PATCH 93/94] python312Packages.wandb: skip failing test on darwin --- pkgs/development/python-modules/wandb/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index 9f6fce682714..df396b281391 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -357,6 +357,9 @@ buildPythonPackage rec { "test_matplotlib_plotly_with_multiple_axes" "test_matplotlib_to_plotly" "test_plotly_from_matplotlib_with_image" + + # RuntimeError: *** -[__NSPlaceholderArray initWithObjects:count:]: attempt to insert nil object from objects[1] + "test_wandb_image_with_matplotlib_figure" ]; pythonImportsCheck = [ "wandb" ]; From 205cb9602bee6697edf6402c1555b323a846613e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 7 May 2025 15:02:31 +0200 Subject: [PATCH 94/94] odin: dev-2025-01 -> dev-2025-04 Diff: https://github.com/odin-lang/Odin/compare/dev-2025-01...dev-2025-04 Changelog: https://github.com/odin-lang/Odin/releases/tag/dev-2025-04 --- pkgs/by-name/od/odin/package.nix | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/od/odin/package.nix b/pkgs/by-name/od/odin/package.nix index c30f50c52bda..8eb1e0db73d4 100644 --- a/pkgs/by-name/od/odin/package.nix +++ b/pkgs/by-name/od/odin/package.nix @@ -1,31 +1,35 @@ { - fetchFromGitHub, lib, llvmPackages, + fetchFromGitHub, makeBinaryWrapper, - nix-update-script, which, + nix-update-script, }: let inherit (llvmPackages) stdenv; in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "odin"; - version = "dev-2025-01"; + version = "dev-2025-04"; src = fetchFromGitHub { owner = "odin-lang"; repo = "Odin"; - rev = "dev-2025-01"; - hash = "sha256-GXea4+OIFyAhTqmDh2q+ewTUqI92ikOsa2s83UH2r58="; + tag = finalAttrs.version; + hash = "sha256-dVC7MgaNdgKy3X9OE5ZcNCPnuDwqXszX9iAoUglfz2k="; }; patches = [ ./darwin-remove-impure-links.patch ]; - LLVM_CONFIG = "${llvmPackages.llvm.dev}/bin/llvm-config"; + postPatch = '' + patchShebangs ./build_odin.sh + ''; + + LLVM_CONFIG = lib.getExe' llvmPackages.llvm.dev "llvm-config"; dontConfigure = true; @@ -72,6 +76,7 @@ stdenv.mkDerivation { description = "Fast, concise, readable, pragmatic and open sourced programming language"; downloadPage = "https://github.com/odin-lang/Odin"; homepage = "https://odin-lang.org/"; + changelog = "https://github.com/odin-lang/Odin/releases/tag/${finalAttrs.version}"; license = lib.licenses.bsd3; mainProgram = "odin"; maintainers = with lib.maintainers; [ @@ -80,4 +85,4 @@ stdenv.mkDerivation { platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isMusl; }; -} +})