From 4730a65008c646ffde6a6800004d98e3f2162a37 Mon Sep 17 00:00:00 2001 From: Colin Date: Wed, 6 Mar 2024 09:52:30 +0000 Subject: [PATCH] nixpkgs: 2024-03-05 -> 2024-03-06 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` • Updated input 'nixpkgs-next-unpatched': 'github:nixos/nixpkgs/16bca48d251761297746d5bb7b9e47a3c6564c5a' (2024-03-05) → 'github:nixos/nixpkgs/09c267dae0dae6585ddbc98bd2301bd8153ac177' (2024-03-06) • Updated input 'nixpkgs-unpatched': 'github:nixos/nixpkgs/b3ed737064bc4cc0312081b6937fa2bb48d62afa' (2024-03-05) → 'github:nixos/nixpkgs/a85303aef29c6a9000a259ed21c9c14a1aa3859e' (2024-03-06) • Updated input 'sops-nix': 'github:Mic92/sops-nix/291aad29b59ceda517a06e59809f35cb0bb17c6b' (2024-03-04) → 'github:Mic92/sops-nix/25dd60fdd08fcacee2567a26ba6b91fe098941dc' (2024-03-06) ``` --- flake.lock | 18 +++++++++--------- nixpatches/list.nix | 6 ------ 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 266feba7..84586b52 100644 --- a/flake.lock +++ b/flake.lock @@ -19,11 +19,11 @@ }, "nixpkgs-next-unpatched": { "locked": { - "lastModified": 1709618472, - "narHash": "sha256-pxmx96mzlg27VkxO2yegxNf34GBVLDecPM2dMma2HME=", + "lastModified": 1709704879, + "narHash": "sha256-gjdEHcFTFT5RlhoKSvABD3giCUs5/tHPeklXjzbpYVA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "16bca48d251761297746d5bb7b9e47a3c6564c5a", + "rev": "09c267dae0dae6585ddbc98bd2301bd8153ac177", "type": "github" }, "original": { @@ -51,11 +51,11 @@ }, "nixpkgs-unpatched": { "locked": { - "lastModified": 1709632904, - "narHash": "sha256-pMcGX1ikywlbrVTqtTCVg7jc3uZCBe90OQ0uO1s/PQQ=", + "lastModified": 1709718694, + "narHash": "sha256-22NG5QXlB5oQWwgMxlEPow+zp7JwCzhF9QMB52Mi3k0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b3ed737064bc4cc0312081b6937fa2bb48d62afa", + "rev": "a85303aef29c6a9000a259ed21c9c14a1aa3859e", "type": "github" }, "original": { @@ -82,11 +82,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1709591996, - "narHash": "sha256-0sQcalXSgqlO6mnxBTXkSQChBHy2GQsokB1XY8r+LpQ=", + "lastModified": 1709711091, + "narHash": "sha256-L0rSIU9IguTG4YqSj4B/02SyTEz55ACq5t8gXpzteYc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "291aad29b59ceda517a06e59809f35cb0bb17c6b", + "rev": "25dd60fdd08fcacee2567a26ba6b91fe098941dc", "type": "github" }, "original": { diff --git a/nixpatches/list.nix b/nixpatches/list.nix index 8c74d626..cb657894 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -32,12 +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/291400"; - title = "cozy: 1.2.1 -> 1.3.0"; - hash = "sha256-fU59om6Ad+RHcA6t4w4db6eDM4Dd5KetXRCNpK5eXlo="; - }) - (fetchpatch' { prUrl = "https://github.com/NixOS/nixpkgs/pull/292868"; saneCommit = "f090c1cd6bb5bbb14a86ec90ced78ca1a165a4fe";