From 49c5ddd9f31ee12ce966c52518128180c126ff7f Mon Sep 17 00:00:00 2001 From: Colin Date: Wed, 23 Aug 2023 13:39:20 +0000 Subject: [PATCH] nixpkgs: 2023-08-19 -> 2023-08-21 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` • Updated input 'nixpkgs-unpatched': 'github:nixos/nixpkgs/d680ded26da5cf104dd2735a51e88d2d8f487b4d' (2023-08-19) → 'github:nixos/nixpkgs/91a22f76cd1716f9d0149e8a5c68424bb691de15' (2023-08-21) • Updated input 'sops-nix': 'github:Mic92/sops-nix/f81e73cf9a4ef4b949b9225be3daa1e586c096da' (2023-08-15) → 'github:Mic92/sops-nix/1b7b3a32d65dbcd69c217d7735fdf0a6b2184f45' (2023-08-22) • Updated input 'sops-nix/nixpkgs-stable': 'github:NixOS/nixpkgs/efeed708ece1a9f4ae0506ae4a4d7da264a74102' (2023-08-12) → 'github:NixOS/nixpkgs/5e63e8bbc46bc4fc22254da1edaf42fc7549c18a' (2023-08-20) ``` --- flake.lock | 18 +++++++++--------- nixpatches/list.nix | 6 ------ 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 3a454dfb..aec50725 100644 --- a/flake.lock +++ b/flake.lock @@ -69,11 +69,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1691874659, - "narHash": "sha256-qgmixg0c/CRNT2p9Ad35kaC7NzYVZ6GRooErYI7OGJM=", + "lastModified": 1692492726, + "narHash": "sha256-rld5qm2B4oRkDwcPD+yOSyTrZQdfCR6mzJGGkecjvTs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "efeed708ece1a9f4ae0506ae4a4d7da264a74102", + "rev": "5e63e8bbc46bc4fc22254da1edaf42fc7549c18a", "type": "github" }, "original": { @@ -85,11 +85,11 @@ }, "nixpkgs-unpatched": { "locked": { - "lastModified": 1692447944, - "narHash": "sha256-fkJGNjEmTPvqBs215EQU4r9ivecV5Qge5cF/QDLVn3U=", + "lastModified": 1692638711, + "narHash": "sha256-J0LgSFgJVGCC1+j5R2QndadWI1oumusg6hCtYAzLID4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d680ded26da5cf104dd2735a51e88d2d8f487b4d", + "rev": "91a22f76cd1716f9d0149e8a5c68424bb691de15", "type": "github" }, "original": { @@ -116,11 +116,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1692127428, - "narHash": "sha256-+e9dD67mpGLBhhqdv7A7i1g/r2AT/PmqthWaYHyVZR4=", + "lastModified": 1692728678, + "narHash": "sha256-02MjG7Sb9k7eOi86CcC4GNWVOjT6gjmXFSqkRjZ8Xyk=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f81e73cf9a4ef4b949b9225be3daa1e586c096da", + "rev": "1b7b3a32d65dbcd69c217d7735fdf0a6b2184f45", "type": "github" }, "original": { diff --git a/nixpatches/list.nix b/nixpatches/list.nix index fc5767fe..c51e1445 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -279,12 +279,6 @@ in [ # saneCommit = "4dc30718fe01e9dbed4ffc2ff375148da218e86b"; # hash = "sha256-Nb2LphSyv8Dayqfwqfua0eKtNzsnaf7PC/KYUhIvnT8="; # }) - (fetchpatch' { - title = "gupnp: fix cross compilation"; - prUrl = "https://github.com/NixOS/nixpkgs/pull/246931"; - saneCommit = "3af24c9e517689d048bb62511c6e8acf9bc55684"; - hash = "sha256-I/+ArctOngrxacaMk82GODaodwSzmy+rh6q0J6KjMwA="; - }) (fetchpatch' { title = "blueman: support cross compilation"; saneCommit = "e070195bdf213dffb0164574397b6a7417f81c9e";