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

nixpkgs: 24.05-unstable-2024-09-28 -> 24.05-unstable-2024-10-02

Browse Source
This commit is contained in:
Colin
2024-10-02 15:06:47 +00:00
parent 0710419495
commit ceb0d02efe
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 = "b89bdd0a6cb0b46f78384ccab26f55da1b5a4772"; master.rev = "dd89098d752fcd8af9c4e59a66b97af8e8fd185b";
master.sha256 = "sha256-Bf24h5jSiwifUPwn8juF+mvLAasykX8rPrJ4OJ2FZg4="; master.sha256 = "sha256-L/g6FGwBe9yd7IXE4271e9ptU0Cb22ycA2I1Ymn+HTk=";
staging.rev = "b89bdd0a6cb0b46f78384ccab26f55da1b5a4772"; staging.rev = "dd89098d752fcd8af9c4e59a66b97af8e8fd185b";
staging.sha256 = "sha256-Bf24h5jSiwifUPwn8juF+mvLAasykX8rPrJ4OJ2FZg4="; staging.sha256 = "sha256-L/g6FGwBe9yd7IXE4271e9ptU0Cb22ycA2I1Ymn+HTk=";
staging-next.rev = "b89bdd0a6cb0b46f78384ccab26f55da1b5a4772"; staging-next.rev = "dd89098d752fcd8af9c4e59a66b97af8e8fd185b";
staging-next.sha256 = "sha256-Bf24h5jSiwifUPwn8juF+mvLAasykX8rPrJ4OJ2FZg4="; staging-next.sha256 = "sha256-L/g6FGwBe9yd7IXE4271e9ptU0Cb22ycA2I1Ymn+HTk=";
}; };
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-09-28"; version = "24.05-unstable-2024-10-02";
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

@@ -45,12 +45,6 @@ in
hash = "sha256-43zxnbUJuGXThadHoQRi6cevD7SFSZejWj324V6eBpw="; hash = "sha256-43zxnbUJuGXThadHoQRi6cevD7SFSZejWj324V6eBpw=";
}) })
(fetchpatch' {
title = "picocom: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/345811";
hash = "sha256-VVm5IZzx/GPKyYoPBNmKoVcp1xNSAvtYbdnmw9b/wEI=";
})
(fetchpatch' { (fetchpatch' {
title = "libjxl: build plugins/loaders unconditionally"; title = "libjxl: build plugins/loaders unconditionally";
prUrl = "https://github.com/NixOS/nixpkgs/pull/345306"; prUrl = "https://github.com/NixOS/nixpkgs/pull/345306";