Merge master into staging-nixos

2026-03-20 06:20:32 +00:00
parent 47f72ff760 f57e1a41ba
commit 886caedda6
23 changed files with 289 additions and 56 deletions
@@ -851,11 +851,11 @@
    "vendorHash": "sha256-HzBj7TSjiv/Ov10KOt5V4oQaKK7CKjBjxpSrhmOl1lQ="
  },
  "loafoe_htpasswd": {
-    "hash": "sha256-1o2kgeTFxegzOgGXWP4OYZ3uC3WbAkCXPqScMvVpHr0=",
+    "hash": "sha256-1HCvAGWsYlcYCA8iOmBb/AawxHPLuoxxQWLzNy0x79M=",
    "homepage": "https://registry.terraform.io/providers/loafoe/htpasswd",
    "owner": "loafoe",
    "repo": "terraform-provider-htpasswd",
-    "rev": "v2.0.0",
+    "rev": "v2.1.0",
    "spdx": "MIT",
    "vendorHash": "sha256-1gzJdcSvFPE8Spkwxe24U7DUyrz4qpDoFVHm6vCWF6A="
  },
@@ -10,11 +10,11 @@
 buildKodiAddon rec {
  pname = "trakt";
  namespace = "script.trakt";
-  version = "3.6.1";
+  version = "3.8.2";

  src = fetchzip {
    url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip";
-    sha256 = "sha256-ZlBucYYRA1cL5c0H1jhXeKE1itReZe2gAJYFFxuUebo=";
+    sha256 = "sha256-75neHPVWpHhzMIOfNFvvX/Xqy3n1DO3SGg16zv/r9dU=";
  };

  propagatedBuildInputs = [
@@ -15,10 +15,10 @@

 let
  source = {
-    version = "2.33.0";
-    hash = "sha256-jHwSJm1VB0W3/sIas39wgvcn+K62DyKJqMdO0kbSgeY=";
-    npmDepsHash = "sha256-PvtnkQytGkKS2MYwpwAGd5F2CrsVKJ2lLbS46ta5a5c=";
-    clientNpmDepsHash = "sha256-+ivzzGLWPCnXWJt6Z6jzXkzMjzXWUK4iRfmF+gUSKEo=";
+    version = "2.33.1";
+    hash = "sha256-O1AurSUq3MNcSchQlC/UfPO2KoB4dBBsONAQ2Bmxk9o=";
+    npmDepsHash = "sha256-NVHKPiT4GFiFVVyO7z/fZtU8Zf4o/LM1PmUs6zwzZF0=";
+    clientNpmDepsHash = "sha256-KWGnFeXxOVGqAruB9k/FqQfQNG6JrZFUQpo0Ls8jEYA=";
  };

  src = fetchFromGitHub {
@@ -41,6 +41,11 @@ stdenv.mkDerivation (finalAttrs: {
    })
  ];

+  postPatch = ''
+    # Fix build with boost 1.89+ where boost_system stub library has been removed
+    substituteInPlace makefile --replace-fail "-lboost_system" ""
+  '';
+
  # Required by rocksdb after 10.7.5
  env.EXTRA_CFLAGS = "-std=c++20 -fno-char8_t";

@@ -18,13 +18,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "cvc5";
-  version = "1.3.2";
+  version = "1.3.3";

  src = fetchFromGitHub {
    owner = "cvc5";
    repo = "cvc5";
    tag = "cvc5-${finalAttrs.version}";
-    hash = "sha256-Um1x+XgQ5yWSoqtx1ZWbVAnNET2C4GVasIbn0eNfico=";
+    hash = "sha256-tXhOMrf/sZwEZFWB2Amp9lApWEsfuPqaj9H7RmI733o=";
  };

  __structuredAttrs = true;
@@ -11,13 +11,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "cwal";
-  version = "0.5.0";
+  version = "0.7.0";

  src = fetchFromGitHub {
    owner = "nitinbhat972";
    repo = "cwal";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-ky7ng6yxa8aMKRjjSHzWU6UC4QfeOdS+/rQ3eA/wRPE=";
+    hash = "sha256-2COw5YBa16XzB4h5dfTLDF6LYjb10UC3+hCgTavnnVo=";
  };

  strictDeps = true;
@@ -13,16 +13,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "delta";
-  version = "0.18.2";
+  version = "0.19.0";

  src = fetchFromGitHub {
    owner = "dandavison";
    repo = "delta";
    tag = finalAttrs.version;
-    hash = "sha256-fJSKGa935kwLG8WYmT9Ncg2ozpSNMzUJx0WLo1gtVAA=";
+    hash = "sha256-hVHxzunST35lJXBhSN5eIJfJV+yeRfrYGv2iORUv6W8=";
  };

-  cargoHash = "sha256-qF55A1CENoHu3LBtNRc/n2PKYxMls7pdn2d56Mp18Qs=";
+  cargoHash = "sha256-DGkYtvxhRdKFHUvES0jdynOcWjDX7VEQdNzZ5az0JY0=";

  nativeBuildInputs = [
    installShellFiles
@@ -0,0 +1,38 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "dn42-registry-wizard";
+  version = "0.4.17";
+
+  src = fetchFromGitHub {
+    owner = "Kioubit";
+    repo = "dn42_registry_wizard";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-wczsDKHcf/izEhJp9THL9yoEfZHTZ0FoVU4CTxmNuAY=";
+  };
+
+  cargoHash = "sha256-Op0xjblw3fB1boRaYoVH9O+c2Zodi/TtJ6sQSiz/rLo=";
+
+  postInstall = ''
+    mv $out/bin/{registry_wizard,dn42-registry-wizard}
+  '';
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Collection of tools to interact with DN42 registry data";
+    homepage = "https://github.com/Kioubit/dn42_registry_wizard";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ defelo ];
+    mainProgram = "dn42-registry-wizard";
+  };
+})
@@ -13,6 +13,7 @@
  vampire,
  eprover-ho,
  cvc5,
