From 986db6c7c8b8966681d19475953a4af01203ca0b Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 14 Mar 2025 11:14:27 -0700 Subject: [PATCH 01/17] arocc: 0-unstable-06-01 -> 0-unstable-2025-03-05 --- pkgs/development/compilers/arocc/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/arocc/default.nix b/pkgs/development/compilers/arocc/default.nix index 6d73c2d3562d..2372e60c421d 100644 --- a/pkgs/development/compilers/arocc/default.nix +++ b/pkgs/development/compilers/arocc/default.nix @@ -2,18 +2,18 @@ lib, fetchFromGitHub, callPackage, - zig_0_13, + zig_0_14, }: let versions = [ { - zig = zig_0_13; - version = "0-unstable-06-01"; + zig = zig_0_14; + version = "0-unstable-2025-03-05"; src = fetchFromGitHub { owner = "Vexu"; repo = "arocc"; - rev = "55cb6d1b682b83f75ad4f60e34c6fcd2336e8531"; - hash = "sha256-xs3zNQIC5drrQYT4nxL7Q69xSEdbdMv5+3hQpsX3q5A="; + rev = "8c6bab43ba351fc045a1d262d8a8da4a11215e37"; + hash = "sha256-J5Cj9UMwAMwH2JGby13FIKl5Qbj4N4XpSSY7zL21aoY="; }; } ]; From 609b8b61bedee03bbcdd5f26266636e3706afdb5 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 15 Mar 2025 09:12:55 -0500 Subject: [PATCH 02/17] tests/lua-5: fix checkPropogatedBuildInputs test Dependencies changed in https://github.com/NixOS/nixpkgs/pull/342196 --- .../development/interpreters/lua-5/tests/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/lua-5/tests/default.nix b/pkgs/development/interpreters/lua-5/tests/default.nix index b97266bcf83e..92c6b69e5fcb 100644 --- a/pkgs/development/interpreters/lua-5/tests/default.nix +++ b/pkgs/development/interpreters/lua-5/tests/default.nix @@ -123,12 +123,14 @@ pkgs.recurseIntoAttrs ({ checkPropagatedBuildInputs = pkgs.runCommandLocal "test-${lua.name}-setup-hook" ({ - # lua-curl is a propagatedBuildInput of rest-nvim has buildInputs = [ lua.pkgs.rest-nvim ]; }) - ('' - ${lua}/bin/lua -e "require'cURL'" - touch $out - ''); + # `xml2lua` is a propagatedBuildInput of rest-nvim + ( + '' + ${lua}/bin/lua -e "require'xml2lua'" + touch $out + '' + ); }) From 4249106f2e8e819c6bcff94a619a40c8e75e5586 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 15 Mar 2025 09:25:45 -0500 Subject: [PATCH 03/17] tests/lua-5: fix lint errors Unnecessary parenthesis --- .../interpreters/lua-5/tests/default.nix | 46 +++++++++---------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/pkgs/development/interpreters/lua-5/tests/default.nix b/pkgs/development/interpreters/lua-5/tests/default.nix index 92c6b69e5fcb..6d879ce43292 100644 --- a/pkgs/development/interpreters/lua-5/tests/default.nix +++ b/pkgs/development/interpreters/lua-5/tests/default.nix @@ -10,10 +10,10 @@ let lua: { name, command }: pkgs.runCommandLocal "test-${lua.name}-${name}" - ({ + { nativeBuildInputs = [ lua ]; meta.platforms = lua.meta.platforms; - }) + } ( '' source ${./assert.sh} @@ -58,7 +58,7 @@ let ";./?.lua;${lua}/share/luajit-2.1/?.lua;/usr/local/share/lua/5.1/?.lua;/usr/local/share/lua/5.1/?/init.lua;${lua}/share/lua/5.1/?.lua;${lua}/share/lua/5.1/?/init.lua;"; }; in -pkgs.recurseIntoAttrs ({ +pkgs.recurseIntoAttrs { checkInterpreterPatch = let @@ -75,12 +75,12 @@ pkgs.recurseIntoAttrs ({ checkWrapping = pkgs.runCommandLocal "test-${lua.name}-wrapping" - ({ - }) - ('' + { + } + '' grep -- 'LUA_PATH=' ${wrappedHello}/bin/hello touch $out - ''); + ''; # checks that lua's setup-hook adds dependencies to LUA_PATH # Prevents the following regressions @@ -90,21 +90,21 @@ pkgs.recurseIntoAttrs ({ # stdin:1: module 'http.request' not found: checkSetupHook = pkgs.runCommandLocal "test-${lua.name}-setup-hook" - ({ + { nativeBuildInputs = [ lua ]; buildInputs = [ lua.pkgs.http ]; meta.platforms = lua.meta.platforms; - }) - ('' + } + '' ${lua}/bin/lua -e "require'http.request'" touch $out - ''); + ''; checkRelativeImports = pkgs.runCommandLocal "test-${lua.name}-relative-imports" - ({ - }) - ('' + { + } + '' source ${./assert.sh} lua_vanilla_package_path="$(${lua}/bin/lua -e "print(package.path)")" @@ -117,20 +117,18 @@ pkgs.recurseIntoAttrs ({ assertStringContains "$lua_with_module_package_path" "./?/init.lua" touch $out - ''); + ''; # Check that a lua package's propagatedBuildInputs end up in LUA_PATH checkPropagatedBuildInputs = pkgs.runCommandLocal "test-${lua.name}-setup-hook" - ({ + { buildInputs = [ lua.pkgs.rest-nvim ]; - }) + } # `xml2lua` is a propagatedBuildInput of rest-nvim - ( - '' - ${lua}/bin/lua -e "require'xml2lua'" - touch $out - '' - ); + '' + ${lua}/bin/lua -e "require'xml2lua'" + touch $out + ''; -}) +} From e3864d7d8988652b939e9217cbd122edb2bdc57b Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 15 Mar 2025 09:29:14 -0500 Subject: [PATCH 04/17] tests/lua-5: fix `checkInterpreterPath` test name Checking a path location, not a patch. --- pkgs/development/interpreters/lua-5/tests/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/lua-5/tests/default.nix b/pkgs/development/interpreters/lua-5/tests/default.nix index 6d879ce43292..19146fdeb06e 100644 --- a/pkgs/development/interpreters/lua-5/tests/default.nix +++ b/pkgs/development/interpreters/lua-5/tests/default.nix @@ -60,7 +60,7 @@ let in pkgs.recurseIntoAttrs { - checkInterpreterPatch = + checkInterpreterPath = let golden_LUA_PATH = golden_LUA_PATHS.${lib.versions.majorMinor lua.version}; in From e77db89c578be0d62066db67f5694e300da77cd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 15 Mar 2025 23:42:34 -0700 Subject: [PATCH 05/17] python313Packages.ical: 9.0.0 -> 9.0.1 Diff: https://github.com/allenporter/ical/compare/refs/tags/9.0.0...9.0.1 Changelog: https://github.com/allenporter/ical/releases/tag/9.0.1 --- pkgs/development/python-modules/ical/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix index 104a9842ac9c..e2a150d38092 100644 --- a/pkgs/development/python-modules/ical/default.nix +++ b/pkgs/development/python-modules/ical/default.nix @@ -17,16 +17,16 @@ buildPythonPackage rec { pname = "ical"; - version = "9.0.0"; + version = "9.0.1"; pyproject = true; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "allenporter"; repo = "ical"; tag = version; - hash = "sha256-uAk+VYrcifRkUBLcXjBPwxrOlo1EKQUnPjUmR7+9cVo="; + hash = "sha256-VaFzN/Yzo0Ad1vsuZJ4P8+WWH+GtPJGOz3PWum8rLww="; }; build-system = [ setuptools ]; @@ -48,11 +48,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "ical" ]; - meta = with lib; { + meta = { description = "Library for handling iCalendar"; homepage = "https://github.com/allenporter/ical"; changelog = "https://github.com/allenporter/ical/releases/tag/${src.tag}"; - license = licenses.asl20; - maintainers = with maintainers; [ dotlambda ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; }; } From dba164fe39b0d5c2112a4e0b7c1dc8a8d92a7f3b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Mar 2025 14:47:51 +0000 Subject: [PATCH 06/17] supabase-cli: 2.17.0 -> 2.20.1 --- pkgs/by-name/su/supabase-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/supabase-cli/package.nix b/pkgs/by-name/su/supabase-cli/package.nix index b3ecca381571..89b04c80b9fe 100644 --- a/pkgs/by-name/su/supabase-cli/package.nix +++ b/pkgs/by-name/su/supabase-cli/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "2.17.0"; + version = "2.20.1"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - hash = "sha256-NkXtpymrEBw5fMaRo1fvcoePuOw0sAROLL5NJsrHELE="; + hash = "sha256-AfRO1dFXy5uvMJR09OWc+TfK6PUQi+fC1ZC5FATKmoU="; }; - vendorHash = "sha256-2r1dYUOEA7uj7ZyShz6cgL8Vc6TFKfPp4863i+7x7Ik="; + vendorHash = "sha256-3n2j8zGWudnYLOWn8p/vc4sD/WB7rQxNzZU6CY4Ybik="; ldflags = [ "-s" From 25e5402a49642b302eefda7e1eda4f3848be5de4 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 16 Mar 2025 10:34:51 -0500 Subject: [PATCH 07/17] tests/lua-5: format tweak --- .../interpreters/lua-5/tests/default.nix | 36 ++++++++----------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/pkgs/development/interpreters/lua-5/tests/default.nix b/pkgs/development/interpreters/lua-5/tests/default.nix index 19146fdeb06e..69cd8532d738 100644 --- a/pkgs/development/interpreters/lua-5/tests/default.nix +++ b/pkgs/development/interpreters/lua-5/tests/default.nix @@ -73,14 +73,10 @@ pkgs.recurseIntoAttrs { ''; }; - checkWrapping = - pkgs.runCommandLocal "test-${lua.name}-wrapping" - { - } - '' - grep -- 'LUA_PATH=' ${wrappedHello}/bin/hello - touch $out - ''; + checkWrapping = pkgs.runCommandLocal "test-${lua.name}-wrapping" { } '' + grep -- 'LUA_PATH=' ${wrappedHello}/bin/hello + touch $out + ''; # checks that lua's setup-hook adds dependencies to LUA_PATH # Prevents the following regressions @@ -100,24 +96,20 @@ pkgs.recurseIntoAttrs { touch $out ''; - checkRelativeImports = - pkgs.runCommandLocal "test-${lua.name}-relative-imports" - { - } - '' - source ${./assert.sh} + checkRelativeImports = pkgs.runCommandLocal "test-${lua.name}-relative-imports" { } '' + source ${./assert.sh} - lua_vanilla_package_path="$(${lua}/bin/lua -e "print(package.path)")" - lua_with_module_package_path="$(${luaWithModule}/bin/lua -e "print(package.path)")" + lua_vanilla_package_path="$(${lua}/bin/lua -e "print(package.path)")" + lua_with_module_package_path="$(${luaWithModule}/bin/lua -e "print(package.path)")" - assertStringContains "$lua_vanilla_package_path" "./?.lua" - assertStringContains "$lua_vanilla_package_path" "./?/init.lua" + assertStringContains "$lua_vanilla_package_path" "./?.lua" + assertStringContains "$lua_vanilla_package_path" "./?/init.lua" - assertStringContains "$lua_with_module_package_path" "./?.lua" - assertStringContains "$lua_with_module_package_path" "./?/init.lua" + assertStringContains "$lua_with_module_package_path" "./?.lua" + assertStringContains "$lua_with_module_package_path" "./?/init.lua" - touch $out - ''; + touch $out + ''; # Check that a lua package's propagatedBuildInputs end up in LUA_PATH checkPropagatedBuildInputs = From 72ecfda14a4d2f0f7ddd2a447e7b5fe62b00183f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Mar 2025 23:12:17 +0000 Subject: [PATCH 08/17] pinact: 1.2.1 -> 1.2.2 --- pkgs/by-name/pi/pinact/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pi/pinact/package.nix b/pkgs/by-name/pi/pinact/package.nix index bb16b0d35110..4200ed0bec57 100644 --- a/pkgs/by-name/pi/pinact/package.nix +++ b/pkgs/by-name/pi/pinact/package.nix @@ -8,19 +8,19 @@ let pname = "pinact"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "suzuki-shunsuke"; repo = "pinact"; tag = "v${version}"; - hash = "sha256-WBKe398W9NXwZwiK6P5SDay45bFGkOf1+cmGlS+fWRc="; + hash = "sha256-p2kixWkJgQYanbsShMtDWoY6AT0WrTVLI+Borzm8XLA="; }; mainProgram = "pinact"; in buildGoModule { inherit pname version src; - vendorHash = "sha256-Ix7C+Xs8Y4LoI06Xb5qVGwoJ+J87wTjYjmQp6aAeFhw="; + vendorHash = "sha256-EPQGozC2E+Q+12YBr2xXSzkI/X6bF6NX2kZ8UPh0BXs="; env.CGO_ENABLED = 0; From f017f115e5a84a009a43a7a79dc852424464b21b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 Mar 2025 00:18:05 +0100 Subject: [PATCH 09/17] evcc: 0.200.9 -> 0.201.0 https://github.com/evcc-io/evcc/releases/tag/0.201.0 --- pkgs/by-name/ev/evcc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix index 912878808595..029308c6633f 100644 --- a/pkgs/by-name/ev/evcc/package.nix +++ b/pkgs/by-name/ev/evcc/package.nix @@ -17,13 +17,13 @@ }: let - version = "0.200.9"; + version = "0.201.0"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; tag = version; - hash = "sha256-HIqehST3H4shxEdDyGYLkUXZVbHjHfdzyZ0vCGslozU="; + hash = "sha256-Hw2TIMcKkeSUEKtTwJezCRMUvicrZUjT9UmTvDgKy2s="; }; vendorHash = "sha256-zWHysXjBNAAZfrVGzn39pdDqQrLUc1uYVLO/U7q0g04="; @@ -52,7 +52,7 @@ buildGo124Module rec { npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-VYAJO2HeswhBlCVKi08frkvhKc/AFepmrSGY4JccBZE="; + hash = "sha256-IOpT7YH85iHCK9UqKoomdKQBsPFm4MJ0bbEFbIIxVTc="; }; nativeBuildInputs = [ From 387babd9fbea8a2789ec023f7acd172d25cb1d2e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Mar 2025 00:34:44 +0000 Subject: [PATCH 10/17] vdrPlugins.streamdev: 0.6.3 -> 0.6.4 --- pkgs/applications/video/vdr/streamdev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vdr/streamdev/default.nix b/pkgs/applications/video/vdr/streamdev/default.nix index 7c1defec74e7..e971ef130877 100644 --- a/pkgs/applications/video/vdr/streamdev/default.nix +++ b/pkgs/applications/video/vdr/streamdev/default.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation rec { pname = "vdr-streamdev"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "vdr-projects"; repo = "vdr-plugin-streamdev"; rev = version; - sha256 = "sha256-12sASyFAnSuP2xQzr1KL/Am52ez6hiOUH/0zFH2bxhc="; + sha256 = "sha256-fFnRDe3n/ltanRvLhrQDB6aV0UmyuEJgNUip0gKBrBA="; }; # configure don't accept argument --prefix From 88724622cc261753e74b4357bb6035bc696c7860 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Mar 2025 00:40:11 +0000 Subject: [PATCH 11/17] vdrPlugins.markad: 4.2.8 -> 4.2.10 --- pkgs/applications/video/vdr/markad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vdr/markad/default.nix b/pkgs/applications/video/vdr/markad/default.nix index 77c5e81749e6..d778c762c5b4 100644 --- a/pkgs/applications/video/vdr/markad/default.nix +++ b/pkgs/applications/video/vdr/markad/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-markad"; - version = "4.2.8"; + version = "4.2.10"; src = fetchFromGitHub { repo = "vdr-plugin-markad"; owner = "kfb77"; - hash = "sha256-yv44hC1p56jRg3DRaeFWjnUHeooHhnZVXJPhVNy1mwQ="; + hash = "sha256-qnE/0gnuY982qYz3ouUKFPURNkxM0XKWqf3w5ZwczV0="; rev = "V${version}"; }; From 1978073faf1a17f2ddfb8fd2d5af119f005fcf36 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Mar 2025 00:55:13 +0000 Subject: [PATCH 12/17] oils-for-unix: 0.27.0 -> 0.28.0 --- pkgs/by-name/oi/oils-for-unix/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/oi/oils-for-unix/package.nix b/pkgs/by-name/oi/oils-for-unix/package.nix index 34fc4111db46..f24534264f92 100644 --- a/pkgs/by-name/oi/oils-for-unix/package.nix +++ b/pkgs/by-name/oi/oils-for-unix/package.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { pname = "oils-for-unix"; - version = "0.27.0"; + version = "0.28.0"; src = fetchurl { url = "https://oils.pub/download/oils-for-unix-${version}.tar.gz"; - hash = "sha256-q1ORYt/8FpT9WuicAOQFzF97c2YBWexbJpvt6mMd8X0="; + hash = "sha256-Jm0UsW2Q1KB/53SIHq+g7Nu8hBHPHHX4tuJWNwtmjjU="; }; postPatch = '' From 1e5296714175d21f115787a22dfef96ab47f42f9 Mon Sep 17 00:00:00 2001 From: Daniel Thwaites Date: Mon, 17 Mar 2025 02:02:22 +0000 Subject: [PATCH 13/17] maintainers: update email address for danth --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6bbcab5d3f55..7279952592cb 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5322,7 +5322,7 @@ }; danth = { name = "Daniel Thwaites"; - email = "danthwaites30@btinternet.com"; + email = "danth@danth.me"; matrix = "@danth:danth.me"; github = "danth"; githubId = 28959268; From 14001b14fccca18e4ce86af02982c121c8825c6f Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Sun, 16 Mar 2025 21:35:32 -0500 Subject: [PATCH 14/17] kdePackages.kinfocenter: wrap with --inherit-argv0 --- pkgs/kde/plasma/kinfocenter/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/kde/plasma/kinfocenter/default.nix b/pkgs/kde/plasma/kinfocenter/default.nix index d9a0c171dbdb..c6849d94c93e 100644 --- a/pkgs/kde/plasma/kinfocenter/default.nix +++ b/pkgs/kde/plasma/kinfocenter/default.nix @@ -60,6 +60,8 @@ mkKdeDerivation { extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ libusb1 ]; + qtWrapperArgs = [ "--inherit-argv0" ]; + # fix wrong symlink of infocenter pointing to a 'systemsettings5' binary in # the same directory, while it is actually located in a completely different # store path From e7fa733dbd4513993a7012a5f396143bc02803d7 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Sun, 16 Mar 2025 20:30:15 -0700 Subject: [PATCH 15/17] pkgs/top-level/all-packages.nix: add gnuStdenv (#378409) --- pkgs/top-level/all-packages.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 414488dbf1e9..16fd58b44885 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5744,6 +5744,15 @@ with pkgs; }; }) else ccWrapper; + gnuStdenv = + if stdenv.cc.isGNU + then stdenv + else gccStdenv.override { + cc = gccStdenv.cc.override { + bintools = buildPackages.binutils; + }; + }; + gccStdenv = if stdenv.cc.isGNU then stdenv From 3cbbfb1795a5b79a8b333c1e2089cdf8b3733c05 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Sun, 16 Mar 2025 20:36:53 -0700 Subject: [PATCH 16/17] =?UTF-8?q?pkgs/development/compilers/llvm/common/de?= =?UTF-8?q?fault.nix:=20move=20patches=20into=E2=80=A6=20(#389658)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit pkgs/development/compilers/llvm/common/default.nix: move patches into patches.nix --- .../compilers/llvm/common/default.nix | 228 +----------------- .../compilers/llvm/common/patches.nix | 226 +++++++++++++++++ pkgs/development/compilers/llvm/default.nix | 2 + 3 files changed, 230 insertions(+), 226 deletions(-) create mode 100644 pkgs/development/compilers/llvm/common/patches.nix diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index 948957a1c7ff..225abc626e42 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -27,6 +27,7 @@ officialRelease ? null, monorepoSrc ? null, version ? null, + patchesFn ? lib.id, # Allows passthrough to packages via newScope. This makes it possible to # do `(llvmPackages.override { = bar; }).clang` and get # an llvmPackages whose packages are overridden in an internally consistent way. @@ -80,232 +81,7 @@ let name = builtins.baseNameOf p; path = let - patches = { - "clang/gnu-install-dirs.patch" = [ - { - before = "14"; - path = ../12; - } - { - after = "19"; - path = ../19; - } - ]; - "clang/purity.patch" = [ - { - after = "18"; - path = ../18; - } - { - before = "17"; - after = "15"; - path = ../15; - } - { - before = "16"; - path = ../12; - } - ]; - "clang/aarch64-tblgen.patch" = [ - { - after = "17"; - before = "18"; - path = ../17; - } - ]; - "lld/add-table-base.patch" = [ - { - after = "16"; - path = ../16; - } - ]; - "lld/gnu-install-dirs.patch" = [ - { - after = "18"; - path = ../18; - } - { - before = "14"; - path = ../12; - } - ]; - "llvm/gnu-install-dirs.patch" = [ - { - after = "20"; - path = ../20; - } - { - after = "18"; - before = "20"; - path = ../18; - } - ]; - "llvm/gnu-install-dirs-polly.patch" = [ - { - after = "20"; - path = ../20; - } - { - before = "20"; - after = "18"; - path = ../18; - } - { - before = "18"; - after = "14"; - path = ../14; - } - ]; - "llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch" = [ - { - before = "17"; - after = "15"; - path = ../15; - } - { - after = "17"; - path = ../17; - } - ]; - "llvm/lit-shell-script-runner-set-dyld-library-path.patch" = [ - { - after = "18"; - path = ../18; - } - { - after = "16"; - before = "18"; - path = ../16; - } - ]; - "llvm/polly-lit-cfg-add-libs-to-dylib-path.patch" = [ - { - after = "15"; - path = ../15; - } - ]; - "libunwind/gnu-install-dirs.patch" = [ - { - before = "17"; - after = "15"; - path = ../15; - } - ]; - "compiler-rt/X86-support-extension.patch" = [ - { - after = "15"; - path = ../15; - } - { - before = "15"; - path = ../12; - } - ]; - "compiler-rt/armv6-scudo-libatomic.patch" = [ - { - after = "19"; - path = ../19; - } - { - after = "15"; - before = "19"; - path = ../15; - } - { - before = "15"; - path = ../14; - } - ]; - "compiler-rt/armv7l.patch" = [ - { - before = "15"; - after = "13"; - path = ../13; - } - ]; - "compiler-rt/gnu-install-dirs.patch" = [ - { - before = "14"; - path = ../12; - } - { - after = "13"; - before = "15"; - path = ../14; - } - { - after = "15"; - before = "17"; - path = ../15; - } - { - after = "16"; - path = ../17; - } - ]; - "compiler-rt/darwin-targetconditionals.patch" = [ - { - after = "13"; - path = ../13; - } - ]; - "compiler-rt/codesign.patch" = [ - { - after = "13"; - path = ../13; - } - ]; - "compiler-rt/normalize-var.patch" = [ - { - after = "16"; - path = ../16; - } - { - before = "16"; - path = ../12; - } - ]; - "lldb/procfs.patch" = [ - { - after = "15"; - path = ../15; - } - { - before = "15"; - path = ../12; - } - ]; - "lldb/resource-dir.patch" = [ - { - before = "16"; - path = ../12; - } - ]; - "openmp/fix-find-tool.patch" = [ - { - after = "17"; - before = "19"; - path = ../17; - } - ]; - "openmp/run-lit-directly.patch" = [ - { - after = "16"; - path = ../16; - } - { - after = "14"; - before = "16"; - path = ../14; - } - ]; - "libclc/use-default-paths.patch" = [ - { - after = "19"; - path = ../19; - } - ]; - }; + patches = args.patchesFn (import ./patches.nix); constraints = patches."${p}" or null; matchConstraint = diff --git a/pkgs/development/compilers/llvm/common/patches.nix b/pkgs/development/compilers/llvm/common/patches.nix new file mode 100644 index 000000000000..37ba80c349d2 --- /dev/null +++ b/pkgs/development/compilers/llvm/common/patches.nix @@ -0,0 +1,226 @@ +{ + "clang/gnu-install-dirs.patch" = [ + { + before = "14"; + path = ../12; + } + { + after = "19"; + path = ../19; + } + ]; + "clang/purity.patch" = [ + { + after = "18"; + path = ../18; + } + { + before = "17"; + after = "15"; + path = ../15; + } + { + before = "16"; + path = ../12; + } + ]; + "clang/aarch64-tblgen.patch" = [ + { + after = "17"; + before = "18"; + path = ../17; + } + ]; + "lld/add-table-base.patch" = [ + { + after = "16"; + path = ../16; + } + ]; + "lld/gnu-install-dirs.patch" = [ + { + after = "18"; + path = ../18; + } + { + before = "14"; + path = ../12; + } + ]; + "llvm/gnu-install-dirs.patch" = [ + { + after = "20"; + path = ../20; + } + { + after = "18"; + before = "20"; + path = ../18; + } + ]; + "llvm/gnu-install-dirs-polly.patch" = [ + { + after = "20"; + path = ../20; + } + { + before = "20"; + after = "18"; + path = ../18; + } + { + before = "18"; + after = "14"; + path = ../14; + } + ]; + "llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch" = [ + { + before = "17"; + after = "15"; + path = ../15; + } + { + after = "17"; + path = ../17; + } + ]; + "llvm/lit-shell-script-runner-set-dyld-library-path.patch" = [ + { + after = "18"; + path = ../18; + } + { + after = "16"; + before = "18"; + path = ../16; + } + ]; + "llvm/polly-lit-cfg-add-libs-to-dylib-path.patch" = [ + { + after = "15"; + path = ../15; + } + ]; + "libunwind/gnu-install-dirs.patch" = [ + { + before = "17"; + after = "15"; + path = ../15; + } + ]; + "compiler-rt/X86-support-extension.patch" = [ + { + after = "15"; + path = ../15; + } + { + before = "15"; + path = ../12; + } + ]; + "compiler-rt/armv6-scudo-libatomic.patch" = [ + { + after = "19"; + path = ../19; + } + { + after = "15"; + before = "19"; + path = ../15; + } + { + before = "15"; + path = ../14; + } + ]; + "compiler-rt/armv7l.patch" = [ + { + before = "15"; + after = "13"; + path = ../13; + } + ]; + "compiler-rt/gnu-install-dirs.patch" = [ + { + before = "14"; + path = ../12; + } + { + after = "13"; + before = "15"; + path = ../14; + } + { + after = "15"; + before = "17"; + path = ../15; + } + { + after = "16"; + path = ../17; + } + ]; + "compiler-rt/darwin-targetconditionals.patch" = [ + { + after = "13"; + path = ../13; + } + ]; + "compiler-rt/codesign.patch" = [ + { + after = "13"; + path = ../13; + } + ]; + "compiler-rt/normalize-var.patch" = [ + { + after = "16"; + path = ../16; + } + { + before = "16"; + path = ../12; + } + ]; + "lldb/procfs.patch" = [ + { + after = "15"; + path = ../15; + } + { + before = "15"; + path = ../12; + } + ]; + "lldb/resource-dir.patch" = [ + { + before = "16"; + path = ../12; + } + ]; + "openmp/fix-find-tool.patch" = [ + { + after = "17"; + before = "19"; + path = ../17; + } + ]; + "openmp/run-lit-directly.patch" = [ + { + after = "16"; + path = ../16; + } + { + after = "14"; + before = "16"; + path = ../14; + } + ]; + "libclc/use-default-paths.patch" = [ + { + after = "19"; + path = ../19; + } + ]; +} diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 28bfcb703647..c3d31450830e 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -14,6 +14,7 @@ bootBintoolsNoLibc ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintoolsNoLibc, bootBintools ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintools, llvmVersions ? { }, + patchesFn ? lib.id, # Allows passthrough to packages via newScope in ./common/default.nix. # This makes it possible to do # `(llvmPackages.override { = bar; }).clang` and get @@ -74,6 +75,7 @@ let gitRelease monorepoSrc version + patchesFn ; } // packageSetArgs # Allow overrides. From 8744abec2519ad0188f64d0bf54e5624b21b47a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Mar 2025 01:13:19 +0000 Subject: [PATCH 17/17] hexxy: 0-unstable-2024-09-29 -> 0-unstable-2025-03-16 --- pkgs/by-name/he/hexxy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/he/hexxy/package.nix b/pkgs/by-name/he/hexxy/package.nix index 3864da545207..d33ebbc6d762 100644 --- a/pkgs/by-name/he/hexxy/package.nix +++ b/pkgs/by-name/he/hexxy/package.nix @@ -6,13 +6,13 @@ }: buildGoModule { pname = "hexxy"; - version = "0-unstable-2024-09-29"; + version = "0-unstable-2025-03-16"; src = fetchFromGitHub { owner = "sweetbbak"; repo = "hexxy"; # upstream does not publish releases, i.e., there are no tags - rev = "36174e436f9d57421b9e9515db32ca1425c382bd"; - hash = "sha256-5r8yaKlRkIcZXubHBMhdGV0u52rs2WnEaWatm+D56Fs="; + rev = "d90f345ba80078b18baf006b3a5aec92d2c330e1"; + hash = "sha256-htTGdcJ3oMgfsJ3FH1aRnI2vxMNpBcLksABA75EQUFo="; }; vendorHash = "sha256-qkBpSVLWZPRgS9bqOVUWHpyj8z/nheQJON3vJOwPUj4=";