From d6fb2ab5b4c564d1045d568d7768be699f68f949 Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 19 May 2023 17:58:32 +0000 Subject: [PATCH] flake/nixpkgs 2023-05-14 -> 2023-05-18; nix-serve -> 2023-05-17 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` • Updated input 'nix-serve': 'github:edolstra/nix-serve/3b6d30016d910a43e0e16f94170440a3e0b8fa8d' (2023-03-07) → 'github:edolstra/nix-serve/e6e3d09438e803daa5374ad8edf1271289348456' (2023-05-17) • Updated input 'nixpkgs-unpatched': 'github:nixos/nixpkgs/0470f36b02ef01d4f43c641bbf07020bcab71bf1' (2023-05-14) → 'github:nixos/nixpkgs/48a0fb7aab511df92a17cf239c37f2bd2ec9ae3a' (2023-05-18) ``` --- flake.lock | 12 ++++++------ hosts/by-name/desko/default.nix | 6 ++---- hosts/by-name/lappy/default.nix | 3 ++- nixpatches/list.nix | 7 ------- 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index e6985aef0..fc07af92e 100644 --- a/flake.lock +++ b/flake.lock @@ -36,11 +36,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1678202930, - "narHash": "sha256-SF82/tTnagdazlETJLzXD9kjZ6lyk38agdLbmMx1UZE=", + "lastModified": 1684319086, + "narHash": "sha256-5wwlkWqP1cQUPXp/PJsi09FkgAule5yBghngRZZbUQg=", "owner": "edolstra", "repo": "nix-serve", - "rev": "3b6d30016d910a43e0e16f94170440a3e0b8fa8d", + "rev": "e6e3d09438e803daa5374ad8edf1271289348456", "type": "github" }, "original": { @@ -82,11 +82,11 @@ }, "nixpkgs-unpatched": { "locked": { - "lastModified": 1684049129, - "narHash": "sha256-7WB9LpnPNAS8oI7hMoHeKLNhRX7k3CI9uWBRSfmOCCE=", + "lastModified": 1684385584, + "narHash": "sha256-O7y0gK8OLIDqz+LaHJJyeu09IGiXlZIS3+JgEzGmmJA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0470f36b02ef01d4f43c641bbf07020bcab71bf1", + "rev": "48a0fb7aab511df92a17cf239c37f2bd2ec9ae3a", "type": "github" }, "original": { diff --git a/hosts/by-name/desko/default.nix b/hosts/by-name/desko/default.nix index 23bce3c5e..c3f67ea03 100644 --- a/hosts/by-name/desko/default.nix +++ b/hosts/by-name/desko/default.nix @@ -36,11 +36,9 @@ services.snapper.configs.nix = { # TODO: for the impermanent setup, we'd prefer to just do /nix/persist, # but that also requires setting up the persist dir as a subvol - subvolume = "/nix"; + SUBVOLUME = "/nix"; # TODO: ALLOW_USERS doesn't seem to work. still need `sudo snapper -c nix list` - extraConfig = '' - ALLOW_USERS = "colin"; - ''; + ALLOW_USERS = [ "colin" ]; }; programs.steam = { diff --git a/hosts/by-name/lappy/default.nix b/hosts/by-name/lappy/default.nix index 9cbf5f858..149109c69 100644 --- a/hosts/by-name/lappy/default.nix +++ b/hosts/by-name/lappy/default.nix @@ -29,7 +29,8 @@ services.snapper.configs.nix = { # TODO: for the impermanent setup, we'd prefer to just do /nix/persist, # but that also requires setting up the persist dir as a subvol - subvolume = "/nix"; + SUBVOLUME = "/nix"; + ALLOW_USERS = [ "colin" ]; }; # TODO: only here for debugging diff --git a/nixpatches/list.nix b/nixpatches/list.nix index 4d96dae48..12c23e865 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -68,13 +68,6 @@ in [ hash = "sha256-Z1HOps3w/WvxAiyUAHWszKqwS9EwA6rf4XfgPGp+2sQ="; }) - (fetchpatch' { - # kiwix-tools: 3.4.0 -> 3.5.0 - saneCommit = "146f2449a19101ee202aa578a2b1d7377779890b"; - prUrl = "https://github.com/NixOS/nixpkgs/pull/232020"; - hash = "sha256-Tqr8Ri8X2dDljDmWmjAQDRJGNenSFhrY/wr24h2JAh0="; - }) - (fetchpatch' { # nixos/lemmy: support nginx saneCommit = "4c86db6dcb78795ac9bb514d9c779fd591070b23";