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

nixpkgs: 24.05-unstable-2024-08-09 -> 24.05-unstable-2024-08-11

Browse Source
This commit is contained in:
Colin
2024-08-12 01:08:03 +00:00
parent 4dbff9c18f
commit bd97fb9ec9
2 changed files with 7 additions and 13 deletions
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 let
lock = { lock = {
master.rev = "0048951e7a3eba3dce8bf6ba893390d29375c5d0"; master.rev = "7370c67890fb6ae18bad28496a684294ec1b3f88";
master.sha256 = "sha256-NSvqhZYv0LY2eh0a3yoAvJjGlWeOLSjmPpivSnY9pXg="; master.sha256 = "sha256-3NS9JhGp/tFhMaO44BTbyOpHPqPI+AgNAWjXR5yMwwc=";
staging.rev = "0048951e7a3eba3dce8bf6ba893390d29375c5d0"; staging.rev = "7370c67890fb6ae18bad28496a684294ec1b3f88";
staging.sha256 = "sha256-NSvqhZYv0LY2eh0a3yoAvJjGlWeOLSjmPpivSnY9pXg="; staging.sha256 = "sha256-3NS9JhGp/tFhMaO44BTbyOpHPqPI+AgNAWjXR5yMwwc=";
staging-next.rev = "0048951e7a3eba3dce8bf6ba893390d29375c5d0"; staging-next.rev = "7370c67890fb6ae18bad28496a684294ec1b3f88";
staging-next.sha256 = "sha256-NSvqhZYv0LY2eh0a3yoAvJjGlWeOLSjmPpivSnY9pXg="; staging-next.sha256 = "sha256-3NS9JhGp/tFhMaO44BTbyOpHPqPI+AgNAWjXR5yMwwc=";
}; };
lock' = lock."${variant}"; lock' = lock."${variant}";
unpatchedSrc = fetchzip { unpatchedSrc = fetchzip {
@@ -81,7 +81,7 @@ in
src.overrideAttrs (base: { src.overrideAttrs (base: {
# attributes needed for update scripts # attributes needed for update scripts
pname = "nixpkgs"; pname = "nixpkgs";
version = "24.05-unstable-2024-08-09"; version = "24.05-unstable-2024-08-11";
passthru = (base.passthru or {}) // nixpkgs // { passthru = (base.passthru or {}) // nixpkgs // {
src = unpatchedSrc // { src = unpatchedSrc // {
inherit (lock') rev; inherit (lock') rev;

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

@@ -81,12 +81,6 @@ in
# hash = "sha256-cn6ihwO3MyzdpVoJoQNKAHyo8GuGvFP6vr//7r9pzjE="; # hash = "sha256-cn6ihwO3MyzdpVoJoQNKAHyo8GuGvFP6vr//7r9pzjE=";
}) })
(fetchpatch' {
title = "hickory-dns: rename from trust-dns";
prUrl = "https://github.com/NixOS/nixpkgs/pull/316466";
hash = "sha256-0A43xaBrROJUAENNZNTCB8HLeECVy4n6oMwZluRNBZ8=";
})
(fetchpatch' { (fetchpatch' {
title = "passt: support cross compilation"; title = "passt: support cross compilation";
saneCommit = "3ef36d3aa139f94e8716b0721856c5808937c9f2"; saneCommit = "3ef36d3aa139f94e8716b0721856c5808937c9f2";