Merge master into staging-next

maintainers/maintainer-list.nix

@@ -978,6 +978,12 @@
     githubId = 173595;
     name = "Caleb Maclennan";
   };
+  alex = {
+    email = "alexander.cinnamon927@passmail.net";
+    github = "alexanderjkslfj";
+    githubId = 117545308;
+    name = "Alex";
+  };
   ALEX11BR = {
     email = "alexioanpopa11@gmail.com";
     github = "ALEX11BR";
@@ -7205,6 +7211,11 @@
     githubId = 183879;
     name = "Florian Klink";
   };
+  florensie = {
+    github = "florensie";
+    githubId = 13403842;
+    name = "Florens Pauwels";
+  };
   florentc = {
     github = "florentc";
     githubId = 1149048;
@@ -9545,6 +9556,12 @@
     githubId = 1318743;
     name = "Ivar";
   };
+  iv-nn = {
+    name = "iv-nn";
+    github = "iv-nn";
+    githubId = 49885246;
+    keys = [ { fingerprint = "6358 EF87 86E0 EF2F 1628  103F BAB5 F165 1C71 C9C3"; } ];
+  };
   ivyfanchiang = {
     email = "dev@ivyfanchiang.ca";
     github = "hexadecimalDinosaur";
@@ -18078,6 +18095,12 @@
     name = "Roland Conybeare";
     keys = [ { fingerprint = "bw5Cr/4ul1C2UvxopphbZbFI1i5PCSnOmPID7mJ/Ogo"; } ];
   };
+  rc-zb = {
+    name = "Xiao Haifan";
+    email = "rc-zb@outlook.com";
+    github = "rc-zb";
+    githubId = 161540043;
+  };
   rdnetto = {
     email = "rdnetto@gmail.com";
     github = "rdnetto";
@@ -19234,6 +19257,12 @@
     githubId = 695473;
     name = "Sascha Grunert";
   };
+  satoqz = {
+    email = "mail@satoqz.net";
+    github = "satoqz";
+    githubId = 40795431;
+    name = "satoqz";
+  };
   saturn745 = {
     email = "git-commits.rk7uq@aleeas.com";
     github = "saturn745";
@@ -21914,6 +21943,12 @@
     githubId = 2164118;
     name = "Tobias Bora";
   };
+  tobifroe = {
+    email = "hi@froelich.dev";
+    github = "tobifroe";
+    githubId = 40638719;
+    name = "Tobias Frölich";
+  };
   tobim = {
     email = "nix@tobim.fastmail.fm";
     github = "tobim";

nixos/modules/programs/zsh/oh-my-zsh.nix

@@ -87,6 +87,15 @@ in
             Without this option it would default to the read-only nix store.
           '';
         };
+
+        preLoaded = lib.mkOption {
+          type = lib.types.lines;
+          default = "";
+          description = ''
+            Shell commands executed before the `oh-my-zsh` is loaded.
+            For example, to disable async git prompt write `zstyle ':omz:alpha:lib:git' async-prompt force` (more information https://github.com/ohmyzsh/ohmyzsh?tab=readme-ov-file#async-git-prompt)
+          '';
+        };
       };
     };
 
@@ -120,6 +129,7 @@ in
           ZSH_CACHE_DIR=${cfg.cacheDir}
         ''}
 
+        ${cfg.preLoaded}
         source $ZSH/oh-my-zsh.sh
       '';
 

nixos/modules/services/monitoring/nezha-agent.nix

@@ -92,6 +92,14 @@ in
           Address to the dashboard
         '';
       };
+      extraFlags = lib.mkOption {
+        type = lib.types.listOf lib.types.str;
+        default = [ ];
+        example = [ "--gpu" ];
+        description = ''
+          Extra command-line flags passed to nezha-agent.
+        '';
+      };
     };
   };
 
@@ -125,6 +133,7 @@ in
         ++ lib.optional cfg.gpu "--gpu"
         ++ lib.optional cfg.temperature "--temperature"
         ++ lib.optional cfg.useIPv6CountryCode "--use-ipv6-countrycode"
+        ++ cfg.extraFlags
       );
       wantedBy = [ "multi-user.target" ];
     };

nixos/modules/services/networking/soju.nix

@@ -12,7 +12,7 @@ let
   tlsCfg = optionalString (cfg.tlsCertificate != null)
     "tls ${cfg.tlsCertificate} ${cfg.tlsCertificateKey}";
   logCfg = optionalString cfg.enableMessageLogging
-    "log fs ${stateDir}/logs";
+    "message-store fs ${stateDir}/logs";
 
   configFile = pkgs.writeText "soju.conf" ''
     ${listenCfg}

