From bcd7a6f646be7783108eee4ffe683bd8f69f7393 Mon Sep 17 00:00:00 2001 From: Colin Date: Sat, 24 Feb 2024 12:20:55 +0000 Subject: [PATCH] nixpkgs: 2024-02-22 -> 2024-02-24 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` • Updated input 'nixpkgs-next-unpatched': 'github:nixos/nixpkgs/024149d718e25378f4decfeeb614b88208c2f700' (2024-02-22) → 'github:nixos/nixpkgs/a3e2b0de906a8fe0143c2783199abdc132dee56a' (2024-02-24) • Updated input 'nixpkgs-unpatched': 'github:nixos/nixpkgs/a7fa133a1e973c127e9c83e2c8e3407ae3797099' (2024-02-22) → 'github:nixos/nixpkgs/b66514c14e85cd7d853d6dbbf1a421ba232eff10' (2024-02-24) ``` --- flake.lock | 12 ++++++------ nixpatches/list.nix | 5 ----- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index 6f29fcf29..6c7f07dad 100644 --- a/flake.lock +++ b/flake.lock @@ -19,11 +19,11 @@ }, "nixpkgs-next-unpatched": { "locked": { - "lastModified": 1708581670, - "narHash": "sha256-cW2noQkIvpyAlg5yFr4dFkUYgq+n10XJ9CjJ6LQ47tg=", + "lastModified": 1708776075, + "narHash": "sha256-SFhibVONg+0qHyzmO2VmDn6kD5UZ/FN27Qpr6S1ehgU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "024149d718e25378f4decfeeb614b88208c2f700", + "rev": "a3e2b0de906a8fe0143c2783199abdc132dee56a", "type": "github" }, "original": { @@ -51,11 +51,11 @@ }, "nixpkgs-unpatched": { "locked": { - "lastModified": 1708583918, - "narHash": "sha256-wcAivqrBghg/rPLBeuChEmSyb5j41zFZbVs6xFYgS7E=", + "lastModified": 1708776830, + "narHash": "sha256-V0ghU3y+RwH7ZHKa7jEowts98p81MIFhgyjRYpGDgzo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a7fa133a1e973c127e9c83e2c8e3407ae3797099", + "rev": "b66514c14e85cd7d853d6dbbf1a421ba232eff10", "type": "github" }, "original": { diff --git a/nixpatches/list.nix b/nixpatches/list.nix index 03f5e9010..479a4d82b 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -32,11 +32,6 @@ in [ # saneCommit = "ab094c1e8a511a019cd872b0e957cb42adadd39c"; hash = "sha256-R3EIQwIMMCACmGKbfW6Xv7uZhCDQ/bMHw8/pHcnmOLo="; }) - (fetchpatch' { - prUrl = "https://github.com/NixOS/nixpkgs/pull/288292"; - title = "megapixels: 1.7.0 -> 1.8.0"; - hash = "sha256-jV9eE/BOrvNqVUkk2RG5i6ReNMJWraqqfksJCCdDGGs="; - }) (fetchpatch' { saneCommit = "20c9492d303be7cbad560e3d83bc47ab4b1e93f7"; title = "procmail: support cross compilation";