Merge master into staging-next

doc/release-notes/rl-2511.section.md

@@ -178,6 +178,8 @@
 
 - `orjail` package has been removed as it is broken by the latest firejail release and seems unmaintained.
 
+- `python3Packages.bugwarrior` has been updated to major version 2.0.0 which will likely require manual intervention. See [release notes](https://github.com/GothenburgBitFactory/bugwarrior/releases/tag/2.0.0).
+
 - `pcp` has been removed because the upstream repo was archived and it hasn't been updated since 2021.
 
 - `podofo` has been updated from `0.9.8` to `1.0.0`. These releases are by nature very incompatible due to major API changes. The legacy versions can be found under `podofo_0_10` and `podofo_0_9`.

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

@@ -788,48 +788,62 @@ in
         '';
 
         script = ''
-          export SECRET_KEY="$(head -n1 ${lib.escapeShellArg cfg.secretKeyFile})"
-          export UTILS_SECRET="$(head -n1 ${lib.escapeShellArg cfg.utilsSecretFile})"
+          SECRET_KEY="$(head -n1 ${lib.escapeShellArg cfg.secretKeyFile})"
+          export SECRET_KEY
+          UTILS_SECRET="$(head -n1 ${lib.escapeShellArg cfg.utilsSecretFile})"
+          export UTILS_SECRET
           ${lib.optionalString (cfg.storage.storageType == "s3") ''
-            export AWS_SECRET_ACCESS_KEY="$(head -n1 ${lib.escapeShellArg cfg.storage.secretKeyFile})"
+            AWS_SECRET_ACCESS_KEY="$(head -n1 ${lib.escapeShellArg cfg.storage.secretKeyFile})"
+            export AWS_SECRET_ACCESS_KEY
           ''}
           ${lib.optionalString (cfg.slackAuthentication != null) ''
-            export SLACK_CLIENT_SECRET="$(head -n1 ${lib.escapeShellArg cfg.slackAuthentication.secretFile})"
+            SLACK_CLIENT_SECRET="$(head -n1 ${lib.escapeShellArg cfg.slackAuthentication.secretFile})"
+            export SLACK_CLIENT_SECRET
           ''}
           ${lib.optionalString (cfg.googleAuthentication != null) ''
-            export GOOGLE_CLIENT_SECRET="$(head -n1 ${lib.escapeShellArg cfg.googleAuthentication.clientSecretFile})"
+            GOOGLE_CLIENT_SECRET="$(head -n1 ${lib.escapeShellArg cfg.googleAuthentication.clientSecretFile})"
+            export GOOGLE_CLIENT_SECRET
           ''}
           ${lib.optionalString (cfg.azureAuthentication != null) ''
-            export AZURE_CLIENT_SECRET="$(head -n1 ${lib.escapeShellArg cfg.azureAuthentication.clientSecretFile})"
+            AZURE_CLIENT_SECRET="$(head -n1 ${lib.escapeShellArg cfg.azureAuthentication.clientSecretFile})"
+            export AZURE_CLIENT_SECRET
           ''}
           ${lib.optionalString (cfg.oidcAuthentication != null) ''
-            export OIDC_CLIENT_SECRET="$(head -n1 ${lib.escapeShellArg cfg.oidcAuthentication.clientSecretFile})"
+            OIDC_CLIENT_SECRET="$(head -n1 ${lib.escapeShellArg cfg.oidcAuthentication.clientSecretFile})"
+            export OIDC_CLIENT_SECRET
           ''}
           ${lib.optionalString (cfg.discordAuthentication != null) ''
-            export DISCORD_CLIENT_SECRET="$(head -n1 ${lib.escapeShellArg cfg.discordAuthentication.clientSecretFile})"
+            DISCORD_CLIENT_SECRET="$(head -n1 ${lib.escapeShellArg cfg.discordAuthentication.clientSecretFile})"
+            export DISCORD_CLIENT_SECRET
           ''}
           ${lib.optionalString (cfg.sslKeyFile != null) ''
-            export SSL_KEY="$(head -n1 ${lib.escapeShellArg cfg.sslKeyFile})"
+            SSL_KEY="$(head -n1 ${lib.escapeShellArg cfg.sslKeyFile})"
+            export SSL_KEY
           ''}
           ${lib.optionalString (cfg.sslCertFile != null) ''
-            export SSL_CERT="$(head -n1 ${lib.escapeShellArg cfg.sslCertFile})"
+            SSL_CERT="$(head -n1 ${lib.escapeShellArg cfg.sslCertFile})"
+            export SSL_CERT
           ''}
           ${lib.optionalString (cfg.slackIntegration != null) ''
-            export SLACK_VERIFICATION_TOKEN="$(head -n1 ${lib.escapeShellArg cfg.slackIntegration.verificationTokenFile})"
+            SLACK_VERIFICATION_TOKEN="$(head -n1 ${lib.escapeShellArg cfg.slackIntegration.verificationTokenFile})"
+            export SLACK_VERIFICATION_TOKEN
           ''}
           ${lib.optionalString (cfg.smtp != null) ''
-            export SMTP_PASSWORD="$(head -n1 ${lib.escapeShellArg cfg.smtp.passwordFile})"
+            SMTP_PASSWORD="$(head -n1 ${lib.escapeShellArg cfg.smtp.passwordFile})"
+            export SMTP_PASSWORD
           ''}
 
           ${
             if (cfg.databaseUrl == "local") then
               ''
-                export DATABASE_URL=${lib.escapeShellArg localPostgresqlUrl}
+                DATABASE_URL=${lib.escapeShellArg localPostgresqlUrl}
+                export DATABASE_URL
                 export PGSSLMODE=disable
               ''
             else
               ''
-                export DATABASE_URL=${lib.escapeShellArg cfg.databaseUrl}
+                DATABASE_URL=${lib.escapeShellArg cfg.databaseUrl}
+                export DATABASE_URL
               ''
           }
 

pkgs/applications/editors/vim/plugins/overrides.nix

@@ -1482,6 +1482,7 @@ assertNoAdditions {
     dependencies = with self; [
       nui-nvim
       nvim-treesitter
+      nvim-treesitter-parsers.hurl
       plenary-nvim
     ];
 

pkgs/applications/networking/cluster/terraform-providers/providers.json

@@ -498,13 +498,13 @@
     "vendorHash": "sha256-WFhO48sN8sLRztMBZsGRzOEJO3gi6j5o6wfikiFwuJM="
   },
   "hashicorp_awscc": {
-    "hash": "sha256-G1lIrWSG5wnPv2H5C64I35M8K+AOwn3hlv2rjAGBPAc=",
+    "hash": "sha256-+qcv9cCr5MraBa91x+iziMBK1Wdaq4lg0xbDBf3cmFE=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/awscc",
     "owner": "hashicorp",
     "repo": "terraform-provider-awscc",
-    "rev": "v1.65.0",
+    "rev": "v1.66.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-FXVT5HJYLd80GtDEi8hUFxRGCe1RRuZUQ7em45Ugo38="
+    "vendorHash": "sha256-J5BFrprtg424YG3kYoTagb36CkaYVWIqfoyrUBqNHFg="
   },
   "hashicorp_azuread": {
     "hash": "sha256-ATYOrBmZP9LximrS5KpfktU/kfW08XWShxE4z+x6Sts=",

pkgs/by-name/ac/acli/sources.json

@@ -1,21 +1,21 @@
 {
-  "version": "1.3.7-stable",
+  "version": "1.3.8-stable",
   "sources": {
     "aarch64-darwin": {
-      "url": "https://acli.atlassian.com/darwin/1.3.7-stable/acli_1.3.7-stable_darwin_arm64.tar.gz",
-      "sha256": "0996a8833625bb74f6af55ec628a1208546631f2e10157ee171e98f38d30dce3"
+      "url": "https://acli.atlassian.com/darwin/1.3.8-stable/acli_1.3.8-stable_darwin_arm64.tar.gz",
+      "sha256": "6cca92743b2414217ba2e5654fec2c8fcfb1a529ae9bbabb5174417af5b76cff"
     },
     "aarch64-linux": {
-      "url": "https://acli.atlassian.com/linux/1.3.7-stable/acli_1.3.7-stable_linux_arm64.tar.gz",
-      "sha256": "698e66275bbb1fadbb1bc25c3ac0c014d846ec7fcb8c87c332cdfda3cf539d5f"
+      "url": "https://acli.atlassian.com/linux/1.3.8-stable/acli_1.3.8-stable_linux_arm64.tar.gz",
+      "sha256": "2b69c2828152d05481cc03f282355d3ce79cd5650f4bb3f94489776cfc12e75b"
     },
     "x86_64-darwin": {
-      "url": "https://acli.atlassian.com/darwin/1.3.7-stable/acli_1.3.7-stable_darwin_amd64.tar.gz",
-      "sha256": "02597287d54a39f514dae9ca8d60d3f4ad1eee28fcb2ffc7282fe182398a1438"
+      "url": "https://acli.atlassian.com/darwin/1.3.8-stable/acli_1.3.8-stable_darwin_amd64.tar.gz",
+      "sha256": "27f095a96a2622414a67ac2933c765685586d056558d4401beee7aee9fa1444d"
     },
     "x86_64-linux": {
-      "url": "https://acli.atlassian.com/linux/1.3.7-stable/acli_1.3.7-stable_linux_amd64.tar.gz",
-      "sha256": "43c54b31f5def20cf0f29af9f8987c8b6180d6a875b26e129e11179b8b0d2654"
+      "url": "https://acli.atlassian.com/linux/1.3.8-stable/acli_1.3.8-stable_linux_amd64.tar.gz",
+      "sha256": "ebaeeee8d925be3de85cf05bc2f9b1b0deb6f3b43a0505c5c9b32f0105b90f1c"
     }
   }
 }

pkgs/by-name/ca/cameractrls/package.nix

@@ -40,14 +40,14 @@ let
 in
 python3Packages.buildPythonApplication rec {
   pname = "cameractrls";
-  version = "0.6.9";
+  version = "0.6.10";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "soyersoyer";
     repo = "cameractrls";
     rev = "v${version}";
-    hash = "sha256-eQwTEu8lBToh3N8FSlNQbTIGnIejnJLKScyN07jnzqQ=";
+    hash = "sha256-WtFwi7X2RvOqx8sYLhzurm6DYbwbVOswYJfb17aORF0=";
   };
 
   postPatch = ''

pkgs/by-name/gi/github-linguist/Gemfile.lock

@@ -48,7 +48,7 @@ GEM
       ruby2_keywords (>= 0.0.5)
     net-http (0.6.0)
       uri
-    nokogiri (1.18.8)
+    nokogiri (1.18.10)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     octokit (9.2.0)

pkgs/by-name/gi/github-linguist/gemset.nix

@@ -255,17 +255,14 @@
       "mini_portile2"
       "racc"
     ];
-    groups = [
-      "default"
-      "development"
-    ];
+    groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0rb306hbky6cxfyc8vrwpvl40fdapjvhsk62h08gg9wwbn3n8x4c";
+      sha256 = "1hcwwr2h8jnqqxmf8mfb52b0dchr7pm064ingflb78wa00qhgk6m";
       type = "gem";
     };
