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

nixpkgs: 2025-04-03 -> 2025-04-04

Browse Source
This commit is contained in:
Colin
2025-04-04 15:12:14 +00:00
parent 5e69dddcb7
commit bca2cea95f
4 changed files with 24 additions and 10 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 = "f90d0a338d95120763afc3ba43410ba3391ad77b"; rev = "1f2699e6b328302a2ce91f373e99b838b303752a";
sha256 = "sha256-fCsKB91aNDC7I5LgM5KGxlfJdhEbta5WrYxQmnPL1X4="; sha256 = "sha256-2dRatLLAdktPrIFCvWrZdhki0gQZ00aHi3ZA+4JqGpg=";
version = "0-unstable-2025-04-03"; version = "0-unstable-2025-04-04";
branch = "master"; branch = "master";
} }

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

@@ -29,7 +29,13 @@ let
); );
in in
[ [
./2024-10-01-python-cross-resource-usage.patch # ./2024-10-01-python-cross-resource-usage.patch
(fetchpatch' {
name = "python3: Fixing excessive memory usage for overriden python in cross-compile";
prUrl = "https://github.com/NixOS/nixpkgs/pull/394541";
hash = "sha256-WiZjVWoymgCS7bS5a2J77Fmkvq5nf1qCBe3A7zMl0GU=";
})
(fetchpatch' { (fetchpatch' {
# 2025-03-07: i'm testing this patch before merge. # 2025-03-07: i'm testing this patch before merge.
@@ -54,6 +60,14 @@ in
hash = "sha256-9GjvmZoDmU2vIR4g5ADAGRixe13/js44dzVfh2IIDBw="; hash = "sha256-9GjvmZoDmU2vIR4g5ADAGRixe13/js44dzVfh2IIDBw=";
}) })
(fetchpatch' {
# XXX(2025-04-03): send out for review once tested!
# dep of swaync, evolution-data-server, folks, calls, gnome-calendar, gnome-contacts, planify
name = "libbytesize: fix cross compilation";
saneCommit = "6122f10876e3642092e8b8e1160f164ca87bda7d";
hash = "sha256-wg2iIm36q65rwfTan6ZDBRVoVpG01dIsAu6/loOCxlo=";
})
# (fetchpatch' { # (fetchpatch' {
# # XXX(2025-01-06): patch does not produce valid binaries for cross # # XXX(2025-01-06): patch does not produce valid binaries for cross
# name = "lua-language-server: fix cross compiling"; # name = "lua-language-server: fix cross compiling";

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 = "7b881933073a68a6b76917b1b64c1b538547903d"; rev = "276f9ec97644393e64486c2464716ee80ba39740";
sha256 = "sha256-iz1V93JWiX0t2xbJno0hhj3NawLJC4RP2c3Xx5zQ5QY="; sha256 = "sha256-ziea2r30f+UD0Ly3oeLePIWyK6oV2icPYq2jgCf/wDg=";
version = "0-unstable-2025-04-03"; version = "0-unstable-2025-04-04";
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 = "0fba85408e8856e3dc165dde47f97435c4e1b339"; rev = "3874d83b1936ff35aae17468046eb299cc6a9662";
sha256 = "sha256-JA7aZxXO0UO5qfL9h1mvKAi+WGD6nV/PPTdMP9UnL+w="; sha256 = "sha256-ziea2r30f+UD0Ly3oeLePIWyK6oV2icPYq2jgCf/wDg=";
version = "0-unstable-2025-04-02"; version = "0-unstable-2025-04-04";
branch = "staging"; branch = "staging";
} }