+  libpoly,
  csdp,
  rlwrap,
  perl,
@@ -102,15 +103,22 @@ let
    '';
  };

-  cvc5' = cvc5.overrideAttrs {
-    version = "1.2.0";
-    src = fetchFromGitHub {
-      owner = "cvc5";
-      repo = "cvc5";
-      tag = "cvc5-1.2.0";
-      hash = "sha256-Um1x+XgQ5yWSoqtx1ZWbVAnNET2C4GVasIbn0eNfico=";
-    };
-  };
+  cvc5' =
+    (cvc5.override {
+      libpoly = libpoly.overrideAttrs {
+        version = "0.2.0";
+        __intentionallyOverridingVersion = true;
+      };
+    }).overrideAttrs
+      {
+        version = "1.2.0";
+        src = fetchFromGitHub {
+          owner = "cvc5";
+          repo = "cvc5";
+          tag = "cvc5-1.2.0";
+          hash = "sha256-Um1x+XgQ5yWSoqtx1ZWbVAnNET2C4GVasIbn0eNfico=";
+        };
+      };

 in
 stdenv.mkDerivation (finalAttrs: {
@@ -6,16 +6,16 @@

 buildGoModule (finalAttrs: {
  pname = "kubectl-gadget";
-  version = "0.49.1";
+  version = "0.50.1";

  src = fetchFromGitHub {
    owner = "inspektor-gadget";
    repo = "inspektor-gadget";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-YWH/iW5jVxxKkrlqXIAq30wdrxpLLqZ9Lv6oAWTpZSg=";
+    hash = "sha256-o8Ckpa1UCit8/FTeXwWjRzvOGtRvp4BqL0K6829P7AY=";
  };

-  vendorHash = "sha256-IIRSEqE+cXpQGt3Z9U7fhSuspj5y2l4aRdjY5HnQCbU=";
+  vendorHash = "sha256-UzttScIgwy5pN1bDr6vfYn8V6ipaIp0Cw1xIgCmJIbY=";

  env.CGO_ENABLED = 0;

@@ -9,14 +9,19 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "libpoly";
-  version = "0.2.0";
+  version = "0.2.1";

  src = fetchFromGitHub {
    owner = "SRI-CSL";
    repo = "libpoly";
    # they've pushed to the release branch, use explicit tag
    tag = "v${finalAttrs.version}";
-    sha256 = "sha256-gE2O1YfiVab/aIqheoMP8GhE+N3yho7kb5EP56pzjW8=";
+    hash =
+      {
+        "0.2.1" = "sha256-uDWDio+RzJrgGKbWfT6S6voaJrJR0PzPfyr+33dr0ds=";
+        "0.2.0" = "sha256-gE2O1YfiVab/aIqheoMP8GhE+N3yho7kb5EP56pzjW8=";
+      }
+      ."${finalAttrs.version}";
  };

  postPatch = ''
@@ -24,11 +29,13 @@ stdenv.mkDerivation (finalAttrs: {
      --replace-warn " -Werror " " "
  '';

-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+    python3
+  ];

  buildInputs = [
    gmp
-    python3
  ];

  strictDeps = true;
@@ -13,6 +13,7 @@
  openpbs,
  symlinkJoin,
  slurm,
+  gitUpdater,
 }:
 let
  restclient-cpp = fetchFromGitHub {
@@ -31,13 +32,13 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "nix-scheduler-hook";
-  version = "0.6.1";
+  version = "0.7.2";

  src = fetchFromGitHub {
    owner = "lisanna-dettwyler";
    repo = "nix-scheduler-hook";
    tag = "v${version}";
-    hash = "sha256-pB42rjqkASgdYQJD9nPqFSM0JAUIko1FN4d0J52BUsc=";
+    hash = "sha256-tgZ2BZuKmaoPh4h4r/nej98tvl4PvwZfA6xbTLgNZMA=";
  };

  sourceRoot = "source/src";
@@ -73,6 +74,12 @@ stdenv.mkDerivation rec {
    mv subprojects/restclient-cpp/librestclient_cpp.so!(*p) $out/lib
  '';

+  passthru = {
+    updateScript = gitUpdater {
+      rev-prefix = "v";
+    };
+  };
+
  meta = {
    description = "Nix build hook that forwards builds to job schedulers";
    homepage = "https://github.com/lisanna-dettwyler/nix-scheduler-hook";
@@ -11,6 +11,7 @@
  nix-prefetch-fossil,
  nix-prefetch-git,
  nix-prefetch-pijul,
+  removeReferencesTo,
  testers,
  nixtamal,
 }:
@@ -31,6 +32,7 @@ ocamlPackages.buildDunePackage (finalAttrs: {

  nativeBuildInputs = [
    makeBinaryWrapper
+    removeReferencesTo
    # For manpages
    python3Packages.docutils
    python3Packages.pygments
@@ -40,11 +42,15 @@ ocamlPackages.buildDunePackage (finalAttrs: {
  ];

  buildInputs = with ocamlPackages; [
-    camomile
    cmdliner
+    fmt
+    ppx_deriving_qcheck
+  ];
+
+  propagatedBuildInputs = with ocamlPackages; [
+    camomile
    eio
    eio_main
-    fmt
    jingoo
    (jsont.override {
      withBrr = false;
@@ -53,7 +59,7 @@ ocamlPackages.buildDunePackage (finalAttrs: {
    kdl
    logs
    ppx_deriving
-    ppx_deriving_qcheck
+    qcheck-core
    saturn
    stdint
    uri
@@ -72,8 +78,20 @@ ocamlPackages.buildDunePackage (finalAttrs: {

  doCheck = true;

-  postInstall = ''
-    wrapProgram "$out/bin/nixtamal" --prefix PATH : ${
+  outputs = [
+    "bin"
+    "lib"
+    "out"
+  ];
+
+  installPhase = ''
+    runHook preInstall
+    dune install --prefix="$bin" --libdir="$lib/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib" nixtamal
+    for dep in ${ocamlPackages.ocaml} ${ocamlPackages.camomile}
+    do
+        remove-references-to -t $dep $bin/bin/nixtamal
+    done
+    wrapProgram "$bin/bin/nixtamal" --prefix PATH : ${
      lib.makeBinPath [
        coreutils
        nix-prefetch-darcs
@@ -82,10 +100,11 @@ ocamlPackages.buildDunePackage (finalAttrs: {
        nix-prefetch-pijul
      ]
    }
+    runHook postInstall
  '';

  passthru.tests.version = testers.testVersion {
-    package = nixtamal;
+    package = nixtamal.bin;
    command = "${nixtamal.meta.mainProgram} --version";
  };

@@ -28,11 +28,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "reqable";
-  version = "3.0.38";
+  version = "3.0.39";

  src = fetchurl {
    url = "https://github.com/reqable/reqable-app/releases/download/${finalAttrs.version}/reqable-app-linux-x86_64.deb";
-    hash = "sha256-oY5Z47dKEEwg4R5c80zS8ORqppDxj2A9rO8t3g+TnXM=";
+    hash = "sha256-xKoIS2m1SGMRSbLKP3Yf81nYVcsB9sn3RhKHJvH+nHE=";
  };

  nativeBuildInputs = [
@@ -9,16 +9,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "wayland-pipewire-idle-inhibit";
-  version = "0.7.0";
+  version = "0.7.1";

  src = fetchFromGitHub {
    owner = "rafaelrc7";
    repo = "wayland-pipewire-idle-inhibit";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-s5dXr6fray+ipbmupjTNFq1x9Znx2vu6lfHLo8d9op8=";
+    hash = "sha256-AIj8Ib66ej35UNlbvGh0zW2lpGQfsh2aJbnxgBNaWAY=";
  };

-  cargoHash = "sha256-pei5VSKIRMuqCEeL1aJ394ycjuUtxq9Cu/dZc3zAk6Y=";
+  cargoHash = "sha256-MFNtEyBmrkq2ZpKtGA5GEnJilHpZZvG3j2XcF6kNP9k=";

  nativeBuildInputs = [
    pkg-config
@@ -11,16 +11,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "worktrunk";
-  version = "0.29.0";
+  version = "0.30.0";

  src = fetchFromGitHub {
    owner = "max-sixty";
    repo = "worktrunk";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-JawxnNoEv8ZDLaZmOlMrvsa/cEzmOFYv7oHWmPeOIbc=";
+    hash = "sha256-563tEowYm8mKxA+OnjjcsCCheHLjqNEL/vRsi/g26/Q=";
  };

-  cargoHash = "sha256-aEUnR3Dk3LFo3vJf+k550YiP3pSN6a7175d91yEned0=";
+  cargoHash = "sha256-wmFdKutNzo+2ddvadVdIFBmHGrbb+oJ/Nzmw2H6D1VY=";

  cargoBuildFlags = [ "--package=worktrunk" ];

@@ -14,13 +14,13 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "zeroclaw";
-  version = "0.5.0";
+  version = "0.5.1";

  src = fetchFromGitHub {
    owner = "zeroclaw-labs";
    repo = "zeroclaw";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-RlliRnf9RLIbzWh3WRIvicie8mOPN0uimiiFbFD6+tQ=";
+    hash = "sha256-5P+TjAf7i0oUxBCyBtagrmIHPXW2iZ6620PNxVYYjlQ=";
  };

  postPatch =
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
      ln -s ${zeroclaw-web} web/dist
    '';

-  cargoHash = "sha256-tvT2+hPZpBBkYS1cnkNSzJiV2S2Z6RnhLZDkEYvOvgc=";
+  cargoHash = "sha256-tpgeRLWyye43fuzw2MRevQx8YKEbyOnIgLzjg8EzwCg=";

  nativeBuildInputs = [
    pkg-config
@@ -0,0 +1,38 @@
+{
+  buildPythonPackage,
+  django,
+  fetchFromGitHub,
+  lib,
+  setuptools,
+}:
+buildPythonPackage (finalAttrs: {
+  pname = "django-error-report-2";
+  version = "0.4.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "matmair";
+    repo = "django-error-report-2";
+    tag = finalAttrs.version;
+    hash = "sha256-ZCaslqgruJxM8345/jSlZGruM+27H9hvwL0wtPkUzc0=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    django
+  ];
+
+  # There are no tests on upstream
+  doCheck = false;
+
+  pythonImportsCheck = [ "error_report" ];
+
+  meta = {
+    description = "Log/View Django server errors";
+    homepage = "https://github.com/matmair/django-error-report-2";
+    changelog = "https://github.com/matmair/django-error-report-2/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ kurogeek ];
+  };
+})
@@ -0,0 +1,42 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  pytest-django,
+  pytestCheckHook,
+  setuptools,
+}:
+buildPythonPackage (finalAttrs: {
+  pname = "django-mailbox";
+  version = "4.10.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "coddingtonbear";
+    repo = "django-mailbox";
+    tag = finalAttrs.version;
+    hash = "sha256-7CBUnqveTSfdc+8x8sZUqvwYW3vKjZKfOPVWFSo4es0=";
+  };
+
+  build-system = [ setuptools ];
+
+  preCheck = ''
+    substituteInPlace setup.cfg --replace-fail "pytest" "tool:pytest"
+    export DJANGO_SETTINGS_MODULE=django_mailbox.tests.settings
+  '';
+
+  pythonImportsCheck = [ "django_mailbox" ];
+
+  nativeCheckInputs = [
+    pytest-django
+    pytestCheckHook
+  ];
+
+  meta = {
+    description = "Import mail from POP3, IMAP, local email mailboxes or directly from Postfix or Exim4 into your Django application automatically";
+    homepage = "https://github.com/coddingtonbear/django-mailbox";
+    changelog = "https://github.com/coddingtonbear/django-mailbox/blob/${finalAttrs.src.tag}/CHANGELOG.rst";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ kurogeek ];
+  };
+})
@@ -0,0 +1,58 @@
+{
+  buildPythonPackage,
+  django,
+  fetchFromGitHub,
+  lib,
+  pytest-django,
+  pytestCheckHook,
+  setuptools,
+  markdown,
+  bleach,
+  tinycss2,
+}:
+buildPythonPackage (finalAttrs: {
+  pname = "django-markdownify";
+  version = "0.9.6";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "erwinmatijsen";
+    repo = "django-markdownify";
+    tag = finalAttrs.version;
+    hash = "sha256-L/N0jjxBz7aQletOg+qairgq4utifPz4oqjT9AcljLI=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    django
+    markdown
+    bleach
+  ]
+  ++ bleach.optional-dependencies.css;
+
+  preCheck = ''
+    export DJANGO_SETTINGS_MODULE=markdownify.checks
+  '';
+
+  nativeCheckInputs = [
+    tinycss2
+    pytest-django
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "markdownify" ];
+
+  disabledTests = [
+    # Test settings didn't setup DjangoTemplates
+    "test_markdownify_nodelist"
+  ];
+
+  meta = {
+    description = "Markdown template filter for Django";
+    homepage = "https://github.com/erwinmatijsen/django-markdownify";
+    changelog = "https://github.com/erwinmatijsen/django-markdownify/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ kurogeek ];
+  };
+})
@@ -3,6 +3,7 @@
  buildPythonPackage,
  fetchPypi,
  setuptools,
+  setuptools-scm,
  pytestCheckHook,
  pytest-cov-stub,
  vcrpy,
@@ -21,8 +22,12 @@ buildPythonPackage rec {
    hash = "sha256-e1wa4Qkn+eAs9NVOLHSoqgDNKcONY33v48lI09jp8zo=";
  };

-  nativeBuildInputs = [ setuptools ];
-  propagatedBuildInputs = [
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
    citeproc-py
    looseversion
    requests
@@ -4,8 +4,8 @@
  fetchFromGitHub,
  sphinx,
  pyenchant,
-  setuptools,
-  setuptools-scm,
+  hatchling,
+  hatch-vcs,
  wheel,
 }:

@@ -22,8 +22,8 @@ buildPythonPackage rec {
  };

  nativeBuildInputs = [
-    setuptools
-    setuptools-scm
+    hatchling
+    hatch-vcs
    wheel
  ];

@@ -4176,6 +4176,8 @@ self: super: with self; {

  django-environ = callPackage ../development/python-modules/django-environ { };

+  django-error-report-2 = callPackage ../development/python-modules/django-error-report-2 { };
+
  django-extensions = callPackage ../development/python-modules/django-extensions { };

  django-filer = callPackage ../development/python-modules/django-filer { };
@@ -4248,10 +4250,14 @@ self: super: with self; {
    callPackage ../development/python-modules/django-login-required-middleware
      { };

+  django-mailbox = callPackage ../development/python-modules/django-mailbox { };
+
  django-mailman3 = callPackage ../development/python-modules/django-mailman3 { };

  django-maintenance-mode = callPackage ../development/python-modules/django-maintenance-mode { };

+  django-markdownify = callPackage ../development/python-modules/django-markdownify { };
+
  django-markdownx = callPackage ../development/python-modules/django-markdownx { };

  django-markup = callPackage ../development/python-modules/django-markup { };