Merge master into staging-next

maintainers/maintainer-list.nix

@@ -15580,6 +15580,12 @@
     githubId = 3159451;
     name = "Nicolas Schneider";
   };
+  nipeharefa = {
+    name = "Nipe Harefa";
+    email = "nipeharefa@gmail.com";
+    github = "nipeharefa";
+    githubId = 12620257;
+  };
   NIS = {
     name = "NSC IT Solutions";
     github = "dev-nis";

pkgs/applications/misc/notesnook/default.nix

@@ -2,7 +2,7 @@
 
 let
   pname = "notesnook";
-  version = "3.0.16";
+  version = "3.0.19";
 
   inherit (stdenv.hostPlatform) system;
   throwSystem = throw "Unsupported system: ${system}";
@@ -16,9 +16,9 @@ let
   src = fetchurl {
     url = "https://github.com/streetwriters/notesnook/releases/download/v${version}/notesnook_${suffix}";
     hash = {
-      x86_64-linux = "sha256-HywWk3MAWdRVaQyimlQJCFsgydXdE0VSLWliZT7f8w0=";
-      x86_64-darwin = "sha256-GgZVVt1Gm95/kyI/q99fZ9BIN+5kpxumcSJ9BexfARc=";
-      aarch64-darwin = "sha256-ldg+bVROm/XzACCmiMapMQf3f6le9FHzt18QcaH8TxA=";
+      x86_64-linux = "sha256-yCzREyFyGoAPXVVnNX6GUrr83oaPtoNOgZOOd6vJD1Q=";
+      x86_64-darwin = "sha256-WciEpt0vUuXS6YeZkbyFGqQaotXoZkWnkkn5B6/JXwE=";
+      aarch64-darwin = "sha256-iP3Xd/otYEVwU85U2dlFcX9QjDq2CbIqHmcDYVxzqzI=";
     }.${system} or throwSystem;
   };
 

pkgs/applications/misc/toot/default.nix

@@ -1,36 +0,0 @@
-{ lib, fetchFromGitHub, python3Packages, nixosTests }:
-
-python3Packages.buildPythonApplication rec {
-  pname = "toot";
-  version = "0.42.0";
-
-  src = fetchFromGitHub {
-    owner  = "ihabunek";
-    repo   = "toot";
-    rev = "refs/tags/${version}";
-    sha256 = "sha256-FxA/loJzb/DBI1vWC71IFqdFcwjwIezhBJCGNeBzRoU=";
-  };
-
-  nativeCheckInputs = with python3Packages; [ pytest ];
-
-  propagatedBuildInputs = with python3Packages;
-  [
-    requests beautifulsoup4 future wcwidth
-    urwid urwidgets psycopg2 tomlkit click
-  ];
-
-  checkPhase = ''
-    py.test
-  '';
-
-  passthru.tests.toot = nixosTests.pleroma;
-
-  meta = with lib; {
-    description = "Mastodon CLI interface";
-    mainProgram = "toot";
-    homepage    = "https://github.com/ihabunek/toot";
-    license     = licenses.gpl3;
-    maintainers = [ maintainers.matthiasbeyer ];
-  };
-
-}

pkgs/applications/networking/irc/srain/default.nix

@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "srain";
-  version = "1.7.0";
+  version = "1.8.0";
 
   src = fetchFromGitHub {
     owner = "SrainApp";
     repo = "srain";
     rev = version;
-    hash = "sha256-mhnlHnF23+VZvSPNuTYYUVcA6Md4y2AGqEuJphY1/IY=";
+    hash = "sha256-c5dy5dD5Eb/MVNCpLqIGNuafsrmgLjEfRfSxKVxu5wY=";
   };
 
   nativeBuildInputs = [

pkgs/applications/video/kodi/addons/youtube/default.nix

@@ -3,13 +3,13 @@
 buildKodiAddon rec {
   pname = "youtube";
   namespace = "plugin.video.youtube";
-  version = "7.1.0";
+  version = "7.1.0.1";
 
   src = fetchFromGitHub {
     owner = "anxdpanic";
     repo = "plugin.video.youtube";
     rev = "v${version}";
-    hash = "sha256-I3dSGcPQVVhn4RO8CHtn3FG2dheSv4XiDO7w+MtTjRU=";
+    hash = "sha256-5tctuY2vYEfkkNVjprnUPJ/crwmMGCEdcRxUQR5EQxw=";
   };
 
   propagatedBuildInputs = [

pkgs/by-name/ae/aerogramme/package.nix

@@ -50,5 +50,6 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ supinie ];
     mainProgram = "aerogramme";
     platforms = lib.platforms.linux;
+    broken = true; # https://github.com/rust-lang/rust/issues/129811
   };
 }

pkgs/by-name/ba/baidupcs-go/package.nix

@@ -0,0 +1,33 @@
+{
+  buildGo122Module,
+  lib,
+  fetchFromGitHub,
+  versionCheckHook,
+}:
+buildGo122Module rec {
+  pname = "baidupcs-go";
+  version = "3.9.5";
+  src = fetchFromGitHub {
+    owner = "qjfoidnh";
+    repo = "BaiduPCS-Go";
+    rev = "v${version}";
+    hash = "sha256-zNodRQzflOOB3hAeq4KbjRFlHQwknVy+4ucipUcoufY=";
+  };
+
+  vendorHash = "sha256-msTlXtidxLTe3xjxTOWCqx/epFT0XPdwGPantDJUGpc=";
+  doCheck = false;
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+  versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
+
+  meta = {
+    maintainers = with lib.maintainers; [ xddxdd ];
+    description = "Baidu Netdisk commandline client, mimicking Linux shell file handling commands";
+    homepage = "https://github.com/qjfoidnh/BaiduPCS-Go";
+    license = lib.licenses.asl20;
+    mainProgram = "BaiduPCS-Go";
+  };
+}

pkgs/by-name/de/deepsource/package.nix

@@ -0,0 +1,62 @@
+{
+  lib,
+  stdenv,
+  installShellFiles,
+  buildGoModule,
+  fetchFromGitHub,
+  versionCheckHook,
+}:
+
+buildGoModule rec {
+  pname = "deepsource";
+  version = "0.8.6";
+
+  src = fetchFromGitHub {
+    owner = "DeepSourceCorp";
+    repo = "cli";
+    rev = "v${version}";
+    hash = "sha256-6uNb4cQVerrlW/eUkjmlO1i1YKYX3qaVdo0i5cczt+I=";
+  };
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  doCheck = true;
+
+  checkFlags =
+    let
+      # Skip tests that require network access
+      skippedTests = [
+        "TestReportKeyValueWorkflow"
+        "TestReportAnalyzerTypeWorkflow"
+        "TestReportKeyValueFileWorkflow"
+      ];
+    in
+    [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
+
+  vendorHash = "sha256-SsMq4ngq3sSOL28ysHTxTF4CT9sIcCIW7yIhBxIPrNs=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X=main.version=${version}"
+  ];
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd deepsource \
+      --bash <($out/bin/deepsource completion bash) \
+      --fish <($out/bin/deepsource completion fish) \
+      --zsh <($out/bin/deepsource completion zsh)
+  '';
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
+  meta = {
+    description = "Command line interface to DeepSource, the code health platform";
+    mainProgram = "deepsource";
+    homepage = "https://github.com/DeepSourceCorp/cli";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ nipeharefa ];
+  };
+}

