peter/haccfiles
1
0
Fork 0
forked from hacc/haccfiles
Code Issues Pull requests Projects Releases Wiki Activity

NixOS 24.11

Browse source 
in summary:
 - update inputs
 - copy a fix for the nopersist module from hexchen's nixfiles
   d0b3a042ff
 - remove an already-outdated override in pkgs
 - update zola's config for the docs.hacc.space website
This commit is contained in:
stuebinm 2024-12-04 00:34:55 +01:00
parent 69e51f1e76
commit 0e1f14957e
5 changed files with 29 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
flake.lock
View file

@ -64,41 +64,50 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs-unstable" "nixpkgs-unstable"
], ],
"nixpkgs-24_05": [ "nixpkgs-24_05": "nixpkgs-24_05"
"nixpkgs"
],
"utils": [
"deploy-rs",
"utils"
]
}, },
"locked": { "locked": {
"lastModified": 1718084203, "lastModified": 1722877200,
"narHash": "sha256-Cx1xoVfSMv1XDLgKg08CUd1EoTYWB45VmB9XIQzhmzI=", "narHash": "sha256-qgKDNJXs+od+1UbRy62uk7dYal3h98I4WojfIqMoGcg=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "29916981e7b3b5782dc5085ad18490113f8ff63b", "rev": "af7d3bf5daeba3fc28089b015c0dd43f06b176f2",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"ref": "nixos-24.05", "ref": "master",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"type": "gitlab" "type": "gitlab"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1733107608, "lastModified": 1733220729,
"narHash": "sha256-jdX4KeRP2J1Rj7IRWK5xZFvxr8yjw+PQnCc8n2XclVA=", "narHash": "sha256-BXFReJquw6GPlmeatsIKJIZNxcmy54Dg6zcwrogdlgU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c1c8d3d0b640adbb35a416e5cf8fbaf2186924d0", "rev": "7247d0e9e88c3fc9769b025760db2b0b8698ccd0",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-24.05-small", "ref": "nixos-24.11-small",
"type": "indirect"
}
},
"nixpkgs-24_05": {
"locked": {
"lastModified": 1733016324,
"narHash": "sha256-8qwPSE2g1othR1u4uP86NXxm6i7E9nHPyJX3m3lx7Q4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "7e1ca67996afd8233d9033edd26e442836cc2ad6",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-24.05",
"type": "indirect" "type": "indirect"
} }
}, },

7
flake.nix
View file

@ -2,26 +2,23 @@
description = "hacc infra stuff"; description = "hacc infra stuff";
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-24.05-small"; nixpkgs.url = "nixpkgs/nixos-24.11-small";
nixpkgs-unstable.url = "nixpkgs/nixos-unstable-small"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable-small";
nixpkgs-oldstable.url = "github:/NixOS/nixpkgs?rev=c4aec3c021620d98861639946123214207e98344"; nixpkgs-oldstable.url = "github:/NixOS/nixpkgs?rev=c4aec3c021620d98861639946123214207e98344";
nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05"; nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master";
tracktrain.url = "git+https://stuebinm.eu/git/tracktrain?ref=main"; tracktrain.url = "git+https://stuebinm.eu/git/tracktrain?ref=main";
tracktrain.flake = false; tracktrain.flake = false;
deploy-rs.url = "github:serokell/deploy-rs"; deploy-rs.url = "github:serokell/deploy-rs";
deploy-rs.inputs.nixpkgs.follows = "nixpkgs"; deploy-rs.inputs.nixpkgs.follows = "nixpkgs";
sops-nix.url = "github:Mic92/sops-nix"; sops-nix.url = "github:Mic92/sops-nix";
sops-nix.inputs.nixpkgs-stable.follows = "nixpkgs";
sops-nix.inputs.nixpkgs.follows = "nixpkgs-unstable"; sops-nix.inputs.nixpkgs.follows = "nixpkgs-unstable";
# these exist mostly to make the flake.lock somewhat more human-friendly # these exist mostly to make the flake.lock somewhat more human-friendly
# note that in theory doing this might break things, but it seems fairly unlikely # note that in theory doing this might break things, but it seems fairly unlikely
nixos-mailserver.inputs = { nixos-mailserver.inputs = {
"nixpkgs-24_05".follows = "nixpkgs";
nixpkgs.follows = "nixpkgs-unstable"; nixpkgs.follows = "nixpkgs-unstable";
utils.follows = "/deploy-rs/utils";
flake-compat.follows = "/deploy-rs/flake-compat"; flake-compat.follows = "/deploy-rs/flake-compat";
}; };
}; };

2
modules/nopersist.nix
View file

@ -7,7 +7,7 @@ with lib;
users.mutableUsers = false; users.mutableUsers = false;
boot.initrd = mkIf (config.fileSystems."/".fsType == "zfs") { boot.initrd = mkIf (config.fileSystems."/".fsType or "notzfs" == "zfs") {
network.ssh.hostKeys = mkIf config.hacc.encboot.enable network.ssh.hostKeys = mkIf config.hacc.encboot.enable
(mkForce [ /persist/ssh/encboot_host ]); (mkForce [ /persist/ssh/encboot_host ]);

3
pkgs/default.nix
View file

@ -29,9 +29,6 @@ let
hacc-scripts = callPackage ./scripts {}; hacc-scripts = callPackage ./scripts {};
inherit (oldstable) uwsgi flask; inherit (oldstable) uwsgi flask;
# TODO: once on nixos 24.05, remove this inherit
inherit (unstable) lix;
}; };
in pkgs.extend(_: _: newpkgs) in pkgs.extend(_: _: newpkgs)

4
websites/docs.hacc.space/config.toml
View file

@ -11,8 +11,8 @@ default_language = "en"
# might be useful — this isn't a blog, obviously, but updates for new entries # might be useful — this isn't a blog, obviously, but updates for new entries
# could still be nice, I guess # could still be nice, I guess
generate_feed = true generate_feeds = true
feed_filename = "atom.xml" feed_filenames = [ "atom.xml" ]
build_search_index = true build_search_index = true