Merge pull request #258 from NuschtOS/25.05

Update to NixOS 25.05

Author: SuperSandro2000

.github/workflows/flake-check.yaml

@@ -19,14 +19,14 @@ jobs:
       matrix:
         targets:
           - repo: NixOS/nixpkgs
-            branch: nixos-24.11
+            branch: nixos-25.05
           - repo: NixOS/nixpkgs
             branch: nixos-unstable
 
           - repo: NuschtOS/nuschtpkgs
-            branch: nixos-24.11
+            branch: nixos-25.05
           - repo: NuschtOS/nuschtpkgs
-            branch: backports-24.11
+            branch: backports-25.05
           - repo: NuschtOS/nuschtpkgs
             branch: nixos-unstable
 

modules/nextcloud.nix

@@ -3,8 +3,6 @@
 let
   cfg = config.services.nextcloud;
   inherit (pkgs."nextcloud${lib.versions.major cfg.package.version}Packages") apps;
-  # TODO: drop when dropping 24.11 support
-  hasMemoriesApp = apps?memories;
 in
 {
   options = {
@@ -104,10 +102,10 @@ in
             ];
 
             "memories.exiftool_no_local" = false;
-            "memories.exiftool" = if hasMemoriesApp then "${apps.memories}/bin-ext/exiftool/exiftool" else lib.getExe pkgs.exiftool;
-            "memories.vod.ffmpeg" = if hasMemoriesApp then "${apps.memories}/bin-ext/ffmpeg" else lib.getExe pkgs.ffmpeg-headless;
-            "memories.vod.ffprobe" = if hasMemoriesApp then "${apps.memories}/bin-ext/ffprobe" else lib.getExe' pkgs.ffmpeg-headless "ffprobe";
-            "memories.vod.path" = lib.mkIf hasMemoriesApp "${apps.memories}/bin-ext/go-vod";
+            "memories.exiftool" = "${apps.memories}/bin-ext/exiftool/exiftool";
+            "memories.vod.ffmpeg" = "${apps.memories}/bin-ext/ffmpeg";
+            "memories.vod.ffprobe" = "${apps.memories}/bin-ext/ffprobe";
+            "memories.vod.path" = "${apps.memories}/bin-ext/go-vod";
             "memories.vod.vaapi" = lib.mkIf cfg.configureMemoriesVaapi true;
           })
 
@@ -141,15 +139,6 @@ in
       services = let
         occ = "/run/current-system/sw/bin/nextcloud-occ";
       in {
-        nextcloud-cron = lib.mkIf (cfg.configureMemories && !hasMemoriesApp) {
-          # required for memories
-          # see https://github.com/pulsejet/memories/blob/master/docs/troubleshooting.md#issues-with-nixos
-          path = with pkgs; [ perl ];
-          # fix memories app being unpacked without the x-bit on binaries
-          # could be done in nextcloud-update-plugins but then manually updates would be broken until the next auto update
-          preStart = "${lib.getExe' pkgs.coreutils "chmod"} +x ${cfg.home}/store-apps/memories/bin-ext/*";
-        };
-
         nextcloud-cron-preview-generator = lib.mkIf cfg.configurePreviewSettings {
           environment.NEXTCLOUD_CONFIG_DIR = "${cfg.datadir}/config";
           serviceConfig = {
@@ -213,11 +202,8 @@ in
       extraGroups = lib.mkIf (cfg.configureMemories && cfg.configureMemoriesVaapi) [
         "render" # access /dev/dri/renderD128
       ];
-      packages = with pkgs;
-        # generate video thumbnails with preview generator
-        lib.optional cfg.configurePreviewSettings ffmpeg-headless
-        # required for memories, duplicated with nextcloud-cron to better debug
-        ++ lib.optional (cfg.configureMemories && !hasMemoriesApp) perl;
+      # generate video thumbnails with preview generator
+      packages = lib.optional cfg.configurePreviewSettings pkgs.ffmpeg-headless;
     };
   };
 }

modules/nvidia.nix

@@ -1,9 +1,7 @@
-{ config, lib, options, ... }:
+{ config, lib, ... }:
 
 let
   cfg = config.hardware;
-  # TODO: remove with 24.11
-  hardwareOpengl = if options.hardware?graphics then "graphics" else "opengl";
 in
 {
   options.hardware = {
@@ -17,7 +15,7 @@ in
     };
 
     hardware = {
-      "${hardwareOpengl}".enable = true;
+      graphics.enable = true;
       nvidia = {
         modesetting.enable = true;
         nvidiaSettings = true;

modules/postgres.nix

@@ -221,12 +221,6 @@ in
           # TODO: upstream, this probably requires a new entry in passthru to pick if the object name doesn't match the plugin name or there are multiple
           # https://github.com/NixOS/nixpkgs/blob/nixos-unstable/nixos/modules/services/databases/postgresql.nix#L81
           ++ (let
-            # drop workaround when dropping support for 24.11
-            # https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/databases/postgresql.nix#L52-L54
-            basePackage = if cfg.enableJIT then cfg.package.withJIT else cfg.package.withoutJIT;
-            postgresPkg = if cfg.extensions == [ ] then basePackage else basePackage.withPackages cfg.extensions;
-            finalPackage = cfg.finalPackage or postgresPkg;
-
             # NOTE: move into extensions passthru.libName when upstreaming and find via cfg.finalPackage.installedExtensions
             getSoOrFallback = so: let
               name = lib.getName so;
@@ -235,7 +229,7 @@ in
               # withJIT installs the postgres' jit output as an extension but that is no shared object to load
               postgresql = null;
             }.${name} or name;
-          in lib.optionals cfg.preloadAllExtensions (lib.filter (x: x != null) (map getSoOrFallback finalPackage.installedExtensions)));
+          in lib.optionals cfg.preloadAllExtensions (lib.filter (x: x != null) (map getSoOrFallback cfg.finalPackage.installedExtensions)));
         upgrade.stopServices = with config.services; lib.mkMerge [
           (lib.mkIf (atuin.enable && atuin.database.createLocally) [ "atuin" ])
           (lib.mkIf (gancio.enable && gancio.settings.db.dialect == "postgres") [ "gancio" ])

tests/default.nix

@@ -26,7 +26,7 @@ in toplevel // {
       security.acme.staging = true;
     };
   };
-} // lib.optionalAttrs (lib.versionAtLeast lib.version "24.11") {
+
   # https://github.com/NuschtOS/nixos-modules/issues/39
   hound-repos = mkTest {
     module = {
@@ -36,7 +36,7 @@ in toplevel // {
       };
     };
   };
-} // {
+
   grafana-no-nginx = mkTest {
     module = {
       services.grafana = {