Merge remote-tracking branch 'origin/master' into staging-next

Conflicts: - pkgs/by-name/ca/cargo-leptos/package.nix - pkgs/by-name/ha/harper/package.nix - pkgs/by-name/ma/marmite/package.nix - pkgs/by-name/no/nomino/package.nix - pkgs/by-name/st/stgit/package.nix - pkgs/development/python-modules/pycm/default.nix - pkgs/development/python-modules/python-gvm/default.nix - pkgs/development/tools/rbspy/default.nix
NixOS · Jan 27, 2025 · 33647a8 · 33647a8
2 parents 3ca518f + e16e376
commit 33647a8
Show file tree

Hide file tree

Showing 94 changed files with 536 additions and 866 deletions.
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
@@ -22994,6 +22994,12 @@
     githubId = 5409166;
     name = "Rishi Desai";
   };
+  therobot2105 = {
+    email = "[email protected]";
+    github = "TheRobot2105";
+    githubId = 91203390;
+    name = "Felix Kimmel";
+  };
   thesola10 = {
     email = "[email protected]";
     github = "Thesola10";

diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,8 +1,8 @@
 {
-  x86_64-linux = "/nix/store/wsa13yx6kl6zzjlhjb8vmcqb6msbxym3-nix-2.24.11";
-  i686-linux = "/nix/store/rn1449hjxh77f723m5rc1skgv4paknic-nix-2.24.11";
-  aarch64-linux = "/nix/store/psrkach0v2s66rw30nxzpz7hgsqrvg28-nix-2.24.11";
-  riscv64-linux = "/nix/store/zc8clmxxi9zr7vx7y8v8kg1rsmhwsp42-nix-riscv64-unknown-linux-gnu-2.24.11";
-  x86_64-darwin = "/nix/store/nc81g85wlkzqck5mxdfbnxscavg2xh09-nix-2.24.11";
-  aarch64-darwin = "/nix/store/nqzxb4h7sbkk6876zx8yc88ahlgl5kkl-nix-2.24.11";
+  x86_64-linux = "/nix/store/kwck2vdfdp2v4jr9c4daryyk9mlbx406-nix-2.24.12";
+  i686-linux = "/nix/store/s9qqyxzcgjl7xrfhnnjiiy9v876pcphi-nix-2.24.12";
+  aarch64-linux = "/nix/store/pmj4g05d4nlr3gcr8nyadgwir3svbkmx-nix-2.24.12";
+  riscv64-linux = "/nix/store/nzr3m4x3mcnfpnmyap31f9pviwv29vyc-nix-riscv64-unknown-linux-gnu-2.24.12";
+  x86_64-darwin = "/nix/store/pf6msb0yzccznd75yil32mzk284h90z4-nix-2.24.12";
+  aarch64-darwin = "/nix/store/vaaakw66qnbw4g007rf2nggy0rmhf8fh-nix-2.24.12";
 }
diff --git a/nixos/modules/services/web-apps/freshrss.nix b/nixos/modules/services/web-apps/freshrss.nix
@@ -3,6 +3,7 @@
 with lib;
 let
   cfg = config.services.freshrss;
+  webserver = config.services.${cfg.webserver};
 
   extension-env = pkgs.buildEnv {
     name = "freshrss-extensions";
@@ -129,13 +130,25 @@ in
       example = "/mnt/freshrss";
     };
 
+    webserver = mkOption {
+      type = types.enum [ "nginx" "caddy" "none"];
+      default = "nginx";
+      description = ''
+        Whether to use nginx or caddy for virtual host management.
+
+        Further nginx configuration can be done by adapting `services.nginx.virtualHosts.<name>`.
+        See [](#opt-services.nginx.virtualHosts) for further information.
+
+        Further caddy configuration can be done by adapting `services.caddy.virtualHosts.<name>`.
+        See [](#opt-services.caddy.virtualHosts) for further information.
+      '';
+    };
+
     virtualHost = mkOption {
-      type = types.nullOr types.str;
+      type = types.str;
       default = "freshrss";
       description = ''
-        Name of the nginx virtualhost to use and setup. If null, do not setup any virtualhost.
-        You may need to configure the virtualhost further through services.nginx.virtualHosts.<virtualhost>,
-        for example to enable SSL.
+        Name of the caddy/nginx virtualhost to use and setup.
       '';
     };
 
@@ -204,8 +217,21 @@ in
           '';
         }
       ];
+
+      # Set up a Caddy virtual host.
+      services.caddy = mkIf (cfg.webserver == "caddy") {
+        enable = true;
+        virtualHosts.${cfg.virtualHost}.extraConfig = ''
+          root * ${config.services.freshrss.package}/p
+          php_fastcgi unix/${config.services.phpfpm.pools.freshrss.socket} {
+            env FRESHRSS_DATA_PATH ${config.services.freshrss.dataDir}
+          }
+          file_server
+        '';
+      };
+
       # Set up a Nginx virtual host.
-      services.nginx = mkIf (cfg.virtualHost != null) {
+      services.nginx = mkIf (cfg.webserver == "nginx") {
         enable = true;
         virtualHosts.${cfg.virtualHost} = {
           root = "${cfg.package}/p";
@@ -237,8 +263,8 @@ in
         ${cfg.pool} = {
           user = "freshrss";
           settings = {
-            "listen.owner" = "nginx";
-            "listen.group" = "nginx";
+            "listen.owner" = webserver.user;
+            "listen.group" = webserver.group;
             "listen.mode" = "0600";
             "pm" = "dynamic";
             "pm.max_children" = 32;

diff --git a/nixos/modules/services/web-apps/pixelfed.nix b/nixos/modules/services/web-apps/pixelfed.nix
@@ -109,7 +109,7 @@ in {
           }
         '';
         description = ''
-          With this option, you can customize an nginx virtual host which already has sensible defaults for Dolibarr.
+          With this option, you can customize an nginx virtual host which already has sensible defaults for Pixelfed.
           Set to {} if you do not need any customization to the virtual host.
           If enabled, then by default, the {option}`serverName` is
           `''${domain}`,

diff --git a/nixos/tests/freshrss/caddy-sqlite.nix b/nixos/tests/freshrss/caddy-sqlite.nix
@@ -0,0 +1,30 @@
+import ../make-test-python.nix (
+  { lib, pkgs, ... }:
+  {
+    name = "freshrss-caddy-sqlite";
+    meta.maintainers = with lib.maintainers; [
+      etu
+      stunkymonkey
+    ];
+
+    nodes.machine =
+      { pkgs, ... }:
+      {
+        services.freshrss = {
+          enable = true;
+          baseUrl = "http://localhost";
+          passwordFile = pkgs.writeText "password" "secret";
+          dataDir = "/srv/freshrss";
+          webserver = "caddy";
+          virtualHost = "freshrss:80";
+        };
+      };
+
+    testScript = ''
+      machine.wait_for_unit("multi-user.target")
+      machine.wait_for_open_port(80)
+      response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://localhost:80/i/")
+      assert '<title>Login · FreshRSS</title>' in response, "Login page didn't load successfully"
+    '';
+  }
+)
diff --git a/nixos/tests/freshrss/default.nix b/nixos/tests/freshrss/default.nix
@@ -5,5 +5,6 @@
   http-auth = import ./http-auth.nix { inherit system pkgs; };
   none-auth = import ./none-auth.nix { inherit system pkgs; };
   pgsql = import ./pgsql.nix { inherit system pkgs; };
-  sqlite = import ./sqlite.nix { inherit system pkgs; };
+  nginx-sqlite = import ./nginx-sqlite.nix { inherit system pkgs; };
+  caddy-sqlite = import ./caddy-sqlite.nix { inherit system pkgs; };
 }
diff --git a/nixos/tests/freshrss/extensions.nix b/nixos/tests/freshrss/extensions.nix
@@ -17,7 +17,7 @@ import ../make-test-python.nix (
     testScript = ''
       machine.wait_for_unit("multi-user.target")
       machine.wait_for_open_port(80)
-      response = machine.succeed("curl -vvv -s http://127.0.0.1:80/i/?c=extension")
+      response = machine.succeed("curl -vvv -s http://localhost:80/i/?c=extension")
       assert '<span class="ext_name disabled">YouTube Video Feed</span>' in response, "Extension not present in extensions page."
     '';
   }

diff --git a/nixos/tests/freshrss/http-auth.nix b/nixos/tests/freshrss/http-auth.nix
@@ -18,7 +18,7 @@ import ../make-test-python.nix (
     testScript = ''
       machine.wait_for_unit("multi-user.target")
       machine.wait_for_open_port(80)
-      response = machine.succeed("curl -vvv -s -H 'Host: freshrss' -H 'Remote-User: testuser' http://127.0.0.1:80/i/")
+      response = machine.succeed("curl -vvv -s -H 'Host: freshrss' -H 'Remote-User: testuser' http://localhost:80/i/")
       assert 'Account: testuser' in response, "http_auth method didn't work."
     '';
   }

diff --git a/nixos/tests/freshrss/sqlite.nix → nixos/tests/freshrss/nginx-sqlite.nix b/nixos/tests/freshrss/sqlite.nix → nixos/tests/freshrss/nginx-sqlite.nix
@@ -1,7 +1,7 @@
 import ../make-test-python.nix (
   { lib, pkgs, ... }:
   {
-    name = "freshrss-sqlite";
+    name = "freshrss-nginx-sqlite";
     meta.maintainers = with lib.maintainers; [
       etu
       stunkymonkey
@@ -21,7 +21,7 @@ import ../make-test-python.nix (
     testScript = ''
       machine.wait_for_unit("multi-user.target")
       machine.wait_for_open_port(80)
-      response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://127.0.0.1:80/i/")
+      response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://localhost:80/i/")
       assert '<title>Login · FreshRSS</title>' in response, "Login page didn't load successfully"
     '';
   }

diff --git a/nixos/tests/freshrss/none-auth.nix b/nixos/tests/freshrss/none-auth.nix
@@ -17,7 +17,7 @@ import ../make-test-python.nix (
     testScript = ''
       machine.wait_for_unit("multi-user.target")
       machine.wait_for_open_port(80)
-      response = machine.succeed("curl -vvv -s http://127.0.0.1:80/i/")
+      response = machine.succeed("curl -vvv -s http://localhost:80/i/")
       assert '<title>Main stream · FreshRSS</title>' in response, "FreshRSS stream page didn't load successfully"
     '';
   }

diff --git a/nixos/tests/freshrss/pgsql.nix b/nixos/tests/freshrss/pgsql.nix
@@ -47,7 +47,7 @@ import ../make-test-python.nix (
       machine.wait_for_unit("multi-user.target")
       machine.wait_for_open_port(5432)
       machine.wait_for_open_port(80)
-      response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://127.0.0.1:80/i/")
+      response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://localhost:80/i/")
       assert '<title>Login · FreshRSS</title>' in response, "Login page didn't load successfully"
     '';
   }

diff --git a/pkgs/applications/audio/librespot/default.nix b/pkgs/applications/audio/librespot/default.nix
@@ -29,7 +29,8 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-dGQDRb7fgIkXelZKa+PdodIs9DxbgEMlVGJjK/hU3Mo=";
   };
 
-  cargoHash = "sha256-GScAUqALoocqvsHz4XgPytI8cl0hiuWjqaO/ItNo4v4=";
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-SqvJSHkyd1IicT6c4pE96dBJNNodULhpyG14HRGVWCk=";
 
   nativeBuildInputs =
     [

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -6529,18 +6529,6 @@ final: prev:
     meta.homepage = "https://github.com/nvim-java/lua-async/";
   };
 
-  lua-async-await = buildVimPlugin {
-    pname = "lua-async-await";
-    version = "2024-03-31";
-    src = fetchFromGitHub {
-      owner = "nvim-java";
-      repo = "lua-async";
-      rev = "652d94df34e97abe2d4a689edbc4270e7ead1a98";
-      sha256 = "0jpw9008xghqmzjnikwq417p497lj7v9hkjbrach5p652yca07s8";
-    };
-    meta.homepage = "https://github.com/nvim-java/lua-async/";
-  };
-
   lualine-lsp-progress = buildVimPlugin {
     pname = "lualine-lsp-progress";
     version = "2021-10-23";

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -2255,7 +2255,7 @@ in
 
   nvim-java = super.nvim-java.overrideAttrs {
     dependencies = with self; [
-      lua-async-await
+      lua-async
       mason-nvim
       nui-nvim
       nvim-dap

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2384,6 +2384,22 @@ let
         };
       };
 
+      hirse.vscode-ungit = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "vscode-ungit";
+          publisher = "hirse";
+          version = "2.5.2";
+          hash = "sha256-0CFYL6rBecB8rNnk4IAtg03ZPdSJ9qxwnVdhdQedxsQ=";
+        };
+        meta = {
+          description = "Ungit in Visual Studio Code.";
+          downloadPage = "https://marketplace.visualstudio.com/items?itemName=Hirse.vscode-ungit";
+          homepage = "https://github.com/hirse/vscode-ungit";
+          license = lib.licenses.mit;
+          maintainers = [ lib.maintainers.therobot2105 ];
+        };
+      };
+
       hiukky.flate = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "flate";

diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix
@@ -24,9 +24,9 @@ let fetchurl = args@{url, hash, ...}:
 in rec {
 
   stable = fetchurl rec {
-    version = "9.0";
-    url = "https://dl.winehq.org/wine/source/9.0/wine-${version}.tar.xz";
-    hash = "sha256-fP0JClOV9bdtlbtd76yKMSyN5MBwwRY7i1jaODMMpu4=";
+    version = "10.0";
+    url = "https://dl.winehq.org/wine/source/10.0/wine-${version}.tar.xz";
+    hash = "sha256-xeCz9ffvr7MOnNTZxiS4XFgxcdM1SdkzzTQC80GsNgE=";
 
     ## see http://wiki.winehq.org/Gecko
     gecko32 = fetchurl rec {
@@ -69,9 +69,9 @@ in rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the hash for staging as well.
-    version = "10.0-rc5";
+    version = "10.0";
     url = "https://dl.winehq.org/wine/source/10.0/wine-${version}.tar.xz";
-    hash = "sha256-7IlPe1wH0tTCHVNNf0OUZnuO8ngH4w4hKJhpp02XbtI=";
+    hash = "sha256-xeCz9ffvr7MOnNTZxiS4XFgxcdM1SdkzzTQC80GsNgE=";
     inherit (stable) patches;
 
     ## see http://wiki.winehq.org/Gecko
@@ -117,7 +117,7 @@ in rec {
   staging = fetchFromGitLab rec {
     # https://gitlab.winehq.org/wine/wine-staging
     inherit (unstable) version;
-    hash = "sha256-no+yYF/xhy0kRfBqPer0UbpJNEh9LtKCmyVvhQB58K4=";
+    hash = "sha256-0mzKoaNaJ6ZDYQtJFU383W5nNe/FKtpBjeWDpiqkmp4=";
     domain = "gitlab.winehq.org";
     owner = "wine";
     repo = "wine-staging";
@@ -126,35 +126,7 @@ in rec {
     disabledPatchsets = [ ];
   };
 
-  wayland = fetchFromGitLab {
-    # https://gitlab.collabora.com/alf/wine/-/tree/wayland
-    version = "8.2";
-    hash = "sha256-Eb2SFBIeQQ3cVZkUQcwNT5mcYe0ShFxBdMc3BlqkwTo=";
-    domain = "gitlab.collabora.com";
-    owner = "alf";
-    repo = "wine";
-    rev = "b2547ddf9e08cafce98cf7734d5c4ec926ef3536";
-
-    inherit (unstable) gecko32 gecko64;
-
-    inherit (unstable) mono;
-
-    updateScript = writeShellScript "update-wine-wayland" ''
-      ${updateScriptPreamble}
-      wayland_rev=$(get_source_attr wayland.rev)
-
-      latest_wayland_rev=$(curl -s 'https://gitlab.collabora.com/api/v4/projects/2847/repository/branches/wayland' | jq -r .commit.id)
-
-      if [[ "$wayland_rev" != "$latest_wayland_rev" ]]; then
-          latest_wayland=$(curl -s 'https://gitlab.collabora.com/alf/wine/-/raw/wayland/VERSION' | cut -f3 -d' ')
-          wayland_url=$(get_source_attr wayland.url)
-          set_version_and_hash wayland "$latest_wayland" "$(nix-prefetch-url --unpack "''${wayland_url/$wayland_rev/$latest_wayland_rev}")"
-          set_source_attr wayland rev "\"$latest_wayland_rev\""
-      fi
-
-      do_update
-    '';
-  };
+  wayland = pkgs.lib.warnOnInstantiate "building wine with `wineRelease = \"wayland\"` is deprecated. Wine now builds with the wayland driver by default." stable; # added 2025-01-23
 
   winetricks = fetchFromGitHub rec {
     # https://github.com/Winetricks/winetricks/releases

diff --git a/pkgs/applications/kde/kdevelop/kdev-python.nix b/pkgs/applications/kde/kdevelop/kdev-python.nix
@@ -6,18 +6,14 @@
   threadweaver,
   ktexteditor,
   kdevelop-unwrapped,
-  python39,
+  python3,
 }:
-let
-  # FIXME: stick with python 3.9 until MR supporting 3.10 is ready:
-  # https://invent.kde.org/kdevelop/kdev-python/-/merge_requests/16
-  python = python39;
-in
-mkDerivation rec {
+
+mkDerivation {
   pname = "kdev-python";
 
   cmakeFlags = [
-    "-DPYTHON_EXECUTABLE=${python}/bin/python"
+    "-DPYTHON_EXECUTABLE=${lib.getExe python3}"
   ];
 
   nativeBuildInputs = [

diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "treesheets";
-  version = "0-unstable-2025-01-13";
+  version = "0-unstable-2025-01-16";
 
   src = fetchFromGitHub {
     owner = "aardappel";
     repo = "treesheets";
-    rev = "89b40de858f598975098a0436637bca8357a4a86";
-    hash = "sha256-kduZ+1EYxwuKAIVNBg9u32UD463gpBIjcxSj1FgvIIg=";
+    rev = "f8edf8abe4d7f18528cec6460831d34ee30881e3";
+    hash = "sha256-6EwlpdbLEBu5oUQx6IawaFMkBbmfoRb+lZMZiVLAk8k=";
   };
 
   nativeBuildInputs = [

diff --git a/pkgs/by-name/am/amazon-ssm-agent/package.nix b/pkgs/by-name/am/amazon-ssm-agent/package.nix
@@ -42,13 +42,13 @@ let
 in
 buildGoModule rec {
   pname = "amazon-ssm-agent";
-  version = "3.3.1345.0";
+  version = "3.3.1611.0";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "amazon-ssm-agent";
     tag = version;
-    hash = "sha256-6MGb6P3PYfnoztLdLhOm/smCjyWuV7ZGJtK40l4yFB0=";
+    hash = "sha256-mwru2BAnVSYLXoA+g7eizadSYLr9c3ikEJipo7N1n4Y=";
   };
 
   vendorHash = null;