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

nixpkgs: 2024-07-21 -> 2024-07-24

Browse Source
This commit is contained in:
Colin
2024-07-24 06:38:40 +00:00
parent 91359174f6
commit 8b6971a164
3 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/additional/gpodder-adaptive/default.nix
View File

@@ -4,7 +4,7 @@
gitUpdater, gitUpdater,
gpodder, gpodder,
libhandy, libhandy,
python3Packages, python311Packages,
}: }:
let let
@@ -51,7 +51,7 @@ self = gpodder.overridePythonAttrs (upstream: rec {
buildInputs = upstream.buildInputs ++ [ buildInputs = upstream.buildInputs ++ [
libhandy libhandy
]; ];
propagatedBuildInputs = upstream.propagatedBuildInputs ++ (with python3Packages; [ propagatedBuildInputs = upstream.propagatedBuildInputs ++ (with python311Packages; [
# necessary to enable to "youtube dl" extension (TODO: upstream into nixpkgs!) # necessary to enable to "youtube dl" extension (TODO: upstream into nixpkgs!)
yt-dlp yt-dlp
]); ]);

14
pkgs/additional/nixpkgs/default.nix
View File

@@ -27,12 +27,12 @@
}: }:
let let
lock = { lock = {
master.rev = "b841e48094d6eaad953f36dc0831434966dc7719"; master.rev = "4eb44db1f53f2cc57330a929d8e27fcd4d73f383";
master.sha256 = "sha256-Deu1qPoNm11gqVJR0BCGIBhGNAB4NlXDiElDWBtQN3I="; master.sha256 = "sha256-I9p+zeni96gb302qYh/1NtaciKYZdc7tW7C1SNvUegg=";
staging.rev = "b841e48094d6eaad953f36dc0831434966dc7719"; staging.rev = "4eb44db1f53f2cc57330a929d8e27fcd4d73f383";
staging.sha256 = "sha256-Deu1qPoNm11gqVJR0BCGIBhGNAB4NlXDiElDWBtQN3I="; staging.sha256 = "sha256-I9p+zeni96gb302qYh/1NtaciKYZdc7tW7C1SNvUegg=";
staging-next.rev = "b841e48094d6eaad953f36dc0831434966dc7719"; staging-next.rev = "4eb44db1f53f2cc57330a929d8e27fcd4d73f383";
staging-next.sha256 = "sha256-Deu1qPoNm11gqVJR0BCGIBhGNAB4NlXDiElDWBtQN3I="; staging-next.sha256 = "sha256-I9p+zeni96gb302qYh/1NtaciKYZdc7tW7C1SNvUegg=";
}; };
lock' = lock."${variant}"; lock' = lock."${variant}";
unpatchedSrc = fetchzip { unpatchedSrc = fetchzip {
@@ -81,7 +81,7 @@ in
src.overrideAttrs (base: { src.overrideAttrs (base: {
# attributes needed for update scripts # attributes needed for update scripts
pname = "nixpkgs"; pname = "nixpkgs";
version = "24.05-unstable-2024-07-21"; version = "24.05-unstable-2024-07-24";
passthru = (base.passthru or {}) // nixpkgs // { passthru = (base.passthru or {}) // nixpkgs // {
src = unpatchedSrc // { src = unpatchedSrc // {
inherit (lock') rev; inherit (lock') rev;

8
pkgs/additional/nixpkgs/list.nix
View File

@@ -30,12 +30,6 @@ in
# hash = "sha256-fGuS46f9qSMRHvWZvTmcirKufIqlXHwwhckeK1RNejE="; # hash = "sha256-fGuS46f9qSMRHvWZvTmcirKufIqlXHwwhckeK1RNejE=";
# }) # })
(fetchpatch' {
title = "bonsai: 1.1.0 -> 1.2.0";
prUrl = "https://github.com/NixOS/nixpkgs/pull/329263";
hash = "sha256-dyECCn0gcqYwRvCzXISoNY4oNPSTRUyoNVmPApJqkno=";
})
(fetchpatch' { (fetchpatch' {
title = "python312Packages.contourpy: fix cross compilation"; title = "python312Packages.contourpy: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/328218"; prUrl = "https://github.com/NixOS/nixpkgs/pull/328218";
@@ -62,7 +56,7 @@ in
(fetchpatch' { (fetchpatch' {
title = "hickory-dns: rename from trust-dns"; title = "hickory-dns: rename from trust-dns";
prUrl = "https://github.com/NixOS/nixpkgs/pull/316466"; prUrl = "https://github.com/NixOS/nixpkgs/pull/316466";
hash = "sha256-ApnV1TG/cNbgCAWrkHLZk3jeughvp5ZRji1gjz5ngRE="; hash = "sha256-9bnvkK7nC8d9OHwCKW05OxhSV6kNIHKg2AkYVUud1Vw=";
}) })
(fetchpatch' { (fetchpatch' {