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

nixpkgs: 0-unstable-2024-08-18 -> 0-unstable-2024-08-19

Browse Source
This commit is contained in:
Colin
2024-08-20 08:52:07 +00:00
parent 6e1ccc3e19
commit bf94946759
2 changed files with 9 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,12 +27,12 @@
}: }:
let let
lock = { lock = {
master.rev = "82821e1670b61b43c89b1cf27654321c7623ec2e"; master.rev = "090bc11bc054f5f9745cfbcf058f9ad9a39e51c7";
master.sha256 = "sha256-+MP4Lw0b2NWMnpt0JNczKje38K0AEdGyTTcIhe0/Pr4="; master.sha256 = "sha256-7QdRlhe45Qy5pZ4jYE/biPT8jE/iXOEs94ma3WOIB10=";
staging.rev = "82821e1670b61b43c89b1cf27654321c7623ec2e"; staging.rev = "090bc11bc054f5f9745cfbcf058f9ad9a39e51c7";
staging.sha256 = "sha256-+MP4Lw0b2NWMnpt0JNczKje38K0AEdGyTTcIhe0/Pr4="; staging.sha256 = "sha256-7QdRlhe45Qy5pZ4jYE/biPT8jE/iXOEs94ma3WOIB10=";
staging-next.rev = "82821e1670b61b43c89b1cf27654321c7623ec2e"; staging-next.rev = "090bc11bc054f5f9745cfbcf058f9ad9a39e51c7";
staging-next.sha256 = "sha256-+MP4Lw0b2NWMnpt0JNczKje38K0AEdGyTTcIhe0/Pr4="; staging-next.sha256 = "sha256-7QdRlhe45Qy5pZ4jYE/biPT8jE/iXOEs94ma3WOIB10=";
}; };
lock' = lock."${variant}"; lock' = lock."${variant}";
unpatchedSrc = fetchzip { unpatchedSrc = fetchzip {
@@ -84,7 +84,7 @@ in
src.overrideAttrs (base: { src.overrideAttrs (base: {
# attributes needed for update scripts # attributes needed for update scripts
pname = "nixpkgs"; pname = "nixpkgs";
version = "0-unstable-2024-08-18"; version = "0-unstable-2024-08-19";
passthru = (base.passthru or {}) // nixpkgs // { passthru = (base.passthru or {}) // nixpkgs // {
src = unpatchedSrc // { src = unpatchedSrc // {
inherit (lock') rev; inherit (lock') rev;

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

@@ -39,26 +39,11 @@ in
hash = "sha256-9UrJB/ijXL07H/SESquCCqI1boVoYpDcYqxD+Mx2Mwc="; hash = "sha256-9UrJB/ijXL07H/SESquCCqI1boVoYpDcYqxD+Mx2Mwc=";
}) })
(fetchpatch' {
# branch: pr-flatpak-cross
title = "flatpak: support cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/334324";
saneCommit = "0656837e8bb3aae72245145ea8b2250eadad653d";
hash = "sha256-etogClsQ8USoBzfx8eYXUYp+C5VQ0wJs/1LumjtE+9E=";
# hash = "sha256-Jo37TmzEbqZQVlFtLQ/hI1AAPXS0dnkXh58eHpuwT5M=";
# hash = "sha256-/N3FQ0CZ8IOxEYci2UKOG0POYuTyCTH/ZWTRyjIOlEc=";
})
(fetchpatch' { (fetchpatch' {
# TODO: send upstream: <https://github.com/uninsane/nixpkgs/pull/new/pr-flatpak-cross-2> # TODO: send upstream: <https://github.com/uninsane/nixpkgs/pull/new/pr-flatpak-cross-2>
title = "flatpak: fix cross compilation for 1.14.10"; title = "flatpak: fix cross compilation for 1.14.10";
saneCommit = "665f4fdabdf15110f609bfb59a8b3bc229b195af"; saneCommit = "8359a34a1b944082ea1bd76fee61819e7b86e00e";
hash = "sha256-eSAB5OqnjqXKY19E3PGbKmfUW3l0RyG9khllk6x/tzI="; hash = "sha256-OnWu15IgZREWOohUnF2uqHPQd920aEDJ7oBT4h5vpu4=";
})
(fetchpatch' {
title = "syshud: 0-unstable-2024-07-29 -> 0-unstable-2024-08-10";
prUrl = "https://github.com/NixOS/nixpkgs/pull/333975";
hash = "sha256-DMV9rnigWUGW6kcV5Ve151OEArMWroLcuoK6PdFjTHk=";
}) })
(fetchpatch' { (fetchpatch' {
@@ -76,13 +61,6 @@ in
# hash = "sha256-hEcpS7r1K6yb5dcj2evbWajwIQaaSHKdLPQVg1LlCYE="; # hash = "sha256-hEcpS7r1K6yb5dcj2evbWajwIQaaSHKdLPQVg1LlCYE=";
# }) # })
(fetchpatch' {
# merged into staging 2024-07-25
title = "texinfo: set texinfo_cv_sys_iconv_converts_euc_cn=yes when crosscompiling";
prUrl = "https://github.com/NixOS/nixpkgs/pull/328919";
hash = "sha256-jPbFTg5YHBxAyhOaQGuiLVximKMj7ACXzCK89ddZyNQ=";
})
(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";
@@ -119,13 +97,6 @@ in
# hash = "sha256-r0jKr65dRkVU/LPfgZqNJArs2XWEudsgyYXs5bJpgj4="; # hash = "sha256-r0jKr65dRkVU/LPfgZqNJArs2XWEudsgyYXs5bJpgj4=";
# }) # })
(fetchpatch' {
# required for gpodder to build
title = "python311Packages.mygpoclient: 1.8 -> 1.9";
prUrl = "https://github.com/NixOS/nixpkgs/pull/324734";
hash = "sha256-W2KBnwPonYCKO4TA9+mGbknxgJaZej7iX9dFLLXf/jw=";
})
(fetchpatch' { (fetchpatch' {
# see: <https://github.com/NixOS/nixpkgs/pull/284562#issuecomment-2079104081> # see: <https://github.com/NixOS/nixpkgs/pull/284562#issuecomment-2079104081>
title = "nixos/lemmy: fix nginx backend to proxy needed headers"; title = "nixos/lemmy: fix nginx backend to proxy needed headers";