From 58ed5acb9593c04e3213cc88742f7612b83dafc1 Mon Sep 17 00:00:00 2001 From: June Date: Tue, 29 Sep 2026 01:39:51 +0200 Subject: [PATCH 1/4] Upgrade to NixOS 26.05 (for all hosts) --- .../element-admin.hamburg.ccc.de.nix | 4 ++-- flake.lock | 23 +++---------------- flake.nix | 7 +++--- 3 files changed, 8 insertions(+), 26 deletions(-) diff --git a/config/hosts/public-web-static/virtualHosts/element-admin.hamburg.ccc.de.nix b/config/hosts/public-web-static/virtualHosts/element-admin.hamburg.ccc.de.nix index 8ee4336..95ceeb7 100644 --- a/config/hosts/public-web-static/virtualHosts/element-admin.hamburg.ccc.de.nix +++ b/config/hosts/public-web-static/virtualHosts/element-admin.hamburg.ccc.de.nix @@ -18,8 +18,8 @@ let pnpmDeps = pkgs.pnpm.fetchDeps { inherit (finalAttrs) pname version src; - fetcherVersion = 2; - hash = "sha256-Hf4PWey5bczSNbc3QQ9z9X3OVUZ7VHXw7BHGQqJWPac="; + fetcherVersion = 4; + hash = "sha256-wUAzyx9QsdW2kT2tBX6HeZz20c0Hbz1HZjscb4NCz9E="; }; buildPhase = '' diff --git a/flake.lock b/flake.lock index d3c87ea..04f7d9d 100644 --- a/flake.lock +++ b/flake.lock @@ -19,27 +19,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1782847189, - "narHash": "sha256-twXPFqFsrrY5r28Zh7Homgcp2gUMBgQ6WDS98Q/3xFI=", + "lastModified": 1790533781, + "narHash": "sha256-F+b8u43BVF5DlM0pz7JQSbtbwKy5PrHIT5zQUekXsD0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b6018f87da91d19d0ab4cf979885689b469cdd41", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-25.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2605": { - "locked": { - "lastModified": 1789749394, - "narHash": "sha256-cFTsMQz8Hzn8MT49oaeLSHg62tE86NykugCWkeM2ypk=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "cf9d2fb3e50fa1cd5114c47505ea9177f7ff5f49", + "rev": "cf5e76507c6e23b59f7e0ffcc7baa2a39ddd8442", "type": "github" }, "original": { @@ -69,7 +53,6 @@ "inputs": { "authorizedKeysRepo": "authorizedKeysRepo", "nixpkgs": "nixpkgs", - "nixpkgs-2605": "nixpkgs-2605", "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix" } diff --git a/flake.nix b/flake.nix index f75f2d4..238204e 100644 --- a/flake.nix +++ b/flake.nix @@ -5,9 +5,8 @@ # Use the NixOS small channels for nixpkgs. # https://nixos.org/manual/nixos/stable/#sec-upgrading # https://github.com/NixOS/nixpkgs - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - nixpkgs-2605.url = "github:nixos/nixpkgs?ref=nixos-26.05"; # # Add nixos-generators as an input. # # See here: https://github.com/nix-community/nixos-generators#using-in-a-flake @@ -29,7 +28,7 @@ }; }; - outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-2605, sops-nix, authorizedKeysRepo, ... }: + outputs = { self, nixpkgs, nixpkgs-unstable, sops-nix, authorizedKeysRepo, ... }: let specialArgs = { inherit authorizedKeysRepo; @@ -89,7 +88,7 @@ ]; }; - git = nixpkgs-2605.lib.nixosSystem { + git = nixpkgs.lib.nixosSystem { inherit system specialArgs; modules = [ self.nixosModules.common From 47fcc72214384208d858f6eb20f6277085873680 Mon Sep 17 00:00:00 2001 From: June Date: Tue, 29 Sep 2026 01:41:10 +0200 Subject: [PATCH 2/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs-unstable': 'github:nixos/nixpkgs/6b5e5b7a6631f065bf6908986990b37d845f847f?narHash=sha256-smTKQXMLLStzc8zJevMCckbk3My7SvbbLmPYZUJJKW4%3D' (2026-08-13) → 'github:nixos/nixpkgs/419fe0f449b3fbe3bdd53d9840288db4509ec32e?narHash=sha256-Avcz96Q%2B8OkfUIUXipBBVsQn19L622BtKP7mk6M%2Buls%3D' (2026-09-28) • Updated input 'sops-nix': 'github:Mic92/sops-nix/a8627b21b9107c5711c96b84f32a9a4b3d45295f?narHash=sha256-gkig4nPi1CWc4Z50GBsjE4ygSE7hMpl/TwID2an2Cck%3D' (2026-08-13) → 'github:Mic92/sops-nix/5efb5a6f4f5ab192817d28557dd4d650fa14d866?narHash=sha256-rs9meAYxW3zzrh43yaW7htrqCD%2BX9%2BpupDPHN86fumI%3D' (2026-09-27) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 04f7d9d..00c7882 100644 --- a/flake.lock +++ b/flake.lock @@ -35,11 +35,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1786593342, - "narHash": "sha256-smTKQXMLLStzc8zJevMCckbk3My7SvbbLmPYZUJJKW4=", + "lastModified": 1790570722, + "narHash": "sha256-Avcz96Q+8OkfUIUXipBBVsQn19L622BtKP7mk6M+uls=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6b5e5b7a6631f065bf6908986990b37d845f847f", + "rev": "419fe0f449b3fbe3bdd53d9840288db4509ec32e", "type": "github" }, "original": { @@ -64,11 +64,11 @@ ] }, "locked": { - "lastModified": 1786629091, - "narHash": "sha256-gkig4nPi1CWc4Z50GBsjE4ygSE7hMpl/TwID2an2Cck=", + "lastModified": 1790498116, + "narHash": "sha256-rs9meAYxW3zzrh43yaW7htrqCD+X9+pupDPHN86fumI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "a8627b21b9107c5711c96b84f32a9a4b3d45295f", + "rev": "5efb5a6f4f5ab192817d28557dd4d650fa14d866", "type": "github" }, "original": { From 19508405c18bc0b64dcfdd4e0fb6aef37f5bcfa7 Mon Sep 17 00:00:00 2001 From: June Date: Tue, 29 Sep 2026 01:51:02 +0200 Subject: [PATCH 3/4] ptouch-print-server(host): make forcecommand-lpr-wrapper build again Make forcecommand-lpr-wrapper, and therefore the host, build again. --- config/hosts/ptouch-print-server/printing.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/hosts/ptouch-print-server/printing.nix b/config/hosts/ptouch-print-server/printing.nix index 23cacca..ab5c58b 100644 --- a/config/hosts/ptouch-print-server/printing.nix +++ b/config/hosts/ptouch-print-server/printing.nix @@ -53,6 +53,9 @@ let name = "forcecommand-lpr-wrapper"; src = ./forcecommand-lpr-wrapper; + pyproject = true; + build-system = [ pkgs.python3Packages.setuptools ]; + propagatedBuildInputs = [ pkgs.cups ]; From 9d5fd9da7f6c1bbeeb8c9c581a0bf1401f31c19a Mon Sep 17 00:00:00 2001 From: June Date: Tue, 29 Sep 2026 02:02:05 +0200 Subject: [PATCH 4/4] public-web-static(host): update element-web and element-admin element-web: 1.12.18 -> 1.12.29 element-admin: 0.1.11 -> 0.1.14 --- .../virtualHosts/element-admin.hamburg.ccc.de.nix | 6 +++--- .../virtualHosts/element.hamburg.ccc.de.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/hosts/public-web-static/virtualHosts/element-admin.hamburg.ccc.de.nix b/config/hosts/public-web-static/virtualHosts/element-admin.hamburg.ccc.de.nix index 95ceeb7..14f8e6f 100644 --- a/config/hosts/public-web-static/virtualHosts/element-admin.hamburg.ccc.de.nix +++ b/config/hosts/public-web-static/virtualHosts/element-admin.hamburg.ccc.de.nix @@ -1,14 +1,14 @@ { config, pkgs, ... }: let - elementAdminVersion = "0.1.11"; + elementAdminVersion = "0.1.14"; elementAdmin = pkgs.stdenv.mkDerivation (finalAttrs: { pname = "element-admin"; version = elementAdminVersion; src = pkgs.fetchzip { url = "https://github.com/element-hq/element-admin/archive/refs/tags/v${elementAdminVersion}.zip"; - sha256 = "sha256-tSUTDPspQJjvP1KN4nUr4LYyjNQFj4pKMMA8JmavIxo="; + sha256 = "sha256-ncQjl2V+WhHeLSpPlj0yQ/yyr+RrEizep0pWD0nfECw="; }; nativeBuildInputs = [ @@ -19,7 +19,7 @@ let pnpmDeps = pkgs.pnpm.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 4; - hash = "sha256-wUAzyx9QsdW2kT2tBX6HeZz20c0Hbz1HZjscb4NCz9E="; + hash = "sha256-YMYSJybWCLZuPs8fa4YNFgoQYdjfTQRlCOni7MaYjbQ="; }; buildPhase = '' diff --git a/config/hosts/public-web-static/virtualHosts/element.hamburg.ccc.de.nix b/config/hosts/public-web-static/virtualHosts/element.hamburg.ccc.de.nix index f781dc0..c976780 100644 --- a/config/hosts/public-web-static/virtualHosts/element.hamburg.ccc.de.nix +++ b/config/hosts/public-web-static/virtualHosts/element.hamburg.ccc.de.nix @@ -1,10 +1,10 @@ { pkgs, ... }: let - elementWebVersion = "1.12.18"; + elementWebVersion = "1.12.29"; element-web = pkgs.fetchzip { url = "https://github.com/element-hq/element-web/releases/download/v${elementWebVersion}/element-v${elementWebVersion}.tar.gz"; - sha256 = "sha256-RvPJg28hgOgFs0GFZ9EPypQkUPkAns0alXYJeNst4Bk="; + sha256 = "sha256-lyRg9vGW5TyU/ynl+qJcYHlmgAMO9GJbg7BuZ6Jym60="; }; elementSecurityHeaders = '' # Configuration best practices