diff --git a/config/hosts/ptouch-print-server/printing.nix b/config/hosts/ptouch-print-server/printing.nix index ab5c58b..23cacca 100644 --- a/config/hosts/ptouch-print-server/printing.nix +++ b/config/hosts/ptouch-print-server/printing.nix @@ -53,9 +53,6 @@ let name = "forcecommand-lpr-wrapper"; src = ./forcecommand-lpr-wrapper; - pyproject = true; - build-system = [ pkgs.python3Packages.setuptools ]; - propagatedBuildInputs = [ pkgs.cups ]; 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 14f8e6f..8ee4336 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.14"; + elementAdminVersion = "0.1.11"; 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-ncQjl2V+WhHeLSpPlj0yQ/yyr+RrEizep0pWD0nfECw="; + sha256 = "sha256-tSUTDPspQJjvP1KN4nUr4LYyjNQFj4pKMMA8JmavIxo="; }; nativeBuildInputs = [ @@ -18,8 +18,8 @@ let pnpmDeps = pkgs.pnpm.fetchDeps { inherit (finalAttrs) pname version src; - fetcherVersion = 4; - hash = "sha256-YMYSJybWCLZuPs8fa4YNFgoQYdjfTQRlCOni7MaYjbQ="; + fetcherVersion = 2; + hash = "sha256-Hf4PWey5bczSNbc3QQ9z9X3OVUZ7VHXw7BHGQqJWPac="; }; 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 c976780..f781dc0 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.29"; + elementWebVersion = "1.12.18"; element-web = pkgs.fetchzip { url = "https://github.com/element-hq/element-web/releases/download/v${elementWebVersion}/element-v${elementWebVersion}.tar.gz"; - sha256 = "sha256-lyRg9vGW5TyU/ynl+qJcYHlmgAMO9GJbg7BuZ6Jym60="; + sha256 = "sha256-RvPJg28hgOgFs0GFZ9EPypQkUPkAns0alXYJeNst4Bk="; }; elementSecurityHeaders = '' # Configuration best practices diff --git a/flake.lock b/flake.lock index 00c7882..d3c87ea 100644 --- a/flake.lock +++ b/flake.lock @@ -19,11 +19,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1790533781, - "narHash": "sha256-F+b8u43BVF5DlM0pz7JQSbtbwKy5PrHIT5zQUekXsD0=", + "lastModified": 1782847189, + "narHash": "sha256-twXPFqFsrrY5r28Zh7Homgcp2gUMBgQ6WDS98Q/3xFI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cf5e76507c6e23b59f7e0ffcc7baa2a39ddd8442", + "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", "type": "github" }, "original": { @@ -35,11 +51,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1790570722, - "narHash": "sha256-Avcz96Q+8OkfUIUXipBBVsQn19L622BtKP7mk6M+uls=", + "lastModified": 1786593342, + "narHash": "sha256-smTKQXMLLStzc8zJevMCckbk3My7SvbbLmPYZUJJKW4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "419fe0f449b3fbe3bdd53d9840288db4509ec32e", + "rev": "6b5e5b7a6631f065bf6908986990b37d845f847f", "type": "github" }, "original": { @@ -53,6 +69,7 @@ "inputs": { "authorizedKeysRepo": "authorizedKeysRepo", "nixpkgs": "nixpkgs", + "nixpkgs-2605": "nixpkgs-2605", "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix" } @@ -64,11 +81,11 @@ ] }, "locked": { - "lastModified": 1790498116, - "narHash": "sha256-rs9meAYxW3zzrh43yaW7htrqCD+X9+pupDPHN86fumI=", + "lastModified": 1786629091, + "narHash": "sha256-gkig4nPi1CWc4Z50GBsjE4ygSE7hMpl/TwID2an2Cck=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5efb5a6f4f5ab192817d28557dd4d650fa14d866", + "rev": "a8627b21b9107c5711c96b84f32a9a4b3d45295f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 238204e..f75f2d4 100644 --- a/flake.nix +++ b/flake.nix @@ -5,8 +5,9 @@ # 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-26.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; 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 @@ -28,7 +29,7 @@ }; }; - outputs = { self, nixpkgs, nixpkgs-unstable, sops-nix, authorizedKeysRepo, ... }: + outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-2605, sops-nix, authorizedKeysRepo, ... }: let specialArgs = { inherit authorizedKeysRepo; @@ -88,7 +89,7 @@ ]; }; - git = nixpkgs.lib.nixosSystem { + git = nixpkgs-2605.lib.nixosSystem { inherit system specialArgs; modules = [ self.nixosModules.common