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

nixpkgs: bump; rewrite snapshot patch as nixpkgs commit

Browse Source
This commit is contained in:
Colin
2025-08-27 16:29:58 +00:00
parent 7e17eb4056
commit a4b114fce2
3 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
overlays/cross.nix
View File

@@ -675,11 +675,11 @@ in with final; {
# # ''; # # '';
# }); # });
# 2025/08/26: upstreaming is unblocked, but not as simple as the glycin-loaders approach! # 2025/08/26: upstreaming is unblocked; implemented on desko `pr-snapshot-cross` branch
snapshot = prev.snapshot.override { # snapshot = prev.snapshot.override {
# fixes "error: linker `cc` not found" # # fixes "error: linker `cc` not found"
cargo = crossCargo; # cargo = crossCargo;
}; # };
# 2025/08/26: upstreaming is unblocked; patched on desko branch `pr-spot-cross` # 2025/08/26: upstreaming is unblocked; patched on desko branch `pr-spot-cross`
# spot = prev.spot.override { # spot = prev.spot.override {

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

@@ -14,8 +14,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {}, mkNixpkgs ? import ./mkNixpkgs.nix {},
}: }:
mkNixpkgs { mkNixpkgs {
rev = "f39808415aee96e539b4c06fb5df23a872c63702"; rev = "2882c071a83fa909c4c3d171f65c71000e90f9fb";
sha256 = "sha256-XcMe9OxRtRN9pf6xHXYCl3vidRm9i98FGjYmdzVgtS0="; sha256 = "sha256-q5G/GIlkYheWnM667b/mm1sVWK9FpncwQU8vdMIcJE0=";
version = "unstable-2025-08-27"; version = "unstable-2025-08-27";
branch = "master"; branch = "master";
} }

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

@@ -62,6 +62,12 @@ in
hash = "sha256-B7s2aNVony+G7FW2PaR7FVO7zzWa7SiLONWRGrsXA3A="; hash = "sha256-B7s2aNVony+G7FW2PaR7FVO7zzWa7SiLONWRGrsXA3A=";
}) })
(fetchpatch' {
name = "gmobile: set strictDeps, fix cross compilation";
saneCommit = "223b327fcc0775212bcc30a0bfb57c90ce5e3251";
hash = "sha256-ww6oAJF/AA6GhqJ1nS3QhHHcH7xiZUcNOKKvtE6NkGQ=";
})
(fetchpatch' { (fetchpatch' {
# desko nixpkgs branch: `pr-papers-cross` # desko nixpkgs branch: `pr-papers-cross`
name = "papers: fix cross compilation"; name = "papers: fix cross compilation";
@@ -90,6 +96,13 @@ in
hash = "sha256-ZDDRdGPpxER/i2trBDiovbIZc0Qe94iUp/XdWvIvG98="; hash = "sha256-ZDDRdGPpxER/i2trBDiovbIZc0Qe94iUp/XdWvIvG98=";
}) })
(fetchpatch' {
# desko nixpkgs branch: `pr-snapshot-cross`
name = "snapshot: fix cross compilation";
saneCommit = "9bf01eef452d46c2990cdc872017f1015892ea7d";
hash = "sha256-F6RwprsXOWjk/xNHtBqQWge5edLGJeQUrupKZ1MNphU=";
})
# (fetchpatch' { # (fetchpatch' {
# # opencv used by alpaca, newelle # # opencv used by alpaca, newelle
# name = "opencv: fix cross compliation by patching protobuf"; # name = "opencv: fix cross compliation by patching protobuf";