From 0db546bf82442a42e77d0a3ad56bd21f429c9e7d Mon Sep 17 00:00:00 2001 From: Colin Date: Sat, 6 Apr 2024 10:19:39 +0000 Subject: [PATCH] nixpkgs: 2024-04-05 -> 2024-04-06 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` • Updated input 'nixpkgs-next-unpatched': 'github:nixos/nixpkgs/9a0c25978d78416219718437fd7e618668d9ad74' (2024-04-05) → 'github:nixos/nixpkgs/7c74352f2f7eca1925729f5c9c80cb89df8e74a2' (2024-04-06) • Updated input 'nixpkgs-unpatched': 'github:nixos/nixpkgs/3541c7628de9414f999ced044c95a284584f4ec1' (2024-04-05) → 'github:nixos/nixpkgs/c58702222e0a29fd01cc42d70737d699995f6389' (2024-04-06) ``` --- flake.lock | 12 ++++++------ nixpatches/list.nix | 7 ------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index b1e80078..c52cedc8 100644 --- a/flake.lock +++ b/flake.lock @@ -167,11 +167,11 @@ }, "nixpkgs-next-unpatched": { "locked": { - "lastModified": 1712296878, - "narHash": "sha256-q7tmAWgvlRAHN7BZyjDVZ8P7foMJMki1j9fHJu0AYRw=", + "lastModified": 1712383280, + "narHash": "sha256-YL8miM11o/jMqOwt5DsdyhPgh/JgCl1kOIzvX7ukniY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9a0c25978d78416219718437fd7e618668d9ad74", + "rev": "7c74352f2f7eca1925729f5c9c80cb89df8e74a2", "type": "github" }, "original": { @@ -199,11 +199,11 @@ }, "nixpkgs-unpatched": { "locked": { - "lastModified": 1712307699, - "narHash": "sha256-/PzHcPvBvJeZTY9JCEtbNljYLecwggveHQ2oHPlTycA=", + "lastModified": 1712398506, + "narHash": "sha256-oopwPeBKBXQEw2BlyK2jEs2farZ5uMjAZU7H4FpGuGE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3541c7628de9414f999ced044c95a284584f4ec1", + "rev": "c58702222e0a29fd01cc42d70737d699995f6389", "type": "github" }, "original": { diff --git a/nixpatches/list.nix b/nixpatches/list.nix index d8862def..ca22349b 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -32,13 +32,6 @@ in [ # etc, where "date" is like "20240228181608" # and can be found with `nix-repl > :lf . > lastModifiedDate` - (fetchpatch' { - prUrl = "https://github.com/NixOS/nixpkgs/pull/301919"; - saneCommit = "5468e6802aa060dee755b0019a612f605270d90d"; - title = "nixos/mautrix-meta: fix lax enable check"; - hash = "sha256-e5Yf/HzP0tfY6fuo6A8XrYvAwZOrQCIfRqPBcX+Tfg4="; - }) - (fetchpatch' { prUrl = "https://github.com/NixOS/nixpkgs/pull/298001"; saneCommit = "d599839060400762a67d2c01d15b102ffe75e703";