colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

flake/nixpkgs 2023-05-14 -> 2023-05-18; nix-serve -> 2023-05-17

Browse Source 
```
• 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)
```
This commit is contained in:
Colin
2023-05-19 17:58:32 +00:00
parent a8eaaa4e7a
commit d6fb2ab5b4
4 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
flake.lock generated
View File

@@ -36,11 +36,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1678202930, "lastModified": 1684319086,
"narHash": "sha256-SF82/tTnagdazlETJLzXD9kjZ6lyk38agdLbmMx1UZE=", "narHash": "sha256-5wwlkWqP1cQUPXp/PJsi09FkgAule5yBghngRZZbUQg=",
"owner": "edolstra", "owner": "edolstra",
"repo": "nix-serve", "repo": "nix-serve",
"rev": "3b6d30016d910a43e0e16f94170440a3e0b8fa8d", "rev": "e6e3d09438e803daa5374ad8edf1271289348456",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -82,11 +82,11 @@
}, },
"nixpkgs-unpatched": { "nixpkgs-unpatched": {
"locked": { "locked": {
"lastModified": 1684049129, "lastModified": 1684385584,
"narHash": "sha256-7WB9LpnPNAS8oI7hMoHeKLNhRX7k3CI9uWBRSfmOCCE=", "narHash": "sha256-O7y0gK8OLIDqz+LaHJJyeu09IGiXlZIS3+JgEzGmmJA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0470f36b02ef01d4f43c641bbf07020bcab71bf1", "rev": "48a0fb7aab511df92a17cf239c37f2bd2ec9ae3a",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
hosts/by-name/desko/default.nix
View File

@@ -36,11 +36,9 @@
services.snapper.configs.nix = { services.snapper.configs.nix = {
# TODO: for the impermanent setup, we'd prefer to just do /nix/persist, # 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 # 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` # TODO: ALLOW_USERS doesn't seem to work. still need `sudo snapper -c nix list`
extraConfig = '' ALLOW_USERS = [ "colin" ];
ALLOW_USERS = "colin";
'';
}; };
programs.steam = { programs.steam = {

3
hosts/by-name/lappy/default.nix
View File

@@ -29,7 +29,8 @@
services.snapper.configs.nix = { services.snapper.configs.nix = {
# TODO: for the impermanent setup, we'd prefer to just do /nix/persist, # 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 # but that also requires setting up the persist dir as a subvol
subvolume = "/nix"; SUBVOLUME = "/nix";
ALLOW_USERS = [ "colin" ];
}; };
# TODO: only here for debugging # TODO: only here for debugging

7
nixpatches/list.nix
View File

@@ -68,13 +68,6 @@ in [
hash = "sha256-Z1HOps3w/WvxAiyUAHWszKqwS9EwA6rf4XfgPGp+2sQ="; 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' { (fetchpatch' {
# nixos/lemmy: support nginx # nixos/lemmy: support nginx
saneCommit = "4c86db6dcb78795ac9bb514d9c779fd591070b23"; saneCommit = "4c86db6dcb78795ac9bb514d9c779fd591070b23";