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

nixpkgs-bootstrap: 0-unstable-2024-12-21 -> 0-unstable-2024-12-22

Browse Source
This commit is contained in:
Colin
2024-12-22 19:42:57 +00:00
parent 5956e121d8
commit 6f615d916f
4 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/by-name/gpodder-adaptive/package.nix
View File

@@ -4,7 +4,6 @@
gitUpdater, gitUpdater,
gpodder, gpodder,
libhandy, libhandy,
python311Packages,
}: }:
let let
@@ -21,7 +20,7 @@ self = gpodder.overridePythonAttrs (upstream: rec {
patches = (upstream.patches or []) ++ [ patches = (upstream.patches or []) ++ [
(fetchpatch { (fetchpatch {
# necessary for Python 3.12 compatibility; remove when upgrading past 3.11.4. # 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"; name = "Replace the removed imp module with importlib";
url = "https://github.com/gpodder/gpodder/commit/dd9b594d24a541c0f1d3b096e47b6d7f1c11ca7e.patch"; url = "https://github.com/gpodder/gpodder/commit/dd9b594d24a541c0f1d3b096e47b6d7f1c11ca7e.patch";
hash = "sha256-jAe3onmuPdwBhspWHhMf2Gy1hj5GiGoZjkpLAAy/ZIE="; hash = "sha256-jAe3onmuPdwBhspWHhMf2Gy1hj5GiGoZjkpLAAy/ZIE=";
@@ -51,11 +50,6 @@ self = gpodder.overridePythonAttrs (upstream: rec {
buildInputs = upstream.buildInputs ++ [ buildInputs = upstream.buildInputs ++ [
libhandy 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 { passthru.updateScript = gitUpdater {
rev-prefix = "adaptive/"; rev-prefix = "adaptive/";

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 = "9d61fbb6e2656858a1b458b1e399cba67274e8f1"; rev = "5f023837c82570f0be4044ff2f073b7730236d82";
sha256 = "sha256-+IPfdpTXcDx6uGG7EBMl27KuSDxtFPMX3koIJS83KuY="; sha256 = "sha256-4QR0GPMHt9zNhUH65kYySeNP3XxKqSVqX3W9mgTeDyw=";
version = "0-unstable-2024-12-21"; version = "0-unstable-2024-12-22";
branch = "master"; branch = "master";
} }

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 = "59ce48c98b4794da1a7bc3971563b82af70f3afd"; rev = "c03fa0c918d4a5de826469f265486888fe5267de";
sha256 = "sha256-saqfJEUgnrznctnLl7iGFD++oPgaWC4wum+bf3rfvUM="; sha256 = "sha256-IIrxuRKplK+xD1/41RVDNj8LsaINlQnvvoXiQHafi6M=";
version = "0-unstable-2024-12-20"; version = "0-unstable-2024-12-22";
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 = "fea626d2983c1fe88932013222a44f8e09645f76"; rev = "c1c11568946b9992666302f62490f275a2381660";
sha256 = "sha256-OPL2nbYRjzD3gPa/oPMxX/CSYNeTxiQGpr3KJtwe9VU="; sha256 = "sha256-JX8XcF2U6K7nAm1q+GphEiq1g+9IJk0wNAu48JW40Q8=";
version = "0-unstable-2024-12-20"; version = "0-unstable-2024-12-22";
branch = "staging"; branch = "staging";
} }