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

nixpkgs-bootstrap: 0-unstable-2024-12-29 -> 0-unstable-2024-12-30

Browse Source
This commit is contained in:
Colin
2024-12-30 14:10:44 +00:00
parent da27a0e857
commit d18cd69536
4 changed files with 15 additions and 28 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 = "788f5d7711e9d6ac73bdba4935644a6c46eaaef8"; rev = "7dcdf9d94b96cc7f2e1726c79aa672ce4bcf824b";
sha256 = "sha256-SJAuYWg7vRfrMPnFE6KAcNHHU7gz5o/wrKoLJ9AOYDI="; sha256 = "sha256-d4WLRw1ZPh2K9OAeNgDUvyzTfXScrSkAiJhjtX9VYYg=";
version = "0-unstable-2024-12-29"; version = "0-unstable-2024-12-30";
branch = "master"; branch = "master";
} }

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

@@ -61,12 +61,6 @@ in
hash = "sha256-YzS6eX6sPbEx3CzAGaz8alz/s8O5JjkXtg+/Wk7ndZ0="; hash = "sha256-YzS6eX6sPbEx3CzAGaz8alz/s8O5JjkXtg+/Wk7ndZ0=";
}) })
(fetchpatch' {
name = "coturn: remove unnecessary libpromhttp dependency, fix build";
prUrl = "https://github.com/NixOS/nixpkgs/pull/369142";
hash = "sha256-arauwlYZjhV7r/k/2hAmHdx4bbwD1A+ymhurarTF1fs=";
})
(fetchpatch' { (fetchpatch' {
# 2024-12-26: required to build ollama (with AMD acceleration) # 2024-12-26: required to build ollama (with AMD acceleration)
name = "rocm-6: bump packages to 6.3.1 and add missing packages"; name = "rocm-6: bump packages to 6.3.1 and add missing packages";
@@ -74,13 +68,6 @@ in
hash = "sha256-6XXgSCXhC5DneSICguPtdnjX00SVJeiHxmJ55MoB+Xs="; hash = "sha256-6XXgSCXhC5DneSICguPtdnjX00SVJeiHxmJ55MoB+Xs=";
}) })
(fetchpatch' {
name = "mesa: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/369171";
saneCommit = "4c672bfc7eef1cd0e45158f1e99e71ebbb68bb85";
hash = "sha256-+G5/zfYlyVLebgK/IC3QL1eY19v28+cgvjgk+RrpvGQ=";
})
(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`";
@@ -95,12 +82,12 @@ in
hash = "sha256-pN14eynQizhGPPiF4bj9e/HdNEmW/gJHvK59ihwM/vA="; hash = "sha256-pN14eynQizhGPPiF4bj9e/HdNEmW/gJHvK59ihwM/vA=";
}) })
(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";
saneCommit = "e2022b4caab6dcf031841fcf48752ebeb6837978"; # saneCommit = "e2022b4caab6dcf031841fcf48752ebeb6837978";
hash = "sha256-43zxnbUJuGXThadHoQRi6cevD7SFSZejWj324V6eBpw="; # hash = "sha256-43zxnbUJuGXThadHoQRi6cevD7SFSZejWj324V6eBpw=";
}) # })
# (fetchpatch' { # (fetchpatch' {
# # this causes a rebuild of systemd and everything above it: # # this causes a rebuild of systemd and everything above it:

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 = "e39a96633389958a895c04435a68de1d098787a7"; rev = "20d1b508c197e854f4c160d1b3d6091e545a536b";
sha256 = "sha256-z6U6iY8MnRU+DN7j70uPpy2ZIxXC7NGrIBQB3A2aRjQ="; sha256 = "sha256-p4rf6+UYaYfjVlacM9AzrZQ0ViosXmoQfjJKa4WvH6E=";
version = "0-unstable-2024-12-29"; version = "0-unstable-2024-12-30";
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 = "4e1d4f49f2aeb5fe0a5a9694bfb96dac99045149"; rev = "e7344062a548594feadbccc661322ed5d079ed92";
sha256 = "sha256-EBlotppgK4cIoadWWnscE23tmYD47nbvgaOo2vHEQvQ="; sha256 = "sha256-HOkHAxQw22kpEgPNwdvgAFpKplC/+DYGS/erDgg/hb0=";
version = "0-unstable-2024-12-29"; version = "0-unstable-2024-12-30";
branch = "staging"; branch = "staging";
} }