From a2f8d84d96891e0883803bb08c058f903e0e58ba Mon Sep 17 00:00:00 2001 From: kalipso Date: Thu, 14 Aug 2025 14:08:54 +0200 Subject: [PATCH 1/5] [nixpkgs] update --- flake.lock | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index e11678cb..dea5b70c 100644 --- a/flake.lock +++ b/flake.lock @@ -67,11 +67,11 @@ ] }, "locked": { - "lastModified": 1748226808, - "narHash": "sha256-GaBRgxjWO1bAQa8P2+FDxG4ANBVhjnSjBms096qQdxo=", + "lastModified": 1753592768, + "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=", "owner": "nix-community", "repo": "home-manager", - "rev": "83665c39fa688bd6a1f7c43cf7997a70f6a109f9", + "rev": "fc3add429f21450359369af74c2375cb34a2d204", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1748260747, - "narHash": "sha256-V3ONd70wm55JxcUa1rE0JU3zD+Cz7KK/iSVhRD7lq68=", + "lastModified": 1755102374, + "narHash": "sha256-v6xhTSgnGQoF1a51BB6OQWN8HXiYbZtVL+54TRuk9zk=", "owner": "astro", "repo": "microvm.nix", - "rev": "b6c5dfc2a1c7614c94fd2c5d2e8578fd52396f3b", + "rev": "0a5cda80e48191959cf5a9c0552532599ef2cee4", "type": "github" }, "original": { @@ -145,11 +145,11 @@ ] }, "locked": { - "lastModified": 1747663185, - "narHash": "sha256-Obh50J+O9jhUM/FgXtI3he/QRNiV9+J53+l+RlKSaAk=", + "lastModified": 1751903740, + "narHash": "sha256-PeSkNMvkpEvts+9DjFiop1iT2JuBpyknmBUs0Un0a4I=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "ee07ba0d36c38e9915c55d2ac5a8fb0f05f2afcc", + "rev": "032decf9db65efed428afd2fa39d80f7089085eb", "type": "github" }, "original": { @@ -160,11 +160,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1747900541, - "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=", + "lastModified": 1754564048, + "narHash": "sha256-dz303vGuzWjzOPOaYkS9xSW+B93PSAJxvBd6CambXVA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06", + "rev": "26ed7a0d4b8741fe1ef1ee6fa64453ca056ce113", "type": "github" }, "original": { @@ -192,11 +192,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1748190013, - "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", + "lastModified": 1755027561, + "narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", + "rev": "005433b926e16227259a1843015b5b2b7f7d1fc3", "type": "github" }, "original": { @@ -208,11 +208,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1748162331, - "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=", + "lastModified": 1754937576, + "narHash": "sha256-3sWA5WJybUE16kIMZ3+uxcxKZY/JRR4DFBqLdSLBo7w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334", + "rev": "ddae11e58c0c345bf66efbddbf2192ed0e58f896", "type": "github" }, "original": { @@ -246,11 +246,11 @@ ] }, "locked": { - "lastModified": 1747603214, - "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", + "lastModified": 1754988908, + "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", + "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48", "type": "github" }, "original": { @@ -262,11 +262,11 @@ "spectrum": { "flake": false, "locked": { - "lastModified": 1746869549, - "narHash": "sha256-BKZ/yZO/qeLKh9YqVkKB6wJiDQJAZNN5rk5NsMImsWs=", + "lastModified": 1754675037, + "narHash": "sha256-afS08F7lfMUBR4qrBxinN1kuxu+DoHQ5TPNVp9VS/OA=", "ref": "refs/heads/main", - "rev": "d927e78530892ec8ed389e8fae5f38abee00ad87", - "revCount": 862, + "rev": "586577f3015397afacd83bc185454f4cc3c8028f", + "revCount": 955, "type": "git", "url": "https://spectrum-os.org/git/spectrum" }, From af9253b91c8b0ef5bb6e24271f1830bb1f185e66 Mon Sep 17 00:00:00 2001 From: kalipso Date: Mon, 1 Dec 2025 19:14:06 +0100 Subject: [PATCH 2/5] [nixpkgs] 25.05 -> 25.11 --- flake.lock | 52 ++++++++++++++++++++++++++-------------------------- flake.nix | 2 +- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index dea5b70c..0ecd77fb 100644 --- a/flake.lock +++ b/flake.lock @@ -67,11 +67,11 @@ ] }, "locked": { - "lastModified": 1753592768, - "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=", + "lastModified": 1763992789, + "narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=", "owner": "nix-community", "repo": "home-manager", - "rev": "fc3add429f21450359369af74c2375cb34a2d204", + "rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1755102374, - "narHash": "sha256-v6xhTSgnGQoF1a51BB6OQWN8HXiYbZtVL+54TRuk9zk=", + "lastModified": 1764549796, + "narHash": "sha256-Mswg665P92EoHkBwCwPr/7bdnj04g2Qfb+t02ZEYTHA=", "owner": "astro", "repo": "microvm.nix", - "rev": "0a5cda80e48191959cf5a9c0552532599ef2cee4", + "rev": "030d055e877cc13d7525b39f434150226d5e4482", "type": "github" }, "original": { @@ -145,11 +145,11 @@ ] }, "locked": { - "lastModified": 1751903740, - "narHash": "sha256-PeSkNMvkpEvts+9DjFiop1iT2JuBpyknmBUs0Un0a4I=", + "lastModified": 1764234087, + "narHash": "sha256-NHF7QWa0ZPT8hsJrvijREW3+nifmF2rTXgS2v0tpcEA=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "032decf9db65efed428afd2fa39d80f7089085eb", + "rev": "032a1878682fafe829edfcf5fdfad635a2efe748", "type": "github" }, "original": { @@ -160,11 +160,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1754564048, - "narHash": "sha256-dz303vGuzWjzOPOaYkS9xSW+B93PSAJxvBd6CambXVA=", + "lastModified": 1764440730, + "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "26ed7a0d4b8741fe1ef1ee6fa64453ca056ce113", + "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", "type": "github" }, "original": { @@ -192,11 +192,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1755027561, - "narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=", + "lastModified": 1764517877, + "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "005433b926e16227259a1843015b5b2b7f7d1fc3", + "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", "type": "github" }, "original": { @@ -208,16 +208,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1754937576, - "narHash": "sha256-3sWA5WJybUE16kIMZ3+uxcxKZY/JRR4DFBqLdSLBo7w=", + "lastModified": 1764522689, + "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ddae11e58c0c345bf66efbddbf2192ed0e58f896", + "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -246,11 +246,11 @@ ] }, "locked": { - "lastModified": 1754988908, - "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=", + "lastModified": 1764483358, + "narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48", + "rev": "5aca6ff67264321d47856a2ed183729271107c9c", "type": "github" }, "original": { @@ -262,11 +262,11 @@ "spectrum": { "flake": false, "locked": { - "lastModified": 1754675037, - "narHash": "sha256-afS08F7lfMUBR4qrBxinN1kuxu+DoHQ5TPNVp9VS/OA=", + "lastModified": 1759482047, + "narHash": "sha256-H1wiXRQHxxPyMMlP39ce3ROKCwI5/tUn36P8x6dFiiQ=", "ref": "refs/heads/main", - "rev": "586577f3015397afacd83bc185454f4cc3c8028f", - "revCount": 955, + "rev": "c5d5786d3dc938af0b279c542d1e43bce381b4b9", + "revCount": 996, "type": "git", "url": "https://spectrum-os.org/git/spectrum" }, diff --git a/flake.nix b/flake.nix index ff092dd3..90300a61 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; sops-nix.url = "github:Mic92/sops-nix"; sops-nix.inputs.nixpkgs.follows = "nixpkgs"; From 633b2f4dc795b909e3b806254a766d4a7742eb10 Mon Sep 17 00:00:00 2001 From: ahtlon Date: Wed, 3 Dec 2025 16:38:31 +0100 Subject: [PATCH 3/5] Fix nix check; Also i disabled the zineshop temporairly --- machines/bakunin/configuration.nix | 2 +- machines/louise/configuration.nix | 2 +- machines/nextcloud/configuration.nix | 9 ++------- machines/zineshop/configuration.nix | 2 +- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/machines/bakunin/configuration.nix b/machines/bakunin/configuration.nix index a526f0ea..26a263b9 100644 --- a/machines/bakunin/configuration.nix +++ b/machines/bakunin/configuration.nix @@ -48,7 +48,7 @@ in firefox thunderbird telegram-desktop - tor-browser-bundle-bin + tor-browser keepassxc libreoffice gimp diff --git a/machines/louise/configuration.nix b/machines/louise/configuration.nix index 85bc856c..52158797 100644 --- a/machines/louise/configuration.nix +++ b/machines/louise/configuration.nix @@ -31,7 +31,7 @@ firefox thunderbird telegram-desktop - tor-browser-bundle-bin + tor-browser keepassxc libreoffice gimp diff --git a/machines/nextcloud/configuration.nix b/machines/nextcloud/configuration.nix index 521ffa21..b73181a3 100644 --- a/machines/nextcloud/configuration.nix +++ b/machines/nextcloud/configuration.nix @@ -37,7 +37,7 @@ with lib; services.nextcloud = { enable = true; - package = pkgs.nextcloud31; + package = pkgs.nextcloud32; hostName = "cloud.malobeo.org"; config.adminpassFile = config.sops.secrets.nextcloudAdminPass.path; maxUploadSize = "10G"; @@ -52,14 +52,9 @@ with lib; extraAppsEnable = true; extraApps = { inherit (config.services.nextcloud.package.packages.apps) contacts calendar polls registration collectives forms; - appointments = pkgs.fetchNextcloudApp { - sha256 = "sha256-ls1rLnsX7U9wo2WkEtzhrvliTcWUl6LWXolE/9etJ78="; - url = "https://github.com/SergeyMosin/Appointments/raw/refs/tags/v2.4.3/build/artifacts/appstore/appointments.tar.gz"; - license = "agpl3Plus"; - }; deck = pkgs.fetchNextcloudApp { sha256 = "sha256-1sqDmJpM9SffMY2aaxwzqntdjdcUaRySyaUDv9VHuiE="; - url = "https://link.storjshare.io/raw/jw7pf6gct34j3pcqvlq6ddasvdwq/mal/deck.tar.gz"; + url = "https://link.storjshare.io/raw/jvrl62dakd6htpyxohjkiiqiw5ma/mal/deck32.tar.gz"; license = "agpl3Plus"; }; }; diff --git a/machines/zineshop/configuration.nix b/machines/zineshop/configuration.nix index aac419e4..1ec548ac 100644 --- a/machines/zineshop/configuration.nix +++ b/machines/zineshop/configuration.nix @@ -26,7 +26,7 @@ with lib; services.printing.enable = true; services.malobeo.printing.enable = true; - services.zineshop.enable = true; + services.zineshop.enable = false; networking.firewall.allowedTCPPorts = [ 8080 ]; system.stateVersion = "22.11"; # Did you read the comment? From 530c0cc5f3e1273b9dfcfb97c8c69ac9a27cfb8f Mon Sep 17 00:00:00 2001 From: kalipso Date: Fri, 5 Dec 2025 14:46:18 +0100 Subject: [PATCH 4/5] [zineshop] re-enable --- flake.lock | 8 ++++---- machines/zineshop/configuration.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 0ecd77fb..47faa6ba 100644 --- a/flake.lock +++ b/flake.lock @@ -450,11 +450,11 @@ "utils": "utils_4" }, "locked": { - "lastModified": 1751462005, - "narHash": "sha256-vhr2GORiXij3mL+QIfnL0sKSbbBIglw1wnHWNmFejiA=", + "lastModified": 1764942243, + "narHash": "sha256-P02Zm0VAON9SqRxqe6h5vfxgpCBYeiz5JPWGIn6KFFg=", "ref": "refs/heads/master", - "rev": "f505fb17bf1882cc3683e1e252ce44583cbe58ce", - "revCount": 155, + "rev": "f56b7eb6887b7e0fecae4a1f4c1311392eebad8d", + "revCount": 156, "type": "git", "url": "https://git.dynamicdiscord.de/kalipso/zineshop" }, diff --git a/machines/zineshop/configuration.nix b/machines/zineshop/configuration.nix index 1ec548ac..aac419e4 100644 --- a/machines/zineshop/configuration.nix +++ b/machines/zineshop/configuration.nix @@ -26,7 +26,7 @@ with lib; services.printing.enable = true; services.malobeo.printing.enable = true; - services.zineshop.enable = false; + services.zineshop.enable = true; networking.firewall.allowedTCPPorts = [ 8080 ]; system.stateVersion = "22.11"; # Did you read the comment? From 6e6448eeca3070bc8d47dbdc62b90acfbcd27de1 Mon Sep 17 00:00:00 2001 From: ahtlon Date: Thu, 18 Dec 2025 19:11:11 +0100 Subject: [PATCH 5/5] [nextcloud] fix hash for xustom deck32 app --- machines/nextcloud/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/machines/nextcloud/configuration.nix b/machines/nextcloud/configuration.nix index b73181a3..baccf2a0 100644 --- a/machines/nextcloud/configuration.nix +++ b/machines/nextcloud/configuration.nix @@ -53,7 +53,7 @@ with lib; extraApps = { inherit (config.services.nextcloud.package.packages.apps) contacts calendar polls registration collectives forms; deck = pkgs.fetchNextcloudApp { - sha256 = "sha256-1sqDmJpM9SffMY2aaxwzqntdjdcUaRySyaUDv9VHuiE="; + sha256 = "sha256-epjwIANb6vTNx9KqaG6jZc14YPoFMBTCj+/c9JHcWkA="; url = "https://link.storjshare.io/raw/jvrl62dakd6htpyxohjkiiqiw5ma/mal/deck32.tar.gz"; license = "agpl3Plus"; };