From 12f19506fc3a832b57bc6848eb6e6cc51edd9154 Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Sun, 15 Dec 2024 21:26:51 +0100 Subject: [PATCH] feat(compute01): Update nixos, but keep kanidm_1_3 --- machines/nixos/compute01/kanidm/default.nix | 5 ++++- machines/nixos/compute01/stirling-pdf/default.nix | 2 ++ meta/nodes.nix | 2 +- npins/sources.json | 4 ++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/machines/nixos/compute01/kanidm/default.nix b/machines/nixos/compute01/kanidm/default.nix index a5177a2..3cb0371 100644 --- a/machines/nixos/compute01/kanidm/default.nix +++ b/machines/nixos/compute01/kanidm/default.nix @@ -5,6 +5,7 @@ { config, lib, + pkgs, meta, ... }: @@ -43,10 +44,12 @@ let usernameFor = member: meta.organization.members.${member}.username; in { + nixpkgs.config.permittedInsecurePackages = [ "kanidm-1.3.3" ]; + services.kanidm = { enableServer = true; - # package = nixpkgs.unstable.kanidm; + package = pkgs.kanidm_1_3; serverSettings = { inherit domain; diff --git a/machines/nixos/compute01/stirling-pdf/default.nix b/machines/nixos/compute01/stirling-pdf/default.nix index 7a0f340..bfe9563 100644 --- a/machines/nixos/compute01/stirling-pdf/default.nix +++ b/machines/nixos/compute01/stirling-pdf/default.nix @@ -19,6 +19,8 @@ let in { + disabledModules = [ "services/web-apps/stirling-pdf.nix" ]; + dgn-web.internalPorts.stirling-pdf = port; services.stirling-pdf = { diff --git a/meta/nodes.nix b/meta/nodes.nix index a892ff3..ee5c3f1 100644 --- a/meta/nodes.nix +++ b/meta/nodes.nix @@ -58,7 +58,7 @@ nix-modules = [ "services/stirling-pdf" ]; nixpkgs = { - version = "24.05"; + version = "24.11"; system = "nixos"; }; }; diff --git a/npins/sources.json b/npins/sources.json index 2845f85..066d6f7 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -289,8 +289,8 @@ "nixos-24.11": { "type": "Channel", "name": "nixos-24.11", - "url": "https://releases.nixos.org/nixos/24.11/nixos-24.11.710486.4dc2fc4e62db/nixexprs.tar.xz", - "hash": "1pby8y3dcbdcjb6dklyy0wnn1dhzbbqaki6l2nlw9x13n6qqj4mb" + "url": "https://releases.nixos.org/nixos/24.11/nixos-24.11.711150.314e12ba369c/nixexprs.tar.xz", + "hash": "15vk061qfvpbc41kwbh5ssrlfw0rlcswc7ljjgyb26nrhhw56qph" }, "nixos-generators": { "type": "Git",