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

nixpkgs: 0-unstable-2024-12-05 -> 0-unstable-2024-12-08

Browse Source
This commit is contained in:
Colin
2024-12-08 23:13:23 +00:00
parent 86b9419cc2
commit 5cd292bdc8
4 changed files with 9 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,8 +2,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {} mkNixpkgs ? import ./mkNixpkgs.nix {}
}: }:
mkNixpkgs { mkNixpkgs {
rev = "f2866842c201654ca0e4c620ca5a76ce146f74b1"; rev = "dd51f52372a20a93c219e8216fe528a648ffcbf4";
sha256 = "sha256-nDPWYGk5dsIV+Q1QYHcxGhkQ5t5wTAHC48xHbr3fLDU="; sha256 = "sha256-NQEO/nZWWGTGlkBWtCs/1iF1yl2lmQ1oY/8YZrumn3I=";
version = "0-unstable-2024-12-05"; version = "0-unstable-2024-12-08";
branch = "master"; branch = "master";
} }

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

@@ -85,12 +85,6 @@ in
hash = "sha256-3Yv6Yy1K2dNrrduM2XTEDjSmkysguTbqb8T7mDK2ubI="; hash = "sha256-3Yv6Yy1K2dNrrduM2XTEDjSmkysguTbqb8T7mDK2ubI=";
}) })
(fetchpatch' {
name = "sblast: init at 0.7.0";
prUrl = "https://github.com/NixOS/nixpkgs/pull/343460";
hash = "sha256-WC5gKAzgeta0+a/dOKvFIs66Z/RsjvNP8GHxSMd31Yg=";
})
# (fetchpatch' { # (fetchpatch' {
# name = "nixos/buffyboard: init"; # name = "nixos/buffyboard: init";
@@ -104,12 +98,6 @@ in
# hash = "sha256-pBzW6X84QsmgXqozGRlra0ACF77rDjnw+1UjbeTBmhU="; # hash = "sha256-pBzW6X84QsmgXqozGRlra0ACF77rDjnw+1UjbeTBmhU=";
# }) # })
(fetchpatch' {
name = "nixos/buffyboard: init";
prUrl = "https://github.com/NixOS/nixpkgs/pull/358941";
hash = "sha256-IosH45Zp77AJKEI2RmsZw501yFbzC9wcc1q9COzvLF8=";
})
(fetchpatch' { (fetchpatch' {
name = "nixos/bonsaid: init"; name = "nixos/bonsaid: init";
prUrl = "https://github.com/NixOS/nixpkgs/pull/347818"; prUrl = "https://github.com/NixOS/nixpkgs/pull/347818";
@@ -117,13 +105,6 @@ in
hash = "sha256-xCZIz7vmA/Fq0/G3tyapkdU2qIVtfueArN1qvbZ0y3w="; hash = "sha256-xCZIz7vmA/Fq0/G3tyapkdU2qIVtfueArN1qvbZ0y3w=";
}) })
(fetchpatch' {
name = "nixos/pam: replace apparmor warnings with assertions";
prUrl = "https://github.com/NixOS/nixpkgs/pull/332119";
# saneCommit = "17e5fa9dc3c6d9f1fbfa2b23f6e1ae5c7e17bebd";
hash = "sha256-8aQ/kI5Gd78KqR1DmiXZpJMyeL2JLVW4ZAWkk8PbvEA=";
})
(fetchpatch' { (fetchpatch' {
# TODO: send to upstream nixpkgs once tested (branch: lappy: pr-stepmania-wrapper) # TODO: send to upstream nixpkgs once tested (branch: lappy: pr-stepmania-wrapper)
name = "stepmania: wrap the program so it knows where to find its data files"; name = "stepmania: wrap the program so it knows where to find its data files";
@@ -145,12 +126,6 @@ in
hash = "sha256-rvJLYnmZIr1WYzcZG6gGj/5bNPBRA3Vw/RslhGFjnR4="; hash = "sha256-rvJLYnmZIr1WYzcZG6gGj/5bNPBRA3Vw/RslhGFjnR4=";
}) })
(fetchpatch' {
name = "Add package sm64coopdx";
prUrl = "https://github.com/NixOS/nixpkgs/pull/344305";
hash = "sha256-46KFQ7p0QMZVOJRr207LNPHyA0RGVOgWgNn01BklNfg=";
})
# (fetchpatch' { # (fetchpatch' {
# # this causes a rebuild of systemd and everything above it: # # this causes a rebuild of systemd and everything above it:
# # PR against staging is live: <https://github.com/NixOS/nixpkgs/pull/332399> # # PR against staging is live: <https://github.com/NixOS/nixpkgs/pull/332399>
@@ -189,14 +164,6 @@ in
# hash = "sha256-r0jKr65dRkVU/LPfgZqNJArs2XWEudsgyYXs5bJpgj4="; # hash = "sha256-r0jKr65dRkVU/LPfgZqNJArs2XWEudsgyYXs5bJpgj4=";
# }) # })
(fetchpatch' {
# see: <https://github.com/NixOS/nixpkgs/pull/284562#issuecomment-2079104081>
name = "nixos/lemmy: fix nginx backend to proxy needed headers";
prUrl = "https://github.com/NixOS/nixpkgs/pull/306984";
hash = "sha256-VErGtaZjsUNNXtVESFHAmQlTLabJfZBEftL/nYcpyyE=";
saneCommit = "bd87a38b86f889a6902a356ab415eeead881766b";
})
# (fetchpatch' { # (fetchpatch' {
# # TODO: send for review once hspell fix is merged <https://github.com/NixOS/nixpkgs/pull/263182> # # TODO: send for review once hspell fix is merged <https://github.com/NixOS/nixpkgs/pull/263182>
# # this patch works as-is, but hspell keeps a ref to build perl and thereby pollutes this closure as well. # # this patch works as-is, but hspell keeps a ref to build perl and thereby pollutes this closure as well.

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 = "5f9439fc05c9469d5256a0545505fe4e9149490c"; rev = "908e8572df13e687e075e9d69a1660ffcf2ee6f7";
sha256 = "sha256-8yVp5dfuM7DwBld9ozayxo/MjChmRV0VODXeaa1N42w="; sha256 = "sha256-MwVPit6BEc2EFShZXTjZ+nx4IRDmtBUPg3MRAEBs/y0=";
version = "0-unstable-2024-12-05"; version = "0-unstable-2024-12-08";
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 = "f0e73b01a56f6eb6353dbaecb45bf123d7c3628c"; rev = "942be98f987f55c60b219ee02626f450b683f4ab";
sha256 = "sha256-ZHXKsvryVQKF7t/fpiHn8SDu+P2TVsgVr+Id7hC14SQ="; sha256 = "sha256-JgQv8cOx9sPcjhPyVWN7jvoKzp7r1kSwimhSWV7SQio=";
version = "0-unstable-2024-12-05"; version = "0-unstable-2024-12-08";
branch = "staging"; branch = "staging";
} }