nixpkgs: 2024-06-08 -> 2024-06-11

i haven't actually deployed this yet: i'm pulling it for crappy-staging, but had to update all branches because the trust-dns patch didn't apply cleanly
This commit is contained in:
Colin 2024-06-11 23:31:58 +00:00
parent fff965ab9b
commit 66a012b555
2 changed files with 9 additions and 9 deletions

View File

@ -27,12 +27,12 @@
}:
let
lock = {
master.rev = "33605cdf028a6bfb96ce5d6e6e87d4779555f35f";
master.sha256 = "sha256-Lp669vFtN0vaCyOmXiA1UWrBXyyTlxYu2cZhaD10gn4=";
staging.rev = "33605cdf028a6bfb96ce5d6e6e87d4779555f35f";
staging.sha256 = "sha256-Lp669vFtN0vaCyOmXiA1UWrBXyyTlxYu2cZhaD10gn4=";
staging-next.rev = "33605cdf028a6bfb96ce5d6e6e87d4779555f35f";
staging-next.sha256 = "sha256-Lp669vFtN0vaCyOmXiA1UWrBXyyTlxYu2cZhaD10gn4=";
master.rev = "77e294135ebca24db6ab5236c6d927bfdacbb1a5";
master.sha256 = "sha256:0v4nl36z3m5yrj770wyb77rlj49q5h31qxyi7q78hil33vhbb2cf";
staging.rev = "75cddf78e7ea64d4cfa044cc536f147ba2e34e98";
staging.sha256 = "sha256-Uezg2EZqWcyX0YzRDPCpEBblMl6DWNzcycmRFZG2ZdA=";
staging-next.rev = "2d3f5e7db617ae7662dac5a1d683e7c8d5a90548";
staging-next.sha256 = "sha256-0HrX44jaCCx75TqCzbRmFwBfT6MF7paH26nlYX4Hj5o=";
};
lock' = lock."${variant}";
unpatchedSrc = fetchzip {
@ -76,7 +76,7 @@ in
src.overrideAttrs (base: {
# attributes needed for update scripts
pname = "nixpkgs";
version = "24.05-unstable-2024-06-08";
version = "24.05-unstable-2024-06-11";
passthru = (base.passthru or {}) // nixpkgs // {
src = unpatchedSrc // {
inherit (lock') rev;

View File

@ -53,8 +53,8 @@ in
(fetchpatch' {
title = "trust-dns: rebrand as hickory-dns";
saneCommit = "a7613d50c58b5612a7b806ce1375d8bf0485ab55";
hash = "sha256-N4DfNhCeg9etVeTPVzJ73CwiZzf43SozK8nrfXIm0uQ=";
prUrl = "https://github.com/NixOS/nixpkgs/pull/316466";
hash = "sha256-LJr+z7pgEXnPGqgsWLgMGmCJii1rh6nfIeEMHat4Xg4=";
})
(fetchpatch' {