colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

nixpkgs: 2024-06-26 -> 2024-06-30

Browse Source
This commit is contained in:
Colin 2024-07-01 06:15:42 +00:00
parent 10f7714cfd
commit 75473c7123
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/additional/nixpkgs/default.nix
View File

@ -27,12 +27,12 @@
}:
let
lock = {
master.rev = "909f74453ef69cf26af6be9fa59e0908a98bd79b";
master.sha256 = "sha256-z3sZHTwSgQU00sY+iy+V1BIIHbY+TIxtAJdGf/HyzXY=";
staging.rev = "909f74453ef69cf26af6be9fa59e0908a98bd79b";
staging.sha256 = "sha256-z3sZHTwSgQU00sY+iy+V1BIIHbY+TIxtAJdGf/HyzXY=";
staging-next.rev = "909f74453ef69cf26af6be9fa59e0908a98bd79b";
staging-next.sha256 = "sha256-z3sZHTwSgQU00sY+iy+V1BIIHbY+TIxtAJdGf/HyzXY=";
master.rev = "ce327915979d5938b72489ee9ec255b4b702179e";
master.sha256 = "sha256-C0jyM8nyIaOPMKtwAR34y554hy2ygiLD7LfQHd1Jtvw=";
staging.rev = "ce327915979d5938b72489ee9ec255b4b702179e";
staging.sha256 = "sha256-C0jyM8nyIaOPMKtwAR34y554hy2ygiLD7LfQHd1Jtvw=";
staging-next.rev = "ce327915979d5938b72489ee9ec255b4b702179e";
staging-next.sha256 = "sha256-C0jyM8nyIaOPMKtwAR34y554hy2ygiLD7LfQHd1Jtvw=";
};
lock' = lock."${variant}";
unpatchedSrc = fetchzip {
@ -81,7 +81,7 @@ in
src.overrideAttrs (base: {
# attributes needed for update scripts
pname = "nixpkgs";
version = "24.05-unstable-2024-06-26";
version = "24.05-unstable-2024-06-30";
passthru = (base.passthru or {}) // nixpkgs // {
src = unpatchedSrc // {
inherit (lock') rev;

10
pkgs/additional/nixpkgs/list.nix
View File

@ -44,12 +44,6 @@ in
hash = "sha256-IfGayn+othMzp5Mc+0klBvUmykFwq95OKIJDvWL96d0=";
})
(fetchpatch' {
title = "syshud: init at 0-unstable-2024-06-20";
prUrl = "https://github.com/NixOS/nixpkgs/pull/318440";
hash = "sha256-jVw5pC+f8Z68S/X9EvMB6nbwvoiR03qI7ALeLtkmN24=";
})
(fetchpatch' {
title = "nixos/networkmanager: split ModemManager bits into own module";
prUrl = "https://github.com/NixOS/nixpkgs/pull/316824";
@ -59,9 +53,9 @@ in
})
(fetchpatch' {
title = "trust-dns: rebrand as hickory-dns";
title = "hickory-dns: rename from trust-dns";
prUrl = "https://github.com/NixOS/nixpkgs/pull/316466";
hash = "sha256-LJr+z7pgEXnPGqgsWLgMGmCJii1rh6nfIeEMHat4Xg4=";
hash = "sha256-ApnV1TG/cNbgCAWrkHLZk3jeughvp5ZRji1gjz5ngRE=";
})
(fetchpatch' {