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

nixpkgs: 24.05-unstable-2024-09-17 -> 24.05-unstable-2024-09-21

Browse Source
This commit is contained in:
Colin
2024-09-21 20:23:41 +00:00
parent 68f1dae946
commit a770ac7c78
2 changed files with 7 additions and 14 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 = "1fcc94ec5662ec7f0e38697df1c931d8d64dd86a"; master.rev = "386352a0f465eb5e040950fae259f441a6586a78";
master.sha256 = "sha256-tJy7zC7TEpl7ehFeA0gdtQB5phaHGExFONXviDQOooA="; master.sha256 = "sha256-RYaqjc/2My2rNuPrSdffjldyH3NYQAJgW0heU4lQ7wU=";
staging.rev = "1fcc94ec5662ec7f0e38697df1c931d8d64dd86a"; staging.rev = "386352a0f465eb5e040950fae259f441a6586a78";
staging.sha256 = "sha256-tJy7zC7TEpl7ehFeA0gdtQB5phaHGExFONXviDQOooA="; staging.sha256 = "sha256-RYaqjc/2My2rNuPrSdffjldyH3NYQAJgW0heU4lQ7wU=";
staging-next.rev = "1fcc94ec5662ec7f0e38697df1c931d8d64dd86a"; staging-next.rev = "386352a0f465eb5e040950fae259f441a6586a78";
staging-next.sha256 = "sha256-tJy7zC7TEpl7ehFeA0gdtQB5phaHGExFONXviDQOooA="; staging-next.sha256 = "sha256-RYaqjc/2My2rNuPrSdffjldyH3NYQAJgW0heU4lQ7wU=";
}; };
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-17"; version = "24.05-unstable-2024-09-21";
passthru = (base.passthru or {}) // nixpkgs // { passthru = (base.passthru or {}) // nixpkgs // {
src = unpatchedSrc // { src = unpatchedSrc // {
inherit (lock') rev; inherit (lock') rev;

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

@@ -46,13 +46,6 @@ in
hash = "sha256-43zxnbUJuGXThadHoQRi6cevD7SFSZejWj324V6eBpw="; hash = "sha256-43zxnbUJuGXThadHoQRi6cevD7SFSZejWj324V6eBpw=";
}) })
(fetchpatch' {
title = "pantheon.switchboard-plug-network: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/342648";
saneCommit = "902b9fff95ed3ebe0be04558477b21974d775f17";
hash = "sha256-WkTl1kK5ohO6+Bud8BNbFhjLlYMFapApHhVPsFrFKYc=";
})
(fetchpatch' { (fetchpatch' {
title = "xdg-desktop-portal: support cross compilation"; title = "xdg-desktop-portal: support cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/342669"; prUrl = "https://github.com/NixOS/nixpkgs/pull/342669";