Merge master into staging-next

tweag · Dec 10, 2024 · 78e9caf · 78e9caf
2 parents d8008c0 + 9ad61cf
commit 78e9caf
Show file tree

Hide file tree

Showing 124 changed files with 4,996 additions and 2,566 deletions.
diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix
@@ -275,7 +275,7 @@ in {
               '';
             };
           };
-          config.settings = mkMerge [
+          config.settings = lib.mkMerge [
             {
               inherit (config) port logfile databases maxclients appendOnly;
               daemonize = false;
@@ -293,14 +293,14 @@ in {
               slowlog-log-slower-than = config.slowLogLogSlowerThan;
               slowlog-max-len = config.slowLogMaxLen;
             }
-            (mkIf (config.bind != null) { inherit (config) bind; })
-            (mkIf (config.unixSocket != null) {
+            (lib.mkIf (config.bind != null) { inherit (config) bind; })
+            (lib.mkIf (config.unixSocket != null) {
               unixsocket = config.unixSocket;
               unixsocketperm = toString config.unixSocketPerm;
             })
-            (mkIf (config.slaveOf != null) { slaveof = "${config.slaveOf.ip} ${toString config.slaveOf.port}"; })
-            (mkIf (config.masterAuth != null) { masterauth = config.masterAuth; })
-            (mkIf (config.requirePass != null) { requirepass = config.requirePass; })
+            (lib.mkIf (config.slaveOf != null) { slaveof = "${config.slaveOf.ip} ${toString config.slaveOf.port}"; })
+            (lib.mkIf (config.masterAuth != null) { masterauth = config.masterAuth; })
+            (lib.mkIf (config.requirePass != null) { requirepass = config.requirePass; })
           ];
         }));
         description = "Configuration of multiple `redis-server` instances.";

diff --git a/nixos/modules/services/games/archisteamfarm.nix b/nixos/modules/services/games/archisteamfarm.nix
@@ -221,7 +221,7 @@ in
             RestrictSUIDSGID = true;
             SecureBits = "noroot-locked";
             SystemCallArchitectures = "native";
-            SystemCallFilter = [ "@system-service" "~@privileged" ];
+            SystemCallFilter = [ "@system-service" "~@privileged" "mincore" ];
             UMask = "0077";
           }
         ];

diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix
@@ -87,7 +87,7 @@ in
       };
 
       stateDir = mkOption {
-        type = types.str;
+        type = types.path;
         default = "/var/lib/redmine";
         description = "The state directory, logs and plugins are stored here.";
       };

diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix
@@ -35,6 +35,13 @@ let
     # See: https://gitlab.freedesktop.org/plymouth/plymouth/-/issues/106
     mkdir -p $out/share/plymouth/themes/spinfinity
     ln -s $logo $out/share/plymouth/themes/spinfinity/header-image.png
