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

nixpkgs: 2025-04-20 -> 2025-04-21

Browse Source
This commit is contained in:
Colin
2025-04-21 08:25:16 +00:00
parent 8a262749e8
commit a8c2414f19
4 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/by-name/nixpkgs-bootstrap/master.nix
View File

@@ -8,8 +8,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {}, mkNixpkgs ? import ./mkNixpkgs.nix {},
}: }:
mkNixpkgs { mkNixpkgs {
rev = "31dac92988dd79d638feaa70569c2a4d56c40356"; rev = "b362e0e3eaa24fd0616ca8973550157eb421c2e1";
sha256 = "sha256-Hgr1NaqxMV6YXNhb8FVihSfvFO8k/Z5PKvRb3YnOdE0="; sha256 = "sha256-XkqDkqndTe3iauIK9F7WZH/VcjdaMLw2wGPA0vGLHcs=";
version = "0-unstable-2025-04-20"; version = "0-unstable-2025-04-21";
branch = "master"; branch = "master";
} }

8
pkgs/by-name/nixpkgs-bootstrap/patches.nix
View File

@@ -43,18 +43,12 @@ in
}) })
(fetchpatch' { (fetchpatch' {
# 2025-04-20: merged into staging
name = "git: fix cross compilation"; name = "git: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/399955"; prUrl = "https://github.com/NixOS/nixpkgs/pull/399955";
hash = "sha256-UsVH6NhHIEoipi9fzl89mZolo/Lo1l0dos7trOGdU9A="; hash = "sha256-UsVH6NhHIEoipi9fzl89mZolo/Lo1l0dos7trOGdU9A=";
}) })
(fetchpatch' {
# fixes build
name = "sm64coopdx: 1.2.1 -> 1.3.0";
prUrl = "https://github.com/NixOS/nixpkgs/pull/399415";
hash = "sha256-ExoGrUlZKBNeHyor22D/mi5cQrgbCxapcSdDE5o6Ow8=";
})
(fetchpatch' { (fetchpatch' {
name = "zelda64recomp: init at 1.1.1-unstable-2025-02-14"; name = "zelda64recomp: init at 1.1.1-unstable-2025-02-14";
prUrl = "https://github.com/NixOS/nixpkgs/pull/313013"; prUrl = "https://github.com/NixOS/nixpkgs/pull/313013";

6
pkgs/by-name/nixpkgs-bootstrap/staging-next.nix
View File

@@ -2,8 +2,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {}, mkNixpkgs ? import ./mkNixpkgs.nix {},
}: }:
mkNixpkgs { mkNixpkgs {
rev = "e6ddbb6271183c5602f3df59eab5fe29f43ba3c7"; rev = "770b1e8b708f416a40f5d6de445f1523357a1221";
sha256 = "sha256-g1x7zioawUcLWq7dyIZgJtbaSjUyVVR7VLBKvWBcABo="; sha256 = "sha256-qtTHAUM+MOIyM/0wBrifYYrJA6UykqMXSCMDFhvAHek=";
version = "0-unstable-2025-04-19"; version = "0-unstable-2025-04-21";
branch = "staging-next"; branch = "staging-next";
} }

6
pkgs/by-name/nixpkgs-bootstrap/staging.nix
View File

@@ -2,8 +2,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {}, mkNixpkgs ? import ./mkNixpkgs.nix {},
}: }:
mkNixpkgs { mkNixpkgs {
rev = "bcb880ef3c962e4379d4ae086fc5c49c1b0e47c8"; rev = "c26d4adf7cab1822703646e4d393c995bc80d903";
sha256 = "sha256-2v8hW21YAT8ZMFF0bdWsBYn6+wkCXfa0uu46Jey0Zjw="; sha256 = "sha256-rBpWbI27oOBoj7NAbsXcg+rvap02veN7UsczueitNkY=";
version = "0-unstable-2025-04-20"; version = "0-unstable-2025-04-21";
branch = "staging"; branch = "staging";
} }