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

nixpkgs: 2024-07-07 -> 2024-07-10

Browse Source
This commit is contained in:
Colin
2024-07-10 04:41:43 +00:00
parent 4aaeb42cab
commit 6ee33240d7
3 changed files with 18 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
overlays/preferences.nix
View File

@@ -39,6 +39,17 @@
}; };
}; };
# XXX(2024-07-09): miniupnpc 2.2.8 version bump broke bitcoind, monero-cli, transmission, etc
miniupnpc = super.miniupnpc.overrideAttrs (_: rec {
version = "2.2.7";
src = fetchFromGitHub {
owner = "miniupnp";
repo = "miniupnp";
rev = "miniupnpc_${lib.replaceStrings ["."] ["_"] version}";
hash = "sha256-cIijY1NcdF169tibfB13845UT9ZoJ/CZ+XLES9ctWTY=";
};
});
phog = super.phog.override { phog = super.phog.override {
# disable squeekboard because it takes 20 minutes to compile when emulated # disable squeekboard because it takes 20 minutes to compile when emulated
squeekboard = null; squeekboard = null;

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

@@ -27,12 +27,12 @@
}: }:
let let
lock = { lock = {
master.rev = "d864ebc0c84740d5afe43a528da24ba1562f43f6"; master.rev = "16e401f01842c5bb2499e78c1fe227f939c0c474";
master.sha256 = "sha256-lly7vQG6DbofZN0AwJSdqmbw65T6xdcQ1hFwRUbDakM="; master.sha256 = "sha256-nkUXwunTck+hNMt2wZuYRN+jf2ySRjKTzI0fo5TDH78=";
staging.rev = "d864ebc0c84740d5afe43a528da24ba1562f43f6"; staging.rev = "16e401f01842c5bb2499e78c1fe227f939c0c474";
staging.sha256 = "sha256-lly7vQG6DbofZN0AwJSdqmbw65T6xdcQ1hFwRUbDakM="; staging.sha256 = "sha256-nkUXwunTck+hNMt2wZuYRN+jf2ySRjKTzI0fo5TDH78=";
staging-next.rev = "d864ebc0c84740d5afe43a528da24ba1562f43f6"; staging-next.rev = "16e401f01842c5bb2499e78c1fe227f939c0c474";
staging-next.sha256 = "sha256-lly7vQG6DbofZN0AwJSdqmbw65T6xdcQ1hFwRUbDakM="; staging-next.sha256 = "sha256-nkUXwunTck+hNMt2wZuYRN+jf2ySRjKTzI0fo5TDH78=";
}; };
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-07"; version = "24.05-unstable-2024-07-10";
passthru = (base.passthru or {}) // nixpkgs // { passthru = (base.passthru or {}) // nixpkgs // {
src = unpatchedSrc // { src = unpatchedSrc // {
inherit (lock') rev; inherit (lock') rev;

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

@@ -30,14 +30,6 @@ in
# hash = "sha256-fGuS46f9qSMRHvWZvTmcirKufIqlXHwwhckeK1RNejE="; # hash = "sha256-fGuS46f9qSMRHvWZvTmcirKufIqlXHwwhckeK1RNejE=";
# }) # })
(fetchpatch' {
# xsimd is required by scipy, which is required by ols
title = "xsimd: fix cross compilation";
# prUrl = "https://github.com/NixOS/nixpkgs/pull/321253";
prUrl = "https://github.com/NixOS/nixpkgs/pull/321288";
hash = "sha256-jeRM/dfnljX0i3lHsg8bPfQXO3+Wx9M+hSypJiG9MfE=";
})
(fetchpatch' { (fetchpatch' {
title = "unl0kr: 2.0.0 -> 3.2.0"; title = "unl0kr: 2.0.0 -> 3.2.0";
prUrl = "https://github.com/NixOS/nixpkgs/pull/319126"; prUrl = "https://github.com/NixOS/nixpkgs/pull/319126";
@@ -64,12 +56,6 @@ in
hash = "sha256-hAaFHlJdx1GjQIJG5zxTBHm+CbmR/zlKUB9eyxPQbOg="; hash = "sha256-hAaFHlJdx1GjQIJG5zxTBHm+CbmR/zlKUB9eyxPQbOg=";
}) })
(fetchpatch' {
title = "python3*: backport fix for armv7l, aarch64, riscv64";
prUrl = "https://github.com/NixOS/nixpkgs/pull/325218";
hash = "sha256-EfVXvt3tifUN3q6kKIDHDM+uFFguEEKWQhglgq67RhA=";
})
# branch: wip-ffado-cross / wip-ffado-cross2 # branch: wip-ffado-cross / wip-ffado-cross2
(fetchpatch' { (fetchpatch' {
# TODO: send out for review (after next staging -> master merge, so that it has jtojnar's changes) # TODO: send out for review (after next staging -> master merge, so that it has jtojnar's changes)
@@ -88,13 +74,6 @@ in
hash = "sha256-sKxxYvaZ1W70H4+xZW5f54MTd4NSP3wnc0RGF4VBZ6M="; hash = "sha256-sKxxYvaZ1W70H4+xZW5f54MTd4NSP3wnc0RGF4VBZ6M=";
}) })
(fetchpatch' {
# required for nwg-panel to build
title = "python312Packages.xlib: change nose to pynose";
prUrl = "https://github.com/NixOS/nixpkgs/pull/325179";
hash = "sha256-Dz2qWUQBn79dox7rdM/XkbxhzZtG4hJblI0EdRQAQOY=";
})
(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";