nixos/modules/services/networking/tailscale.nix

@@ -29,6 +29,12 @@ in {
       description = "Username or user ID of the user allowed to to fetch Tailscale TLS certificates for the node.";
     };
 
+    disableTaildrop = mkOption {
+      default = false;
+      type = types.bool;
+      description = "Whether to disable the Taildrop feature for sending files between nodes.";
+    };
+
     package = lib.mkPackageOption pkgs "tailscale" {};
 
     openFirewall = mkOption {
@@ -129,6 +135,8 @@ in {
         ''"FLAGS=--tun ${lib.escapeShellArg cfg.interfaceName} ${lib.concatStringsSep " " cfg.extraDaemonFlags}"''
       ] ++ (lib.optionals (cfg.permitCertUid != null) [
         "TS_PERMIT_CERT_UID=${cfg.permitCertUid}"
+      ]) ++ (lib.optionals (cfg.disableTaildrop) [
+        "TS_DISABLE_TAILDROP=true"
       ]);
       # Restart tailscaled with a single `systemctl restart` at the
       # end of activation, rather than a `stop` followed by a later

nixos/modules/services/web-apps/immich.nix

@@ -258,7 +258,7 @@ in
       postgresEnv
       // redisEnv
       // {
-        HOST = cfg.host;
+        IMMICH_HOST = cfg.host;
         IMMICH_PORT = toString cfg.port;
         IMMICH_MEDIA_LOCATION = cfg.mediaLocation;
         IMMICH_MACHINE_LEARNING_URL = "http://localhost:3003";

nixos/tests/all-tests.nix

@@ -828,8 +828,10 @@ in {
   predictable-interface-names = handleTest ./predictable-interface-names.nix {};
   pretalx = runTest ./web-apps/pretalx.nix;
   pretix = runTest ./web-apps/pretix.nix;
-  printing-socket = handleTest ./printing.nix { socket = true; };
-  printing-service = handleTest ./printing.nix { socket = false; };
+  printing-socket = handleTest ./printing.nix { socket = true; listenTcp = true; };
+  printing-service = handleTest ./printing.nix { socket = false; listenTcp = true; };
+  printing-socket-notcp = handleTest ./printing.nix { socket = true; listenTcp = false; };
+  printing-service-notcp = handleTest ./printing.nix { socket = false; listenTcp = false; };
   private-gpt = handleTest ./private-gpt.nix {};
   privatebin = runTest ./privatebin.nix;
   privoxy = handleTest ./privoxy.nix {};

nixos/tests/printing.nix

@@ -3,12 +3,17 @@
 import ./make-test-python.nix (
 { pkgs
 , socket ? true # whether to use socket activation
+, listenTcp ? true # whether to open port 631 on client
 , ...
 }:
 
+let
+  inherit (pkgs) lib;
+in
+
 {
   name = "printing";
-  meta = with pkgs.lib.maintainers; {
+  meta = with lib.maintainers; {
     maintainers = [ domenkozar matthewbauer ];
   };
 
@@ -35,9 +40,10 @@ import ./make-test-python.nix (
     }];
   };
 
-  nodes.client = { ... }: {
+  nodes.client = { lib, ... }: {
     services.printing.enable = true;
     services.printing.startWhenNeeded = socket;
+    services.printing.listenAddresses = lib.mkIf (!listenTcp) [];
     # Add printer to the client as well, via IPP.
     hardware.printers.ensurePrinters = [{
       name = "DeskjetRemote";
@@ -54,16 +60,16 @@ import ./make-test-python.nix (
     start_all()
 
     with subtest("Make sure that cups is up on both sides and printers are set up"):
-        server.wait_for_unit("cups.${if socket then "socket" else "service"}")
-        client.wait_for_unit("cups.${if socket then "socket" else "service"}")
+        server.wait_for_unit("ensure-printers.service")
+        client.wait_for_unit("ensure-printers.service")
 
     assert "scheduler is running" in client.succeed("lpstat -r")
 
     with subtest("UNIX socket is used for connections"):
         assert "/var/run/cups/cups.sock" in client.succeed("lpstat -H")
 
     with subtest("HTTP server is available too"):
-        client.succeed("curl --fail http://localhost:631/")
+        ${lib.optionalString listenTcp ''client.succeed("curl --fail http://localhost:631/")''}
         client.succeed(f"curl --fail http://{server.name}:631/")
         server.fail(f"curl --fail --connect-timeout 2 http://{client.name}:631/")
 

pkgs/README.md

@@ -75,7 +75,7 @@ Now that this is out of the way. To add a package to Nixpkgs:
 
    - GNU cpio: [`pkgs/tools/archivers/cpio/default.nix`](tools/archivers/cpio/default.nix). Also a simple package. The generic builder in `stdenv` does everything for you. It has no dependencies beyond `stdenv`.
 
-   - GNU Multiple Precision arithmetic library (GMP): [`pkgs/development/libraries/gmp/5.1.x.nix`](development/libraries/gmp/5.1.x.nix). Also done by the generic builder, but has a dependency on `m4`.
+   - GNU Multiple Precision arithmetic library (GMP): [`pkgs/development/libraries/gmp`](development/libraries/gmp). Also done by the generic builder, but has a dependency on `m4`.
 
    - Pan, a GTK-based newsreader: [`pkgs/applications/networking/newsreaders/pan/default.nix`](applications/networking/newsreaders/pan/default.nix). Has an optional dependency on `gtkspell`, which is only built if `spellCheck` is `true`.
 

pkgs/applications/audio/stochas/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "stochas";
-  version = "1.3.10";
+  version = "1.3.12";
 
   src = fetchFromGitHub {
     owner = "surge-synthesizer";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-L7dzUUQNCwcuQavUx9hBH0FX5KSocfeYUv5qBcPD2Vg=";
+    hash = "sha256-GrYzsyezunFLFVzBfYCbNC53K695eYto9338iAALiSk=";
     fetchSubmodules = true;
   };
 

pkgs/applications/blockchains/clightning/default.nix

@@ -24,11 +24,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "clightning";
-  version = "24.08.1";
+  version = "24.08.2";
 
   src = fetchurl {
     url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
-    hash = "sha256-2ZKvhNuzGftKwSdmMkHOwE9UEI5Ewn5HHSyyZUcCwB4=";
+    hash = "sha256-U54HNOreulhvCYeULyBbl/WHQ7F9WQnSCSMGg5WUAdg=";
   };
 
   # when building on darwin we need cctools to provide the correct libtool

pkgs/applications/editors/neovim/wrapper.nix

@@ -29,7 +29,7 @@ let
 
     , withNodeJs ? false
     , withPerl ? false
-    , rubyEnv ? null
+    , withRuby ? true
 
     # wether to create symlinks in $out/bin/vi(m) -> $out/bin/nvim
     , vimAlias ? false
@@ -127,8 +127,7 @@ let
           ;
 
     providerLuaRc = neovimUtils.generateProviderRc {
-      inherit (finalAttrs) withPython3 withNodeJs withPerl;
-      withRuby = rubyEnv != null;
+      inherit (finalAttrs) withPython3 withNodeJs withPerl withRuby;
     };
 
     # If configure != {}, we can't generate the rplugin.vim file with e.g
@@ -155,10 +154,9 @@ let
 
       __structuredAttrs = true;
       dontUnpack = true;
-      inherit viAlias vimAlias withNodeJs withPython3 withPerl;
+      inherit viAlias vimAlias withNodeJs withPython3 withPerl withRuby;
       inherit wrapRc providerLuaRc packpathDirs;
       inherit python3Env rubyEnv;
-      withRuby = rubyEnv != null;
       inherit wrapperArgs generatedWrapperArgs;
       luaRcContent = rcContent;
       # Remove the symlinks created by symlinkJoin which we need to perform
@@ -171,7 +169,7 @@ let
       + lib.optionalString finalAttrs.withPython3 ''
         makeWrapper ${python3Env.interpreter} $out/bin/nvim-python3 --unset PYTHONPATH --unset PYTHONSAFEPATH
       ''
-      + lib.optionalString (finalAttrs.rubyEnv != null) ''
+      + lib.optionalString (finalAttrs.withRuby) ''
         ln -s ${finalAttrs.rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby
       ''
       + lib.optionalString finalAttrs.withNodeJs ''

pkgs/applications/graphics/ipe/default.nix

@@ -1,7 +1,7 @@
 { lib
 , stdenv
 , makeDesktopItem
-, fetchurl
+, fetchFromGitHub
 , pkg-config
 , copyDesktopItems
 , cairo
@@ -23,11 +23,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ipe";
-  version = "7.2.27";
+  version = "7.2.30";
 
-  src = fetchurl {
-    url = "https://github.com/otfried/ipe/releases/download/v${version}/ipe-${version}-src.tar.gz";
-    sha256 = "sha256-wx/bZy8kB7dpZsz58BeRGdS1BzbrIoafgEmLyFg7wZU=";
+  src = fetchFromGitHub {
+    owner = "otfried";
+    repo = "ipe";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-bvwEgEP/cinigixJr8e964sm6secSK+7Ul7WFfwM0gE=";
   };
 
   nativeBuildInputs = [ pkg-config copyDesktopItems wrapQtAppsHook ];