From 6f615d916fc103638b8631ceee55023c7302312c Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Sun, 22 Dec 2024 19:42:57 +0000
Subject: [PATCH] nixpkgs-bootstrap: 0-unstable-2024-12-21 ->
 0-unstable-2024-12-22

---
 pkgs/by-name/gpodder-adaptive/package.nix       | 8 +-------
 pkgs/by-name/nixpkgs-bootstrap/master.nix       | 6 +++---
 pkgs/by-name/nixpkgs-bootstrap/staging-next.nix | 6 +++---
 pkgs/by-name/nixpkgs-bootstrap/staging.nix      | 6 +++---
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/gpodder-adaptive/package.nix b/pkgs/by-name/gpodder-adaptive/package.nix
index a9b694ebe..2d1e1173e 100644
--- a/pkgs/by-name/gpodder-adaptive/package.nix
+++ b/pkgs/by-name/gpodder-adaptive/package.nix
@@ -4,7 +4,6 @@
   gitUpdater,
   gpodder,
   libhandy,
-  python311Packages,
 }:
 
 let
@@ -21,7 +20,7 @@ self = gpodder.overridePythonAttrs (upstream: rec {
   patches = (upstream.patches or []) ++ [
     (fetchpatch {
       # necessary for Python 3.12 compatibility; remove when upgrading past 3.11.4.
-      # TODO: merge into nixpkgs' gpodder expression (after <https://github.com/NixOS/nixpkgs/pull/324734> dependency lands)
+      # TODO: merge into nixpkgs' gpodder expression
       name = "Replace the removed imp module with importlib";
       url = "https://github.com/gpodder/gpodder/commit/dd9b594d24a541c0f1d3b096e47b6d7f1c11ca7e.patch";
       hash = "sha256-jAe3onmuPdwBhspWHhMf2Gy1hj5GiGoZjkpLAAy/ZIE=";
@@ -51,11 +50,6 @@ self = gpodder.overridePythonAttrs (upstream: rec {
   buildInputs = upstream.buildInputs ++ [
     libhandy
   ];
-  propagatedBuildInputs = upstream.propagatedBuildInputs ++ (with python311Packages; [
-    # necessary to enable to "youtube dl" extension
-    # upstreaming progress: <https://github.com/NixOS/nixpkgs/pull/331593>
-    yt-dlp
-  ]);
 
   passthru.updateScript = gitUpdater {
     rev-prefix = "adaptive/";
diff --git a/pkgs/by-name/nixpkgs-bootstrap/master.nix b/pkgs/by-name/nixpkgs-bootstrap/master.nix
index f9c99ec3c..0f06f6f4c 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 = "9d61fbb6e2656858a1b458b1e399cba67274e8f1";
-  sha256 = "sha256-+IPfdpTXcDx6uGG7EBMl27KuSDxtFPMX3koIJS83KuY=";
-  version = "0-unstable-2024-12-21";
+  rev = "5f023837c82570f0be4044ff2f073b7730236d82";
+  sha256 = "sha256-4QR0GPMHt9zNhUH65kYySeNP3XxKqSVqX3W9mgTeDyw=";
+  version = "0-unstable-2024-12-22";
   branch = "master";
 }
diff --git a/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix b/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix
index e3a81cc0a..0c334d985 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 = "59ce48c98b4794da1a7bc3971563b82af70f3afd";
-  sha256 = "sha256-saqfJEUgnrznctnLl7iGFD++oPgaWC4wum+bf3rfvUM=";
-  version = "0-unstable-2024-12-20";
+  rev = "c03fa0c918d4a5de826469f265486888fe5267de";
+  sha256 = "sha256-IIrxuRKplK+xD1/41RVDNj8LsaINlQnvvoXiQHafi6M=";
+  version = "0-unstable-2024-12-22";
   branch = "staging-next";
 }
diff --git a/pkgs/by-name/nixpkgs-bootstrap/staging.nix b/pkgs/by-name/nixpkgs-bootstrap/staging.nix
index bb77c7c36..70f189014 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 = "fea626d2983c1fe88932013222a44f8e09645f76";
-  sha256 = "sha256-OPL2nbYRjzD3gPa/oPMxX/CSYNeTxiQGpr3KJtwe9VU=";
-  version = "0-unstable-2024-12-20";
+  rev = "c1c11568946b9992666302f62490f275a2381660";
+  sha256 = "sha256-JX8XcF2U6K7nAm1q+GphEiq1g+9IJk0wNAu48JW40Q8=";
+  version = "0-unstable-2024-12-22";
   branch = "staging";
 }