From 94431037e1e50581b2251f51ab58518ab985c604 Mon Sep 17 00:00:00 2001 From: Nicolas Goudry Date: Wed, 22 Jan 2025 00:54:41 +0100 Subject: [PATCH 1/9] gitkraken: remove inactive maintainers --- pkgs/by-name/gi/gitkraken/package.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/by-name/gi/gitkraken/package.nix b/pkgs/by-name/gi/gitkraken/package.nix index e81078a768a5..a176ce3d69cd 100644 --- a/pkgs/by-name/gi/gitkraken/package.nix +++ b/pkgs/by-name/gi/gitkraken/package.nix @@ -87,9 +87,6 @@ let license = licenses.unfree; platforms = builtins.attrNames srcs; maintainers = with maintainers; [ - xnwdd - evanjs - arkivm nicolas-goudry Rishik-Y ]; From 0fe2e3f0e3d89f4412940ebff28afea7dfd08390 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 27 Jan 2025 19:07:24 +0100 Subject: [PATCH 2/9] maintainers.nix: Remove unused code --- ci/eval/compare/maintainers.nix | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/ci/eval/compare/maintainers.nix b/ci/eval/compare/maintainers.nix index 6728929952d4..188d8b635729 100644 --- a/ci/eval/compare/maintainers.nix +++ b/ci/eval/compare/maintainers.nix @@ -45,14 +45,6 @@ let pkg: pkg // { maintainers = (pkg.package.meta or { }).maintainers or [ ]; } ) attrsWithPackages; - attrsWeCanPing = builtins.filter ( - pkg: - if (builtins.length pkg.maintainers) > 0 then - true - else - builtins.trace "Package has no maintainers: ${pkg.name}" false - ) attrsWithMaintainers; - relevantFilenames = drv: (lib.lists.unique ( @@ -109,12 +101,6 @@ let } ) { } listToPing; - textForPackages = - packages: lib.strings.concatStringsSep ", " (builtins.map (pkg: pkg.packageName) packages); - - textPerMaintainer = lib.attrsets.mapAttrs ( - maintainer: packages: "- @${maintainer} for ${textForPackages packages}" - ) byMaintainer; packagesPerMaintainer = lib.attrsets.mapAttrs ( maintainer: packages: builtins.map (pkg: pkg.packageName) packages From 0f2797a6eabb086c2b4f4ab6ee3e8b54522fc2f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Jan 2025 13:21:22 +0000 Subject: [PATCH 3/9] websurfx: 1.22.2 -> 1.23.0 --- pkgs/by-name/we/websurfx/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/we/websurfx/package.nix b/pkgs/by-name/we/websurfx/package.nix index 6bafceffe315..ebe1ce4ac311 100644 --- a/pkgs/by-name/we/websurfx/package.nix +++ b/pkgs/by-name/we/websurfx/package.nix @@ -6,7 +6,7 @@ pkg-config, }: let - version = "1.22.2"; + version = "1.23.0"; in rustPlatform.buildRustPackage { pname = "websurfx"; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage { owner = "neon-mmd"; repo = "websurfx"; tag = "v${version}"; - hash = "sha256-Kwf4lIY99dnF8p59qOUefHIyhQHBb/ZasidswETLICM="; + hash = "sha256-+29Q963+CdYgy8JmhZwG22CElliYpFyEtOj8pHZj8XY="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage { useFetchCargoVendor = true; - cargoHash = "sha256-DK5eYgz/+FieauE7bCXXOs7RQUQWEphq3wP8QD0S9QQ="; + cargoHash = "sha256-16u9pb8+qjoQPK5xipJAFCMIpebJRTiGtv1gFn3xyj8="; postPatch = '' substituteInPlace src/handler/mod.rs \ From 80e011146bf92416ce58ffd62c191875f566810c Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 27 Jan 2025 22:44:51 +0100 Subject: [PATCH 4/9] ci/eval/compare: Improve performance and avoid large stacks Various improvements such as: 1. Avoiding deduplications when there can't be any duplicates 2. Avoiding O(n^2) deduplications 3. Using builtins.any to avoid list allocations 4. Using builtins.concatMap instead of lib.flatten when it's known that there's only one level of nesting 5. Using builtins.groupBy instead of folding with an accumulator In particular 5. should fix CI exceeding the stack size on staging: https://github.com/NixOS/nixpkgs/actions/runs/12989244871/job/36240781244?pr=377253 While 2. in particular should make CI a lot faster. --- ci/eval/compare/default.nix | 5 ++-- ci/eval/compare/maintainers.nix | 43 +++++++++++---------------------- 2 files changed, 16 insertions(+), 32 deletions(-) diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix index 0c55b01c7160..b844d45f5902 100644 --- a/ci/eval/compare/default.nix +++ b/ci/eval/compare/default.nix @@ -69,7 +69,6 @@ let groupByPlatform extractPackageNames getLabels - uniqueStrings ; getAttrs = dir: builtins.fromJSON (builtins.readFile "${dir}/outpaths.json"); @@ -81,7 +80,7 @@ let # - values: lists of `packagePlatformPath`s diffAttrs = diff beforeAttrs afterAttrs; - rebuilds = uniqueStrings (diffAttrs.added ++ diffAttrs.changed); + rebuilds = diffAttrs.added ++ diffAttrs.changed; rebuildsPackagePlatformAttrs = convertToPackagePlatformAttrs rebuilds; changed-paths = @@ -110,7 +109,7 @@ let ); maintainers = import ./maintainers.nix { - changedattrs = lib.unique (map (a: a.packagePath) rebuildsPackagePlatformAttrs); + changedattrs = lib.attrNames (lib.groupBy (a: a.name) rebuildsPackagePlatformAttrs); changedpathsjson = touchedFilesJson; }; in diff --git a/ci/eval/compare/maintainers.nix b/ci/eval/compare/maintainers.nix index 188d8b635729..64025c066f96 100644 --- a/ci/eval/compare/maintainers.nix +++ b/ci/eval/compare/maintainers.nix @@ -11,17 +11,13 @@ let changedpaths = builtins.fromJSON (builtins.readFile changedpathsjson); anyMatchingFile = - filename: - let - matching = builtins.filter (changed: lib.strings.hasSuffix changed filename) changedpaths; - in - (builtins.length matching) > 0; + filename: builtins.any (changed: lib.strings.hasSuffix changed filename) changedpaths; - anyMatchingFiles = files: (builtins.length (builtins.filter anyMatchingFile files)) > 0; + anyMatchingFiles = files: builtins.any anyMatchingFile files; - enrichedAttrs = builtins.map (path: { - path = path; - name = builtins.concatStringsSep "." path; + enrichedAttrs = builtins.map (name: { + path = lib.splitString "." name; + name = name; }) changedattrs; validPackageAttributes = builtins.filter ( @@ -80,27 +76,16 @@ let attrsWithModifiedFiles = builtins.filter (pkg: anyMatchingFiles pkg.filenames) attrsWithFilenames; - listToPing = lib.lists.flatten ( - builtins.map ( - pkg: - builtins.map (maintainer: { - id = maintainer.githubId; - packageName = pkg.name; - dueToFiles = pkg.filenames; - }) pkg.maintainers - ) attrsWithModifiedFiles - ); - - byMaintainer = lib.lists.foldr ( - ping: collector: - collector - // { - "${toString ping.id}" = [ - { inherit (ping) packageName dueToFiles; } - ] ++ (collector."${toString ping.id}" or [ ]); - } - ) { } listToPing; + listToPing = lib.concatMap ( + pkg: + builtins.map (maintainer: { + id = maintainer.githubId; + packageName = pkg.name; + dueToFiles = pkg.filenames; + }) pkg.maintainers + ) attrsWithModifiedFiles; + byMaintainer = lib.groupBy (ping: toString ping.id) listToPing; packagesPerMaintainer = lib.attrsets.mapAttrs ( maintainer: packages: builtins.map (pkg: pkg.packageName) packages From 5eeeafe5160f880da38cc00385e1ea3fdfe5667e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 29 Jan 2025 12:00:17 +0100 Subject: [PATCH 5/9] neovim-unwrapped: 0.10.3 -> 0.10.4 Diff: https://github.com/neovim/neovim/compare/refs/tags/v0.10.3...v0.10.4 Changelog: https://github.com/neovim/neovim/releases/tag/v0.10.4 --- pkgs/by-name/ne/neovim-unwrapped/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix index b8d3e76cd16c..05737a4a1726 100644 --- a/pkgs/by-name/ne/neovim-unwrapped/package.nix +++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation ( in { pname = "neovim-unwrapped"; - version = "0.10.3"; + version = "0.10.4"; __structuredAttrs = true; @@ -104,7 +104,7 @@ stdenv.mkDerivation ( owner = "neovim"; repo = "neovim"; tag = "v${finalAttrs.version}"; - hash = "sha256-nmnEyHE/HcrwK+CyJHNoLG0BqjnWleiBy0UYcJL7Ecc="; + hash = "sha256-TAuoa5GD50XB4OCHkSwP1oXfedzVrCBRutNxBp/zGLY="; }; patches = [ From 5b7802894d1ea32f8b25756ccc468bf3889a400e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 Jan 2025 14:22:08 +0000 Subject: [PATCH 6/9] postgresqlPackages.pgrouting: 3.7.1 -> 3.7.2 --- pkgs/servers/sql/postgresql/ext/pgrouting.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix index 4f3f6bea9354..f795ad8618fb 100644 --- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix +++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix @@ -11,7 +11,7 @@ buildPostgresqlExtension rec { pname = "pgrouting"; - version = "3.7.1"; + version = "3.7.2"; nativeBuildInputs = [ cmake @@ -23,7 +23,7 @@ buildPostgresqlExtension rec { owner = "pgRouting"; repo = "pgrouting"; rev = "v${version}"; - hash = "sha256-tK1JLWPtFR9nn5SULsPdpC3TXdmWAqq8QGDuD0bkElc="; + hash = "sha256-dzt1fVqbOE37A/qcQbuQuyiZpYuCwavQhnN/ZwFy1KM="; }; meta = with lib; { From 360076da02294de3e19ede4c7669b12b4eadae57 Mon Sep 17 00:00:00 2001 From: 4ever2 <3417013+4ever2@users.noreply.github.com> Date: Wed, 29 Jan 2025 12:17:27 +0100 Subject: [PATCH 7/9] =?UTF-8?q?coqPackages.metacoq:=201.3.2=20=E2=86=92=20?= =?UTF-8?q?1.3.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/ElmExtraction/default.nix | 2 +- pkgs/development/coq-modules/RustExtraction/default.nix | 2 +- pkgs/development/coq-modules/metacoq/default.nix | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/coq-modules/ElmExtraction/default.nix b/pkgs/development/coq-modules/ElmExtraction/default.nix index cfba9df2a660..73b526cc0a67 100644 --- a/pkgs/development/coq-modules/ElmExtraction/default.nix +++ b/pkgs/development/coq-modules/ElmExtraction/default.nix @@ -26,7 +26,7 @@ mkCoqDerivation { { cases = [ (range "8.17" "9.0") - (range "1.3.1" "1.3.2") + (range "1.3.1" "1.3.4") ]; out = "0.1.0"; } diff --git a/pkgs/development/coq-modules/RustExtraction/default.nix b/pkgs/development/coq-modules/RustExtraction/default.nix index 4aaa96e77f85..d9a51b0eefa9 100644 --- a/pkgs/development/coq-modules/RustExtraction/default.nix +++ b/pkgs/development/coq-modules/RustExtraction/default.nix @@ -26,7 +26,7 @@ mkCoqDerivation { { cases = [ (range "8.17" "8.19") - (range "1.3.1" "1.3.2") + (range "1.3.1" "1.3.3") ]; out = "0.1.0"; } diff --git a/pkgs/development/coq-modules/metacoq/default.nix b/pkgs/development/coq-modules/metacoq/default.nix index 15c83514cce2..ba94bf8c5d1f 100644 --- a/pkgs/development/coq-modules/metacoq/default.nix +++ b/pkgs/development/coq-modules/metacoq/default.nix @@ -43,11 +43,11 @@ let } { case = "8.19"; - out = "1.3.2-8.19"; + out = "1.3.3-8.19"; } { case = "8.20"; - out = "1.3.2-8.20"; + out = "1.3.4-8.20"; } ] null; release = { @@ -67,6 +67,8 @@ let "1.3.1-8.19".sha256 = "sha256-fZED/Uel1jt5XF83dR6HfyhSkfBdLkET8C/ArDgsm64="; "1.3.2-8.19".sha256 = "sha256-e5Pm1AhaQrO6JoZylSXYWmeXY033QflQuCBZhxGH8MA="; "1.3.2-8.20".sha256 = "sha256-4J7Ly4Fc2E/I6YqvzTLntVVls5t94OUOjVMKJyyJdw8="; + "1.3.3-8.19".sha256 = "sha256-SBTv49zQXZ+oGvIqWM53hjBKru9prFgZRv8gVgls40k="; + "1.3.4-8.20".sha256 = "sha256-ofRP0Uo48G2LBuIy/5ZLyK+iVZXleKiwfMEBD0rX9fQ="; }; releaseRev = v: "v${v}"; From 74858c19390d4d5be7a14654bdc9a9daae8a397b Mon Sep 17 00:00:00 2001 From: Martin Schwaighofer Date: Tue, 28 Jan 2025 20:18:59 +0100 Subject: [PATCH 8/9] rocmPackages.tensile: use unwrapped cc as assembler Tensile calls rocm clang with parameters such as "-x assembler -target amdgcn-amd-amdhsa". Using a wrapped compiler with "-target" leads to warnings introduced in fc590fdd053b8eee03385d4cff4d71ead4c71547. Co-authored-by: Mauricio Collares --- pkgs/development/rocm-modules/6/tensile/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/rocm-modules/6/tensile/default.nix b/pkgs/development/rocm-modules/6/tensile/default.nix index 0a1f4d60ea5e..e2a892b34308 100644 --- a/pkgs/development/rocm-modules/6/tensile/default.nix +++ b/pkgs/development/rocm-modules/6/tensile/default.nix @@ -13,6 +13,7 @@ joblib, filelock, rocminfo, + writeText, }: buildPythonPackage rec { @@ -61,6 +62,12 @@ buildPythonPackage rec { ROCM_PATH = rocminfo; }; + # TODO: remove this workaround once https://github.com/NixOS/nixpkgs/pull/323869 + # does not cause issues anymore, or at least replace it with a better workaround + setupHook = writeText "setup-hook" '' + export TENSILE_ROCM_ASSEMBLER_PATH="${stdenv.cc.cc}/bin/clang++"; + ''; + pythonImportsCheck = [ "Tensile" ]; passthru.updateScript = rocmUpdateScript { From 2094f0d9bef7232c3c9054f395bacad1342c26b3 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Wed, 29 Jan 2025 16:20:36 +0100 Subject: [PATCH 9/9] rocmPackages_5.tensile, rocmPackages_5.llvm.libcxx: port fixes --- .../5/llvm/stage-2/1000-libcxx-failing-tests.list | 1 + pkgs/development/rocm-modules/5/tensile/default.nix | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/pkgs/development/rocm-modules/5/llvm/stage-2/1000-libcxx-failing-tests.list b/pkgs/development/rocm-modules/5/llvm/stage-2/1000-libcxx-failing-tests.list index d5e1f675079f..a70c98d4e473 100644 --- a/pkgs/development/rocm-modules/5/llvm/stage-2/1000-libcxx-failing-tests.list +++ b/pkgs/development/rocm-modules/5/llvm/stage-2/1000-libcxx-failing-tests.list @@ -173,3 +173,4 @@ ../libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array14.pass.cpp ../libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete14.pass.cpp ../libcxx/test/libcxx/selftest/sh.cpp/empty.sh.cpp +../libcxx/test/libcxx/transitive_includes.sh.cpp diff --git a/pkgs/development/rocm-modules/5/tensile/default.nix b/pkgs/development/rocm-modules/5/tensile/default.nix index bb8db155c42a..262939c0ae67 100644 --- a/pkgs/development/rocm-modules/5/tensile/default.nix +++ b/pkgs/development/rocm-modules/5/tensile/default.nix @@ -12,6 +12,7 @@ joblib, filelock, rocminfo, + writeText, }: buildPythonPackage rec { @@ -47,6 +48,12 @@ buildPythonPackage rec { export ROCM_PATH=${rocminfo} ''; + # TODO: remove this workaround once https://github.com/NixOS/nixpkgs/pull/323869 + # does not cause issues anymore, or at least replace it with a better workaround + setupHook = writeText "setup-hook" '' + export TENSILE_ROCM_ASSEMBLER_PATH="${stdenv.cc.cc}/bin/clang++"; + ''; + pythonImportsCheck = [ "Tensile" ]; passthru.updateScript = rocmUpdateScript {