From b6b0e65ef6fba914bc5575a20bef0708184bd254 Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 23 Jun 2023 19:06:08 +0000 Subject: [PATCH] flake/nixpkgs: 2023-06-17 -> 2023-06-22 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` • Updated input 'nix-serve': 'github:edolstra/nix-serve/e6e3d09438e803daa5374ad8edf1271289348456' (2023-05-17) → 'github:edolstra/nix-serve/d6df5bd8584f37e22cff627db2fc4058a4aab5ee' (2023-06-20) • Updated input 'nixpkgs-unpatched': 'github:nixos/nixpkgs/04af42f3b31dba0ef742d254456dc4c14eedac86' (2023-06-17) → 'github:nixos/nixpkgs/e603dc5f061ca1d8a19b3ede6a8cf9c9fcba6cdc' (2023-06-22) • Updated input 'sops-nix': 'github:Mic92/sops-nix/1634d2da53f079e7f5924efa7a96511cd9596f81' (2023-06-18) → 'github:Mic92/sops-nix/2ff6973350682f8d16371f8c071a304b8067f192' (2023-06-22) ``` --- flake.lock | 18 +++++++++--------- nixpatches/list.nix | 7 ------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index f7f36578..f3b27587 100644 --- a/flake.lock +++ b/flake.lock @@ -36,11 +36,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1684319086, - "narHash": "sha256-5wwlkWqP1cQUPXp/PJsi09FkgAule5yBghngRZZbUQg=", + "lastModified": 1687251388, + "narHash": "sha256-E9cVlgeCvzPbA/G3mCDCzz8TdRwXyGYzIjmwcvIfghg=", "owner": "edolstra", "repo": "nix-serve", - "rev": "e6e3d09438e803daa5374ad8edf1271289348456", + "rev": "d6df5bd8584f37e22cff627db2fc4058a4aab5ee", "type": "github" }, "original": { @@ -82,11 +82,11 @@ }, "nixpkgs-unpatched": { "locked": { - "lastModified": 1686960236, - "narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=", + "lastModified": 1687412861, + "narHash": "sha256-Z/g0wbL68C+mSGerYS2quv9FXQ1RRP082cAC0Bh4vcs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "04af42f3b31dba0ef742d254456dc4c14eedac86", + "rev": "e603dc5f061ca1d8a19b3ede6a8cf9c9fcba6cdc", "type": "github" }, "original": { @@ -113,11 +113,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1687058111, - "narHash": "sha256-xDSn/APfAdJinHV4reTfplX5XnLsJSGdVwHpmdgP9Mo=", + "lastModified": 1687398569, + "narHash": "sha256-e/umuIKFcFtZtWeX369Hbdt9r+GQ48moDmlTcyHWL28=", "owner": "Mic92", "repo": "sops-nix", - "rev": "1634d2da53f079e7f5924efa7a96511cd9596f81", + "rev": "2ff6973350682f8d16371f8c071a304b8067f192", "type": "github" }, "original": { diff --git a/nixpatches/list.nix b/nixpatches/list.nix index 6a71e400..8c3a84a3 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -58,13 +58,6 @@ in [ hash = "sha256-jl6SZwSDhQTlpM5FyGaFU/svwTb1ySdKtvWMgsneq3A="; }) - (fetchpatch' { - title = "cargo-docset: init at 0.3.1"; - saneCommit = "5a09e84c6159ce545029483384580708bc04c08f"; - prUrl = "https://github.com/NixOS/nixpkgs/pull/231188"; - hash = "sha256-Z1HOps3w/WvxAiyUAHWszKqwS9EwA6rf4XfgPGp+2sQ="; - }) - # (fetchpatch' { # # phoc: 0.25.0 -> 0.27.0 # # TODO: move wayland-scanner & glib to nativeBuildInputs