+
+    # Logo for catppuccin (two-step) theme
+    for flavour in mocha macchiato latte frappe
+    do
+      mkdir -p $out/share/plymouth/themes/catppuccin-"$flavour"
+      ln -s $logo $out/share/plymouth/themes/catppuccin-"$flavour"/header-image.png
+    done
   '';
 
   themesEnv = pkgs.buildEnv {

diff --git a/pkgs/applications/editors/jetbrains/plugins/default.nix b/pkgs/applications/editors/jetbrains/plugins/default.nix
@@ -106,7 +106,14 @@ in {
         IFS=' ' read -ra pluginArray <<< "$newPlugins"
         for plugin in "''${pluginArray[@]}"
         do
-          ln -s "$plugin" -t "$out/${rootDir}/plugins/"
+          pluginfiles=$(ls $plugin);
+          if [ $(echo $pluginfiles | wc -l) -eq 1 ] && echo $pluginfiles | grep -E "\.jar" 1> /dev/null; then
+            # if the plugin contains a single jar file, link it directly into the plugins folder
+            ln -s "$plugin/$(echo $pluginfiles | head -1)" $out/${rootDir}/plugins/
+          else
+            # otherwise link the plugin directory itself
+            ln -s "$plugin" -t $out/${rootDir}/plugins/
+          fi
         done
         sed "s|${ide.outPath}|$out|" \
           -i $(realpath $out/bin/${meta.mainProgram})

diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix
@@ -5,14 +5,14 @@
 
 buildPythonApplication rec {
   pname = "rednotebook";
-  version = "2.35";
+  version = "2.36";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jendrikseipp";
     repo = "rednotebook";
-    rev = "refs/tags/v${version}";
-    sha256 = "sha256-sGwdZZ3YGm3sXJoxnYwj6HQcYMnC1pEzba3N9KLfRHM=";
+    tag = "v${version}";
+    sha256 = "sha256-ISwYQPI7qM0+cEdWnHLdrJA/07BUjDP4gzF/GzqNcsE=";
   };
 
   # We have not packaged tests.

diff --git a/pkgs/applications/emulators/libretro/cores/mrboom.nix b/pkgs/applications/emulators/libretro/cores/mrboom.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore rec {
   core = "mrboom";
-  version = "0-unstable-2024-07-01";
+  version = "5.5-unstable-2024-10-21";
 
   src = fetchFromGitHub {
     owner = "Javanaise";
     repo = "mrboom-libretro";
-    rev = "22765ce7176d236d846f504318a51c448d2b469b";
-    hash = "sha256-hzdc4PM/EARNEtpeATo4VohXtkeBra6rCz3tdIgBfVw=";
+    rev = "d011acfbdb2d93ed38bd684ccfa0db79bda1c932";
+    hash = "sha256-DjTSrp38MwdEtUZPTgZYEZHWgv48IN1oHkKsVqmOwII=";
     fetchSubmodules = true;
   };
 

diff --git a/pkgs/applications/emulators/libretro/cores/snes9x.nix b/pkgs/applications/emulators/libretro/cores/snes9x.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "snes9x";
-  version = "0-unstable-2024-10-28";
+  version = "1.63-unstable-2024-12-08";
 
   src = fetchFromGitHub {
     owner = "snes9xgit";
     repo = "snes9x";
-    rev = "fd05ca7df5259a2cd0aa9204f331e0b05126c376";
-    hash = "sha256-o/Rb1XQ7QoI0hKROMFZ9igyH8NN3bMryvyU4oNUqtRA=";
+    rev = "9be3ed49a8711b016eb7280b758995bf2cbca4dd";
+    hash = "sha256-3FE90o+OJYiBzaiLEggZZ3jbLCFTRMwI/ayaJ5clm4c=";
   };
 
   makefile = "Makefile";

diff --git a/pkgs/applications/emulators/libretro/cores/stella.nix b/pkgs/applications/emulators/libretro/cores/stella.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "stella";
-  version = "0-unstable-2024-11-17";
+  version = "7.0-unstable-2024-12-09";
 
   src = fetchFromGitHub {
     owner = "stella-emu";
     repo = "stella";
-    rev = "0e2ce2771c7d0c9b2dd5c06e3a4746738d3c9e47";
-    hash = "sha256-axt5wvH7WENh1ALPYc+f5XpCv2xPm5jYx26zMhLEt3E=";
+    rev = "91417312f1a756a1dac88d1df1cecc7362ff7a44";
+    hash = "sha256-e8b9kCsa5FxyMExqppCX1jE0YmK1T1n8fORBBSvyE54=";
   };
 
   makefile = "Makefile";

diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix
@@ -11,17 +11,17 @@
 buildDotnetModule rec {
   pname = "ArchiSteamFarm";
   # nixpkgs-update: no auto update
-  version = "6.0.8.7";
+  version = "6.1.0.3";
 
   src = fetchFromGitHub {
     owner = "JustArchiNET";
     repo = "ArchiSteamFarm";
     rev = version;
-    hash = "sha256-PnHMJtM4lWuRn+7J9NxObEOJi4pbYEChcpcAJ+EdtSI=";
+    hash = "sha256-3NOeKdXb1tz4qx+tCs6QKfze2KLfyodKwt/aNx6tLvI=";
   };
 
-  dotnet-runtime = dotnetCorePackages.aspnetcore_8_0;
-  dotnet-sdk = dotnetCorePackages.sdk_8_0;
+  dotnet-runtime = dotnetCorePackages.aspnetcore_9_0;
+  dotnet-sdk = dotnetCorePackages.sdk_9_0;
 
   nugetDeps = ./deps.nix;
 
@@ -38,7 +38,7 @@ buildDotnetModule rec {
   ]
   ;
   dotnetBuildFlags = [
-    "--framework=net8.0"
+    "--framework=net9.0"
   ];
   dotnetInstallFlags = dotnetBuildFlags;