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

nixpkgs: 0-unstable-2025-01-23 -> 0-unstable-2025-01-24

Browse Source
This commit is contained in:
Colin
2025-01-25 01:52:40 +00:00
parent b9cfd504cc
commit 2a1b0cc90c
2 changed files with 3 additions and 18 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 = "a37ebead1785777bed04c56a029f099b85c957d2"; rev = "401ac2b03c8fa072b0a8a0c517ed196d9be6499d";
sha256 = "sha256-QLvC0BQ5xhnHUpmKzJl1KWNVjyysqoCbuAg+bx4VndU="; sha256 = "sha256-2mNYOXUh7ZJxqiI4Bvt9XXUwTG6mWJRMi50yh23Vro4=";
version = "0-unstable-2025-01-23"; version = "0-unstable-2025-01-24";
branch = "master"; branch = "master";
} }

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

@@ -46,12 +46,6 @@ in
# hash = "sha256-jW66W1V3upZMfbjuoruY3OGNJfEewx7DW/Z4vAhMEXw="; # hash = "sha256-jW66W1V3upZMfbjuoruY3OGNJfEewx7DW/Z4vAhMEXw=";
# }) # })
(fetchpatch' {
name = "nautilus: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/373662";
hash = "sha256-lm/FNd9yaTDGW1NXHjrZc1cP3wyp9LlWH9CfkyViymk=";
})
(fetchpatch' { (fetchpatch' {
# patch should be safe to remove; keeping it here to track the upstreaming status # patch should be safe to remove; keeping it here to track the upstreaming status
name = "nixos/gitea: don't configure the database if `createDatabase == false`"; name = "nixos/gitea: don't configure the database if `createDatabase == false`";
@@ -67,15 +61,6 @@ in
# hash = "sha256-43zxnbUJuGXThadHoQRi6cevD7SFSZejWj324V6eBpw="; # hash = "sha256-43zxnbUJuGXThadHoQRi6cevD7SFSZejWj324V6eBpw=";
# }) # })
# (fetchpatch' {
# # this causes a rebuild of systemd and everything above it:
# # PR against staging is live: <https://github.com/NixOS/nixpkgs/pull/332399>
# name = "libcap: ship the optional 'captree' component";
# prUrl = "https://github.com/NixOS/nixpkgs/pull/332399";
# saneCommit = "30d6d5d6e86c490978b9615a9c685ffd92c81116";
# hash = "sha256-hEcpS7r1K6yb5dcj2evbWajwIQaaSHKdLPQVg1LlCYE=";
# })
# (fetchpatch' { # (fetchpatch' {
# name = "unl0kr: 2.0.0 -> 3.2.0"; # name = "unl0kr: 2.0.0 -> 3.2.0";
# prUrl = "https://github.com/NixOS/nixpkgs/pull/319126"; # prUrl = "https://github.com/NixOS/nixpkgs/pull/319126";