CCCHH/nix-infra
CCCHH/nix-infra
Watch
2
3
Fork
You've already forked nix-infra
 2
Code Issues Pull requests 2 Wiki Activity

Compare commits

base: CCCHH:726dab1ccfc3cd55333995253518881531c40986
Branches Tags
CCCHH:main
CCCHH:feat/docs-c3voc-static-web
CCCHH:shairport-sync-cleanup
CCCHH:ci-check
CCCHH:ci-check-lix
CCCHH:nixOptions
CCCHH:spaceapi
CCCHH:ptouch-print-server
CCCHH:Bendodroid-ldflagsSpaceapid
..
compare: CCCHH:9d5fd9da7f6c1bbeeb8c9c581a0bf1401f31c19a
Branches Tags
CCCHH:main
CCCHH:feat/docs-c3voc-static-web
CCCHH:shairport-sync-cleanup
CCCHH:ci-check
CCCHH:ci-check-lix
CCCHH:nixOptions
CCCHH:spaceapi
CCCHH:ptouch-print-server
CCCHH:Bendodroid-ldflagsSpaceapid
Author SHA1 Message Date
June
9d5fd9da7f
 		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
 2026-09-29 02:02:05 +02:00
June
19508405c1
 		ptouch-print-server(host): make forcecommand-lpr-wrapper build again 
Make forcecommand-lpr-wrapper, and therefore the host, build again.
 2026-09-29 01:51:02 +02:00
June
47fcc72214
 		flake.lock: Update 
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)
 2026-09-29 01:41:10 +02:00
June
58ed5acb95
 		Upgrade to NixOS 26.05 (for all hosts) 2026-09-29 01:39:51 +02:00
5 changed files with 21 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

3
config/hosts/ptouch-print-server/printing.nix
View file

@ -53,6 +53,9 @@ let
name = "forcecommand-lpr-wrapper"; name = "forcecommand-lpr-wrapper";
src = ./forcecommand-lpr-wrapper; src = ./forcecommand-lpr-wrapper;
pyproject = true;
build-system = [ pkgs.python3Packages.setuptools ];
propagatedBuildInputs = [ propagatedBuildInputs = [
pkgs.cups pkgs.cups
]; ];

8
config/hosts/public-web-static/virtualHosts/element-admin.hamburg.ccc.de.nix
View file

@ -1,14 +1,14 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let let
elementAdminVersion = "0.1.11"; elementAdminVersion = "0.1.14";
elementAdmin = pkgs.stdenv.mkDerivation (finalAttrs: { elementAdmin = pkgs.stdenv.mkDerivation (finalAttrs: {
pname = "element-admin"; pname = "element-admin";
version = elementAdminVersion; version = elementAdminVersion;
src = pkgs.fetchzip { src = pkgs.fetchzip {
url = "https://github.com/element-hq/element-admin/archive/refs/tags/v${elementAdminVersion}.zip"; url = "https://github.com/element-hq/element-admin/archive/refs/tags/v${elementAdminVersion}.zip";
sha256 = "sha256-tSUTDPspQJjvP1KN4nUr4LYyjNQFj4pKMMA8JmavIxo="; sha256 = "sha256-ncQjl2V+WhHeLSpPlj0yQ/yyr+RrEizep0pWD0nfECw=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -18,8 +18,8 @@ let
pnpmDeps = pkgs.pnpm.fetchDeps { pnpmDeps = pkgs.pnpm.fetchDeps {
inherit (finalAttrs) pname version src; inherit (finalAttrs) pname version src;
fetcherVersion = 2; fetcherVersion = 4;
hash = "sha256-Hf4PWey5bczSNbc3QQ9z9X3OVUZ7VHXw7BHGQqJWPac="; hash = "sha256-YMYSJybWCLZuPs8fa4YNFgoQYdjfTQRlCOni7MaYjbQ=";
}; };
buildPhase = '' buildPhase = ''

4
config/hosts/public-web-static/virtualHosts/element.hamburg.ccc.de.nix
View file

@ -1,10 +1,10 @@
{ pkgs, ... }: { pkgs, ... }:
let let
elementWebVersion = "1.12.18"; elementWebVersion = "1.12.29";
element-web = pkgs.fetchzip { element-web = pkgs.fetchzip {
url = "https://github.com/element-hq/element-web/releases/download/v${elementWebVersion}/element-v${elementWebVersion}.tar.gz"; 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 = '' elementSecurityHeaders = ''
# Configuration best practices # Configuration best practices

35
flake.lock generated
View file

@ -19,27 +19,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1782847189, "lastModified": 1790533781,
"narHash": "sha256-twXPFqFsrrY5r28Zh7Homgcp2gUMBgQ6WDS98Q/3xFI=", "narHash": "sha256-F+b8u43BVF5DlM0pz7JQSbtbwKy5PrHIT5zQUekXsD0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b6018f87da91d19d0ab4cf979885689b469cdd41", "rev": "cf5e76507c6e23b59f7e0ffcc7baa2a39ddd8442",
"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" "type": "github"
}, },
"original": { "original": {
@ -51,11 +35,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1786593342, "lastModified": 1790570722,
"narHash": "sha256-smTKQXMLLStzc8zJevMCckbk3My7SvbbLmPYZUJJKW4=", "narHash": "sha256-Avcz96Q+8OkfUIUXipBBVsQn19L622BtKP7mk6M+uls=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6b5e5b7a6631f065bf6908986990b37d845f847f", "rev": "419fe0f449b3fbe3bdd53d9840288db4509ec32e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -69,7 +53,6 @@
"inputs": { "inputs": {
"authorizedKeysRepo": "authorizedKeysRepo", "authorizedKeysRepo": "authorizedKeysRepo",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-2605": "nixpkgs-2605",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
} }
@ -81,11 +64,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1786629091, "lastModified": 1790498116,
"narHash": "sha256-gkig4nPi1CWc4Z50GBsjE4ygSE7hMpl/TwID2an2Cck=", "narHash": "sha256-rs9meAYxW3zzrh43yaW7htrqCD+X9+pupDPHN86fumI=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "a8627b21b9107c5711c96b84f32a9a4b3d45295f", "rev": "5efb5a6f4f5ab192817d28557dd4d650fa14d866",
"type": "github" "type": "github"
}, },
"original": { "original": {

7
flake.nix
View file

@ -5,9 +5,8 @@
# Use the NixOS small channels for nixpkgs. # Use the NixOS small channels for nixpkgs.
# https://nixos.org/manual/nixos/stable/#sec-upgrading # https://nixos.org/manual/nixos/stable/#sec-upgrading
# https://github.com/NixOS/nixpkgs # 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-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
nixpkgs-2605.url = "github:nixos/nixpkgs?ref=nixos-26.05";
# # Add nixos-generators as an input. # # Add nixos-generators as an input.
# # See here: https://github.com/nix-community/nixos-generators#using-in-a-flake # # 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 let
specialArgs = { specialArgs = {
inherit authorizedKeysRepo; inherit authorizedKeysRepo;
@ -89,7 +88,7 @@
]; ];
}; };
git = nixpkgs-2605.lib.nixosSystem { git = nixpkgs.lib.nixosSystem {
inherit system specialArgs; inherit system specialArgs;
modules = [ modules = [
self.nixosModules.common self.nixosModules.common