-    version = "1.18.8";
+    version = "1.18.10";
   };
   octokit = {
     dependencies = [

pkgs/by-name/gv/gvisor/package.nix

@@ -12,7 +12,7 @@
 
 buildGoModule {
   pname = "gvisor";
-  version = "20250512.0";
+  version = "20251110.0";
 
   # gvisor provides a synthetic go branch (https://github.com/google/gvisor/tree/go)
   # that can be used to build gvisor without bazel.
@@ -21,8 +21,8 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "google";
     repo = "gvisor";
-    rev = "2a7b5c7dece9218a44afb8c56e28f2aae8038f6b";
-    hash = "sha256-u2YMFesrtQX+eE0aKYiOr+4/khPtsH2P2EQWfvHs8nI=";
+    rev = "2617196c08506a30764bf6261b79d52797916dda";
+    hash = "sha256-qx1uCRTJVotSbTojBf/Nj8LfLdUvsnxMkPuyJjLLadM=";
   };
 
   # Replace the placeholder with the actual path to ldconfig
@@ -31,7 +31,7 @@ buildGoModule {
       --replace-fail '"/sbin/ldconfig"' '"${glibc}/bin/ldconfig"'
   '';
 
-  vendorHash = "sha256-3fKFr8viabGEwIHYxg9vjhKMVOxCjji3PDgs8wBBZzY=";
+  vendorHash = "sha256-Ey4M3NK/+AVkr7r0aA+kAfNk1yVfnDn3Izy7u74HFkE=";
 
   nativeBuildInputs = [ makeWrapper ];
 

pkgs/by-name/in/inspec/package.nix

@@ -1,24 +1,33 @@
 {
   lib,
-  ruby,
+  ruby_3_4, # fix "Source locally installed gems is ignoring ... because it is missing extensions"
   bundlerApp,
   bundlerUpdateScript,
+  inspec,
+  testers,
 }:
 
 bundlerApp {
   pname = "inspec";
   gemdir = ./.;
 
-  inherit ruby;
+  ruby = ruby_3_4;
 
   exes = [ "inspec" ];
 
-  passthru.updateScript = bundlerUpdateScript "inspec";
+  passthru = {
+    updateScript = bundlerUpdateScript "inspec";
+    tests.version = testers.testVersion {
+      package = inspec;
+      command = "inspec version";
+      inherit ((import ./gemset.nix).inspec) version;
+    };
+  };
 
   meta = {
     description = "Open-source testing framework for infrastructure with a human- and machine-readable language for specifying compliance, security and policy requirements";
     homepage = "https://inspec.io/";
-    license = lib.licenses.asl20;
+    license = lib.licenses.unfree; # rubygems distribution is unfree, see https://github.com/inspec/inspec/blob/main/Chef-EULA
     maintainers = with lib.maintainers; [ dylanmtaylor ];
     mainProgram = "inspec";
   };

pkgs/by-name/jj/jjui/package.nix

@@ -7,16 +7,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "jjui";
-  version = "0.9.7";
+  version = "0.9.8";
 
   src = fetchFromGitHub {
     owner = "idursun";
     repo = "jjui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-WkJofvalxjcehlVZiPB51jw7exQ2rU8CiRq3gxMKzEQ=";
+    hash = "sha256-YEEcSaIm21IUp7EFdYvDG2h55YIqzghYdGxdXmZnp9I=";
   };
 
-  vendorHash = "sha256-dSODeMvlPWrOS97sw1qbf3vrmv8Bs+Z3rmN0ZRV/KjU=";
+  vendorHash = "sha256-2TlJJY/eM6yYFOdq8CcH9l2lFHJmFrihuGwLS7jMwJ0=";
 
   ldflags = [ "-X main.Version=${finalAttrs.version}" ];
 

pkgs/by-name/li/libmsquic/package.nix

@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libmsquic";
-  version = "2.5.5";
+  version = "2.5.6";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "msquic";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-V1QAY1E6prAtEDkUVOuBExHaDw91+fW3OKYZr2bQavQ=";
+    hash = "sha256-Nq7iIOz9duThWQSjJTGK+xnKEH3H3ck9v37ppoGFaEE=";
     fetchSubmodules = true;
   };
 

pkgs/by-name/ll/llama-cpp/package.nix

@@ -73,13 +73,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "llama-cpp";
-  version = "7342";
+  version = "7356";
 
   src = fetchFromGitHub {
     owner = "ggml-org";
     repo = "llama.cpp";
     tag = "b${finalAttrs.version}";
-    hash = "sha256-x/Eq27wxEBSkcJnJXY8hQ7uL3zFVnAvMKvdoYh2AtPY=";
+    hash = "sha256-zrdnjiwM0gdy1wSWSR0AA6uZHYW1deVG3yRFlalAAZc=";
     leaveDotGit = true;
     postFetch = ''
       git -C "$out" rev-parse --short HEAD > $out/COMMIT

pkgs/by-name/pi/pixi/package.nix

@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pixi";
-  version = "0.60.0";
+  version = "0.61.0";
 
   src = fetchFromGitHub {
     owner = "prefix-dev";
     repo = "pixi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JFXa72bPRYkNb/7XbBOnI1ay0WFVAoAssoNtGjSsW/s=";
+    hash = "sha256-BMHZcsFU9aYEiUJ1WfS2hve7pCHknOKpsNJ7VPUmuwU=";
   };
 
-  cargoHash = "sha256-aDWDJ0uGAa/gdV6aelBd6tlRssd75EzeGbnw7qPzLDY=";
+  cargoHash = "sha256-RIw5wAxick23kK16Pvc8U4uSSWe/VxE/9NmIP8X9Ruw=";
 
   nativeBuildInputs = [
     pkg-config

pkgs/by-name/st/starc/package.nix

@@ -6,10 +6,10 @@
 }:
 let
   pname = "starc";
-  version = "0.7.8";
+  version = "0.8.0";
   src = fetchurl {
     url = "https://github.com/story-apps/starc/releases/download/v${version}/starc-setup.AppImage";
-    hash = "sha256-thW7BzbY0eR72sa0eQT8iTo+K193k2C5b+R0zyXni9Y=";
+    hash = "sha256-0lD2mpHslOGgvGG8edPqlhyNi9ewzSgN+Eaabbcs7CI=";
   };
 
   appimageContents = appimageTools.extract { inherit pname version src; };

pkgs/by-name/th/thorium-reader/package.nix

@@ -11,16 +11,16 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "thorium-reader";
-  version = "3.2.2";
+  version = "3.3.0";
   nodejs = nodejs_24;
-  npmDepsHash = "sha256-T70Oxn97oDyFSxkJ55nlM2ET0UEWpo8ahnipkUwgTcM=";
+  npmDepsHash = "sha256-UR2MSqmdJ79Fz7qjQRkCAwx2jdMn8KLWPzNSnnsb5Ak=";
   makeCacheWritable = true;
 
   src = fetchFromGitHub {
     owner = "edrlab";
     repo = "thorium-reader";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+1cc8UxcLaqC6Yrc4RYAKDZ4hzoz0eX31HaiUtp/znE=";
+    hash = "sha256-2d5M9C/cLK2A8O3Ls0xEkT6H8tucVR7eivPi+82V7Zg=";
   };
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";

pkgs/development/python-modules/bugwarrior/default.nix

@@ -1,68 +1,118 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  pythonOlder,
+  fetchFromGitHub,
+  taskwarrior3,
+  versionCheckHook,
+  writableTmpDirAsHomeHook,
   setuptools,
-  twiggy,
-  requests,
-  offtrac,
-  python-bugzilla,
-  taskw,
+  click,
+  dogpile-cache,
+  importlib-metadata,
+  jinja2,
+  lockfile,
+  pydantic,
   python-dateutil,
   pytz,
-  keyring,
-  six,
-  jinja2,
-  pycurl,
-  dogpile-cache,
-  lockfile,
-  click,
-  pyxdg,
-  future,
+  requests,
+  taskw,
+  debianbts,
+  python-bugzilla,
+  google-api-python-client,
+  google-auth-oauthlib,
   jira,
+  keyring,
+  offtrac,
+  pytestCheckHook,
+  docutils,
+  pytest-subtests,
+  responses,
+  sphinx,
+  sphinx-click,
+  sphinx-inline-tabs,
 }:
 
 buildPythonPackage rec {
   pname = "bugwarrior";
-  version = "1.8.0";
-  format = "setuptools";
-  disabled = pythonOlder "3.6";
+  version = "2.0.0";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "f024c29d2089b826f05481cace33a62aa984f33e98d226f6e41897e6f11b3f51";
+  src = fetchFromGitHub {
+    owner = "GothenburgBitFactory";
+    repo = "bugwarrior";
+    tag = version;
+    hash = "sha256-VuHTrkxLZmQOxyig2krVU9UZDDbLY08MfB9si08lh3E=";
   };
 
-  propagatedBuildInputs = [
-    setuptools
-    twiggy
-    requests
-    offtrac
-    python-bugzilla
-    taskw
+  build-system = [ setuptools ];
+
+  dependencies = [
+    click
+    dogpile-cache
+    importlib-metadata
+    jinja2
+    lockfile
+    pydantic
     python-dateutil
     pytz
-    keyring
-    six
-    jinja2
-    pycurl
-    dogpile-cache
-    lockfile
-    click
-    pyxdg
-    future
-    jira
+    requests
+    taskw
+  ]
+  ++ pydantic.optional-dependencies.email;
+  pythonRemoveDeps = [ "tomli" ];
+
+  optional-dependencies = {
+    bts = [ debianbts ];
+    bugzilla = [ python-bugzilla ];
+    gmail = [
+      google-api-python-client
+      google-auth-oauthlib
+    ];
+    jira = [ jira ];
+    keyring = [ keyring ];
+    trac = [ offtrac ];
+  };
+
+  nativeCheckInputs = [
+    taskwarrior3
+    versionCheckHook
+    writableTmpDirAsHomeHook
+    pytestCheckHook
+    docutils
+    pytest-subtests
+    responses
+    sphinx
+    sphinx-click
+    sphinx-inline-tabs
+  ]
+  ++ lib.concatAttrValues optional-dependencies;
+  disabledTestPaths = [
+    # Optional dependencies for these services aren't packaged.
+    "tests/test_kanboard.py"
+    "tests/test_phab.py"
+    "tests/test_todoist.py"
+  ];
+  disabledTests = [
+    # Requires ini2toml dependency, which isn't packaged.
+    "TestIni2Toml"
+    # Import services for which the optional dependencies aren't packaged.
+    "TestValidation"
+    "ExampleTest"
+    "TestServices"
   ];
 
-  # for the moment oauth2client <4.0.0 and megaplan>=1.4 are missing for running the test suite.
-  doCheck = false;
+  pythonImportsCheck = [ "bugwarrior" ];
 
   meta = {
     homepage = "https://github.com/GothenburgBitFactory/bugwarrior";
     description = "Sync github, bitbucket, bugzilla, and trac issues with taskwarrior";
+    changelog = "https://github.com/GothenburgBitFactory/bugwarrior/blob/${src.tag}/CHANGELOG.rst";
     license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ pierron ];
+    mainProgram = "bugwarrior";
+    maintainers = with lib.maintainers; [
+      pierron
+      ryneeverett
+    ];
   };
 }

pkgs/development/python-modules/taskw/default.nix

@@ -43,10 +43,10 @@ buildPythonPackage rec {
 
   buildInputs = [
     taskwarrior2
-    distutils
   ];
 
   dependencies = [
+    distutils
     kitchen
     python-dateutil
     pytz