pkgs/by-name/ge/gepetto-viewer-corba/package.nix

@@ -14,14 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gepetto-viewer-corba";
-  version = "5.8.0";
-  pyproject = false; # CMake
+  version = "5.8.1";
 
   src = fetchFromGitHub {
     owner = "gepetto";
     repo = "gepetto-viewer-corba";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-/bpAs4ca/+QjWEGuHhuDT8Ts2Ggg+DZWETZfjho6E0w=";
+    hash = "sha256-C7xrODoKCcyLPZr0+zZSZ/o5i5EeNsxCPXp2WrP28A4=";
   };
 
   outputs = [
@@ -29,12 +28,6 @@ stdenv.mkDerivation (finalAttrs: {
     "doc"
   ];
 
-  postPatch = ''
-    substituteInPlace src/CMakeLists.txt \
-      --replace-fail "ARGUMENTS $" "ARGUMENTS -p${python3Packages.omniorbpy}/${python3Packages.python.sitePackages} $" \
-      --replace-fail '$'{CMAKE_SOURCE_DIR}/cmake '$'{JRL_CMAKE_MODULES}
-  '';
-
   buildInputs = [ libsForQt5.qtbase ];
 
   nativeBuildInputs = [

pkgs/by-name/ge/gepetto-viewer/package.nix

@@ -4,7 +4,6 @@
   darwin,
   doxygen,
   fetchFromGitHub,
-  fetchpatch,
   fontconfig,
   lib,
   jrl-cmakemodules,
@@ -21,28 +20,15 @@
 let
   gepetto-viewer = stdenv.mkDerivation (finalAttrs: {
     pname = "gepetto-viewer";
-    version = "5.1.0";
+    version = "5.2.0";
 
     src = fetchFromGitHub {
       owner = "gepetto";
       repo = "gepetto-viewer";
       rev = "v${finalAttrs.version}";
-      hash = "sha256-A2J3HidG+OHJO8LpLiOEvORxDtViTdeVD85AmKkkOg8=";
+      hash = "sha256-kAQPi7bO48H0CZKz1bxfkvMiNy8RsXvRvpDK0KF7XLM=";
     };
 
-    patches = [
-      # fix use of CMAKE_INSTALL_BINDIR for $bin output
-      (fetchpatch {
-        url = "https://github.com/Gepetto/gepetto-viewer/pull/230/commits/9b1b3a61da016934c3e766e6b491c1d6f3fc80d6.patch";
-        hash = "sha256-dpviEkOyCZpTYntZ4sCG1AvobljJphPQxg7gA6JxfWs=";
-      })
-      # fix use of CMAKE_INSTALL_FULL_INCLUDEDIR for $dev output
-      (fetchpatch {
-        url = "https://github.com/Gepetto/gepetto-viewer/pull/230/commits/4e1c2bbe063db20b605e51495e9f9eca40138cca.patch";
-        hash = "sha256-HrecvW1ulCSt9+DUaQVBOoDkilGRqU2+GUx7NUw7hqc=";
-      })
-    ];
-
     cmakeFlags = [
       (lib.cmakeBool "BUILD_PY_QCUSTOM_PLOT" (!stdenv.hostPlatform.isDarwin))
       (lib.cmakeBool "BUILD_PY_QGV" (!stdenv.hostPlatform.isDarwin))

pkgs/by-name/gn/gnome-maps/package.nix

@@ -5,7 +5,6 @@
   meson,
   ninja,
   gettext,
-  python3,
   pkg-config,
   gnome,
   glib,
@@ -75,8 +74,8 @@ stdenv.mkDerivation (finalAttrs: {
     # entry point to the wrapped binary we get back to a wrapped
     # binary.
     substituteInPlace "data/org.gnome.Maps.service.in" \
-        --replace "Exec=@pkgdatadir@/@app-id@" \
-                  "Exec=$out/bin/gnome-maps"
+      --replace-fail "Exec=@pkgdatadir@/@app-id@" \
+                     "Exec=$out/bin/gnome-maps"
   '';
 
   preCheck = ''
@@ -97,6 +96,12 @@ stdenv.mkDerivation (finalAttrs: {
     rm $out/lib/gnome-maps/libgnome-maps.so.0
   '';
 
+  preFixup = ''
+    substituteInPlace "$out/share/applications/org.gnome.Maps.desktop" \
+      --replace-fail "Exec=gapplication launch org.gnome.Maps" \
+                     "Exec=gnome-maps"
+  '';
+
   passthru = {
     updateScript = gnome.updateScript { packageName = "gnome-maps"; };
   };

pkgs/by-name/hy/hyprgui/package.nix

@@ -0,0 +1,52 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  pkg-config,
+  glib,
+  pango,
+  cairo,
+  gtk4,
+  wrapGAppsHook4,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "hyprgui";
+  version = "0.1.6";
+
+  src = fetchFromGitHub {
+    owner = "hyprutils";
+    repo = "hyprgui";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-n/poyVDBnMb4vw2YEymxxdjscGmu76qQ/BbS5BJOknM=";
+  };
+
+  cargoHash = "sha256-w+Bfjv7usyYfgTKW+KHqskNPco17QSjwn96cG/6yVoU=";
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    wrapGAppsHook4
+  ];
+  buildInputs = [
+    glib
+    cairo
+    pango
+    gtk4
+  ];
+
+  postInstall = ''
+    install -Dm644 -t $out/usr/share/icons hyprgui.png
+    install -Dm644 -t $out/usr/share/applications hyprgui.desktop
+  '';
+
+  meta = {
+    description = "GUI for configuring Hyprland written in Rust";
+    homepage = "https://github.com/hyprutils/hyprgui";
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ fccapria ];
+    badPlatforms = lib.platforms.darwin;
+    mainProgram = "hyprgui";
+  };
+}

pkgs/by-name/ke/keycastr/package.nix

@@ -6,11 +6,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "keycastr";
-  version = "0.9.18";
+  version = "0.10.1";
 
   src = fetchurl {
     url = "https://github.com/keycastr/keycastr/releases/download/v${finalAttrs.version}/KeyCastr.app.zip";
-    hash = "sha256-q12c/W0yGoVL+wx+T/gaevx2P0Xwcv0a0FMv7bKfUnE=";
+    hash = "sha256-Ea/QtYiM7J2Gc5T8M+WizSBrgmhJ+NW4ern2A58glUk=";
   };
 
   sourceRoot = ".";

pkgs/by-name/lm/lms/package.nix

@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lms";
-  version = "3.58.0";
+  version = "3.60.0";
 
   src = fetchFromGitHub {
     owner = "epoupon";
     repo = "lms";
     rev = "v${version}";
-    hash = "sha256-sWlD/n9Qjwiu/UfZrxRxwv2rc4XwRZN35fyjIriGZPY=";
+    hash = "sha256-sLs73356BaFbKtyQc4cTFm7Wp/UemH8J+tkajXAA0do=";
   };
 
   strictDeps = true;
@@ -54,10 +54,7 @@ stdenv.mkDerivation rec {
   ];
 
   postPatch = ''
-    substituteInPlace src/lms/main.cpp --replace-fail "/etc/lms.conf" "$out/share/lms/lms.conf"
-    substituteInPlace src/tools/recommendation/LmsRecommendation.cpp --replace-fail "/etc/lms.conf" "$out/share/lms/lms.conf"
-    substituteInPlace src/tools/db-generator/LmsDbGenerator.cpp --replace-fail "/etc/lms.conf" "$out/share/lms/lms.conf"
-    substituteInPlace src/tools/cover/LmsCover.cpp --replace-fail "/etc/lms.conf" "$out/share/lms/lms.conf"
+    substituteInPlace src/libs/core/include/core/SystemPaths.hpp --replace-fail "/etc" "$out/share/lms"
   '';
 
   postInstall = ''

pkgs/by-name/mu/mucommander/package.nix

@@ -1,24 +1,22 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, gradle_7
-, makeWrapper
-, jdk
-, gsettings-desktop-schemas
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  gradle,
+  makeWrapper,
+  jdk,
+  gsettings-desktop-schemas,
 }:
 
-let
-  gradle = gradle_7;
-in
 stdenv.mkDerivation (finalAttrs: {
   pname = "mucommander";
-  version = "1.3.0-1";
+  version = "1.5.2-1";
 
   src = fetchFromGitHub {
     owner = "mucommander";
     repo = "mucommander";
     rev = finalAttrs.version;
-    sha256 = "sha256-rSHHv96L2EHQuKBSAdpfi1XGP2u9o2y4g1+65FHWFMw=";
+    sha256 = "sha256-J1paBXlAGe2eKMg4wvaXTzMIiSMFIJ1XIAaKrfOwQLc=";
   };
 
   postPatch = ''
@@ -28,7 +26,10 @@ stdenv.mkDerivation (finalAttrs: {
       --replace "revision = git.head().id" "revision = '${finalAttrs.version}'"
   '';
 
-  nativeBuildInputs = [ gradle makeWrapper ];
+  nativeBuildInputs = [
+    gradle
+    makeWrapper
+  ];
 
   mitmCache = gradle.fetchDeps {
     inherit (finalAttrs) pname;

pkgs/by-name/mv/mvt/package.nix

@@ -0,0 +1,51 @@
+{
+  lib,
+  python3,
+  fetchFromGitHub,
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "mvt";
+  pyproject = true;
+  version = "2.5.4";
+
+  src = fetchFromGitHub {
+    owner = "mvt-project";
+    repo = "mvt";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-xDUjyvOsiweRqibTe7V8I/ABeaahCoR/d5w23qixp9A";
+  };
+
+  build-system = with python3.pkgs; [ setuptools ];
+
+  dependencies = with python3.pkgs; [
+    adb-shell
+    appdirs
+    click
+    cryptography
+    libusb1
+    iosbackup
+    packaging
+    pyahocorasick
+    pyyaml
+    requests
+    rich
+    simplejson
+    tld
+  ];
+
+  nativeCheckInputs = with python3.pkgs; [
+    pytestCheckHook
+    pytest-mock
+    stix2
+  ];
+
+  meta = {
+    description = "Tool to facilitate the consensual forensic analysis of Android and iOS devices";
+    homepage = "https://docs.mvt.re/en/latest/";
+    # https://github.com/mvt-project/mvt/blob/main/LICENSE
+    license = lib.licenses.unfree;
+    changelog = "https://github.com/mvt-project/mvt/releases/tag/v${version}";
+    maintainers = with lib.maintainers; [ PapayaJackal ];
+  };
+}

pkgs/by-name/sb/sby/package.nix

@@ -19,13 +19,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "sby";
-  version = "0.45";
+  version = "0.46";
 
   src = fetchFromGitHub {
     owner = "YosysHQ";
     repo = "sby";
     rev = "yosys-${version}";
-    hash = "sha256-HRQ5ZL0w3GLUySTFekE/T/VlxJLFIQQr0bW8l7rp/zs=";
+    hash = "sha256-LVfHSVMrAKImD1y6icQSSfOSt9khZfOKK+lXhxdvRb4=";
   };
 
   nativeBuildInputs = [ bash ];

pkgs/by-name/sk/sketchybar/package.nix

@@ -1,26 +1,14 @@
 {
   lib,
-  overrideSDK,
   stdenv,
-  darwin,
   fetchFromGitHub,
-  testers,
   nix-update-script,
+  apple-sdk_15,
+  versionCheckHook,
 }:
 
 let
   inherit (stdenv.hostPlatform) system;
-  inherit (darwin.apple_sdk_11_0.frameworks)
-    AppKit
-    Carbon
-    CoreAudio
-    CoreWLAN
-    CoreVideo
-    DisplayServices
-    IOKit
-    MediaRemote
-    SkyLight
-    ;
 
   target =
     {
@@ -28,10 +16,8 @@ let
       "x86_64-darwin" = "x86";
     }
     .${system} or (throw "Unsupported system: ${system}");
-
-  stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
 in
-stdenv'.mkDerivation (finalAttrs: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "sketchybar";
   version = "2.21.0";
 
@@ -43,15 +29,7 @@ stdenv'.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    AppKit
-    Carbon
-    CoreAudio
-    CoreWLAN
-    CoreVideo
-    DisplayServices
-    IOKit
-    MediaRemote
-    SkyLight
+    apple-sdk_15
   ];
 
   makeFlags = [ target ];
@@ -65,14 +43,11 @@ stdenv'.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  passthru = {
-    tests.version = testers.testVersion {
-      package = finalAttrs.finalPackage;
-      version = "sketchybar-v${finalAttrs.version}";
-    };
+  passthru.updateScript = nix-update-script { };
 
-    updateScript = nix-update-script { };
-  };
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
 
   meta = {
     description = "Highly customizable macOS status bar replacement";

pkgs/by-name/to/toot/package.nix

@@ -0,0 +1,57 @@
+{
+  lib,
+  fetchFromGitHub,
+  python3Packages,
+  nixosTests,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "toot";
+  version = "0.45.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "ihabunek";
+    repo = "toot";
+    rev = "refs/tags/${version}";
+    hash = "sha256-xBpqB81LSOq+eGVwEL6fAxBR8UXCduf5syzCdwydW4Q=";
+  };
+
+  nativeCheckInputs = with python3Packages; [ pytest ];
+
+  build-system = with python3Packages; [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = with python3Packages; [
+    requests
+    beautifulsoup4
+    wcwidth
+    urwid
+    urwidgets
+    tomlkit
+    click
+    pillow
+    term-image
+  ];
+
+  checkPhase = ''
+    runHook preCheck
+    py.test
+    runHook postCheck
+  '';
+
+  passthru.tests.toot = nixosTests.pleroma;
+
+  meta = {
+    description = "Mastodon CLI interface";
+    mainProgram = "toot";
+    homepage = "https://github.com/ihabunek/toot";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
+      matthiasbeyer
+      aleksana
+    ];
+  };
+}

pkgs/by-name/ue/uesave/package.nix

@@ -0,0 +1,32 @@
+{
+  fetchFromGitHub,
+  lib,
+  rustPlatform,
+  versionCheckHook,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "uesave";
+  version = "0.5.0";
+  src = fetchFromGitHub {
+    owner = "trumank";
+    repo = "uesave-rs";
+    rev = "v${version}";
+    hash = "sha256-9gOOSLejVfR1KJMhcNuKDkuTOvPC6sNG8xQOZlt8NxI=";
+  };
+
+  cargoHash = "sha256-U6RzSS2j6FK70OHlmWmHZZYT3UB0+Hi+uLofLy+XtGQ=";
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+  versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
+
+  meta = {
+    maintainers = with lib.maintainers; [ xddxdd ];
+    description = "Reading and writing Unreal Engine save files (commonly referred to as GVAS)";
+    homepage = "https://github.com/trumank/uesave-rs";
+    license = lib.licenses.mit;
+    mainProgram = "uesave";
+  };
+}

pkgs/development/compilers/reason/default.nix

@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "ocaml${ocaml.version}-reason";
-  version = "3.12.0";
+  version = "3.13.0";
 
   src = fetchurl {
     url = "https://github.com/reasonml/reason/releases/download/${version}/reason-${version}.tbz";
-    hash = "sha256-Y9lQr/viA3AaPUwHaidQtWIRuucBfNj1naUI77CaGv4=";
+    hash = "sha256-3yVEYGvIJKZwguIBGCbnoc3nrwzLW6RX6Tf+AYw85+Q=";
   };
 
   strictDeps = true;

pkgs/development/libraries/openvino/default.nix

@@ -18,6 +18,7 @@
 
 # runtime
 , flatbuffers
+, gflags
 , level-zero
 , libusb1
 , libxml2
@@ -48,6 +49,7 @@ let
 
   python = python3Packages.python.withPackages (ps: with ps; [
     cython
+    distutils
     pybind11
     setuptools
     sphinx
@@ -58,14 +60,14 @@ in
 
 stdenv.mkDerivation rec {
   pname = "openvino";
-  version = "2024.2.0";
+  version = "2024.4.1";
 
   src = fetchFromGitHub {
     owner = "openvinotoolkit";
     repo = "openvino";
     rev = "refs/tags/${version}";
     fetchSubmodules = true;
-    hash = "sha256-HiKKvmqgbwW625An+Su0EOHqVrP18yvG2aOzrS0jWr4=";
+    hash = "sha256-v0PPGFUHCGNWdlTff40Ol2NvaYglb/+L/zZAQujk6lk=";
   };
 
   outputs = [
@@ -117,6 +119,7 @@ stdenv.mkDerivation rec {
 
     # features
     (cmakeBool "ENABLE_INTEL_CPU" stdenv.hostPlatform.isx86_64)
+    (cmakeBool "ENABLE_INTEL_NPU" false) # undefined reference to `std::ios_base_library_init()@GLIBCXX_3.4.32'
     (cmakeBool "ENABLE_JS" false)
     (cmakeBool "ENABLE_LTO" true)
     (cmakeBool "ENABLE_ONEDNN_FOR_GPU" false)
@@ -138,6 +141,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     flatbuffers
+    gflags
     level-zero
     libusb1
     libxml2

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

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "atom";
-  version = "0.10.5";
+  version = "0.11.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "nucleic";
     repo = "atom";
     rev = "refs/tags/${version}";
-    hash = "sha256-wRVmCyqMwDs1thnRXYH6z1a/qCubw8CVUhaEMqLtiSM=";
+    hash = "sha256-3Xk4CM8Cnkc0lIdjJUYs/6UTqqpPALrUa3DpKD40og8=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];

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

@@ -0,0 +1,36 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  nskeyedunarchiver,
+  pycrypto,
+}:
+
+buildPythonPackage rec {
+  pname = "iosbackup";
+  version = "0.9.925";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit version;
+    pname = "iOSbackup";
+    hash = "sha256-M1Rakknls/qq3x7ngv5r3823D64N77oazuM2pl+T0co=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    pycrypto
+    nskeyedunarchiver
+  ];
+
+  pythonImportsCheck = [ "iOSbackup" ];
+
+  meta = {
+    description = "Reads and extracts files from password-encrypted iOS backups";
+    homepage = "https://github.com/avibrazil/iOSbackup";
+    license = lib.licenses.lgpl2Only;
+    maintainers = with lib.maintainers; [ PapayaJackal ];
+  };
+}

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

@@ -6,6 +6,7 @@
   fetchFromGitHub,
   darwin,
   libiconv,
+  openssl,
   pkg-config,
   protobuf,
   attrs,
@@ -28,14 +29,14 @@
 
 buildPythonPackage rec {
   pname = "lancedb";
-  version = "0.13.0";
+  version = "0.14.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lancedb";
     repo = "lancedb";
     rev = "refs/tags/python-v${version}";
-    hash = "sha256-6E20WgyoEALdxmiOfgq89dCkqovvIMzc/wy+kvjDWwU=";
+    hash = "sha256-lw2tZ26Py6JUxuetaokJKnxOv/WoLK4spxssLKxvxJA=";
   };
 
   buildAndTestSubdir = "python";
@@ -50,13 +51,14 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [
     pkg-config
+    protobuf
     rustPlatform.cargoSetupHook
   ];
 
   buildInputs =
     [
       libiconv
-      protobuf
+      openssl
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin (
       with darwin.apple_sdk.frameworks;
@@ -96,14 +98,21 @@ buildPythonPackage rec {
 
   pytestFlagsArray = [ "-m 'not slow'" ];
 
-  disabledTests = [
-    # require tantivy which is not packaged in nixpkgs
-    "test_basic"
+  disabledTests =
+    [
+      # require tantivy which is not packaged in nixpkgs
+      "test_basic"
 
-    # polars.exceptions.ComputeError: TypeError: _scan_pyarrow_dataset_impl() got multiple values for argument 'batch_size'
-    # https://github.com/lancedb/lancedb/issues/1539
-    "test_polars"
-  ];
+      # polars.exceptions.ComputeError: TypeError: _scan_pyarrow_dataset_impl() got multiple values for argument 'batch_size'
+      # https://github.com/lancedb/lancedb/issues/1539
+      "test_polars"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      # fail with darwin sandbox
+      "test_async_remote_db"
+      "test_http_error"
+      "test_retry_error"
+    ];
 
   disabledTestPaths = [
     # touch the network

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

@@ -6,7 +6,9 @@
   protobuf,
   pycryptodomex,
   pyogg,
+  pythonOlder,
   requests,
+  setuptools,
   websocket-client,
   zeroconf,
 }:
@@ -14,7 +16,9 @@
 buildPythonPackage rec {
   pname = "librespot";
   version = "0.0.9";
-  format = "setuptools";
+  pyproject = true;
+
+  disabled = pythonOlder "3.10";
 
   src = fetchFromGitHub {
     owner = "kokarare1212";
@@ -23,10 +27,13 @@ buildPythonPackage rec {
     hash = "sha256-k9qVsxjRlUZ7vCBx00quiAR7S+YkfyoZiAKVnOOG4xM=";
   };
 
+  env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python";
+
   pythonRelaxDeps = true;
 
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     defusedxml
     protobuf
     pycryptodomex

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

@@ -0,0 +1,45 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytestCheckHook,
+  setuptools,
+  flask,
+  flask-httpauth,
+  pytz,
+  six,
+  pymongo,
+}:
+
+buildPythonPackage rec {
+  pname = "medallion";
+  version = "3.0.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "oasis-open";
+    repo = "cti-taxii-server";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-+fWifWi/XR6MSOLhWXn2CFpItVdkOpzQItlrZkjapAk=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    flask
+    flask-httpauth
+    pymongo
+    pytz
+    six
+  ];
+
+  pythonImportsCheck = [ "medallion" ];
+
+  meta = with lib; {
+    description = "Minimal implementation of a TAXII 2.1 Server in Python";
+    homepage = "https://medallion.readthedocs.io/en/latest/";
+    changelog = "https://github.com/oasis-open/cti-taxii-server/blob/v${version}/CHANGES.txt";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ PapayaJackal ];
+  };
+}

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

@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
 
@@ -47,6 +48,13 @@ buildPythonPackage rec {
     pytz
   ];
 
+  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
+    # cannot access /usr/bin/pgrep from the sandbox
+    "test_stop_standing_subproc"
+    "test_stop_standing_subproc_and_descendants"
+    "test_stop_standing_subproc_without_pipe"
+  ];
+
   __darwinAllowLocalNetworking = true;
 
   meta = with lib; {

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

@@ -0,0 +1,29 @@
+{
+  buildPythonPackage,
+  fetchPypi,
+  lib,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "nskeyedunarchiver";
+  version = "1.2";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit version;
+    pname = "NSKeyedUnArchiver";
+    hash = "sha256-OZWPGH8ggYYKxeg6CGyft6ZM9Yx/43z7YylzXlQcTVg=";
+  };
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "NSKeyedUnArchiver" ];
+
+  meta = {
+    description = "Unserializes plist data into a usable Python dict";
+    homepage = "https://github.com/avibrazil/NSKeyedUnArchiver";
+    license = lib.licenses.bsdOriginal;
+    maintainers = with lib.maintainers; [ PapayaJackal ];
+  };
+}

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

@@ -35,14 +35,14 @@
 
 buildPythonPackage rec {
   pname = "pylance";
-  version = "0.17.0";
+  version = "0.18.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lancedb";
     repo = "lance";
     rev = "refs/tags/v${version}";
-    hash = "sha256-E+29CbVNbzmrQnBZt0860IvL4xYZqzE+uzSuKDwgxzg=";
+    hash = "sha256-CIIZbeRrraTqWronkspDpBVP/Z4JVoaiS5iBIXfsZGg=";
   };
 
   buildAndTestSubdir = "python";

pkgs/development/python-modules/rich-argparse/default.nix

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "rich-argparse";
-  version = "1.5.2";
+  version = "1.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "hamdanal";
     repo = "rich-argparse";
     rev = "refs/tags/v${version}";
-    hash = "sha256-kHGNjVx3d+JSsN/BpNua2rGD5S5sBfJvh1NyqQnziBI=";
+    hash = "sha256-ae++npgZ8jZazwARwlPw73uhpQ8IT+7OekNl2vfu4Z0=";
   };
 
   build-system = [ hatchling ];
@@ -28,11 +28,6 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  disabledTests = [
-    # https://github.com/hamdanal/rich-argparse/issues/133
-    "test_help_preview_generation"
-  ];
-
   pythonImportsCheck = [ "rich_argparse" ];
 
   meta = with lib; {

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

@@ -4,6 +4,7 @@
   cargo,
   rustPlatform,
   rustc,
+  setuptools,
   setuptools-rust,
   numpy,
   fixtures,
@@ -12,40 +13,50 @@
   libiconv,
   stdenv,
   lib,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "rustworkx";
-  version = "0.14.2";
-  format = "setuptools";
+  version = "0.15.1";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Qiskit";
-    repo = pname;
+    repo = "rustworkx";
     rev = version;
-    hash = "sha256-gck5X6J4Yg5it/YCBsk/yZ5qXg/iwCEbyDIKfBTRxHM=";
+    hash = "sha256-0WYgShihTBM0e+MIhON0dnhZug6l280tZcVp3KF1Jq0=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
-    hash = "sha256-FNCa5pshcnsYpjlz6yDITe2k0cHLTybj3rF34qrsRVU=";
+    hash = "sha256-AgHfCKLna30WERAFGEs8yRxxZHwvLzR+/S+ivwKHXXE=";
   };
 
   nativeBuildInputs = [
-    setuptools-rust
     rustPlatform.cargoSetupHook
     cargo
     rustc
   ];
 
+  build-system = [
+    setuptools
+    setuptools-rust
+  ];
+
   buildInputs = [ numpy ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
 
-  checkInputs = [
+  nativeCheckInputs = [
     fixtures
     networkx
+    pytestCheckHook
     testtools
   ];
 
+  preCheck = ''
+    rm -r rustworkx
+  '';
+
   pythonImportsCheck = [ "rustworkx" ];
 
   meta = with lib; {

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

@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "signxml";
-  version = "3.2.2";
+  version = "4.0.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -22,12 +22,12 @@ buildPythonPackage rec {
     owner = "XML-Security";
     repo = "signxml";
     rev = "refs/tags/v${version}";
-    hash = "sha256-TlOIHYvx1o46nr/3qq45pgeOqmuyWaaTGvOS0Jwz1zs=";
+    hash = "sha256-ZpboU0N8dD03yHSboMpC+TJvp16StM45Qhn0Hv9+6fg=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     certifi
     cryptography
     lxml

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

@@ -0,0 +1,62 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytestCheckHook,
+  setuptools,
+  haversine,
+  medallion,
+  pytz,
+  rapidfuzz,
+  requests,
+  simplejson,
+  stix2-patterns,
+  taxii2-client,
+}:
+
+buildPythonPackage rec {
+  pname = "stix2";
+  version = "3.0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "oasis-open";
+    repo = "cti-python-stix2";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-1bILZUZgPOWmFWRu4p/fmgi4QPEE1lFQH9mxoWd/saI=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    pytz
+    requests
+    simplejson
+    stix2-patterns
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    haversine
+    medallion
+    rapidfuzz
+    taxii2-client
+  ];
+
+  disabledTests = [
+    # flaky tests
+    "test_graph_equivalence_with_filesystem_source"
+    "test_graph_similarity_with_filesystem_source"
+    "test_object_similarity_prop_scores"
+  ];
+
+  pythonImportsCheck = [ "stix2" ];
+
+  meta = with lib; {
+    description = "Produce and consume STIX 2 JSON content";
+    homepage = "https://stix2.readthedocs.io/en/latest/";
+    changelog = "https://github.com/oasis-open/cti-python-stix2/blob/v${version}/CHANGELOG";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ PapayaJackal ];
+  };
+}

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

@@ -4,21 +4,24 @@
   fetchFromGitHub,
   pyperclip,
   urwid,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "upass";
-  version = "0.2.1";
-  format = "setuptools";
+  version = "0.3.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Kwpolska";
     repo = "upass";
     rev = "v${version}";
-    sha256 = "0bgplq07dmlld3lp6jag1w055glqislfgwwq2k7cb2bzjgvysdnj";
+    hash = "sha256-IlNqPmDaRZ3yRV8O6YKjQkZ3fKNcFgzJHtIX0ADrOyU=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     pyperclip
     urwid
   ];

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

@@ -2,32 +2,35 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  isPy3k,
   setuptools,
   lazr-uri,
 }:
 
 buildPythonPackage rec {
   pname = "wadllib";
-  version = "1.3.9";
-  format = "setuptools";
+  version = "2.0.0";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-wL4oM4myKP/ZPNru+44HDyLd98tcd+SMaMOWD98lmEQ=";
+    hash = "sha256-HtuvI+T6NP6nDJs4C6oqE5sQhq5InrzMxLO2X8lzdCc=";
   };
 
-  propagatedBuildInputs = [
-    setuptools
+  build-system = [ setuptools ];
+
+  dependencies = [
     lazr-uri
   ];
 
-  doCheck = isPy3k;
+  pythonImportsCheck = [ "wadllib" ];
+
+  # pypi tarball has no tests
+  doCheck = false;
 
   meta = with lib; {
     description = "Navigate HTTP resources using WADL files as guides";
     homepage = "https://launchpad.net/wadllib";
-    license = licenses.lgpl3;
+    license = licenses.lgpl3Only;
     maintainers = [ ];
   };
 }

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

@@ -5,6 +5,7 @@
   pythonOlder,
   fetchFromGitHub,
   which,
+  setuptools,
   # runtime dependencies
   numpy,
   torch,
@@ -29,25 +30,27 @@
 }:
 let
   inherit (torch) cudaCapabilities cudaPackages cudaSupport;
-  version = "0.0.23.post1";
+  version = "0.0.28.post3";
 in
 buildPythonPackage {
   pname = "xformers";
   inherit version;
-  format = "setuptools";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "facebookresearch";
     repo = "xformers";
     rev = "refs/tags/v${version}";
-    hash = "sha256-AJXow8MmX4GxtEE2jJJ/ZIBr+3i+uS4cA6vofb390rY=";
+    hash = "sha256-23tnhCHK+Z0No8fqZxkgDFp2VIgXZR4jpM+pkb/vvmw=";
     fetchSubmodules = true;
   };
 
   patches = [ ./0001-fix-allow-building-without-git.patch ];
 
+  build-system = [ setuptools ];
+
   preBuild = ''
     cat << EOF > ./xformers/version.py
     # noqa: C801
@@ -81,7 +84,7 @@ buildPythonPackage {
     which
   ] ++ lib.optionals cudaSupport (with cudaPackages; [ cuda_nvcc ]);
 
-  propagatedBuildInputs = [
+  dependencies = [
     numpy
     torch
   ];
@@ -115,7 +118,7 @@ buildPythonPackage {
   ];
 
   meta = with lib; {
-    description = "XFormers: A collection of composable Transformer building blocks";
+    description = "Collection of composable Transformer building blocks";
     homepage = "https://github.com/facebookresearch/xformers";
     changelog = "https://github.com/facebookresearch/xformers/blob/${version}/CHANGELOG.md";
     license = licenses.bsd3;

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

@@ -5,28 +5,33 @@
   gevent,
   python,
   pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "yappi";
-  version = "1.6.3";
-  format = "setuptools";
+  version = "1.6.4";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "sumerc";
-    repo = pname;
+    repo = "yappi";
     rev = "refs/tags/${version}";
-    hash = "sha256-nkkm50/94iVYZdUBm7DZkNQsBqddO6unjP29ctf7dxo=";
+    hash = "sha256-3lGbFDu7sk83KrSHo6qZxHT2dxPWtT8yfXXQO1GbteU=";
   };
 
   patches = [ ./tests.patch ];
 
+  build-system = [ setuptools ];
+
   nativeCheckInputs = [ gevent ];
 
   checkPhase = ''
+    runHook preCheck
     ${python.interpreter} run_tests.py
+    runHook postCheck
   '';
 
   pythonImportsCheck = [ "yappi" ];

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

@@ -5,10 +5,10 @@
   fetchFromGitHub,
   pytestCheckHook,
   libxcrypt,
-  pythonOlder,
   gtest,
   pybind11,
   nlohmann_json,
+  setuptools,
 }:
 
 let
@@ -21,16 +21,14 @@ let
 in
 buildPythonPackage rec {
   pname = "yaramod";
-  version = "4.0.0";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
+  version = "4.0.1";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "avast";
-    repo = pname;
+    repo = "yaramod";
     rev = "refs/tags/v${version}";
-    hash = "sha256-YbsNFtDk5u5UyTsS1aGKUv/HWYxEwERinZ3G84/mC9o=";
+    hash = "sha256-EkGG3J84mTFnor1YX9B1TyjvW6mCCF/AH904DaVX+VU=";
   };
 
   postPatch = ''
@@ -48,12 +46,16 @@ buildPythonPackage rec {
   nativeBuildInputs = [
     cmake
     pog
-    gtest
   ];
 
-  setupPyBuildFlags = [ "--with-unit-tests" ];
+  build-system = [ setuptools ];
 
-  checkInputs = [ pytestCheckHook ];
+  env.ENV_YARAMOD_BUILD_WITH_UNIT_TESTS = true;
+
+  nativeCheckInputs = [
+    gtest
+    pytestCheckHook
+  ];
 
   pytestFlagsArray = [ "tests/" ];
 

pkgs/development/python-modules/zipstream-ng/default.nix

@@ -4,12 +4,13 @@
   fetchFromGitHub,
   pytestCheckHook,
   pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "zipstream-ng";
-  version = "1.7.1";
-  format = "setuptools";
+  version = "1.8.0";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -17,9 +18,11 @@ buildPythonPackage rec {
     owner = "pR0Ps";
     repo = "zipstream-ng";
     rev = "refs/tags/v${version}";
-    hash = "sha256-BYQse+DlyLUH9CofRfGrPUZjP7E8AP/wpirvJmSRfow=";
+    hash = "sha256-mmPxzml+gaVg2IQ/Gql+3ru0hHosbyX4WjLCMxD/MJw=";
   };
 
+  build-system = [ setuptools ];
+
   pythonImportsCheck = [ "zipstream" ];
 
   nativeCheckInputs = [ pytestCheckHook ];

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

@@ -3,25 +3,41 @@
   buildPythonPackage,
   pythonOlder,
   fetchPypi,
+  setuptools,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "zodbpickle";
-  version = "4.1";
-  format = "setuptools";
+  version = "4.1.1";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-esg1awxi3HQA+b0mUyX2Fe7LJPFDWFnB4utEQ1ivt1c=";
+    hash = "sha256-38DJFe8Umd0GA5cPXBECxr1+t7asRkNLKabYQL8Cckg=";
   };
 
-  # fails..
-  doCheck = false;
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace "setuptools<74" "setuptools"
+  '';
+
+  build-system = [ setuptools ];
 
   pythonImportsCheck = [ "zodbpickle" ];
 
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  # fails..
+  disabledTests = [
+    "test_dump"
+    "test_dumps"
+    "test_load"
+    "test_loads"
+  ];
+
   meta = with lib; {
     description = "Fork of Python's pickle module to work with ZODB";
     homepage = "https://github.com/zopefoundation/zodbpickle";

pkgs/development/tools/bazel-watcher/default.nix

@@ -4,6 +4,7 @@
   buildGoModule,
   testers,
   bazel-watcher,
+  stdenv,
 }:
 
 buildGoModule rec {
@@ -19,7 +20,8 @@ buildGoModule rec {
 
   vendorHash = "sha256-0I/bvuyosN55oNSMuom4C8rVjxneUaqV19l9OMiwWhU=";
 
-  CGO_ENABLED = "0";
+  # The dependency github.com/fsnotify/fsevents requires CGO
+  CGO_ENABLED = if stdenv.hostPlatform.isDarwin then "1" else "0";
   ldflags = [
     "-s"
     "-X main.Version=${version}"
@@ -28,7 +30,10 @@ buildGoModule rec {
   subPackages = [ "cmd/ibazel" ];
 
   passthru = {
-    tests.version = testers.testVersion { package = bazel-watcher; };
+    tests.version = testers.testVersion {
+      package = bazel-watcher;
+      command = "ibazel version";
+    };
   };
 
   meta = with lib; {

pkgs/os-specific/linux/vendor-reset/default.nix

@@ -2,24 +2,15 @@
 
 stdenv.mkDerivation rec {
   pname = "vendor-reset";
-  version = "unstable-2021-02-16-${kernel.version}";
+  version = "unstable-2024-04-16-${kernel.version}";
 
   src = fetchFromGitHub {
     owner = "gnif";
     repo = "vendor-reset";
-    rev = "225a49a40941e350899e456366265cf82b87ad25";
-    sha256 = "sha256-xa7P7+mRk4FVgi+YYCcsFLfyNqPmXvy3xhGoTDVqPxw=";
+    rev = "084881c6e9e11bdadaf05798e669568848e698a3";
+    hash = "sha256-Klu2uysbF5tH7SqVl815DwR7W+Vx6PyVDDLwoMZiqBI=";
   };
 
-  patches = [
-    # Fix build with Linux 5.18.
-    # https://github.com/gnif/vendor-reset/pull/58
-    (fetchpatch {
-      url = "https://github.com/gnif/vendor-reset/commit/5bbffcd6fee5348e8808bdbfcb5b21d455b02f55.patch";
-      sha256 = "sha256-L1QxVpcZAVYiaMFCBfL2EJgeMyOR8sDa1UqF1QB3bns=";
-    })
-  ];
-
   nativeBuildInputs = kernel.moduleBuildDependencies;
 
   hardeningDisable = [ "pic" ];

pkgs/servers/authelia/sources.nix

@@ -1,14 +1,14 @@
 { fetchFromGitHub }:
 rec {
   pname = "authelia";
-  version = "4.38.15";
+  version = "4.38.17";
 
   src = fetchFromGitHub {
     owner = "authelia";
     repo = "authelia";
     rev = "v${version}";
-    hash = "sha256-brgA485sst/jXjdhKrhQilreCYBhESro9j/63g8qQg4=";
+    hash = "sha256-JymfNe7Xoa2Hh219GtBjlyaGK+Jn8XWqrTnkY8377Ro=";
   };
-  vendorHash = "sha256-kSuIyL+6ue8voTzHTfnAYr9q4hUzIv/lkRopGSFaLv8=";
-  pnpmDepsHash = "sha256-fufxoAL0z6bhRnBI4Gu61hBeUnyFYROmfResHJforfE=";
+  vendorHash = "sha256-q38jSX7jZO3Y4gn7dxq4NYLEfCUWVcUwmNfqT52AU/M=";
+  pnpmDepsHash = "sha256-jih+mFZKKOBUH0f2zzKN49VV6iUbMhVImFDWFYaZWWI=";
 }

pkgs/servers/zoneminder/default.nix

@@ -57,13 +57,13 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "zoneminder";
-  version = "1.36.34";
+  version = "1.36.35";
 
   src = fetchFromGitHub {
     owner  = "ZoneMinder";
     repo   = "zoneminder";
     rev    = version;
-    hash = "sha256-ClO1f0Aspz04C8wgQurtHWmwzu2f4RZ/1oGjPN8HQrw=";
+    hash = "sha256-0mpT3qjF8zlcsd6OlNIvrabDsz+oJPPy9Vn2TQSuHAI=";
     fetchSubmodules = true;
   };
 

pkgs/tools/admin/aws-rotate-key/default.nix

@@ -2,21 +2,22 @@
 
 buildGoModule rec {
   pname = "aws-rotate-key";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "Fullscreen";
     repo = "aws-rotate-key";
     rev = "v${version}";
-    sha256 = "sha256-PZ7+GC4P4bkT+DWOhW70KkhUCUjn4gIG+OKoOBSc/8c=";
+    sha256 = "sha256-fYpgHHOw0k/8WLGhq+uVOvoF4Wff6wzTXuN8r4D+TmU=";
   };
 
-  vendorHash = "sha256-Asfbv7avT+L8/WNQ6NS7gFcjA9MiTCu5PzsuA/PT6/k=";
+  vendorHash = "sha256-gXtTd7lU9m9rO1w7Fx8o/s45j63h6GtUZrjOzFI4Q/o=";
 
   ldflags = [ "-s" "-w" ];
 
   passthru.tests.version = testers.testVersion {
     package = aws-rotate-key;
+    command = "AWS_SHARED_CREDENTIALS_FILE=/dev/null aws-rotate-key --version";
   };
 
   meta = with lib; {

pkgs/tools/misc/glasgow/default.nix

@@ -10,7 +10,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "glasgow";
-  version = "0-unstable-2024-09-10";
+  version = "0-unstable-2024-10-24";
   # from `pdm show`
   realVersion = let
       tag = builtins.elemAt (lib.splitString "-" version) 0;
@@ -22,8 +22,8 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "GlasgowEmbedded";
     repo = "glasgow";
-    rev = "f2c0ecbe0d47d96f940e77f9def209e9c57d3962";
-    sha256 = "sha256-aNzNh/YkWjnHiO+QWbJu2Y3kL/53kDvVn/8Ncz2kpFI=";
+    rev = "3d7a14165f9f5179bcd2a2a119ab4bbf9d81326c";
+    sha256 = "sha256-fhT5xRq4VE8lOTJI470E2PPTSPSUHh90S17MdilFWAA=";
   };
 
   nativeBuildInputs = [
@@ -51,6 +51,8 @@ python3.pkgs.buildPythonApplication rec {
 
   enableParallelBuilding = true;
 
+  __darwinAllowLocalNetworking = true;
+
   preBuild = ''
     make -C firmware LIBFX2=${python3.pkgs.fx2}/share/libfx2
     cp firmware/glasgow.ihex software/glasgow

pkgs/tools/system/zx/default.nix

@@ -8,16 +8,16 @@
 
 buildNpmPackage rec {
   pname = "zx";
-  version = "8.1.9";
+  version = "8.2.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "zx";
     rev = version;
-    hash = "sha256-vy53g6nG/krK1PsfIKEdok67ghf9Jm2xNMmZpU2N+A0=";
+    hash = "sha256-tu5arRnbIVEVkmLBrutW8rNIHN3joA87AYyO+Smmcug=";
   };
 
-  npmDepsHash = "sha256-bKckzwvJNWDYkF1ZBwB9RpzJAVTIoAjoKK8D3V8RHmQ=";
+  npmDepsHash = "sha256-TEVEa0hvSRFp1ju1Ajer4u7mdf4y/N3ged8wuXzyy8A=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;

pkgs/top-level/all-packages.nix

@@ -2756,8 +2756,6 @@ with pkgs;
     boost = boost185;
   };
 
-  mucommander = callPackage ../applications/file-managers/mucommander { };
-
   nnn = callPackage ../applications/file-managers/nnn { };
 
   noice = callPackage ../applications/file-managers/noice { };
@@ -32727,8 +32725,6 @@ with pkgs;
 
   tony = libsForQt5.callPackage ../applications/audio/tony { };
 
-  toot = callPackage ../applications/misc/toot { };
-
   toipe = callPackage ../applications/misc/toipe { };
 
   toxiproxy = callPackage ../development/tools/toxiproxy { };

pkgs/top-level/python-packages.nix

@@ -6237,6 +6237,8 @@ self: super: with self; {
 
   iopath = callPackage ../development/python-modules/iopath { };
 
+  iosbackup = callPackage ../development/python-modules/iosbackup { };
+
   iotawattpy = callPackage ../development/python-modules/iotawattpy { };
 
   iottycloud = callPackage ../development/python-modules/iottycloud { };
@@ -6905,7 +6907,9 @@ self: super: with self; {
     inherit (pkgs) lammps;
   };
 
-  lancedb = callPackage ../development/python-modules/lancedb { };
+  lancedb = callPackage ../development/python-modules/lancedb {
+    inherit (pkgs) protobuf;
+  };
 
   langchain = callPackage ../development/python-modules/langchain { };
 
@@ -7845,6 +7849,8 @@ self: super: with self; {
 
   mechanize = callPackage ../development/python-modules/mechanize { };
 
+  medallion = callPackage ../development/python-modules/medallion { };
+
   mediafile = callPackage ../development/python-modules/mediafile { };
 
   mediafire-dl = callPackage ../development/python-modules/mediafire-dl { };
@@ -9131,6 +9137,8 @@ self: super: with self; {
 
   nsapi = callPackage ../development/python-modules/nsapi { };
 
+  nskeyedunarchiver = callPackage ../development/python-modules/nskeyedunarchiver { };
+
   ntc-templates = callPackage ../development/python-modules/ntc-templates { };
 
   ntplib = callPackage ../development/python-modules/ntplib { };
@@ -15151,6 +15159,8 @@ self: super: with self; {
 
   stim = callPackage ../development/python-modules/stim { };
 
+  stix2 = callPackage ../development/python-modules/stix2 { };
+
   stix2-patterns = callPackage ../development/python-modules/stix2-patterns { };
 
   stix2-validator = callPackage ../development/python-modules/stix2-validator { };