From 8f986e4616bcffec6d49bd72d38daa75ca9cfa7b Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 8 Mar 2024 13:15:25 +0000 Subject: [PATCH] nixpkgs: 2024-03-07 -> 2024-03-08 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` • Updated input 'nixpkgs-next-unpatched': 'github:nixos/nixpkgs/5e0cda94371075bead6d953e8a60a717ec022524' (2024-03-07) → 'github:nixos/nixpkgs/f391672e1727b933cf6933154817fe236c6f84c7' (2024-03-08) • Updated input 'nixpkgs-unpatched': 'github:nixos/nixpkgs/90714b18a06ddad90159cc312814f1871509e10e' (2024-03-07) → 'github:nixos/nixpkgs/baf89057836e5f9928696526b85774ea529c749d' (2024-03-08) ``` --- flake.lock | 12 ++++++------ nixpatches/list.nix | 8 -------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index ace7fd1d8..7f2f5a259 100644 --- a/flake.lock +++ b/flake.lock @@ -19,11 +19,11 @@ }, "nixpkgs-next-unpatched": { "locked": { - "lastModified": 1709805514, - "narHash": "sha256-AenreYConPr2/kyljat9uJPHlQTwj4q5HdpoBmezbEw=", + "lastModified": 1709899282, + "narHash": "sha256-IZ6gMyvXBoO2GyNp8qEch12JUR/6eWfdeVaS4q+OLoA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5e0cda94371075bead6d953e8a60a717ec022524", + "rev": "f391672e1727b933cf6933154817fe236c6f84c7", "type": "github" }, "original": { @@ -51,11 +51,11 @@ }, "nixpkgs-unpatched": { "locked": { - "lastModified": 1709809582, - "narHash": "sha256-QL3tLWK8oybb/l1HXmCHuhBGDR+w5i4uM8r0VVBu8ZQ=", + "lastModified": 1709902792, + "narHash": "sha256-SwQln8e37XLHWNKPwdCsqaCeghRjH4IgiZE+7tdeXcc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "90714b18a06ddad90159cc312814f1871509e10e", + "rev": "baf89057836e5f9928696526b85774ea529c749d", "type": "github" }, "original": { diff --git a/nixpatches/list.nix b/nixpatches/list.nix index 5eee4d98c..860a0d9d9 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -54,14 +54,6 @@ in [ hash = "sha256-MgqeTufPek0cUELXjHWoSfDU5Pl9wtwnjWBlnqabHu8="; }) - (fetchpatch' { - # this forces an expensive rebuild, mostly just to reduce moby's closure by 40 MiB (if even) - prUrl = "https://github.com/NixOS/nixpkgs/pull/291942"; - title = "imagemagick, graphicsmagick: remove build coreutils from cross-compiled output"; - hash = "sha256-XtQtB1gq25TE5hFiWUH8bdk6VV9CxcKlA6ffVJvHqZo="; - merged.staging = "20240228181608"; - }) - # (fetchpatch' { # title = "nixos/slskd: allow omitting username from yaml config"; # saneCommit = "541c37e8689b6422ea07be1395f1a63357bb0c63";