From 798396826f09d6273c00692eefa087db237e6f14 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Thu, 18 Apr 2024 17:24:49 +0200 Subject: [PATCH] feat(router): pin nixpkgs and kernel versions --- nix/os/devices/router0-dmz0/configuration.nix | 15 ++++--- nix/os/devices/router0-dmz0/flake.lock | 44 +++++++++---------- nix/os/devices/router0-dmz0/flake.nix | 7 +-- 3 files changed, 34 insertions(+), 32 deletions(-) diff --git a/nix/os/devices/router0-dmz0/configuration.nix b/nix/os/devices/router0-dmz0/configuration.nix index cd0629e..38160cc 100644 --- a/nix/os/devices/router0-dmz0/configuration.nix +++ b/nix/os/devices/router0-dmz0/configuration.nix @@ -963,12 +963,13 @@ in { # ]) # ]; - # cname = [ - # "mailserver.svc.stefanjunker.de,${exposedHost}" - # "www.stefanjunker.de,${exposedHost}" - # "hedgedoc.www.stefanjunker.de,${exposedHost}" - # "jitsi.www.stefanjunker.de,${exposedHost}" - # ]; + cname = [ + "mailserver.svc.stefanjunker.de,${exposedHost}" + "www.stefanjunker.de,${exposedHost}" + "hedgedoc.www.stefanjunker.de,${exposedHost}" + "jitsi.www.stefanjunker.de,${exposedHost}" + "lldap.www.stefanjunker.de,${exposedHost}" + ]; }; }; @@ -978,7 +979,7 @@ in { system.stateVersion = "23.05"; - boot.kernelPackages = pkgs.linuxPackages_bpir3_latest; + boot.kernelPackages = pkgs.linuxPackages_bpir3_6_6; # We exclude a number of modules included in the default list. A non-insignificant amount do # not apply to embedded hardware like this, so simply skip the defaults. # diff --git a/nix/os/devices/router0-dmz0/flake.lock b/nix/os/devices/router0-dmz0/flake.lock index cefbdd9..d1a0074 100644 --- a/nix/os/devices/router0-dmz0/flake.lock +++ b/nix/os/devices/router0-dmz0/flake.lock @@ -7,16 +7,16 @@ ] }, "locked": { - "lastModified": 1703603768, - "narHash": "sha256-ZViXHNt7ClqNtlRO9iot+LxiSbBvZi/RR+/6Q7W6UV8=", + "lastModified": 1712309414, + "narHash": "sha256-Z1bK3rlZhI1qVDU3qS4cqZBIQL2xomtUPYHdxQgRuw0=", "owner": "steveej-forks", "repo": "nixos-bpir3", - "rev": "47cb545b92c136d1482a66b940c4719c40eb5fe3", + "rev": "4cfe402142e6ef76d83fcd7c92d75029a39d3997", "type": "github" }, "original": { "owner": "steveej-forks", - "ref": "linux-6.6", + "ref": "pr_kernel_config_for_nixpkgs_update", "repo": "nixos-bpir3", "type": "github" } @@ -49,11 +49,11 @@ ] }, "locked": { - "lastModified": 1711006105, - "narHash": "sha256-pvjqjx4L2Hx/NP3RWcwLjk+ABtMODAJ9+rgreU6fP6I=", + "lastModified": 1711934712, + "narHash": "sha256-sBDe+QmX/QohlnKeSEzrftcXyZL5FY09OMjZ59Rpyy4=", "owner": "nix-community", "repo": "disko", - "rev": "a8c966ee117c278a5aabc6f00b00ef62eb7e28f6", + "rev": "611c9ea53250f7bb22286b3d26872280a0e608f9", "type": "github" }, "original": { @@ -84,16 +84,16 @@ ] }, "locked": { - "lastModified": 1711133180, - "narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=", + "lastModified": 1710888565, + "narHash": "sha256-s9Hi4RHhc6yut4EcYD50sZWRDKsugBJHSbON8KFwoTw=", "owner": "nix-community", "repo": "home-manager", - "rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb", + "rev": "f33900124c23c4eca5831b9b5eb32ea5894375ce", "type": "github" }, "original": { "owner": "nix-community", - "ref": "master", + "ref": "release-23.11", "repo": "home-manager", "type": "github" } @@ -101,11 +101,11 @@ "hostapd": { "flake": false, "locked": { - "lastModified": 1710970863, - "narHash": "sha256-mB4oXrQWMVuVHe1ZJDU4LEu3Nha8efxSqs72EAJiyEI=", + "lastModified": 1712252662, + "narHash": "sha256-eQ6SiquqNFL/uewktFYFASQOC3qKbKDnG5l4VHcDouk=", "ref": "refs/heads/main", - "rev": "c24453dd936dc418bb4254b6c2ea42a2288d9607", - "revCount": 19406, + "rev": "e2ae53e1dbce10161a90bf2e64fd7241e40f4b71", + "revCount": 19445, "type": "git", "url": "git://w1.fi/hostap.git?branch=main" }, @@ -137,16 +137,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1711001935, - "narHash": "sha256-URtGpHue7HHZK0mrHnSf8wJ6OmMKYSsoLmJybrOLFSQ=", + "lastModified": 1712168706, + "narHash": "sha256-XP24tOobf6GGElMd0ux90FEBalUtw6NkBSVh/RlA6ik=", "owner": "nixos", "repo": "nixpkgs", - "rev": "20f77aa09916374aa3141cbc605c955626762c9a", + "rev": "1487bdea619e4a7a53a4590c475deabb5a9d1bfb", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } @@ -189,11 +189,11 @@ ] }, "locked": { - "lastModified": 1710982111, - "narHash": "sha256-IKcJnJwLnNXcnTZY4vxhQ0zEkZvr7srhXSZpxa3IiHA=", + "lastModified": 1712191870, + "narHash": "sha256-+MzSZ4IuZNT4QJS8b+gM48thfWkrJ7vL4NV5zG8Lqx8=", "owner": "numtide", "repo": "srvos", - "rev": "918e2ad35a9ce4071e9bc72e82ad97a65c8b861b", + "rev": "ddafe2fd3547f63e6bf75b6e1a99ecfa61c59687", "type": "github" }, "original": { diff --git a/nix/os/devices/router0-dmz0/flake.nix b/nix/os/devices/router0-dmz0/flake.nix index 22c71ae..2d02246 100644 --- a/nix/os/devices/router0-dmz0/flake.nix +++ b/nix/os/devices/router0-dmz0/flake.nix @@ -1,10 +1,10 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; get-flake.url = "github:ursi/get-flake"; - home-manager.url = "github:nix-community/home-manager/master"; + home-manager.url = "github:nix-community/home-manager/release-23.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; disko.url = "github:nix-community/disko"; @@ -13,7 +13,7 @@ srvos.inputs.nixpkgs.follows = "nixpkgs"; bpir3.url = - "github:steveej-forks/nixos-bpir3/linux-6.6" + "github:steveej-forks/nixos-bpir3/pr_kernel_config_for_nixpkgs_update" # "/home/steveej/src/steveej/nixos-bpir3" ; @@ -88,6 +88,7 @@ inherit (bpir3Pkgs) linuxPackages_bpir3 + linuxPackages_bpir3_6_6 linuxPackages_bpir3_latest ; })