From d18cd69536c7513b37cbee4591bcfa25721a4218 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Mon, 30 Dec 2024 14:10:44 +0000
Subject: [PATCH] nixpkgs-bootstrap: 0-unstable-2024-12-29 ->
 0-unstable-2024-12-30

---
 pkgs/by-name/nixpkgs-bootstrap/master.nix     |  6 ++---
 pkgs/by-name/nixpkgs-bootstrap/patches.nix    | 25 +++++--------------
 .../nixpkgs-bootstrap/staging-next.nix        |  6 ++---
 pkgs/by-name/nixpkgs-bootstrap/staging.nix    |  6 ++---
 4 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/pkgs/by-name/nixpkgs-bootstrap/master.nix b/pkgs/by-name/nixpkgs-bootstrap/master.nix
index fa48acaa9..1074b106a 100644
--- a/pkgs/by-name/nixpkgs-bootstrap/master.nix
+++ b/pkgs/by-name/nixpkgs-bootstrap/master.nix
@@ -8,8 +8,8 @@
   mkNixpkgs ? import ./mkNixpkgs.nix {}
 }:
 mkNixpkgs {
-  rev = "788f5d7711e9d6ac73bdba4935644a6c46eaaef8";
-  sha256 = "sha256-SJAuYWg7vRfrMPnFE6KAcNHHU7gz5o/wrKoLJ9AOYDI=";
-  version = "0-unstable-2024-12-29";
+  rev = "7dcdf9d94b96cc7f2e1726c79aa672ce4bcf824b";
+  sha256 = "sha256-d4WLRw1ZPh2K9OAeNgDUvyzTfXScrSkAiJhjtX9VYYg=";
+  version = "0-unstable-2024-12-30";
   branch = "master";
 }
diff --git a/pkgs/by-name/nixpkgs-bootstrap/patches.nix b/pkgs/by-name/nixpkgs-bootstrap/patches.nix
index f1db5ef9a..f04f567fd 100644
--- a/pkgs/by-name/nixpkgs-bootstrap/patches.nix
+++ b/pkgs/by-name/nixpkgs-bootstrap/patches.nix
@@ -61,12 +61,6 @@ in
     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' {
     # 2024-12-26: required to build ollama (with AMD acceleration)
     name = "rocm-6: bump packages to 6.3.1 and add missing packages";
@@ -74,13 +68,6 @@ in
     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' {
     # 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`";
@@ -95,12 +82,12 @@ in
     hash = "sha256-pN14eynQizhGPPiF4bj9e/HdNEmW/gJHvK59ihwM/vA=";
   })
 
-  (fetchpatch' {
-    # 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";
-    saneCommit = "e2022b4caab6dcf031841fcf48752ebeb6837978";
-    hash = "sha256-43zxnbUJuGXThadHoQRi6cevD7SFSZejWj324V6eBpw=";
-  })
+  # (fetchpatch' {
+  #   # 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";
+  #   saneCommit = "e2022b4caab6dcf031841fcf48752ebeb6837978";
+  #   hash = "sha256-43zxnbUJuGXThadHoQRi6cevD7SFSZejWj324V6eBpw=";
+  # })
 
   # (fetchpatch' {
   #   # this causes a rebuild of systemd and everything above it:
diff --git a/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix b/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix
index ee2d26e7b..e62f8a552 100644
--- a/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix
+++ b/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix
@@ -2,8 +2,8 @@
   mkNixpkgs ? import ./mkNixpkgs.nix {}
 }:
 mkNixpkgs {
-  rev = "e39a96633389958a895c04435a68de1d098787a7";
-  sha256 = "sha256-z6U6iY8MnRU+DN7j70uPpy2ZIxXC7NGrIBQB3A2aRjQ=";
-  version = "0-unstable-2024-12-29";
+  rev = "20d1b508c197e854f4c160d1b3d6091e545a536b";
+  sha256 = "sha256-p4rf6+UYaYfjVlacM9AzrZQ0ViosXmoQfjJKa4WvH6E=";
+  version = "0-unstable-2024-12-30";
   branch = "staging-next";
 }
diff --git a/pkgs/by-name/nixpkgs-bootstrap/staging.nix b/pkgs/by-name/nixpkgs-bootstrap/staging.nix
index 1b736261f..ce5c77873 100644
--- a/pkgs/by-name/nixpkgs-bootstrap/staging.nix
+++ b/pkgs/by-name/nixpkgs-bootstrap/staging.nix
@@ -2,8 +2,8 @@
   mkNixpkgs ? import ./mkNixpkgs.nix {}
 }:
 mkNixpkgs {
-  rev = "4e1d4f49f2aeb5fe0a5a9694bfb96dac99045149";
-  sha256 = "sha256-EBlotppgK4cIoadWWnscE23tmYD47nbvgaOo2vHEQvQ=";
-  version = "0-unstable-2024-12-29";
+  rev = "e7344062a548594feadbccc661322ed5d079ed92";
+  sha256 = "sha256-HOkHAxQw22kpEgPNwdvgAFpKplC/+DYGS/erDgg/hb0=";
+  version = "0-unstable-2024-12-30";
   branch = "staging";
 }