From 0b76b065ac9fd730555bf5800530fd606ec7bf99 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 6 Jun 2024 00:22:05 +0200 Subject: [PATCH 01/16] git-branchless: make fetchpatch url reproducible --- .../version-management/git-branchless/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-branchless/default.nix b/pkgs/applications/version-management/git-branchless/default.nix index fd6213269729..8dec676a9c52 100644 --- a/pkgs/applications/version-management/git-branchless/default.nix +++ b/pkgs/applications/version-management/git-branchless/default.nix @@ -27,12 +27,14 @@ rustPlatform.buildRustPackage rec { patches = [ # Fix tests with Git 2.44.0+ (fetchpatch { - url = "https://github.com/arxanas/git-branchless/pull/1245.patch"; + name = "1245.patch"; # https://github.com/arxanas/git-branchless/pull/1245 + url = "https://github.com/arxanas/git-branchless/commit/c8436aed3d616409b4d6fb1eedb383077f435497.patch"; hash = "sha256-gBm0A478Uhg9IQVLQppvIeTa8s1yHUMddxiUbpHUvGw="; }) # Fix tests with Git 2.44.0+ (fetchpatch { - url = "https://github.com/arxanas/git-branchless/pull/1161.patch"; + name = "1161.patch"; # https://github.com/arxanas/git-branchless/pull/1161 + url = "https://github.com/arxanas/git-branchless/commit/6e1f26900a0dd60d10d9aa3552cab9181fa7be03.patch"; hash = "sha256-KHobEIXhlDar8CvIVUi4I695jcJZXgGRhU86b99x86Y="; }) ]; From a0b5c51f2346d79945bd09e33fce962a0db42205 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 6 Jun 2024 00:25:32 +0200 Subject: [PATCH 02/16] modern-cpp-kafka: make fetchpatch url reproducible --- pkgs/by-name/mo/modern-cpp-kafka/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/mo/modern-cpp-kafka/package.nix b/pkgs/by-name/mo/modern-cpp-kafka/package.nix index 7986c63aab53..ba69be491e53 100644 --- a/pkgs/by-name/mo/modern-cpp-kafka/package.nix +++ b/pkgs/by-name/mo/modern-cpp-kafka/package.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { }; patches = [ - (fetchpatch { + (fetchpatch { # https://github.com/morganstanley/modern-cpp-kafka/pull/221 name = "fix-avoid-overwriting-library-paths.patch"; - url = "https://github.com/morganstanley/modern-cpp-kafka/pull/221.patch"; + url = "https://github.com/morganstanley/modern-cpp-kafka/compare/a146d10bcf166f55299c7a55728abaaea52cb0e5...a0b5ec08315759097ce656813be57b2c38d79091.patch"; hash = "sha256-UsQcMvJoRTn5kgXhmXOyqfW3n59kGKO596U2WjtdqAY="; }) - (fetchpatch { + (fetchpatch { # https://github.com/morganstanley/modern-cpp-kafka/pull/222 name = "add-pkg-config-cmake-config.patch"; - url = "https://github.com/morganstanley/modern-cpp-kafka/pull/222.patch"; + url = "https://github.com/morganstanley/modern-cpp-kafka/commit/edc576ab83710412f6201e2bb8de5cb41682ee4a.patch"; hash = "sha256-OjoSttnpgEwSZjCVKc888xJb5f1Dulu/rQqoGmqXNM4="; }) # Fix gcc-13 build failure: From 463c72bb6e4979166e19f37ecebe397217ff784b Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 6 Jun 2024 00:25:35 +0200 Subject: [PATCH 03/16] mpvScripts.mpv-notify-send: make fetchpatch url reproducible --- pkgs/applications/video/mpv/scripts/mpv-notify-send.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix b/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix index 3e3a04499d08..838e30a2fabc 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix @@ -21,7 +21,8 @@ buildLua rec { patches = [ # show title of online videos instead of url (fetchpatch { - url = "https://github.com/emilazy/mpv-notify-send/pull/6.patch"; + name = "6.patch"; # https://github.com/emilazy/mpv-notify-send/pull/6 + url = "https://github.com/emilazy/mpv-notify-send/commit/948347e14890e15e89cd1e069beb1140e2d01dce.patch"; hash = "sha256-7aXQ8qeqG4yX0Uyn09xCIESnwPZsb6Frd7C49XgbpFw="; }) ]; From 5c10264dd7e98e724fa912bf4e5395c13252541a Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 6 Jun 2024 00:28:26 +0200 Subject: [PATCH 04/16] python311Packages.dazl: make fetchpatch url reproducible --- pkgs/development/python-modules/dazl/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dazl/default.nix b/pkgs/development/python-modules/dazl/default.nix index 70cd5116c585..7613795fabe9 100644 --- a/pkgs/development/python-modules/dazl/default.nix +++ b/pkgs/development/python-modules/dazl/default.nix @@ -36,7 +36,8 @@ buildPythonPackage rec { patches = [ # Merged, remove this next release (fetchpatch { - url = "https://github.com/digital-asset/dazl-client/pull/428.patch"; + name = "428.patch"; # https://github.com/digital-asset/dazl-client/pull/428 + url = "https://github.com/digital-asset/dazl-client/commit/a68bad0471d22210f0abf31447a7732477de39d4.patch"; sha256 = "sha256-Gx9W1XkvMPg8FAOAXijDF5QnMbntk5mR0q5+o5i2KAE="; }) ]; From 22ca7bfea200b6944b3eeae1d9a0e3ba75dd6bed Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 6 Jun 2024 00:29:33 +0200 Subject: [PATCH 05/16] python311Packages.pymilter: make fetchpatch url reproducible --- pkgs/development/python-modules/pymilter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymilter/default.nix b/pkgs/development/python-modules/pymilter/default.nix index d26e354d54b2..32b7cfcc9bbc 100644 --- a/pkgs/development/python-modules/pymilter/default.nix +++ b/pkgs/development/python-modules/pymilter/default.nix @@ -31,9 +31,9 @@ buildPythonPackage rec { pydns ]; patches = [ - (fetchpatch { + (fetchpatch { # https://github.com/sdgathman/pymilter/pull/57 name = "Remove-calls-to-the-deprecated-method-assertEquals"; - url = "https://github.com/sdgathman/pymilter/pull/57.patch"; + url = "https://github.com/sdgathman/pymilter/commit/1ead9028fc63ae3ec6ea3b0c438e6ed088a2b20e.patch"; hash = "sha256-/5LlDR15nMR3l7rkVjT3w4FbDTFAAgNdERWlPNL2TVg="; }) ]; From ef15362c97daaffa385c85f5b593bec2dbcfbed0 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 6 Jun 2024 00:30:19 +0200 Subject: [PATCH 06/16] python311Packages.xgboost: make fetchpatch url reproducible --- pkgs/development/libraries/xgboost/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index ecb90117b6fe..e5432430cac3 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -59,9 +59,9 @@ effectiveStdenv.mkDerivation rec { }; patches = lib.optionals (cudaSupport && cudaPackages.cudaMajorMinorVersion == "12.4") [ - (fetchpatch { + (fetchpatch { # https://github.com/dmlc/xgboost/pull/10123 name = "Fix compilation with the ctk 12.4."; - url = "https://github.com/dmlc/xgboost/pull/10123.patch"; + url = "https://github.com/dmlc/xgboost/commit/c760f85db0bc7bd6379901fbfb67ceccc2b37700.patch"; hash = "sha256-iP9mll9pg8T2ztCR7dBPnLP17/x3ImJFrr5G3e2dqHo="; }) ]; From 8e1e4c64035a440870492dc6635df6412203a603 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 6 Jun 2024 00:37:33 +0200 Subject: [PATCH 07/16] webtorrent_desktop: make fetchpatch url reproducible --- pkgs/applications/video/webtorrent_desktop/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/applications/video/webtorrent_desktop/default.nix index 75a8d9f5c639..60ef7c57cdc8 100644 --- a/pkgs/applications/video/webtorrent_desktop/default.nix +++ b/pkgs/applications/video/webtorrent_desktop/default.nix @@ -12,12 +12,14 @@ buildNpmPackage { patches = [ # electron 27 fix (fetchpatch { - url = "https://github.com/webtorrent/webtorrent-desktop/pull/2388.patch"; + name = "2388.patch"; # https://github.com/webtorrent/webtorrent-desktop/pull/2388 + url = "https://github.com/webtorrent/webtorrent-desktop/compare/ebaf9cf8487dbd9e14a9a0c5adc3eab23b199e58...0c3e55d1f091bf66a342e2732550ebeccc2e4169.patch"; hash = "sha256-gam5oAZtsaiCNFwecA5ff0nhraySLx3SOHlb/js+cPM="; }) # startup fix (fetchpatch { - url = "https://github.com/webtorrent/webtorrent-desktop/pull/2389.patch"; + name = "2389.patch"; # https://github.com/webtorrent/webtorrent-desktop/pull/2389 + url = "https://github.com/webtorrent/webtorrent-desktop/commit/407046d150ed7ff876a5e1978f68630e9c8f0074.patch"; hash = "sha256-hBJGLNNjcGRhYOFlLm/RL0po+70tEeJtR6Y/CfacPAI="; }) ]; From feff02cf107840bd0c7ec8d4e3b612142ecbb12b Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 10 Jun 2024 13:58:57 +0200 Subject: [PATCH 08/16] libsbml: make fetchpatch url reproducible --- pkgs/by-name/li/libsbml/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libsbml/package.nix b/pkgs/by-name/li/libsbml/package.nix index ce895beee006..513e72f322bc 100644 --- a/pkgs/by-name/li/libsbml/package.nix +++ b/pkgs/by-name/li/libsbml/package.nix @@ -22,9 +22,9 @@ stdenv.mkDerivation (attrs: { patches = [ # This should be in next release, remember to remove fetchpatch - (fetchpatch { + (fetchpatch { # https://github.com/sbmlteam/libsbml/pull/358 name = "fix-xmlerror-conversion.patch"; - url = "https://github.com/sbmlteam/libsbml/pull/358.patch"; + url = "https://github.com/sbmlteam/libsbml/commit/de2f77ee6766fe933a1472200f5e08e7c5ba6f8c.patch"; hash = "sha256-uirG6XJ+w0hqBUEAGDnzhHoVtJVRdN1eqBYeneKMBao="; }) ]; From 7e9245b3de657857257d8abd06e77073e059c1af Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 10 Jun 2024 14:10:20 +0200 Subject: [PATCH 09/16] haskell.packages.ghc98.libmpd: make fetchpatch urls reproducible --- .../development/haskell-modules/configuration-ghc-9.8.x.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index 5248e2d3ab91..02ac104c0212 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -131,8 +131,10 @@ self: super: { hip = appendConfigureFlag "--ghc-options=-fsimpl-tick-factor=200" super.hip; # Fix build with text-2.x. - libmpd = appendPatch (pkgs.fetchpatch - { url = "https://github.com/vimus/libmpd-haskell/pull/138.patch"; + libmpd = appendPatch + (pkgs.fetchpatch { + name = "138.patch"; # https://github.com/vimus/libmpd-haskell/pull/138 + url = "https://github.com/vimus/libmpd-haskell/compare/95d3b3bab5858d6d1f0e079d0ab7c2d182336acb...f1cbf247261641565a3937b90721f7955d254c5e.patch"; sha256 = "Q4fA2J/Tq+WernBo+UIMdj604ILOMlIYkG4Pr046DfM="; }) super.libmpd; From 40a7f218c554ef239062629b7db97bf1beedca58 Mon Sep 17 00:00:00 2001 From: Peter Waller Date: Sun, 16 Jun 2024 14:47:45 +0100 Subject: [PATCH 10/16] llvmPackages_{12,13,14,15,16,17,18,git}: Allow overriding dependencies ... consistently. Further to #307211, allow overriding arguments through llvmPackages.override. This makes it possible to override any dependency of LLVM or clang by overriding it on `llvmPackages.override { = ...; }`. This is useful in development or customization where sometimes it is desirable to turn features on or off. Without this patch the only way to for example override ncurses was to do `overriddenLLVM = llvmPackages.llvm.override { ncurses }`, but then you would have to thread `overriddenLLVM` as dependencies into clang and other packages, which results in quite a difficult expression to write correctly in cross compilation scenarios. Signed-off-by: Peter Waller --- pkgs/development/compilers/llvm/12/default.nix | 10 +++++++--- pkgs/development/compilers/llvm/13/default.nix | 11 +++++++---- pkgs/development/compilers/llvm/14/default.nix | 9 +++++++-- pkgs/development/compilers/llvm/15/default.nix | 9 +++++++-- pkgs/development/compilers/llvm/16/default.nix | 9 +++++++-- pkgs/development/compilers/llvm/17/default.nix | 9 +++++++-- pkgs/development/compilers/llvm/18/default.nix | 9 +++++++-- pkgs/development/compilers/llvm/git/default.nix | 9 +++++++-- 8 files changed, 56 insertions(+), 19 deletions(-) diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix index d3b823215c52..0e498aa30356 100644 --- a/pkgs/development/compilers/llvm/12/default.nix +++ b/pkgs/development/compilers/llvm/12/default.nix @@ -1,7 +1,7 @@ -{ lowPrio, newScope, pkgs, lib, stdenv, cmake +{ lowPrio, newScope, pkgs, lib, stdenv , preLibcCrossHeaders -, substitute, substituteAll, fetchFromGitHub, fetchpatch -, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith +, substitute, substituteAll, fetchFromGitHub, fetchpatch, fetchurl +, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross , targetLlvm @@ -17,6 +17,10 @@ then null else pkgs.bintools , darwin +# 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. +, ... }@args: let diff --git a/pkgs/development/compilers/llvm/13/default.nix b/pkgs/development/compilers/llvm/13/default.nix index 0b231a91512b..22bdc6140ab3 100644 --- a/pkgs/development/compilers/llvm/13/default.nix +++ b/pkgs/development/compilers/llvm/13/default.nix @@ -1,7 +1,7 @@ -{ lowPrio, newScope, pkgs, lib, stdenv, cmake +{ lowPrio, newScope, pkgs, lib, stdenv , preLibcCrossHeaders -, fetchpatch -, libxml2, python3, isl, fetchFromGitHub, substitute, substituteAll, overrideCC, wrapCCWith, wrapBintoolsWith +, substitute, substituteAll, fetchFromGitHub, fetchpatch +, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross , targetLlvm @@ -40,7 +40,10 @@ # to you to make sure that the LLVM repo given matches the release configuration # specified. , monorepoSrc ? null - +# 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. +, ... }@args: assert diff --git a/pkgs/development/compilers/llvm/14/default.nix b/pkgs/development/compilers/llvm/14/default.nix index a80b3aa4ffff..22fd8223c8f2 100644 --- a/pkgs/development/compilers/llvm/14/default.nix +++ b/pkgs/development/compilers/llvm/14/default.nix @@ -1,6 +1,7 @@ -{ lowPrio, newScope, pkgs, lib, stdenv, cmake +{ lowPrio, newScope, pkgs, lib, stdenv , preLibcCrossHeaders -, libxml2, python3, fetchFromGitHub, substitute, substituteAll, fetchpatch, overrideCC, wrapCCWith, wrapBintoolsWith +, substitute, substituteAll, fetchFromGitHub, fetchpatch +, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross , targetLlvm @@ -39,6 +40,10 @@ # to you to make sure that the LLVM repo given matches the release configuration # specified. , monorepoSrc ? null +# 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. +, ... }@args: assert diff --git a/pkgs/development/compilers/llvm/15/default.nix b/pkgs/development/compilers/llvm/15/default.nix index e30e9f9a59db..b3d2d9c3de48 100644 --- a/pkgs/development/compilers/llvm/15/default.nix +++ b/pkgs/development/compilers/llvm/15/default.nix @@ -1,6 +1,7 @@ -{ lowPrio, newScope, pkgs, lib, stdenv, cmake, ninja +{ lowPrio, newScope, pkgs, lib, stdenv , preLibcCrossHeaders -, libxml2, python3, fetchFromGitHub, fetchpatch, substitute, substituteAll, overrideCC, wrapCCWith, wrapBintoolsWith +, substitute, substituteAll, fetchFromGitHub, fetchpatch +, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross , targetLlvm @@ -39,6 +40,10 @@ # to you to make sure that the LLVM repo given matches the release configuration # specified. , monorepoSrc ? null +# 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. +, ... }@args: assert diff --git a/pkgs/development/compilers/llvm/16/default.nix b/pkgs/development/compilers/llvm/16/default.nix index 426bcb4c46d8..521e1ed92e3e 100644 --- a/pkgs/development/compilers/llvm/16/default.nix +++ b/pkgs/development/compilers/llvm/16/default.nix @@ -1,6 +1,7 @@ -{ lowPrio, newScope, pkgs, lib, stdenv, cmake, ninja +{ lowPrio, newScope, pkgs, lib, stdenv , preLibcCrossHeaders -, libxml2, python3, fetchFromGitHub, substituteAll, overrideCC, wrapCCWith, wrapBintoolsWith +, substitute, substituteAll, fetchFromGitHub +, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross , targetLlvm @@ -39,6 +40,10 @@ # to you to make sure that the LLVM repo given matches the release configuration # specified. , monorepoSrc ? null +# 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. +, ... }@args: assert diff --git a/pkgs/development/compilers/llvm/17/default.nix b/pkgs/development/compilers/llvm/17/default.nix index a6d7f48eb800..af0d648c4fd0 100644 --- a/pkgs/development/compilers/llvm/17/default.nix +++ b/pkgs/development/compilers/llvm/17/default.nix @@ -1,6 +1,7 @@ -{ lowPrio, newScope, pkgs, lib, stdenv, cmake, ninja +{ lowPrio, newScope, pkgs, lib, stdenv , preLibcCrossHeaders -, libxml2, python3, fetchFromGitHub, fetchpatch, substituteAll, overrideCC, wrapCCWith, wrapBintoolsWith +, substitute, substituteAll, fetchFromGitHub, fetchpatch +, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross , targetLlvm @@ -39,6 +40,10 @@ # to you to make sure that the LLVM repo given matches the release configuration # specified. , monorepoSrc ? null +# 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. +, ... }@args: assert diff --git a/pkgs/development/compilers/llvm/18/default.nix b/pkgs/development/compilers/llvm/18/default.nix index d62ae9c820b2..4ef972870838 100644 --- a/pkgs/development/compilers/llvm/18/default.nix +++ b/pkgs/development/compilers/llvm/18/default.nix @@ -1,6 +1,7 @@ -{ lowPrio, newScope, pkgs, lib, stdenv, cmake, ninja +{ lowPrio, newScope, pkgs, lib, stdenv , preLibcCrossHeaders -, libxml2, python3, fetchFromGitHub, substituteAll, overrideCC, wrapCCWith, wrapBintoolsWith +, substitute, substituteAll, fetchFromGitHub +, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross , targetLlvm @@ -39,6 +40,10 @@ # to you to make sure that the LLVM repo given matches the release configuration # specified. , monorepoSrc ? null +# 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. +, ... }@args: assert diff --git a/pkgs/development/compilers/llvm/git/default.nix b/pkgs/development/compilers/llvm/git/default.nix index 464c405dc060..0e3a0eb7c696 100644 --- a/pkgs/development/compilers/llvm/git/default.nix +++ b/pkgs/development/compilers/llvm/git/default.nix @@ -1,6 +1,7 @@ -{ lowPrio, newScope, pkgs, lib, stdenv, cmake, ninja +{ lowPrio, newScope, pkgs, lib, stdenv , preLibcCrossHeaders -, libxml2, python3, fetchFromGitHub, substituteAll, overrideCC, wrapCCWith, wrapBintoolsWith +, substitute, substituteAll, fetchFromGitHub, fetchpatch +, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross , targetLlvm @@ -44,6 +45,10 @@ # to you to make sure that the LLVM repo given matches the release configuration # specified. , monorepoSrc ? null +# 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. +, ... }@args: assert From 52e2f9fc91884002fe1d9a91203bf8a9f149ce6f Mon Sep 17 00:00:00 2001 From: LuoChen Date: Mon, 17 Jun 2024 21:19:24 +0800 Subject: [PATCH 11/16] lean4: 4.7.0 -> 4.8.0 --- pkgs/applications/science/logic/lean4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/lean4/default.nix b/pkgs/applications/science/logic/lean4/default.nix index ac41b03643dc..2ec05098f407 100644 --- a/pkgs/applications/science/logic/lean4/default.nix +++ b/pkgs/applications/science/logic/lean4/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lean4"; - version = "4.7.0"; + version = "4.8.0"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean4"; rev = "v${finalAttrs.version}"; - hash = "sha256-jHY8BhDotfGcMS0Xzl5iawqCaug3dDEKuD5Y1WcM06I="; + hash = "sha256-R75RrAQb/tRTtMvy/ddLl1KQaA7V71nocvjIS9geMrg="; }; postPatch = '' From df90591e548884a607898d92426975bbed234593 Mon Sep 17 00:00:00 2001 From: emilylange Date: Wed, 19 Jun 2024 17:23:28 +0200 Subject: [PATCH 12/16] chromedriver: 126.0.6478.61 -> 126.0.6478.62 --- .../networking/browsers/chromium/upstream-info.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 746cc6d6068b..008e5aeae27a 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,11 +1,11 @@ { stable = { chromedriver = { - hash_darwin = "sha256-OvRkO/mBXOk3IqZtvjKzOsBPBaZzq+YOb//SsXtgB9k="; + hash_darwin = "sha256-BWZaa1+3EUG11RmZjjbwG2UPZhlCpW3X9rkpiWrjgzM="; hash_darwin_aarch64 = - "sha256-ODR4fFW24yh4vIGcWjBVH+mfK+LECU/LXlWVq+NBNlI="; - hash_linux = "sha256-7vWid5i9bOyuGL2v9kdzv2yW2ZqWNNZDQScSDriaxxM="; - version = "126.0.6478.61"; + "sha256-wkUIFolVdvcnEQKKehKCyD5GS5Q42fVFKj/iHtiIj8I="; + hash_linux = "sha256-owTmkkgMcmuuhGv23uNjFjBdC49IJt+v6rjWu7xuchQ="; + version = "126.0.6478.62"; }; deps = { gn = { From 5bfb8d7d7d71411cb9e62f8e2bce002aeeb1eddd Mon Sep 17 00:00:00 2001 From: emilylange Date: Wed, 19 Jun 2024 17:25:06 +0200 Subject: [PATCH 13/16] chromium: 126.0.6478.61 -> 126.0.6478.114 https://chromereleases.googleblog.com/2024/06/stable-channel-update-for-desktop_18.html This update includes 6 security fixes. CVEs: CVE-2024-6100 CVE-2024-6101 CVE-2024-6102 CVE-2024-6103 --- .../networking/browsers/chromium/upstream-info.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 008e5aeae27a..6f432bc71a9e 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -15,8 +15,8 @@ version = "2024-05-13"; }; }; - hash = "sha256-cB2jrasrtaFWM8tpG9leuC+jUAvoU8g5977cn4r7rbw="; - version = "126.0.6478.61"; + hash = "sha256-sXP+/KXDoy3QnRoa9acGbsXKVCPspyNGtZTLMHBqxvw="; + version = "126.0.6478.114"; }; ungoogled-chromium = { deps = { From 79df5368f862204e46498870963493b226f6ab32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20L=C3=B6per?= Date: Wed, 19 Jun 2024 14:14:05 +0200 Subject: [PATCH 14/16] jetbrains: prevent download of unpatched jetbrains jdk --- pkgs/applications/editors/jetbrains/bin/linux.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/jetbrains/bin/linux.nix b/pkgs/applications/editors/jetbrains/bin/linux.nix index ca70c4e4cec5..1effb9def007 100644 --- a/pkgs/applications/editors/jetbrains/bin/linux.nix +++ b/pkgs/applications/editors/jetbrains/bin/linux.nix @@ -110,7 +110,7 @@ with stdenv; lib.makeOverridable mkDerivation (rec { --set-default JDK_HOME "$jdk" \ --set-default ANDROID_JAVA_HOME "$jdk" \ --set-default JAVA_HOME "$jdk" \ - --set-default JETBRAINSCLIENT_JDK "$jdk" \ + --set-default JETBRAINS_CLIENT_JDK "$jdk" \ --set-default ${hiName}_JDK "$jdk" \ --set-default ${hiName}_VM_OPTIONS ${vmoptsFile} From a82d3ce1bb75eef8bc12fcd047f01b5412d71245 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Jun 2024 21:51:30 +0000 Subject: [PATCH 15/16] gitlab-ci-local: 4.50.1 -> 4.51.0 --- pkgs/by-name/gi/gitlab-ci-local/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/gitlab-ci-local/package.nix b/pkgs/by-name/gi/gitlab-ci-local/package.nix index 8752b7cdf2ff..027036915a5b 100644 --- a/pkgs/by-name/gi/gitlab-ci-local/package.nix +++ b/pkgs/by-name/gi/gitlab-ci-local/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "gitlab-ci-local"; - version = "4.50.1"; + version = "4.51.0"; src = fetchFromGitHub { owner = "firecow"; repo = "gitlab-ci-local"; rev = version; - hash = "sha256-nlxYZY8SntMffmKiDpp/m8GfsB4lp+T8UoUPOLQlcC8="; + hash = "sha256-D1zviTj7isAuEyzRYEyjq4sx+jo/U3ZQZLFr35/1ZNo="; }; - npmDepsHash = "sha256-uDhot9kGmF717itia6hyx0xZkyMYDpH7BmGl12xSJyI="; + npmDepsHash = "sha256-ocrSOPLbWkU0LBpWAdl54hWr+7gE3z2sy8lJilGsExo="; postPatch = '' # remove cleanup which runs git commands From 9e716b10358e8a7637ceae0507742133ac197e5f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Jun 2024 22:03:29 +0000 Subject: [PATCH 16/16] cargo-i18n: 0.2.12 -> 0.2.13 --- pkgs/by-name/ca/cargo-i18n/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-i18n/package.nix b/pkgs/by-name/ca/cargo-i18n/package.nix index 158d22f97b03..43b353ed4d49 100644 --- a/pkgs/by-name/ca/cargo-i18n/package.nix +++ b/pkgs/by-name/ca/cargo-i18n/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-i18n"; - version = "0.2.12"; + version = "0.2.13"; src = fetchFromGitHub { owner = "kellpossible"; repo = "cargo-i18n"; rev = "v${version}"; - hash = "sha256-ck0GYy9DLngOunpItGQ4+qrlzaWDk0zTnIzuRQt2/Gw="; + hash = "sha256-azwQlXsoCgNB/TjSBBE+taUR1POBJXaPnS5Sr+HVR90="; }; - cargoHash = "sha256-nvZx2wJDs7PZQLCl8Hrf2blR+lNUBVr6k664VSVQ5iI="; + cargoHash = "sha256-vN62QmCuhu7AjL6xSpBU6/ul4WgNLZbjWDCFyHj6rIM="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation