Merge staging-next into staging

maintainers/maintainer-list.nix

@@ -23838,6 +23838,12 @@
     githubId = 2212422;
     name = "uwap";
   };
+  uxodb = {
+    name = "uxodb";
+    matrix = "@uxodb:matrix.org";
+    github = "uxodb";
+    githubId = 20535246;
+  };
   V = {
     name = "V";
     email = "v@anomalous.eu";

nixos/modules/programs/ssh.nix

@@ -13,7 +13,7 @@ let
 
   askPasswordWrapper = pkgs.writeScript "ssh-askpass-wrapper" ''
     #! ${pkgs.runtimeShell} -e
-    eval export $(systemctl --user show-environment | ${pkgs.coreutils}/bin/grep -E '^(DISPLAY|WAYLAND_DISPLAY|XAUTHORITY)=')
+    eval export $(systemctl --user show-environment | ${lib.getExe pkgs.gnugrep} -E '^(DISPLAY|WAYLAND_DISPLAY|XAUTHORITY)=')
     exec ${cfg.askPassword} "$@"
   '';
 

pkgs/applications/office/scribus/default.nix

@@ -32,11 +32,11 @@ in
 stdenv.mkDerivation (finalAttrs: {
   pname = "scribus";
 
-  version = "1.6.2";
+  version = "1.6.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/scribus/scribus-devel/scribus-${finalAttrs.version}.tar.xz";
-    hash = "sha256-fv+bH0fjcuVrs2nx2+GP5JEBeJtea8/beJDgNGtkE4M=";
+    hash = "sha256-CuWM7UEBAegmVeO0wgoHDPF2cUWtojPc73wguLpr1Ic=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/ap/api-linter/package.nix

@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "api-linter";
-  version = "1.67.6";
+  version = "1.68.0";
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "api-linter";
     rev = "v${version}";
-    hash = "sha256-Dp5bZu9/wqrBZuups69P/SxK6RAKLSPqYt3TXdxMQss=";
+    hash = "sha256-pYzdI7bcAPP47K4EKjsAV7UY2RLGX9m3tksYRZeGdTQ=";
   };
 
-  vendorHash = "sha256-RPw8SPfs/M5ycPxB7eM2BmSYU0kKp/4drBvju0u+eoM=";
+  vendorHash = "sha256-vdoEMMlFwS+BBd0EsrahVL3ZZE4PHQJP4CNwsqIo5Y8=";
 
   subPackages = [ "cmd/api-linter" ];
 

pkgs/by-name/ca/cargo-expand/package.nix

@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-expand";
-  version = "1.0.96";
+  version = "1.0.100";
 
   src = fetchFromGitHub {
     owner = "dtolnay";
     repo = pname;
     rev = version;
-    hash = "sha256-uLJ7XD1m4KreIue+p6Duoa8+DYjhaHagDMmPKcvHZ0I=";
+    hash = "sha256-nbzQmZ8hAiU8K+/VHwbEniTsioCgQhbADIxV9tL3M1k=";
   };
 
-  cargoHash = "sha256-XAkEcd/QDw1SyrPuuk5ojqlKHiG28DgdipbKtnlWsGg=";
+  cargoHash = "sha256-sOxLRNGIHsUBNWWRUo2qyeewL06rU5paq4LbXpksMzg=";
 
   meta = with lib; {
     description = "Cargo subcommand to show result of macro expansion";

pkgs/by-name/fl/flaca/package.nix

@@ -9,7 +9,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "flaca";
-  version = "3.1.6";
+  version = "3.2.0";
 
   src =
     let
@@ -17,11 +17,11 @@ rustPlatform.buildRustPackage rec {
         owner = "Blobfolio";
         repo = pname;
         rev = "v${version}";
-        hash = "sha256-mNCb9d7/nRWSkiir2bYkslw/F2GmjvE0cPi7HhzEN68=";
+        hash = "sha256-pT3CizoqMQe+JljuDbV7hQpUmG+fx/ES2reupeX60iY=";
       };
       lockFile = fetchurl {
         url = "https://github.com/Blobfolio/flaca/releases/download/v${version}/Cargo.lock";
-        hash = "sha256-tyxTgYEGROCtoiKPX57pF32UcfpDCuMdFSttZu++ju8=";
+        hash = "sha256-Ek33acdDA9iMgpyIdx12arKtPHoKaIrfh5GNdgT7ib0=";
       };
     in
     runCommand "source-with-lock" { nativeBuildInputs = [ lndir ]; } ''
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ rustPlatform.bindgenHook ];
 
-  cargoHash = "sha256-YYNWCJT5ZT36v4u4P3gtW/osor6eIvR8leqlQHHZYMk=";
+  cargoHash = "sha256-n8GDe8OVmHYgBaSp9Zb7Z/F2orDAR6d82Tikrd0y6Ts=";
 
   meta = with lib; {
     description = "CLI tool to losslessly compress JPEG and PNG images";

pkgs/by-name/gi/gitleaks/package.nix

@@ -3,7 +3,6 @@
   stdenv,
   buildGoModule,
   fetchFromGitHub,
-  gitleaks,
   installShellFiles,
   nix-update-script,
   versionCheckHook,
@@ -11,13 +10,13 @@
 
 buildGoModule rec {
   pname = "gitleaks";
-  version = "8.22.1";
+  version = "8.23.0";
 
   src = fetchFromGitHub {
     owner = "zricethezav";
     repo = "gitleaks";
     tag = "v${version}";
-    hash = "sha256-PJczVI2/TogRaw+Hs6HibHuwhKwL2scrCpsTQMsHv6Y=";
+    hash = "sha256-+9aZXjinvDYbPw+yjkQ/BH3LB0xbY1eual/zKoWMlJc=";
   };
 
   vendorHash = "sha256-hq3v//fhCUOvKPBZ/+YrLIc4nDLxR9Yc+MeIXY7TArA=";

pkgs/by-name/go/gomanagedocker/package.nix

@@ -1,13 +1,17 @@
 {
   lib,
+  stdenv,
   buildGoModule,
   fetchFromGitHub,
-  stdenv,
-  darwin,
+  versionCheckHook,
+  nix-update-script,
   xorg,
+  pkg-config,
+  gpgme,
+  btrfs-progs,
 }:
 let
-  version = "1.4";
+  version = "1.5";
 in
 buildGoModule {
   pname = "gomanagedocker";
@@ -17,20 +21,39 @@ buildGoModule {
     owner = "ajayd-san";
     repo = "gomanagedocker";
     tag = "v${version}";
-    hash = "sha256-oM0DCOHdVPJFWgmHF8yeGGo6XvuTCXar7NebM1obahg=";
+    hash = "sha256-y2lepnhaLsjokd587D0bCEd9cmG7GuNBbbx+0sKSCGA=";
   };
 
-  vendorHash = "sha256-M/jfQWCBrv7hZm450yLBmcjWtNSCziKOpfipxI6U9ak=";
+  vendorHash = "sha256-hUlv3i+ri9W8Pf1zVtFxB/QSdPJu1cWCjMbquCxoSno=";
 
-  buildInputs =
-    lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 ];
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    gpgme
+    btrfs-progs
+  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 ];
 
   ldflags = [
     "-s"
     "-w"
   ];
 
+  # Mocking of docker and podman containers fails
+  doCheck = false;
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
+  versionCheckProgramArg = [ "--version" ];
+  doInstallCheck = true;
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "TUI tool to manage your docker images, containers and volumes";
     homepage = "https://github.com/ajayd-san/gomanagedocker";

pkgs/by-name/gs/gssg/package.nix

@@ -0,0 +1,37 @@
+{
+  lib,
+  fetchFromSourcehut,
+  buildGoModule,
+  unstableGitUpdater,
+}:
+
+buildGoModule {
+  pname = "gssg";
+  version = "0-unstable-2023-05-29";
+
+  src = fetchFromSourcehut {
+    owner = "~gsthnz";
+    repo = "gssg";
+    rev = "fc755f281d750d0b022689d58d0f32e6799dfef8";
+    hash = "sha256-m0bVH6upLSA1dcxds3VJFFaSYs7YoMuoAmEe5qAUTmw=";
+  };
+
+  vendorHash = "sha256-NxfZbwKo8SY0XfWivQ42cNqIbJQ1EBsxPFr70ZU9G6E=";
+
+  ldFlags = [
+    "-s"
+    "-w"
+  ];
+
+  passthru = {
+    updateScript = unstableGitUpdater { };
+  };
+
+  meta = {
+    description = "Gemini static site generator";
+    homepage = "https://git.sr.ht/~gsthnz/gssg";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ genga898 ];
+    mainProgram = "gssg";
+  };
+}

pkgs/by-name/le/lean4/package.nix

@@ -13,18 +13,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lean4";
-  version = "4.12.0";
+  version = "4.15.0";
 
   src = fetchFromGitHub {
     owner = "leanprover";
     repo = "lean4";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-O2Egyh2D0TfQWzQKfHUeAh7qAjMfeLVwXwGUw5QqcvE=";
+    hash = "sha256-Xzuk41voBP93vsl3u/bBii9Y6DMfvi6UazKiLLABgHA=";
   };
 
   postPatch = ''
     substituteInPlace src/CMakeLists.txt \
-      --replace 'set(GIT_SHA1 "")' 'set(GIT_SHA1 "${finalAttrs.src.rev}")'
+      --replace-fail 'set(GIT_SHA1 "")' 'set(GIT_SHA1 "${finalAttrs.src.rev}")'
 
     # Remove tests that fails in sandbox.
     # It expects `sourceRoot` to be a git repository.
@@ -37,12 +37,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     cmake
-    cadical
   ];
 
   buildInputs = [
     gmp
     libuv
+    cadical
   ];
 
   nativeCheckInputs = [

pkgs/by-name/mu/mujoco/mujoco-system-deps-dont-fetch.patch

@@ -1,17 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index eea180c0..efb39178 100644
+index aaac4e38..fe4e9932 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -93,7 +93,7 @@ add_subdirectory(src/render)
- add_subdirectory(src/thread)
- add_subdirectory(src/ui)
- 
--target_compile_definitions(mujoco PRIVATE _GNU_SOURCE CCD_STATIC_DEFINE MUJOCO_DLL_EXPORTS -DMC_IMPLEM_ENABLE)
-+target_compile_definitions(mujoco PRIVATE _GNU_SOURCE MUJOCO_DLL_EXPORTS -DMC_IMPLEM_ENABLE)
- if(MUJOCO_ENABLE_AVX_INTRINSICS)
-   target_compile_definitions(mujoco PUBLIC mjUSEPLATFORMSIMD)
- endif()
-@@ -118,7 +118,7 @@ target_link_libraries(
+@@ -120,7 +120,7 @@ target_link_libraries(
            lodepng
            qhullstatic_r
            tinyobjloader
@@ -21,7 +12,7 @@ index eea180c0..efb39178 100644
  
  set_target_properties(
 diff --git a/cmake/MujocoDependencies.cmake b/cmake/MujocoDependencies.cmake
-index 44962272..656beeb8 100644
+index 23e4e71e..33081e00 100644
 --- a/cmake/MujocoDependencies.cmake
 +++ b/cmake/MujocoDependencies.cmake
 @@ -93,28 +93,36 @@ set(BUILD_SHARED_LIBS
@@ -75,7 +66,7 @@ index 44962272..656beeb8 100644
    )
  
    FetchContent_GetProperties(marchingcubecpp)
-@@ -124,119 +132,158 @@ if(NOT TARGET marchingcubecpp)
+@@ -124,119 +132,157 @@ if(NOT TARGET marchingcubecpp)
    endif()
  endif()
  
@@ -196,7 +187,6 @@ index 44962272..656beeb8 100644
  option(SDFLIB_USE_ASSIMP OFF)
  option(SDFLIB_USE_OPENMP OFF)
  option(SDFLIB_USE_ENOKI OFF)
-+
  findorfetch(
    USE_SYSTEM_PACKAGE
 -  OFF
@@ -285,7 +275,7 @@ index 44962272..656beeb8 100644
    set(ABSL_PROPAGATE_CXX_STD ON)
  
    # This specific version of Abseil does not have the following variable. We need to work with BUILD_TESTING
-@@ -249,15 +296,11 @@ if(MUJOCO_BUILD_TESTS)
+@@ -249,15 +295,11 @@ if(MUJOCO_BUILD_TESTS)
    set(ABSL_BUILD_TESTING OFF)
    findorfetch(
      USE_SYSTEM_PACKAGE
@@ -302,7 +292,7 @@ index 44962272..656beeb8 100644
      TARGETS
      absl::core_headers
      EXCLUDE_FROM_ALL
-@@ -268,6 +311,9 @@ if(MUJOCO_BUILD_TESTS)
+@@ -268,6 +310,9 @@ if(MUJOCO_BUILD_TESTS)
        CACHE BOOL "Build tests." FORCE
    )
  
@@ -312,7 +302,7 @@ index 44962272..656beeb8 100644
    # Avoid linking errors on Windows by dynamically linking to the C runtime.
    set(gtest_force_shared_crt
        ON
-@@ -276,22 +322,20 @@ if(MUJOCO_BUILD_TESTS)
+@@ -276,22 +321,20 @@ if(MUJOCO_BUILD_TESTS)
  
    findorfetch(
      USE_SYSTEM_PACKAGE
@@ -341,7 +331,7 @@ index 44962272..656beeb8 100644
    set(BENCHMARK_EXTRA_FETCH_ARGS "")
    if(WIN32 AND NOT MSVC)
      set(BENCHMARK_EXTRA_FETCH_ARGS
-@@ -310,15 +354,11 @@ if(MUJOCO_BUILD_TESTS)
+@@ -310,15 +353,11 @@ if(MUJOCO_BUILD_TESTS)
  
    findorfetch(
      USE_SYSTEM_PACKAGE
@@ -358,7 +348,7 @@ index 44962272..656beeb8 100644
      TARGETS
      benchmark::benchmark
      benchmark::benchmark_main
-@@ -328,15 +368,18 @@ if(MUJOCO_BUILD_TESTS)
+@@ -328,15 +367,18 @@ if(MUJOCO_BUILD_TESTS)
  endif()
  
  if(MUJOCO_TEST_PYTHON_UTIL)
@@ -382,7 +372,7 @@ index 44962272..656beeb8 100644
      )
  
      FetchContent_GetProperties(Eigen3)
-@@ -348,6 +391,19 @@ if(MUJOCO_TEST_PYTHON_UTIL)
+@@ -348,6 +390,19 @@ if(MUJOCO_TEST_PYTHON_UTIL)
        set_target_properties(
          Eigen3::Eigen PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${eigen3_SOURCE_DIR}"
        )
@@ -479,19 +469,10 @@ index 5141406c..75ff7884 100644
    glfw
    EXCLUDE_FROM_ALL
 diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index 122760a9..ddd90819 100644
+index 0f92803d..da9dce4c 100644
 --- a/test/CMakeLists.txt
 +++ b/test/CMakeLists.txt
-@@ -30,7 +30,7 @@ macro(mujoco_test name)
-   )
- 
-   add_executable(${name} ${name}.cc)
--  target_link_libraries(${name} gtest_main mujoco)
-+  target_link_libraries(${name} GTest::gtest_main mujoco)
-   target_include_directories(${name} PRIVATE ${MUJOCO_TEST_INCLUDE})
-   set_target_properties(${name} PROPERTIES BUILD_RPATH ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
-   # gtest_discover_tests is recommended over gtest_add_tests, but has some issues in Windows.
-@@ -60,20 +60,20 @@ target_link_libraries(
+@@ -81,8 +81,8 @@ target_link_libraries(
           absl::synchronization
           absl::flat_hash_map
           absl::flat_hash_set
@@ -502,18 +483,3 @@ index 122760a9..ddd90819 100644
           mujoco::mujoco
  )
  target_include_directories(fixture PRIVATE ${mujoco_SOURCE_DIR}/include gmock)
- 
- mujoco_test(fixture_test)
--target_link_libraries(fixture_test fixture gmock)
-+target_link_libraries(fixture_test fixture GTest::gmock)
- 
- mujoco_test(header_test)
--target_link_libraries(header_test fixture gmock)
-+target_link_libraries(fixture_test fixture GTest::gmock)
- 
- mujoco_test(pipeline_test)
--target_link_libraries(pipeline_test fixture gmock)
-+target_link_libraries(fixture_test fixture GTest::gmock)
- 
- add_subdirectory(benchmark)
- add_subdirectory(engine)

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

@@ -1,13 +1,14 @@
 {
-  cereal_1_3_2,
-  cmake,
+  lib,
+  stdenv,
   fetchFromGitHub,
+  cmake,
   fetchFromGitLab,
   glfw,
   glm,
-  lib,
   spdlog,
-  stdenv,
+  cereal_1_3_2,
+  python3Packages,
 }:
 
 let
@@ -35,8 +36,8 @@ let
     eigen3 = fetchFromGitLab {
       owner = "libeigen";
       repo = "eigen";
-      rev = "d34b100c137ac931379ae5e1b888f16a9c8d6c72";
-      hash = "sha256-GYjENtobSWCJqRw2GJbxAJDZSdyBNqWkobn2Vm5H53Q=";
+      rev = "7f2377859377da6f22152015c28b12c04752af77";
+      hash = "sha256-SmyvY/WlU9jryD9ZpSw73dQEc9jI4ySQPRnplg/BC4w=";
     };
     googletest = fetchFromGitHub {
       owner = "google";
@@ -131,7 +132,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "mujoco";
-  version = "3.2.6";
+  version = "3.2.7";
 
   # Bumping version? Make sure to look though the MuJoCo's commit
   # history for bumped dependency pins!
@@ -139,7 +140,7 @@ stdenv.mkDerivation rec {
     owner = "google-deepmind";
     repo = "mujoco";
     tag = version;
-    hash = "sha256-n1H9e+GMqHYsimypF7AiVzHC2dXkL+4FWDEHB5B2ZIE=";
+    hash = "sha256-TAhgu3h7tCflIMscVS+jYuUfMmIYcCcI3JFxUlj8g9E=";
   };
 
   patches = [ ./mujoco-system-deps-dont-fetch.patch ];
@@ -177,8 +178,13 @@ stdenv.mkDerivation rec {
     ln -s ${pin.marchingcubecpp} build/_deps/marchingcubecpp-src
   '';
 
-  passthru.pin = {
-    inherit (pin) lodepng eigen3 abseil-cpp;
+  passthru = {
+    pin = {
+      inherit (pin) lodepng eigen3 abseil-cpp;
+    };
+    tests = {
+      pythonMujoco = python3Packages.mujoco;
+    };
   };
 
   meta = {

pkgs/by-name/ne/netlify-cli/package.nix

@@ -11,16 +11,16 @@
 
 buildNpmPackage rec {
   pname = "netlify-cli";
-  version = "17.38.0";
+  version = "18.0.0";
 
   src = fetchFromGitHub {
     owner = "netlify";
     repo = "cli";
     tag = "v${version}";
-    hash = "sha256-fK+Z6bqnaqSYXgO0lUbGALZeCiAnvMd6LkMSH7JB7J8=";
+    hash = "sha256-LGnFVg7c+CMgjxkVdy/rdoo6uU5HaOwGKRDHRe5Hz3Y=";
   };
 
-  npmDepsHash = "sha256-oFt+l8CigOtm3W5kiT0kFsqKLOJB9ggfiFQgUU5xQ1I=";
+  npmDepsHash = "sha256-ONLkCbmmY45/sRwaGUWhA187YVtCcdPVnD7ZMFoQ2Y0=";
 
   inherit nodejs;
 

pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix

@@ -7,7 +7,7 @@
 
 let
   bits = if stdenv.hostPlatform.is64bit then "x64" else "ia32";
-  version = "0.94.0";
+  version = "0.94.1";
 in
 stdenv.mkDerivation {
   pname = "nwjs-ffmpeg-prebuilt";
@@ -16,8 +16,8 @@ stdenv.mkDerivation {
   src =
     let
       hashes = {
-        "x64" = "sha256-lepsr2/sCEUrq+an/z2g4Auj7MZcDT5I9PAKlFIbkpQ=";
-        "ia32" = "sha256-lepsr2/sCEUrq+an/z2g4Auj7MZcDT5I9PAKlFIbkpQ=";
+        "x64" = "sha256-FlhYfEUmmB4kgy2QT3e3cniNY/8eBYD4p2c23oTnEJU=";
+        "ia32" = "sha256-FlhYfEUmmB4kgy2QT3e3cniNY/8eBYD4p2c23oTnEJU=";
       };
     in
     fetchurl {

pkgs/by-name/op/opensnitch-ui/package.nix

@@ -34,6 +34,7 @@ python311Packages.buildPythonApplication rec {
   propagatedBuildInputs = with python311Packages; [
     grpcio-tools
     notify2
+    packaging
     pyasn
     pyinotify
     pyqt5

pkgs/by-name/pa/pam_u2f/package.nix

@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation rec {
   pname = "pam_u2f";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchurl {
     url = "https://developers.yubico.com/pam-u2f/Releases/${pname}-${version}.tar.gz";
-    sha256 = "sha256-cjYMaHVIXrTfQJ2o+PUrF4k/BeTZmFKcI4gUSA4RUiA=";
+    hash = "sha256-mhNUmUf4RPazq2kdca+09vAKRdFl/tJ7AcZsB3UKk4c=";
   };
 
   nativeBuildInputs = [ pkg-config ];

pkgs/by-name/sa/saga/package.nix

@@ -34,11 +34,11 @@
 
 stdenv.mkDerivation rec {
   pname = "saga";
-  version = "9.7.0";
+  version = "9.7.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/saga-gis/saga-${version}.tar.gz";
-    hash = "sha256-wUj0TvZoL/9miCwVk3eYilYXqczkbgsStCrbKAoeuxw=";
+    hash = "sha256-ZPJ8OlVEqG/jmRaA7BJRsw3b1X/3tKtRcYTXqfGdJ0I=";
   };
 
   sourceRoot = "saga-${version}/saga-gis";

pkgs/by-name/so/sops/package.nix

@@ -8,16 +8,16 @@
 
 buildGo122Module rec {
   pname = "sops";
-  version = "3.9.2";
+  version = "3.9.3";
 
   src = fetchFromGitHub {
     owner = "getsops";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-v35LRFYdnWigWYlDhrOgSOcCI7SUqJbJHaZvlQ6PC4I=";
+    hash = "sha256-U8ZJktOSj0JJ70CbXDS3FpNmk07cKnco5w2rt4BnQBU=";
   };
 
-  vendorHash = "sha256-dnhrZPXZWeU98+dEaFLIdtcLWgIrh47l+WAxe+F+0/I=";
+  vendorHash = "sha256-+UxngJgKG+gAjnXXEcdXPXQqRcMfRDn4wPeR1IhltC0=";
 
   postPatch = ''
     substituteInPlace go.mod \

pkgs/by-name/su/surrealist/package.nix

@@ -1,16 +1,18 @@
 {
   buildGoModule,
   cairo,
-  cargo,
   cargo-tauri,
+  cargo,
   esbuild,
   fetchFromGitHub,
   gdk-pixbuf,
   glib-networking,
   gobject-introspection,
+  jq,
   lib,
   libsoup_3,
   makeBinaryWrapper,
+  moreutils,
   nodejs,
   openssl,
   pango,
@@ -48,13 +50,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "surrealist";
-  version = "3.0.8";
+  version = "3.1.9";
 
   src = fetchFromGitHub {
     owner = "surrealdb";
     repo = "surrealist";
     rev = "surrealist-v${finalAttrs.version}";
-    hash = "sha256-46CXldjhWc7H6wdKfMK2IlmBqfe0QHi/J1uFhbV42HY=";
+    hash = "sha256-p+Tyu65A+vykqafu1RCRKYFXb435Uyu9WxUoEqjI8d8=";
   };
 
   # HACK: A dependency (surrealist -> tauri -> **reqwest**) contains hyper-tls
@@ -70,23 +72,25 @@ stdenv.mkDerivation (finalAttrs: {
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit (finalAttrs) patches src;
     sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}";
-    hash = "sha256-HmdEcjgxPyRsQqhU0P/C3KVgwZsSvfHjyzj0OHKe5jY";
+    hash = "sha256-8rw3x17f5pLLyvxozFPWq9pJNHy4wXwV9CcaUGAbdd0=";
     patchFlags = [ "-p2" ];
   };
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-uBDbBfWC9HxxzY1x4+rNo87D5C1zZa2beFLa5NkLs80=";
+    hash = "sha256-JwOY6Z8UjbrodSQ3csnT+puftbQUDF3NIK7o6rSpl2o=";
   };
 
   nativeBuildInputs = [
     cargo
     cargo-tauri.hook
     gobject-introspection
+    jq
     makeBinaryWrapper
+    moreutils
     nodejs
-    pnpm.configHook
     pkg-config
+    pnpm.configHook
     rustc
     rustPlatform.cargoSetupHook
   ];
@@ -108,6 +112,15 @@ stdenv.mkDerivation (finalAttrs: {
   cargoRoot = "src-tauri";
   buildAndTestSubdir = finalAttrs.cargoRoot;
 
+  # Deactivate the upstream update mechanism
+  postPatch = ''
+    jq '
+      .bundle.createUpdaterArtifacts = false |
+      .plugins.updater = {"active": false, "pubkey": "", "endpoints": []}
+    ' \
+    src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json
+  '';
+
   postFixup = ''
     wrapProgram "$out/bin/surrealist" \
       --set GIO_EXTRA_MODULES ${glib-networking}/lib/gio/modules \

pkgs/by-name/wa/wasm-bindgen-cli/package.nix

@@ -9,9 +9,9 @@
   stdenv,
   curl,
   darwin,
-  version ? "0.2.95",
-  hash ? "sha256-prMIreQeAcbJ8/g3+pMp1Wp9H5u+xLqxRxL+34hICss=",
-  cargoHash ? "sha256-6iMebkD7FQvixlmghGGIvpdGwFNLfnUcFke/Rg8nPK4=",
+  version ? "0.2.100",
+  hash ? "sha256-3RJzK7mkYFrs7C/WkhW9Rr4LdP5ofb2FdYGz1P7Uxog=",
+  cargoHash ? "sha256-tD0OY2PounRqsRiFh8Js5nyknQ809ZcHMvCOLrvYHRE=",
 }:
 
 rustPlatform.buildRustPackage rec {

pkgs/data/themes/sddm-astronaut/default.nix

@@ -3,22 +3,25 @@
   lib,
   stdenvNoCC,
   themeConfig ? null,
+  embeddedTheme ? "astronaut",
 }:
 stdenvNoCC.mkDerivation rec {
   pname = "sddm-astronaut";
-  version = "1.0";
+  version = "1.0-unstable-2025-01-05";
 
   src = pkgs.fetchFromGitHub {
     owner = "Keyitdev";
     repo = "sddm-astronaut-theme";
-    rev = "48ea0a792711ac0c58cc74f7a03e2e7ba3dc2ac0";
-    hash = "sha256-kXovz813BS+Mtbk6+nNNdnluwp/7V2e3KJLuIfiWRD0=";
+    rev = "11c0bf6147bbea466ce2e2b0559e9a9abdbcc7c3";
+    hash = "sha256-gBSz+k/qgEaIWh1Txdgwlou/Lfrfv3ABzyxYwlrLjDk=";
   };
 
   dontWrapQtApps = true;
+
   propagatedBuildInputs = with pkgs.kdePackages; [
-    qt5compat
     qtsvg
+    qtmultimedia
+    qtvirtualkeyboard
   ];
 
   installPhase =
@@ -27,13 +30,21 @@ stdenvNoCC.mkDerivation rec {
       configFile = iniFormat.generate "" { General = themeConfig; };
 
       basePath = "$out/share/sddm/themes/sddm-astronaut-theme";
+      sedString = "ConfigFile=Themes/";
     in
     ''
       mkdir -p ${basePath}
       cp -r $src/* ${basePath}
     ''
+    + lib.optionalString (embeddedTheme != "astronaut") ''
+
+      # Replaces astronaut.conf with embedded theme in metadata.desktop on line 9.
+      # ConfigFile=Themes/astronaut.conf.
+      sed -i "s|^${sedString}.*\\.conf$|${sedString}${embeddedTheme}.conf|" ${basePath}/metadata.desktop
+    ''
     + lib.optionalString (themeConfig != null) ''
-      ln -sf ${configFile} ${basePath}/theme.conf.user
+      chmod u+w ${basePath}/Themes/
+      ln -sf ${configFile} ${basePath}/Themes/${embeddedTheme}.conf.user
     '';
 
   meta = {
@@ -42,6 +53,9 @@ stdenvNoCC.mkDerivation rec {
     license = lib.licenses.gpl3;
 
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ danid3v ];
+    maintainers = with lib.maintainers; [
+      danid3v
+      uxodb
+    ];
   };
 }

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

@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "aiohomeconnect";
-  version = "0.9.0";
+  version = "0.10.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "MartinHjelmare";
     repo = "aiohomeconnect";
     tag = "v${version}";
-    hash = "sha256-SHrhlchjyUPhf/LnIHB/b90aglboVArcQ/YTOw1vbII=";
+    hash = "sha256-3ugV0stIUdFlcjN+Z8N4GBrXbjBfZcYZmd3THSS7oZg=";
   };
 
   pythonRelaxDeps = [ "httpx" ];

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

@@ -0,0 +1,70 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  buildPythonPackage,
+  setuptools,
+  bidict,
+  h5py,
+  matplotlib,
+  numpy,
+  scikit-learn,
+  scipy,
+  shortuuid,
+  six,
+  joblib,
+  pywavelets,
+  mock,
+  tkinter,
+  opencv-python,
+}:
+
+buildPythonPackage rec {
+  pname = "biosppy";
+  version = "2.2.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "scientisst";
+    repo = "BioSPPy";
+    tag = "v${version}";
+    hash = "sha256-U0ZftAlRlazSO66raH74o/6eP1RpmuFoA6HJ+xmgKR8=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    opencv-python
+    bidict
+    h5py
+    matplotlib
+    numpy
+    scikit-learn
+    scipy
+    shortuuid
+    six
+    joblib
+    pywavelets
+    mock
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ tkinter ];
+
+  doCheck = false; # no tests
+
+  pythonImportsCheck = [
+    "biosppy"
+    "biosppy.signals"
+    "biosppy.synthesizers"
+    "biosppy.inter_plotting"
+    "biosppy.features"
+  ];
+
+  meta = {
+    description = "Biosignal Processing in Python";
+    homepage = "https://biosppy.readthedocs.io/";
+    changelog = "https://github.com/scientisst/BioSPPy/releases/tag/v${version}";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ genga898 ];
+  };
+}

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

@@ -1,18 +1,20 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   setuptools,
   pymupdf,
 }:
 buildPythonPackage rec {
   pname = "cardimpose";
-  version = "0.2.1";
+  version = "0.2.1-unstable-2024-12-28";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-7GyLTUzWd9cZ8/k+0FfzKW3H2rKZ3NHqkZkNmiQ+Tec=";
+  src = fetchFromGitHub {
+    owner = "frsche";
+    repo = "cardimpose";
+    rev = "eb26a9795e20db3e3dd5b62dbcbbad547cb05a55";
+    hash = "sha256-Fel0YOe2D76h+QAon/wxI6EsZhfLca+0ncNi9i888+E=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/google-auth-oauthlib/default.nix

@@ -4,12 +4,11 @@
   buildPythonPackage,
   fetchPypi,
   setuptools,
+  google-auth,
+  requests-oauthlib,
   click,
   mock,
   pytestCheckHook,
-  google-auth,
-  requests-oauthlib,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -17,8 +16,6 @@ buildPythonPackage rec {
   version = "1.2.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.6";
-
   src = fetchPypi {
     pname = "google_auth_oauthlib";
     inherit version;
@@ -53,12 +50,14 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "google_auth_oauthlib" ];
 
-  meta = with lib; {
+  __darwinAllowLocalNetworking = true;
+
+  meta = {
     description = "Google Authentication Library: oauthlib integration";
     homepage = "https://github.com/GoogleCloudPlatform/google-auth-library-python-oauthlib";
     changelog = "https://github.com/googleapis/google-auth-library-python-oauthlib/blob/v${version}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ terlar ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ terlar ];
     mainProgram = "google-oauthlib-tool";
   };
 }

pkgs/development/python-modules/google-cloud-artifact-registry/default.nix

@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-artifact-registry";
-  version = "1.13.1";
+  version = "1.14.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_artifact_registry";
     inherit version;
-    hash = "sha256-wbr6WfuA9n94DK/B0OKS8PrnP1tiCRORKGXtDv6vU0Q=";
+    hash = "sha256-xn4OBhidFxwfNHcCoXecZqMbGyFNIJ75f5u75Fi5yQ4=";
   };
 
   build-system = [ setuptools ];

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

@@ -9,21 +9,22 @@
 
   # dependencies
   absl-py,
+  distutils,
   h5py,
   ml-dtypes,
   namex,
   numpy,
+  onnxruntime,
   optree,
   packaging,
-  rich,
-  tensorflow,
   pythonAtLeast,
-  distutils,
+  rich,
+  scikit-learn,
+  tensorflow,
 
   # tests
   dm-tree,
   jax,
-  jaxlib,
   pandas,
   pydot,
   pytestCheckHook,
@@ -33,14 +34,14 @@
 
 buildPythonPackage rec {
   pname = "keras";
-  version = "3.7.0";
+  version = "3.8.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "keras-team";
     repo = "keras";
     tag = "v${version}";
-    hash = "sha256-qidY1OmlOYPKVoxryx1bEukA7IS6rPV4jqlnuf3y39w=";
+    hash = "sha256-sbAGiI1Ai0MPiQ8AMpa5qX6hYt/plsIqhn9xYLBb120=";
   };
 
   build-system = [
@@ -53,9 +54,11 @@ buildPythonPackage rec {
     ml-dtypes
     namex
     numpy
+    onnxruntime
     optree
     packaging
     rich
+    scikit-learn
     tensorflow
   ] ++ lib.optionals (pythonAtLeast "3.12") [ distutils ];
 
@@ -66,7 +69,6 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     dm-tree
-    jaxlib
     jax
     pandas
     pydot
@@ -81,6 +83,9 @@ buildPythonPackage rec {
 
   disabledTests =
     [
+      # Requires onnx which is currently broken
+      "test_export_onnx"
+
       # Tries to install the package in the sandbox
       "test_keras_imports"
 
@@ -99,6 +104,9 @@ buildPythonPackage rec {
     ];
 
   disabledTestPaths = [
+    # Require onnx which is currently broken
+    "keras/src/export/onnx_test.py"
+
     # Datasets are downloaded from the internet
     "integration_tests/dataset_tests"
 
@@ -121,7 +129,6 @@ buildPythonPackage rec {
 
     # TypeError: this __dict__ descriptor does not support '_DictWrapper' objects
     "keras/src/backend/tensorflow/saved_model_test.py"
-    "keras/src/export/export_lib_test.py"
 
     # KeyError: 'Unable to synchronously open object (bad object header version number)'
     "keras/src/saving/file_editor_test.py"

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

@@ -1,29 +1,26 @@
 {
   lib,
   buildPythonPackage,
+  fetchFromGitHub,
   cmake,
   cython,
-  fetchFromGitHub,
   ninja,
-  pytestCheckHook,
-  pythonOlder,
-  rapidfuzz,
-  rapidfuzz-cpp,
   scikit-build-core,
+  rapidfuzz-cpp,
+  rapidfuzz,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "levenshtein";
-  version = "0.26.0";
+  version = "0.27.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "maxbachmann";
     repo = "Levenshtein";
     tag = "v${version}";
-    hash = "sha256-uLOOAmJ8Y0z+tuIIOSnI8qZoZ+IA2+tNBX1lDCvc8+A=";
+    hash = "sha256-kiYu46qv8sBBcPoCo3PN1q9F0EJ1s5hAMKavPaztM4s=";
     fetchSubmodules = true; # # for vendored `rapidfuzz-cpp`
   };
 
@@ -44,11 +41,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "Levenshtein" ];
 
-  meta = with lib; {
+  meta = {
     description = "Functions for fast computation of Levenshtein distance and string similarity";
     homepage = "https://github.com/maxbachmann/Levenshtein";
-    changelog = "https://github.com/maxbachmann/Levenshtein/blob/${src.rev}/HISTORY.md";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ fab ];
+    changelog = "https://github.com/maxbachmann/Levenshtein/blob/v${version}/HISTORY.md";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }

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

@@ -37,7 +37,7 @@ buildPythonPackage rec {
   # in the project's CI.
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-kl7+5cMvaAaILEARKs5KPtdLE7Kv8J7NddZnj6oLwk8=";
+    hash = "sha256-a0ATRmtFV11J3T2HSNCZhfc0kAOu8yaHIW0rkCrHsTg=";
   };
 
   nativeBuildInputs = [ cmake ];

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

@@ -0,0 +1,101 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  buildPythonPackage,
+  setuptools,
+  pytest,
+  scipy,
+  scikit-learn,
+  pandas,
+  matplotlib,
+  requests,
+  cvxopt,
+  biosppy,
+  pytest-cov-stub,
+  mock,
+  plotly,
+  astropy,
+  coverage,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "neurokit2";
+  version = "0.2.10";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "neuropsychology";
+    repo = "NeuroKit";
+    tag = "v${version}";
+    hash = "sha256-e/B1JvO6uYZ6iVskFvxZLSSXi0cPep9bBZ0JXZTVS28=";
+  };
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace-fail '"pytest-runner"' '"pytest"'
+  '';
+
+  build-system = [
+    setuptools
+    pytest
+  ];
+
+  dependencies = [
+    scipy
+    scikit-learn
+    pandas
+    matplotlib
+    requests
+    cvxopt
+    biosppy
+  ];
+
+  nativeCheckInputs = [
+    pytest-cov-stub
+    mock
+    plotly
+    astropy
+    coverage
+    pytestCheckHook
+  ];
+
+  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
+    # Crash in matplotlib (Fatal Python error: Aborted)
+    "test_events_plot"
+  ];
+
+  disabledTestPaths = [
+    # Required dependencies not available in nixpkgs
+    "tests/tests_complexity.py"
+    "tests/tests_eeg.py"
+    "tests/tests_eog.py"
+    "tests/tests_ecg.py"
+    "tests/tests_bio.py"
+    "tests/tests_data.py"
+    "tests/tests_epochs.py"
+    "tests/tests_ecg_findpeaks.py"
+    "tests/tests_eda.py"
+    "tests/tests_emg.py"
+    "tests/tests_hrv.py"
+    "tests/tests_rsp.py"
+    "tests/tests_ppg.py"
+    "tests/tests_signal.py"
+
+    # Dependency is broken `mne-python`
+    "tests/tests_microstates.py"
+  ];
+
+  pythonImportsCheck = [
+    "neurokit2"
+  ];
+
+  meta = {
+    description = "Python Toolbox for Neurophysiological Signal Processing";
+    homepage = "https://github.com/neuropsychology/NeuroKit";
+    changelog = "https://github.com/neuropsychology/NeuroKit/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ genga898 ];
+  };
+}

pkgs/development/python-modules/pygame-gui/default.nix

@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "pygame-gui";
-  version = "0612";
+  version = "0613";
   pyproject = true;
   # nixpkgs-update: no auto update
 
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "MyreMylar";
     repo = "pygame_gui";
     tag = "v_${version}";
-    hash = "sha256-6Ps3pmQ8tYwQyv0TliOvUNLy3GjSJ2jdDQTTxfYej0o=";
+    hash = "sha256-vLDl3VcrjjWpw4hLuKmomK6EykF1VK1CGLkEqjNUQ/Q=";
   };
 
   nativeBuildInputs = [ setuptools ];

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

@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
 
@@ -132,46 +133,52 @@ buildPythonPackage rec {
     ++ optional-dependencies.gym-continuous
     ++ optional-dependencies.rendering;
 
-  disabledTests = [
-    # torchrl is incompatible with gymnasium>=1.0
-    # https://github.com/pytorch/rl/discussions/2483
-    "test_resetting_strategies"
-    "test_torchrl_to_gym"
+  disabledTests =
+    [
+      # torchrl is incompatible with gymnasium>=1.0
+      # https://github.com/pytorch/rl/discussions/2483
+      "test_resetting_strategies"
+      "test_torchrl_to_gym"
 
-    # mujoco.FatalError: an OpenGL platform library has not been loaded into this process, this most likely means that a valid OpenGL context has not been created before mjr_makeContext was called
-    "test_vecenvs_env"
+      # mujoco.FatalError: an OpenGL platform library has not been loaded into this process, this most likely means that a valid OpenGL context has not been created before mjr_makeContext was called
+      "test_vecenvs_env"
 
-    # ValueError: Can't write images with one color channel.
-    "test_log_video"
+      # ValueError: Can't write images with one color channel.
+      "test_log_video"
 
-    # Those tests require the ALE environments (provided by unpackaged shimmy)
-    "test_collector_env_reset"
-    "test_gym"
-    "test_gym_fake_td"
-    "test_recorder"
-    "test_recorder_load"
-    "test_rollout"
-    "test_parallel_trans_env_check"
-    "test_serial_trans_env_check"
-    "test_single_trans_env_check"
-    "test_td_creation_from_spec"
-    "test_trans_parallel_env_check"
-    "test_trans_serial_env_check"
-    "test_transform_env"
+      # Those tests require the ALE environments (provided by unpackaged shimmy)
+      "test_collector_env_reset"
+      "test_gym"
+      "test_gym_fake_td"
+      "test_recorder"
+      "test_recorder_load"
+      "test_rollout"
+      "test_parallel_trans_env_check"
+      "test_serial_trans_env_check"
+      "test_single_trans_env_check"
+      "test_td_creation_from_spec"
+      "test_trans_parallel_env_check"
+      "test_trans_serial_env_check"
+      "test_transform_env"
 
-    # undeterministic
-    "test_distributed_collector_updatepolicy"
-    "test_timeit"
+      # undeterministic
+      "test_distributed_collector_updatepolicy"
+      "test_timeit"
 
-    # On a 24 threads system
-    # assert torch.get_num_threads() == max(1, init_threads - 3)
-    # AssertionError: assert 23 == 21
-    "test_auto_num_threads"
+      # On a 24 threads system
+      # assert torch.get_num_threads() == max(1, init_threads - 3)
+      # AssertionError: assert 23 == 21
+      "test_auto_num_threads"
 
-    # Flaky (hangs indefinitely on some CPUs)
-    "test_gae_multidim"
-    "test_gae_param_as_tensor"
-  ];
+      # Flaky (hangs indefinitely on some CPUs)
+      "test_gae_multidim"
+      "test_gae_param_as_tensor"
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+      # Flaky
+      # AssertionError: assert tensor([51.]) == ((5 * 11) + 2)
+      "test_vecnorm_parallel_auto"
+    ];
 
   meta = {
     description = "Modular, primitive-first, python-first PyTorch library for Reinforcement Learning";

pkgs/development/ruby-modules/gem-config/default.nix

@@ -410,8 +410,10 @@ in
       ++ lib.optional (lib.versionAtLeast attrs.version "1.53.0" && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) autoSignDarwinBinariesHook;
     buildInputs = [ openssl ];
     hardeningDisable = [ "format" ];
-    env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
-    patches = [
+    env = lib.optionalAttrs (lib.versionOlder attrs.version "1.68.1") {
+      NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
+    };
+    patches = lib.optionals (lib.versionOlder attrs.version "1.65.0") [
       (fetchpatch {
         name = "gcc-14-fixes.patch";
         url = "https://boringssl.googlesource.com/boringssl/+/c70190368c7040c37c1d655f0690bcde2b109a0d%5E%21/?format=TEXT";

pkgs/tools/security/trufflehog/default.nix

@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "trufflehog";
-  version = "3.88.1";
+  version = "3.88.2";
 
   src = fetchFromGitHub {
     owner = "trufflesecurity";
     repo = "trufflehog";
     tag = "v${version}";
-    hash = "sha256-peZGCJ3g/u4gAznYM9wzgaqsEYGk0SSzI23g/xglngE=";
+    hash = "sha256-p5vB9ug/H7xV7Y4GIk2BUUMFJ4/tcKj+V4qvYwCJlRU=";
   };
 
   vendorHash = "sha256-YsUAu2gEXzpjM/jg4VJ7KTvf1/cLTO04hLOLmUDeYk0=";

pkgs/top-level/all-packages.nix

@@ -4329,7 +4329,7 @@ with pkgs;
     };
   });
 
-  netlify-cli = callPackage ../development/web/netlify-cli {
+  netlify-cli = callPackage ../by-name/ne/netlify-cli/package.nix {
     nodejs = nodejs_20;
   };
 

pkgs/top-level/python-packages.nix

@@ -1673,6 +1673,8 @@ self: super: with self; {
 
   biopython = callPackage ../development/python-modules/biopython { };
 
+  biosppy = callPackage ../development/python-modules/biosppy { };
+
   biothings-client = callPackage ../development/python-modules/biothings-client { };
 
   biplist = callPackage ../development/python-modules/biplist { };
@@ -9184,6 +9186,8 @@ self: super: with self; {
 
   neuralfoil = callPackage ../development/python-modules/neuralfoil { };
 
+  neurokit2 = callPackage ../development/python-modules/neurokit2 { };
+
   neuron-full = pkgs.neuron-full.override { python3 = python; };
 
   neuronpy = toPythonModule neuron-full;