Update to 26.05 #161

Merged

ahtlon merged 11 commits from 26_05_upgrade into master 2026-08-11 09:50:55 +02:00

Conversation 7 Commits 11 Files Changed 8

+55 -50

ahtlon commented 2026-06-17 09:57:04 +02:00

Owner

Copy Link

Copy Source

No description provided.

ahtlon added 1 commit 2026-06-17 09:57:04 +02:00

Update to 26.05 1cc93d5dc2

kalipso commented 2026-06-17 11:06:10 +02:00

Owner

Copy Link

Copy Source

The option definition `services.promtail' in `/nix/store/gd2xdz7xz96q1pigd0bfm1ggqm1clcfb-source/machines/modules/malobeo/metrics.nix' no longer has any effect; please remove it.
       The promtail module has been removed, as promtail reached its end of life.

``` The option definition `services.promtail' in `/nix/store/gd2xdz7xz96q1pigd0bfm1ggqm1clcfb-source/machines/modules/malobeo/metrics.nix' no longer has any effect; please remove it. The promtail module has been removed, as promtail reached its end of life. ```

ahtlon added 3 commits 2026-06-17 11:29:51 +02:00

Promtail is EOL ... a575d16ec0

Recomended migtration to grafana-alloy (https://grafana.com/docs/alloy/latest/set-up/migrate/from-promtail/) or fluent-bit (https://docs.fluentbit.io/manual/data-pipeline/outputs/loki)
I chose alloy because of the compatability.
This needs to be reworked to a native implementation later

Hardcode grafana security key ... 8c9b49f5c3

Grafana's secret key (services.grafana.settings.security.secret_key) doesn't have a default  value anymore. Please generate your own and use a file-provider on this option! See also https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#secret_key for more information. See https://grafana.com/docs/grafana/latest/setup-grafana/configure-security/configure-database-encryption/#re-encrypt-secrets on how to re-encrypt.
As stated in the NixOS changelog for 26.05, there's no official way to rotate.
 Either hard-code the old key ("SW2YcwTIb9zpOOhoPsMm") if your setup doesn't have any secrets in the DB that need special protection or perform a rotation with a 3rd-party tool (https://github.com/erooke/grafana-secretkey-rotation-tool/tree/d9dc788902fa5185e15cb15ce6129f7237ab6138).

Change credentialsFile to environmentFile 90d631f73c

ahtlon added 1 commit 2026-06-17 11:30:04 +02:00

change mpd config to declarative b5b84e2ec8

ahtlon added 2 commits 2026-06-17 11:45:22 +02:00

[Nextcloud] build deck in flake ... 0b77bbd8a6

Changes from a cloud filehost to a local build, should also be more maintainable

Multilingual keyword not supported cf89ece4d6

ahtlon commented 2026-06-17 11:45:56 +02:00

Author

Owner

Copy Link

Copy Source

nix build .#nixosConfigurations.fanny.config.system.build.toplevel now builds without errors for me

nix build .\#nixosConfigurations.fanny.config.system.build.toplevel now builds without errors for me

ahtlon added 1 commit 2026-06-17 11:52:58 +02:00

[docs] update nextcloud instructions 529848d89e

ahtlon requested review from kalipso 2026-06-17 11:53:35 +02:00

kalipso commented 2026-06-18 10:17:31 +02:00

Owner

Copy Link

Copy Source

Did you test these changes in vm? 0b77bbd8a6

I tried a similar approach in the past, but during nextclouds boot the deck module did not load properly

Did you test these changes in vm? https://git.dynamicdiscord.de/malobeo/infrastructure/commit/0b77bbd8a6fd46ea1f012e15a2f061ba946d60b6 I tried a similar approach in the past, but during nextclouds boot the deck module did not load properly

ahtlon commented 2026-06-18 20:08:01 +02:00

Author

Owner

Copy Link

Copy Source

Nach 4 stunden rumprobieren muss ich leider erstmal das handtuch werfen...
Problem ist das das plugin composer deps (dafür ist buildComposerProject2 da) aber auch npm deps für npm run build zum bauen braucht.
Ich habe versucht ne kombination zu schreiben

deck = pkgs.buildNpmPackage (finalAttrs: {
        pname = "deck";
        version = "0";
        src = pkgs.fetchFromGitHub {
          owner = "nextcloud";
          repo = "deck";
          rev = "2db3a31161c65b3d712c46d585b6478110689d91";
          hash = "sha256-SnfDRYFF05k/lIzoOZDL/9o/OqqpMBJhtVua0yhFBOM=";
        };
        npmDepsFetcherVersion = 2;
        npmDepsHash = "sha256-HeqKl9gBPb64XrYMfevRTvpq7dI2oNwzJFtZjf1hHm8=";
        patches = [ ./0001-Patch-cards-to-be-draggable.patch ];
        #nativeBuildInputs = [ pkgs.nodejs_24 pkgs.webpack-cli];
        forceEmptyCache = true;
        npmFlags = ["--prefer-online" "--legacy-peer-deps" "--verbose"];
        preBuild = ''
          composer install
          composer install --no-dev
        '';
        postInstall = ''
          chmod -R u+w $out/share
          mv $out/share/php/deck/* $out/
          rm -r $out/share $out/composer.* $out/Makefile $out/psalm.xml $out/tests
        '';
      });

aber die funktioniert nicht weil irgendeine npm dependency nicht gefunden wird.

Nach 4 stunden rumprobieren muss ich leider erstmal das handtuch werfen... Problem ist das das plugin composer deps (dafür ist buildComposerProject2 da) aber auch npm deps für `npm run build` zum bauen braucht. Ich habe versucht ne kombination zu schreiben ``` deck = pkgs.buildNpmPackage (finalAttrs: { pname = "deck"; version = "0"; src = pkgs.fetchFromGitHub { owner = "nextcloud"; repo = "deck"; rev = "2db3a31161c65b3d712c46d585b6478110689d91"; hash = "sha256-SnfDRYFF05k/lIzoOZDL/9o/OqqpMBJhtVua0yhFBOM="; }; npmDepsFetcherVersion = 2; npmDepsHash = "sha256-HeqKl9gBPb64XrYMfevRTvpq7dI2oNwzJFtZjf1hHm8="; patches = [ ./0001-Patch-cards-to-be-draggable.patch ]; #nativeBuildInputs = [ pkgs.nodejs_24 pkgs.webpack-cli]; forceEmptyCache = true; npmFlags = ["--prefer-online" "--legacy-peer-deps" "--verbose"]; preBuild = '' composer install composer install --no-dev ''; postInstall = '' chmod -R u+w $out/share mv $out/share/php/deck/* $out/ rm -r $out/share $out/composer.* $out/Makefile $out/psalm.xml $out/tests ''; }); ``` aber die funktioniert nicht weil irgendeine npm dependency nicht gefunden wird.

ahtlon added 2 commits 2026-06-18 20:11:32 +02:00

[nextcloud] undo the packaging change... 8de6687f1f

[nextcloud] update d7547be088

kalipso commented 2026-06-19 11:43:08 +02:00

Owner

Copy Link

Copy Source

I tried also different approaches already, available here: 669b355d99
I think the one that got the closest was using kankerl - a build tool for nextcloud apps. But even with successfull builds there was error during loading the app on runtime. I think combined we managed tody waste 8 hours on this alrea haha.

I tried also different approaches already, available here: https://git.dynamicdiscord.de/malobeo/infrastructure/commit/669b355d99640acf7055d5d3e941730b8016c465 I think the one that got the closest was using [kankerl](https://github.com/ChristophWurst/krankerl) - a build tool for nextcloud apps. But even with successfull builds there was error during loading the app on runtime. I think combined we managed tody waste 8 hours on this alrea haha.

kalipso commented 2026-06-19 11:46:52 +02:00

Owner

Copy Link

Copy Source

The mpd conf you converted to declarative doesnt seem to build: https://hydra.dynamicdiscord.de/build/1296/nixlog/457

Since we dont use lucia with mpd at the moment i suggest to just remove the mpd section for now.

The mpd conf you [converted to declarative](https://git.dynamicdiscord.de/malobeo/infrastructure/commit/b5b84e2ec868e9f003b63c6648d2f23e151a395e) doesnt seem to build: https://hydra.dynamicdiscord.de/build/1296/nixlog/457 Since we dont use lucia with mpd at the moment i suggest to just remove the mpd section for now.

ahtlon added 1 commit 2026-06-23 18:55:06 +02:00

[lucia] remove mpd 379c6c83d2

kalipso approved these changes 2026-06-25 11:13:40 +02:00

kalipso left a comment

Owner

Copy Link

Copy Source

I suggest merging after next plenary

I suggest merging after next plenary

ahtlon added 1 commit 2026-08-08 14:09:38 +02:00

flake.lock: Update ... 76d7c5ddee

Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/8355f0a16b2dbb06a97959a918af5b239bbe05ae' (2026-06-13)
  → 'github:nix-community/home-manager/d4fd24667c8cbef124bb70a20380cab75ec8474d' (2026-07-27)
• Updated input 'microvm':
    'github:astro/microvm.nix/6ad601df0a07d9855c5e8f9b81135ecaf7c287eb' (2026-06-13)
  → 'github:astro/microvm.nix/e615e23267bf10d483fb44f759d4e61c354cc0f4' (2026-08-04)
• Updated input 'microvm/spectrum':
    'git+https://spectrum-os.org/git/spectrum?ref=refs/heads/main&rev=367dd227f539267eae2b62770b4c17b88ac8c1f1' (2026-05-16)
  → 'git+https://spectrum-os.org/git/spectrum?ref=refs/heads/main&rev=a7762d6f54b40560dd5255ce902e6e6a5d980fe9' (2026-08-03)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/08018c72174a4df5657f8d94178ac69fb9c243e5' (2026-06-16)
  → 'github:NixOS/nixos-hardware/2e790b0a6be8ec2b76174ac0931b8ff11919ec98' (2026-07-28)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/a0374025a863d007d98e3297f6aa46cc3141c2f0' (2026-06-11)
  → 'github:NixOS/nixpkgs/445d861c6d31b4af0c79d8d4be2331f762a361d7' (2026-08-06)
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/567a49d1913ce81ac6e9582e3553dd90a955875f' (2026-06-16)
  → 'github:NixOS/nixpkgs/b7c2ada94fe99c15b0dbcf4d11fd7850b957a436' (2026-08-05)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/9ed65852b6257fbeae4355bc24ecfea307ca759a' (2026-06-04)
  → 'github:Mic92/sops-nix/f1406619a3884cd5c47992a70b8b35c9c0fcb4c9' (2026-07-04)

kalipso added 1 commit 2026-08-08 16:16:31 +02:00

[pretalx] fix redis eval error by disabling it for now 6c2b262fc8

ahtlon force-pushed 26_05_upgrade from 6c2b262fc8 to 379c6c83d2 2026-08-08 18:05:02 +02:00 Compare

ahtlon force-pushed 26_05_upgrade from 379c6c83d2 to 43da21d363 2026-08-08 18:13:00 +02:00 Compare

ahtlon scheduled this pull request to auto merge when all checks succeed 2026-08-08 18:13:36 +02:00

ahtlon merged commit 891f3d6159 into master 2026-08-11 09:50:55 +02:00

ahtlon referenced this issue from a commit 2026-08-11 09:50:58 +02:00

Merge pull request 'Update to 26.05' (#161) from 26_05_upgrade into master

Sign in to join this conversation.

Reviewers

No Reviewers

kalipso

Labels

Clear labels

Bug/Problem

Lokal

Migration

Module/Disks

Module/Initssh

Request

Security

Service

Updates

bump

nextcloud

No labels

Milestone

No items

No Milestone

Projects

Clear projects

No projects

Assignees

Clear assignees

Bender (Bender Bending Rodríguez) ahtlon kalipso quinn

No Assignees

2 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: malobeo/infrastructure#161