From 2f04b563d151d5e8e420322481bfb32421f2e434 Mon Sep 17 00:00:00 2001 From: Colin Date: Sun, 14 Jan 2024 18:28:18 +0000 Subject: [PATCH] nixpkgs: 2024-01-11 -> 2024-01-14 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` • Updated input 'nixpkgs-next-unpatched': 'github:nixos/nixpkgs/06797d4df4baaa51b229081083a88b92dac3ff7c' (2024-01-11) → 'github:nixos/nixpkgs/724e39ebb9b8eda97f17d423f66fbc5a991f4f8d' (2024-01-14) • Updated input 'nixpkgs-unpatched': 'github:nixos/nixpkgs/51f399ec47c082d678261883095bb8ad552e6500' (2024-01-11) → 'github:nixos/nixpkgs/6c08fe3ccf437d8b26bec010fd925ddd6bb0d0d5' (2024-01-14) • Updated input 'sops-nix': 'github:Mic92/sops-nix/c0b3a5af90fae3ba95645bbf85d2b64880addd76' (2024-01-10) → 'github:Mic92/sops-nix/70dd0d521f7849338e487a219c1a07c429a66d77' (2024-01-14) • Updated input 'sops-nix/nixpkgs-stable': 'github:NixOS/nixpkgs/70bdadeb94ffc8806c0570eb5c2695ad29f0e421' (2024-01-03) → 'github:NixOS/nixpkgs/a1982c92d8980a0114372973cbdfe0a307f1bdea' (2024-01-12) ``` --- flake.lock | 24 ++++++++++++------------ nixpatches/list.nix | 36 +++++++++++++++--------------------- overlays/cross.nix | 7 +++++++ 3 files changed, 34 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 44a86254..509f6732 100644 --- a/flake.lock +++ b/flake.lock @@ -19,11 +19,11 @@ }, "nixpkgs-next-unpatched": { "locked": { - "lastModified": 1704996080, - "narHash": "sha256-Px4zy3epXmonec1BnVuXCufDtZ+pKj178/mfcxYHrwo=", + "lastModified": 1705233677, + "narHash": "sha256-eq3VE8QGJsunqqF/BlLslWE1gASp4Hlgp0c78coxat0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "06797d4df4baaa51b229081083a88b92dac3ff7c", + "rev": "724e39ebb9b8eda97f17d423f66fbc5a991f4f8d", "type": "github" }, "original": { @@ -35,11 +35,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1704290814, - "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", + "lastModified": 1705033721, + "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", + "rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea", "type": "github" }, "original": { @@ -51,11 +51,11 @@ }, "nixpkgs-unpatched": { "locked": { - "lastModified": 1705013512, - "narHash": "sha256-ABitjQAo1OW+LRsaPdyJMbspkJhX97UM6ozcB0hc0tc=", + "lastModified": 1705254014, + "narHash": "sha256-4RrVNEqxeji4vqDgzSl7JoCD6a0ag5LF9zXFndtqrpE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "51f399ec47c082d678261883095bb8ad552e6500", + "rev": "6c08fe3ccf437d8b26bec010fd925ddd6bb0d0d5", "type": "github" }, "original": { @@ -82,11 +82,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1704908274, - "narHash": "sha256-74W9Yyomv3COGRmKi8zvyA5tL2KLiVkBeaYmYLjXyOw=", + "lastModified": 1705201153, + "narHash": "sha256-y0/a4IMDZrc7lAkR7Gcm5R3W2iCBiARHnYZe6vkmiNE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c0b3a5af90fae3ba95645bbf85d2b64880addd76", + "rev": "70dd0d521f7849338e487a219c1a07c429a66d77", "type": "github" }, "original": { diff --git a/nixpatches/list.nix b/nixpatches/list.nix index 672da7fd..99f36bfc 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -26,33 +26,27 @@ let // (if title != null then { name = title; } else {}) ) else null; in [ + (fetchpatch' { + prUrl = "https://github.com/NixOS/nixpkgs/pull/280551"; + title = "python3Packages.pure-protobuf: 3.0.0 -> 2.3.0"; # 2024/01/12: fix build + hash = "sha256-T1Ojc4A9rcJsmQ8Il76qdVFNOqnWHJj9kKnnWt0E74A="; + }) + (fetchpatch' { + prUrl = "https://github.com/NixOS/nixpkgs/pull/280925"; + title = "j4-dmenu-desktop: pin to gcc12"; # 2024/01/14: fix build + hash = "sha256-VW2l7eViI1erlTRFw2mpY2qWDdBlYxVSQewFPWwRhgg="; + }) + (fetchpatch' { + prUrl = "https://github.com/NixOS/nixpkgs/pull/277003"; + title = " pcsclite: disable building pcsc-wirecheck{,-gen} when cross compiling"; # 2023/12/27: fix build + hash = "sha256-9QqeZV1FgbxRpDDqHXWcIpOqyAt0YZRBcCTdoC6ugaY="; + }) (fetchpatch' { title = "argyllcms: support cross compilation"; prUrl = "https://github.com/NixOS/nixpkgs/pull/275755"; saneCommit = "8114d5dabbf5f4f1e8c370b889d4f2986b63998b"; hash = "sha256-z/vY2CxdrUVd4n7w+m8aNffXaN/jH7IWEwRfWNr9w94="; }) - (fetchpatch' { - title = "jbig2dec: fix cross"; - prUrl = "https://github.com/NixOS/nixpkgs/pull/266254"; - hash = "sha256-HOR9oehqs1n3KE4jKZavXYy7pqEq9osJsxupCDnrtHY="; - merged.staging = "202312062110"; - merged.staging-next = "202312210000"; - }) - (fetchpatch' { - title = "jbig2dec cross fix"; - prUrl = "https://github.com/NixOS/nixpkgs/pull/275027"; - hash = "sha256-sGBX1UamML46oS7zPZcuQXURjwADiPvvcEmAphoHvMg="; - merged.staging = "202312202300"; - merged.staging-next = "202312210000"; - }) - (fetchpatch' { - title = "vala: look for files in targetOffset"; - prUrl = "https://github.com/NixOS/nixpkgs/pull/267550"; - hash = "sha256-Dl9ZQazjXjIbw38Q78otQvgVCB/QZAC1IYoFX0Tuyw0="; - merged.staging = "202312012359"; - merged.staging-next = "202312210000"; - }) # (fetchpatch' { # title = "nixos/slskd: allow omitting username from yaml config"; diff --git a/overlays/cross.nix b/overlays/cross.nix index 97e869da..d8c61bd2 100644 --- a/overlays/cross.nix +++ b/overlays/cross.nix @@ -1243,6 +1243,13 @@ in with final; { } ); + # 2024/01/14: patched and built; verified no native runtime deps + # fixes "proto/meson.build:17:15: ERROR: Failed running '/nix/store/sx2814jd7xim65qbiqry94vkq2b4xv5b-python3-aarch64-unknown-linux-gnu-3.11.7-env/bin/python3', binary or interpreter not executable." + # source runs python during build only as a sanity check: we could instead disable that. + # this library is probably only used by xwayland: + # in turn used by gdm + libei = prev.libei.override { python3 = buildPackages.python3; }; + # libgweather = rmNativeInputs [ glib ] (prev.libgweather.override { # # alternative to emulating python3 is to specify it in `buildInputs` instead of `nativeBuildInputs` (upstream), # # but presumably that's just a different way to emulate it.