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

2025-06-10 03:23:29 +03:00 · 2024-01-18 19:15:32 +03:00 · 2024-01-18 19:15:32 +03:00 · 967d49b8a8
commit 967d49b8a8
parent 1472cd16bb 8d814209bc
74 changed files with 1772 additions and 1094 deletions
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@ -62,7 +62,8 @@ rec {

    is32bit        = { cpu = { bits = 32; }; };
    is64bit        = { cpu = { bits = 64; }; };
-    isILP32        = map (a: { abi = { abi = a; }; }) [ "n32" "ilp32" "x32" ];
+    isILP32        = [ { cpu = { family = "wasm"; bits = 32; }; } ] ++
+                     map (a: { abi = { abi = a; }; }) [ "n32" "ilp32" "x32" ];
    isBigEndian    = { cpu = { significantByte = significantBytes.bigEndian; }; };
    isLittleEndian = { cpu = { significantByte = significantBytes.littleEndian; }; };

--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -3406,8 +3406,7 @@
  };
  chuangzhu = {
    name = "Chuang Zhu";
-    email = "chuang@melty.land";
-    matrix = "@chuangzhu:matrix.org";
+    email = "nixos@chuang.cz";
    github = "chuangzhu";
    githubId = 31200881;
    keys = [{
@ -17255,6 +17254,12 @@
    githubId = 3789764;
    name = "skykanin";
  };
+  skyrina = {
+    email = "sorryu02@gmail.com";
+    github = "skyrina";
+    githubId = 116099351;
+    name = "Skylar";
+  };
  slam-bert = {
    github = "slam-bert";
    githubId = 106779009;
@ -20920,6 +20925,12 @@
    githubId = 81353;
    name = "Alexandre Macabies";
  };
+  zoriya = {
+    email = "zoe.roux@zoriya.dev";
+    github = "zoriya";
+    githubId = 32224410;
+    name = "Zoe Roux";
+  };
  zowoq = {
    github = "zowoq";
    githubId = 59103226;
--- a/nixos/doc/manual/release-notes/rl-2405.section.md
+++ b/nixos/doc/manual/release-notes/rl-2405.section.md
@ -130,6 +130,10 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
 - `security.pam.enableSSHAgentAuth` now requires `services.openssh.authorizedKeysFiles` to be non-empty,
  which is the case when `services.openssh.enable` is true. Previously, `pam_ssh_agent_auth` silently failed to work.

+- The configuration format for `services.prometheus.exporters.snmp` changed with release 0.23.0.
+  The module now includes an optional config check, that is enabled by default, to make the change obvious before any deployment.
+  More information about the configuration syntax change is available in the [upstream repository](https://github.com/prometheus/snmp_exporter/blob/b75fc6b839ee3f3ccbee68bee55f1ae99555084a/auth-split-migration.md).
+
 ## Other Notable Changes {#sec-release-24.05-notable-changes}

 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
--- a/nixos/modules/security/acme/default.md
+++ b/nixos/modules/security/acme/default.md
@ -72,7 +72,7 @@ services.nginx = {
      };
    };
  };
-}
+};
 ```

 ## Using ACME certificates in Apache/httpd {#module-security-acme-httpd}
@ -111,7 +111,7 @@ services.nginx = {
      };
    };
  };
-}
+};
 # Alternative config for Apache
 users.users.wwwrun.extraGroups = [ "acme" ];
 services.httpd = {
@ -131,7 +131,7 @@ services.httpd = {
      '';
    };
  };
-}
+};
 ```

 Now you need to configure ACME to generate a certificate.
@ -181,7 +181,7 @@ services.bind = {
      extraConfig = "allow-update { key rfc2136key.example.com.; };";
    }
  ];
-}
+};

 # Now we can configure ACME
 security.acme.acceptTerms = true;
@ -271,7 +271,7 @@ services.nginx = {
      acmeRoot = null;
    };
  };
-}
+};
 ```

 And that's it! Next time your configuration is rebuilt, or when
--- a/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix
@ -4,6 +4,25 @@ with lib;

 let
  cfg = config.services.prometheus.exporters.snmp;
+
+  # This ensures that we can deal with string paths, path types and
+  # store-path strings with context.
+  coerceConfigFile = file:
+    if (builtins.isPath file) || (lib.isStorePath file) then
+      file
+    else
+      (lib.warn ''
+        ${logPrefix}: configuration file "${file}" is being copied to the nix-store.
+        If you would like to avoid that, please set enableConfigCheck to false.
+        '' /. + file);
+
+  checkConfig = file:
+    pkgs.runCommandLocal "checked-snmp-exporter-config.yml" {
+      nativeBuildInputs = [ pkgs.buildPackages.prometheus-snmp-exporter ];
+    } ''
+      ln -s ${coerceConfigFile file} $out
+      snmp_exporter --dry-run --config.file $out
+    '';
 in
 {
  port = 9116;
@ -24,13 +43,21 @@ in
        Snmp exporter configuration as nix attribute set. Mutually exclusive with 'configurationPath' option.
      '';
      example = {
-        "default" = {
-          "version" = 2;
-          "auth" = {
-            "community" = "public";
+        auths.public_v2 = {
+          community = "public";
+          version = 2;
        };
      };
    };
+
+    enableConfigCheck = mkOption {
+      type = types.bool;
+      default = true;
+      description = lib.mdDoc ''
+        Whether to run a correctness check for the configuration file. This depends
+        on the configuration file residing in the nix-store. Paths passed as string will
+        be copied to the store.
+      '';
    };

    logFormat = mkOption {
@ -50,9 +77,13 @@ in
    };
  };
  serviceOpts = let
-    configFile = if cfg.configurationPath != null
+    uncheckedConfigFile = if cfg.configurationPath != null
                          then cfg.configurationPath
                          else "${pkgs.writeText "snmp-exporter-conf.yml" (builtins.toJSON cfg.configuration)}";
+    configFile = if cfg.enableConfigCheck then
+      checkConfig uncheckedConfigFile
+    else
+      uncheckedConfigFile;
    in {
    serviceConfig = {
      ExecStart = ''
--- a/nixos/tests/prometheus-exporters.nix
+++ b/nixos/tests/prometheus-exporters.nix
@ -1392,9 +1392,11 @@ let
    snmp = {
      exporterConfig = {
        enable = true;
-        configuration.default = {
+        configuration = {
+          auths.public_v2 = {
+            community = "public";
            version = 2;
-          auth.community = "public";
+          };
        };
      };
      exporterTest = ''
--- a/pkgs/applications/editors/libresprite/default.nix
+++ b/pkgs/applications/editors/libresprite/default.nix
@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch

 , cmake
 , pkg-config
@ -38,6 +39,15 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-d8GmVHYomDb74iSeEhJEVTHvbiVXggXg7xSqIKCUSzY=";
  };

+  # Backport GCC 13 build fix
+  # FIXME: remove in next release
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/LibreSprite/LibreSprite/commit/6ffe8472194bf5d0a73b4b2cd7f6804d3c80aa0c.patch";
+      hash = "sha256-5chXt0H+koofIspYsCJ7/eUxMGcCBVXJcXe3U/7F9Vc=";
+    })
+  ];
+
  nativeBuildInputs = [
    cmake
    pkg-config
--- a/pkgs/applications/emulators/pcsx2/default.nix
+++ b/pkgs/applications/emulators/pcsx2/default.nix
@ -6,14 +6,13 @@
 , curl
 , extra-cmake-modules
 , ffmpeg
-, gettext
-, harfbuzz
 , libaio
 , libbacktrace
 , libpcap
-, libsamplerate
+, libwebp
 , libXrandr
 , libzip
+, lz4
 , makeWrapper
 , pkg-config
 , qtbase
@ -29,6 +28,7 @@
 , wrapQtAppsHook
 , xz
 , zip
+, zstd
 }:

 let
@ -36,26 +36,30 @@ let
  pcsx2_patches = fetchFromGitHub {
    owner = "PCSX2";
    repo = "pcsx2_patches";
-    rev = "42d7ee72b66955e3bbd2caaeaa855f605b463722";
-    sha256 = "sha256-Zd+Aeps2IWVX2fS1Vyczv/wAX8Z89XnCH1eqSPdYEw8=";
+    rev = "619e75bb8db50325b44863f2ccf3c39470c3d5a3";
+    sha256 = "sha256-2KE0W3WwBJCLe8DosyDVsFtEofKgBsChpQEQe+3O+Hg=";
  };
 in
 llvmPackages_17.stdenv.mkDerivation rec {
  pname = "pcsx2";
-  version = "1.7.5318";
+  version = "1.7.5474";

  src = fetchFromGitHub {
    owner = "PCSX2";
    repo = "pcsx2";
    fetchSubmodules = true;
    rev = "v${version}";
-    sha256 = "sha256-5SUlq3HQAzROG1yncA4u4XGVv+1I+s9FQ6LgJkiLSD0=";
+    sha256 = "sha256-5ZCXw6PEQ6Ed6kEP27m9O0U79uVGEFR/vwee6/dZBD8=";
  };

+  patches = [
+    ./define-rev.patch
+  ];
+
  cmakeFlags = [
    "-DDISABLE_ADVANCE_SIMD=ON"
    "-DUSE_LINKED_FFMPEG=ON"
-    "-DDISABLE_BUILD_DATE=ON"
+    "-DPCSX2_GIT_REV=v${version}"
  ];

  nativeBuildInputs = [
@ -70,14 +74,13 @@ llvmPackages_17.stdenv.mkDerivation rec {
  buildInputs = [
    curl
    ffmpeg
-    gettext
-    harfbuzz
    libaio
    libbacktrace
    libpcap
-    libsamplerate
+    libwebp
    libXrandr
    libzip
+    lz4
    qtbase
    qtsvg
    qttools
@ -85,9 +88,9 @@ llvmPackages_17.stdenv.mkDerivation rec {
    SDL2
    soundtouch
    vulkan-headers
-    vulkan-loader
    wayland
    xz
+    zstd
  ]
  ++ cubeb.passthru.backendLibs;

--- a/pkgs/applications/emulators/pcsx2/define-rev.patch
+++ b/pkgs/applications/emulators/pcsx2/define-rev.patch
@ -0,0 +1,12 @@
+diff --git a/cmake/Pcsx2Utils.cmake b/cmake/Pcsx2Utils.cmake
+index 87f012c..052f1be 100644
+--- a/cmake/Pcsx2Utils.cmake
+++ b/cmake/Pcsx2Utils.cmake
+@@ -44,7 +44,6 @@ function(detect_compiler)
+ endfunction()
+ 
+ function(get_git_version_info)
+-	set(PCSX2_GIT_REV "")
+ 	set(PCSX2_GIT_TAG "")
+ 	set(PCSX2_GIT_HASH "")
+ 	if (GIT_FOUND AND EXISTS ${PROJECT_SOURCE_DIR}/.git)
--- a/pkgs/applications/misc/houdini/default.nix
+++ b/pkgs/applications/misc/houdini/default.nix
@ -31,6 +31,7 @@ buildFHSEnv rec {
    ocl-icd  # needed for opencl
    numactl  # needed by hfs ocl backend
    ncurses5  # needed by hfs ocl backend
+    zstd  # needed from 20.0
  ] ++ (with xorg; [
    libICE
    libSM
--- a/pkgs/applications/misc/houdini/runtime.nix
+++ b/pkgs/applications/misc/houdini/runtime.nix
@ -1,14 +1,11 @@
 { lib, stdenv, requireFile, callPackage}:

-let
-  license_dir = "~/.config/houdini";
-in
 callPackage ./runtime-build.nix rec {
-  version = "19.5.569";
+  version = "20.0.506";
  eulaDate = "2021-10-13";
  src = requireFile rec {
-    name = "houdini-${version}-linux_x86_64_gcc9.3.tar.gz";
-    sha256 = "0c2d6a31c24f5e7229498af6c3a7cdf81242501d7a0792e4c33b53a898d4999e";
+    name = "houdini-${version}-linux_x86_64_gcc11.2.tar.gz";
+    sha256 = "10dcb695bf9bb6407ccfd91c67858d69864208ee97e1e9afe216abf99db549f5";
    url = "https://www.sidefx.com/download/daily-builds/?production=true";
  };
 }
--- a/pkgs/applications/science/logic/easycrypt/default.nix
+++ b/pkgs/applications/science/logic/easycrypt/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "easycrypt";
-  version = "2023.09";
+  version = "2024.01";

  src = fetchFromGitHub {
    owner = pname;
    repo = pname;
    rev = "r${version}";
-    hash = "sha256-9xavU9jRisZekPqC87EyiLXtZCGu/9QeGzq6BJGt1+Y=";
+    hash = "sha256-UYDoVMi5TtYxgPq5nkp/oRtcMcHl2p7KAG8ptvuOL5U=";
  };

  nativeBuildInputs = with ocamlPackages; [
--- a/pkgs/applications/video/manim/default.nix
+++ b/pkgs/applications/video/manim/default.nix
@ -54,11 +54,18 @@ in python.pkgs.buildPythonApplication rec {
    owner  = "ManimCommunity";
    repo = "manim";
    rev = "refs/tags/v${version}";
-    sha256 = "sha256-TI7O0b1JvUZAxTj6XfpAJKhbGqrGnhcrE9eRJUVx4GM=";
+    hash = "sha256-TI7O0b1JvUZAxTj6XfpAJKhbGqrGnhcrE9eRJUVx4GM=";
  };

  nativeBuildInputs = with python.pkgs; [
    poetry-core
+    pythonRelaxDepsHook
+  ];
+
+  pythonRelaxDeps = [
+    "cloup"
+    "pillow"
+    "skia-pathops"
  ];

  patches = [
@ -67,8 +74,7 @@ in python.pkgs.buildPythonApplication rec {

  postPatch = ''
    substituteInPlace pyproject.toml \
-      --replace "--no-cov-on-fail --cov=manim --cov-report xml --cov-report term" "" \
-      --replace 'cloup = "^0.13.0"' 'cloup = "*"' \
+      --replace "--no-cov-on-fail --cov=manim --cov-report xml --cov-report term" ""
  '';

  buildInputs = [ cairo ];
--- a/pkgs/build-support/dotnet/make-nuget-source/default.nix
+++ b/pkgs/build-support/dotnet/make-nuget-source/default.nix
@ -3,10 +3,10 @@
 { name
 , description ? ""
 , deps ? []
-}:
+, ...
+}@args:

-let
-  nuget-source = stdenvNoCC.mkDerivation {
+stdenvNoCC.mkDerivation (lib.recursiveUpdate {
  inherit name;

  nativeBuildInputs = [ python3 ];
@ -25,14 +25,4 @@ let
  '';

  meta.description = description;
-  } // { # We need data from `$out` for `meta`, so we have to use overrides as to not hit infinite recursion.
-    meta = nuget-source.meta // {
-      licenses = let
-        # TODO: avoid IFD
-        depLicenses = lib.splitString "\n" (builtins.readFile "${nuget-source}/share/licenses");
-      in lib.flatten (lib.forEach depLicenses (spdx:
-        lib.optionals (spdx != "") (lib.getLicenseFromSpdxId spdx)
-      ));
-    };
-  };
-in nuget-source
+} (removeAttrs args [ "name" "description" "deps" ]))
--- a/pkgs/by-name/ar/arjun/package.nix
+++ b/pkgs/by-name/ar/arjun/package.nix
@ -5,14 +5,14 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "arjun";
-  version = "2.2.1";
+  version = "2.2.2";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "s0md3v";
    repo = "Arjun";
    rev = "refs/tags/${version}";
-    hash = "sha256-YxfUlD7aBwoYYsZE0zTZxoXg1TgU2yT1V+mglmsXtlo=";
+    hash = "sha256-odVUFs517RSp66MymniSeTKTntQtXomjC68Hhdsglf0=";
  };

  nativeBuildInputs = with python3.pkgs; [
--- a/pkgs/by-name/br/bruteforce-salted-openssl/package.nix
+++ b/pkgs/by-name/br/bruteforce-salted-openssl/package.nix
@ -0,0 +1,38 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, openssl
+}:
+
+stdenv.mkDerivation rec {
+  pname = "bruteforce-salted-openssl";
+  version = "1.4.2";
+
+  src = fetchFromGitHub {
+    owner = "glv2";
+    repo = "bruteforce-salted-openssl";
+    rev = version;
+    hash = "sha256-ICxXdKjRP2vXdJpjn0PP0/6rw9LKju0nVOSj47TyrzY=";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
+
+  buildInputs = [
+    openssl
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = with lib; {
+    description = "Try to find the password of file encrypted with OpenSSL";
+    homepage = "https://github.com/glv2/bruteforce-salted-openssl";
+    changelog = "https://github.com/glv2/bruteforce-salted-openssl/blob/${src.rev}/NEWS";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ octodi ];
+    mainProgram = "bruteforce-salted-openssl";
+    platforms = platforms.linux;
+  };
+}
--- a/pkgs/by-name/br/bruteforce-wallet/package.nix
+++ b/pkgs/by-name/br/bruteforce-wallet/package.nix
@ -0,0 +1,40 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, openssl
+, db
+}:
+
+stdenv.mkDerivation rec {
+  pname = "bruteforce-wallet";
+  version = "1.5.3";
+
+  src = fetchFromGitHub {
+    owner = "glv2";
+    repo = "bruteforce-wallet";
+    rev = version;
+    hash = "sha256-1sMoVlQK3ceFOHyGeXKXUD35HmMxVX8w7qefZrzAj5k=";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
+
+  buildInputs = [
+    openssl
+    db
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = with lib; {
+    description = "Try to find password of encrypted cryptocurrency wallet";
+    homepage = "https://github.com/glv2/bruteforce-wallet";
+    changelog = "https://github.com/glv2/bruteforce-wallet/blob/${src.rev}/NEWS";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ octodi ];
+    mainProgram = "bruteforce-wallet";
+    platforms = platforms.linux;
+  };
+}
--- a/pkgs/by-name/co/cosmic-edit/Cargo.lock
+++ b/pkgs/by-name/co/cosmic-edit/Cargo.lock
--- a/pkgs/by-name/co/cosmic-edit/package.nix
+++ b/pkgs/by-name/co/cosmic-edit/package.nix
@ -2,7 +2,6 @@
  lib,
  stdenv,
  fetchFromGitHub,
-  rust,
  rustPlatform,
  cmake,
  makeBinaryWrapper,
@ -21,13 +20,13 @@

 rustPlatform.buildRustPackage rec {
  pname = "cosmic-edit";
-  version = "unstable-2023-11-29";
+  version = "0-unstable-2024-01-12";

  src = fetchFromGitHub {
    owner = "pop-os";
    repo = pname;
-    rev = "4a3dd101f35eb3c1c585f104d78ed4ee31d393d3";
-    hash = "sha256-pk+4u13oWZ4fgXy1tlDgq+E4J+UddjTNSexMm4dgBSo=";
+    rev = "c1944f9c15812ce842c91a77e228cc22a0f49f18";
+    hash = "sha256-wJnBfBQKYmpJBSboGKtlwew17clE60ac2AismIe1XaA=";
  };

  cargoLock = {
@ -35,8 +34,10 @@ rustPlatform.buildRustPackage rec {
    outputHashes = {
      "accesskit-0.11.0" = "sha256-xVhe6adUb8VmwIKKjHxwCwOo5Y1p3Or3ylcJJdLDrrE=";
      "atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA=";
-      "cosmic-config-0.1.0" = "sha256-wBliqZbRHYiwZmu0vHeIP5DFzg/1IeQP3aMxiYC88bo=";
-      "cosmic-text-0.10.0" = "sha256-fE5HkhITLw0OBfFLFMsKEJw5idO265i4S7qylHTt7C0=";
+      "cosmic-config-0.1.0" = "sha256-GHjoLGF9hFJRpf5i+TwflRnh8N+oWyWZ9fqgRFLXQsw=";
+      "cosmic-syntax-theme-0.1.0" = "sha256-9Vf2s5Ry2hco80EbXOuVLwvOWygRiuaRD4tTImWooSg=";
+      "cosmic-text-0.10.0" = "sha256-PHz5jUecK889E88Y20XUe2adTUO8ElnoV7IIcaohMUw=";
+      "glyphon-0.3.0" = "sha256-JGkNIfj1HjOF8kGxqJPNq/JO+NhZD6XrZ4KmkXEP6Xc=";
      "sctk-adwaita-0.5.4" = "sha256-yK0F2w/0nxyKrSiHZbx7+aPNY2vlFs7s8nu/COp2KqQ=";
      "softbuffer-0.3.3" = "sha256-eKYFVr6C1+X6ulidHIu9SP591rJxStxwL9uMiqnXx4k=";
      "smithay-client-toolkit-0.16.1" = "sha256-z7EZThbh7YmKzAACv181zaEZmWxTrMkFRzP0nfsHK6c=";
@ -50,12 +51,7 @@ rustPlatform.buildRustPackage rec {
    substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)"
  '';

-  nativeBuildInputs = [
-    cmake
-    just
-    pkg-config
-    makeBinaryWrapper
-  ];
+  nativeBuildInputs = [ just pkg-config makeBinaryWrapper ];
  buildInputs = [
    libxkbcommon
    xorg.libX11
@ -75,9 +71,7 @@ rustPlatform.buildRustPackage rec {
    (placeholder "out")
    "--set"
    "bin-src"
-    "target/${
-      rust.lib.toRustTargetSpecShort stdenv.hostPlatform
-    }/release/cosmic-edit"
+    "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-edit"
  ];

  # LD_LIBRARY_PATH can be removed once tiny-xlib is bumped above 0.2.2
@ -91,7 +85,7 @@ rustPlatform.buildRustPackage rec {
    homepage = "https://github.com/pop-os/cosmic-edit";
    description = "Text Editor for the COSMIC Desktop Environment";
    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ ahoneybun ];
+    maintainers = with maintainers; [ ahoneybun nyanbinary ];
    platforms = platforms.linux;
  };
 }
--- a/pkgs/by-name/co/cosmic-term/package.nix
+++ b/pkgs/by-name/co/cosmic-term/package.nix
@ -10,8 +10,6 @@
  just,
  pkg-config,
  libxkbcommon,
-  glib,
-  gtk3,
  libinput,
  fontconfig,
  freetype,
@ -63,8 +61,6 @@ rustPlatform.buildRustPackage rec {
    fontconfig
    freetype
    wayland
-    glib
-    gtk3
  ];

  dontUseJustBuild = true;
@ -84,7 +80,7 @@ rustPlatform.buildRustPackage rec {
  postInstall = ''
    wrapProgram "$out/bin/${pname}" \
      --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \
-      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ xorg.libX11 wayland libxkbcommon ]}
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ xorg.libX11 xorg.libXcursor xorg.libXrandr xorg.libXi wayland libxkbcommon ]}
  '';

  meta = with lib; {
--- a/pkgs/by-name/cs/csharpier/package.nix
+++ b/pkgs/by-name/cs/csharpier/package.nix
@ -0,0 +1,18 @@
+{ buildDotnetGlobalTool, lib }:
+
+buildDotnetGlobalTool {
+  pname = "csharpier";
+  version = "0.27.0";
+  executables = "dotnet-csharpier";
+
+  nugetSha256 = "sha256-aI8sZoUXAA/bOn7ITMkBFXHeTVRm9O/qX+bWfOKwRDs=";
+
+  meta = with lib; {
+    description = "An opinionated code formatter for C#";
+    homepage = "https://csharpier.com/";
+    changelog = "https://github.com/belav/csharpier/blob/main/CHANGELOG.md";
+    license = licenses.mit;
+    maintainers = with maintainers; [ zoriya ];
+    mainProgram = "dotnet-csharpier";
+  };
+}
--- a/pkgs/by-name/li/libtas/package.nix
+++ b/pkgs/by-name/li/libtas/package.nix
@ -0,0 +1,65 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
+, SDL2
+, alsa-lib
+, ffmpeg
+, lua5_3
+, qt5
+, file
+, makeDesktopItem
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libtas";
+  version = "1.4.5";
+
+  src = fetchFromGitHub {
+    owner = "clementgallet";
+    repo = "libTAS";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-n4iaJG9k+/TFfGMDCYL83Z6paxpm/gY3thP9T84GeQU=";
+  };
+
+  nativeBuildInputs = [ autoreconfHook qt5.wrapQtAppsHook pkg-config ];
+  buildInputs = [ SDL2 alsa-lib ffmpeg lua5_3 qt5.qtbase ];
+
+  configureFlags = [
+    "--enable-release-build"
+  ];
+
+  postInstall = ''
+    mkdir -p $out/lib
+    mv $out/bin/libtas*.so $out/lib/
+  '';
+
+  enableParallelBuilding = true;
+
+  postFixup = ''
+    wrapProgram $out/bin/libTAS \
+      --suffix PATH : ${lib.makeBinPath [ file ]} \
+      --set-default LIBTAS_SO_PATH $out/lib/libtas.so
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "libTAS";
+      desktopName = "libTAS";
+      exec = "libTAS %U";
+      icon = "libTAS";
+      startupWMClass = "libTAS";
+      keywords = [ "libTAS" ];
+    })
+  ];
+
+  meta = with lib; {
+    homepage = "https://clementgallet.github.io/libTAS/";
+    description = "GNU/Linux software to give TAS tools to games";
+    license = lib.licenses.gpl3Only;
+    maintainers = with maintainers; [ skyrina ];
+    mainProgram = "libTAS";
+    platforms = [ "i686-linux" "x86_64-linux" ];
+  };
+})
--- a/pkgs/by-name/mo/modprobed-db/package.nix
+++ b/pkgs/by-name/mo/modprobed-db/package.nix
@ -0,0 +1,50 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, pkg-config
+, libevdev
+, kmod
+, bash
+, installShellFiles
+}:
+let
+  pname = "modprobed-db";
+  version = "2.46";
+in
+stdenv.mkDerivation {
+  inherit pname version;
+
+  src = fetchFromGitHub {
+    owner = "graysky2";
+    repo = "modprobed-db";
+    rev = "v${version}";
+    hash = "sha256-GQME5CAZsGVHSPowKQMyUR7OjHeFZi/5YcWFUT9L/AQ=";
+  };
+
+  strictDeps = true;
+  nativeBuildInputs = [ pkg-config installShellFiles ];
+  buildInputs = [ kmod libevdev bash ];
+
+  installFlags = [
+    "PREFIX=$(out)"
+    "INITDIR_SYSTEMD=$(out)/lib/systemd/user"
+  ];
+
+  postPatch = ''
+    substituteInPlace ./common/modprobed-db.in \
+      --replace "/usr/share" "$out/share"
+  '';
+
+  postInstall = ''
+    installShellCompletion --zsh common/zsh-completion
+  '';
+
+  meta = {
+    homepage = "https://github.com/graysky2/modprobed-db";
+    description = "Useful utility for users wishing to build a minimal kernel via a make localmodconfig";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ NotAShelf ];
+    mainProgram = "modprobed-db";
+    platforms = lib.platforms.linux;
+  };
+}
--- a/pkgs/by-name/na/naps2/package.nix
+++ b/pkgs/by-name/na/naps2/package.nix
@ -11,13 +11,13 @@

 buildDotnetModule rec {
  pname = "naps2";
-  version = "7.2.2";
+  version = "7.3.0";

  src = fetchFromGitHub {
    owner = "cyanfish";
    repo = "naps2";
    rev = "v${version}";
-    hash = "sha256-ikt0gl/pNjEaENj1WRLdn/Zvx349FAGpzSV62Y2GwXI=";
+    hash = "sha256-aR4IDPfcbWWyM+1MhSWIsNUNLi43MvbWBykoEkVbe+4=";
  };

  projectFile = "NAPS2.App.Gtk/NAPS2.App.Gtk.csproj";
--- a/pkgs/by-name/po/powersupply/package.nix
+++ b/pkgs/by-name/po/powersupply/package.nix
@ -0,0 +1,62 @@
+{ lib
+, python3
+, fetchFromGitLab
+, desktop-file-utils
+, gobject-introspection
+, gtk3
+, libhandy
+, meson
+, ninja
+, pkg-config
+, wrapGAppsHook
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "powersupply";
+  version = "0.9.0";
+
+  format = "other";
+
+  src = fetchFromGitLab {
+    owner = "martijnbraam";
+    repo = "powersupply";
+    rev = version;
+    hash = "sha256-3NXoOqveMlMezYe4C78F3764KeAy5Sz3M714PO3h/eI=";
+  };
+
+  nativeBuildInputs = [
+    desktop-file-utils
+    gtk3
+    gobject-introspection
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    gtk3
+    libhandy
+  ];
+
+  propagatedBuildInputs = with python3.pkgs; [
+    pygobject3
+  ];
+
+  dontWrapGApps = true;
+
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
+  strictDeps = true;
+
+  meta = with lib; {
+    description = "Graphical app to display power status of mobile Linux platforms";
+    homepage = "https://gitlab.com/MartijnBraam/powersupply";
+    license = licenses.mit;
+    mainProgram = "powersupply";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ Luflosi ];
+  };
+}
--- a/pkgs/by-name/qg/qgrep/package.nix
+++ b/pkgs/by-name/qg/qgrep/package.nix
@ -0,0 +1,53 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, darwin
+}:
+
+stdenv.mkDerivation rec {
+  pname = "qgrep";
+  version = "1.3";
+
+  src = fetchFromGitHub {
+    owner = "zeux";
+    repo = "qgrep";
+    rev = "v${version}";
+    fetchSubmodules = true;
+    hash = "sha256-TeXOzfb1Nu6hz9l6dXGZY+xboscPapKm0Z264hv1Aww=";
+  };
+
+  patches = [
+    (fetchpatch {
+      name = "gcc-13.patch";
+      url = "https://github.com/zeux/qgrep/commit/8810ab153ec59717a5d7537b3e7812c01cd80848.patch";
+      hash = "sha256-lCMvpuLZluT6Rw8RFZ2uY9bffPBoq6sRVWYLUmeXfOg=";
+    })
+  ];
+
+  buildInputs = lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.CoreServices
+    darwin.apple_sdk.frameworks.CoreFoundation
+  ];
+
+  env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [
+    "-Wno-error=unused-command-line-argument"
+    "-Wno-error=unqualified-std-cast-call"
+  ]);
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 qgrep $out/bin/qgrep
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Fast regular expression grep for source code with incremental index updates";
+    homepage = "https://github.com/zeux/qgrep";
+    license = licenses.mit;
+    maintainers = [ maintainers.yrashk ];
+    platforms = platforms.all;
+  };
+}
--- a/pkgs/tools/security/websploit/default.nix
+++ b/pkgs/tools/security/websploit/default.nix
@ -1,18 +1,25 @@
-{ lib, buildPythonApplication, fetchFromGitHub
-, requests, scapy }:
+{ lib
+, fetchFromGitHub
+, python3
+}:

-buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
  pname = "websploit";
  version = "4.0.4";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "f4rih";
-    repo = pname;
-    rev = version;
+    repo = "websploit";
+    rev = "refs/tags/${version}";
    sha256 = "LpDfJmH2FbL37Fk86CAC/bxFqM035DBN6c6FPfGpaIw=";
  };

-  propagatedBuildInputs = [
+  nativeBuildInputs = with python3.pkgs; [
+    setuptools
+  ];
+
+  propagatedBuildInputs = with python3.pkgs; [
    requests
    scapy
  ];
@ -20,10 +27,16 @@ buildPythonApplication rec {
  # Project has no tests
  doCheck = false;

+  pythonImportsCheck = [
+    "websploit"
+  ];
+
  meta = with lib; {
    description = "A high level MITM framework";
    homepage = "https://github.com/f4rih/websploit";
+    changelog = "https://github.com/f4rih/websploit/releases/tag/${version}";
    license = licenses.mit;
    maintainers = with maintainers; [ emilytrau ];
+    mainProgram = "websploit";
  };
 }
--- a/pkgs/by-name/wh/whistle/package.nix
+++ b/pkgs/by-name/wh/whistle/package.nix
@ -2,16 +2,16 @@

 buildNpmPackage rec {
  pname = "whistle";
-  version = "2.9.62";
+  version = "2.9.63";

  src = fetchFromGitHub {
    owner = "avwo";
    repo = "whistle";
    rev = "v${version}";
-    hash = "sha256-sAG08hUhsd/73seBnQaSzKE/ej+c7aee34xG468gMF4=";
+    hash = "sha256-Dp3bW31INOVMCAculPsGHmzkQiWawfo5k9ALs21C1mc=";
  };

-  npmDepsHash = "sha256-2CISLLcoTkSKfpJDbLApqh3KtpIxYEjSKzUfw202Zkc=";
+  npmDepsHash = "sha256-Qqtp0SukzkuG1DGMcKP4eLXGfWHMZY9TcyP280wkk0g=";

  dontNpmBuild = true;

--- a/pkgs/development/compilers/ante/Cargo.lock
+++ b/pkgs/development/compilers/ante/Cargo.lock
--- a/pkgs/development/compilers/ante/default.nix
+++ b/pkgs/development/compilers/ante/default.nix
@ -2,24 +2,24 @@
 , lib
 , libffi
 , libxml2
-, llvmPackages_13
+, llvmPackages_16
 , ncurses
 , rustPlatform
 }:

 rustPlatform.buildRustPackage {
  pname = "ante";
-  version = "unstable-2022-08-22";
+  version = "unstable-2023-12-18";
  src = fetchFromGitHub {
    owner = "jfecher";
    repo = "ante";
-    rev = "8b708d549c213c34e4ca62d31cf0dd25bfa7b548";
-    sha256 = "sha256-s8nDuG32lI4pBLsOzgfyUGpc7/r0j4EhzH54ErBK7A0=";
+    rev = "e38231ffa51b84a2ca53b4b0439d1ca5e0dea32a";
+    hash = "sha256-UKEoOm+Jc0YUwO74Tn038MLeX/c3d2z8I0cTBVfX61U=";
  };
  cargoLock = {
    lockFile = ./Cargo.lock;
    outputHashes = {
-      "inkwell-0.1.0" = "sha256-vWrpF66r5HalGQz2jSmQljfz0EgS7shLw7A8q75j3tE=";
+      "inkwell-0.2.0" = "sha256-eMoclRtekg8v+m5KsTcjB3zCdPkcJy42NALEEuT/fw8=";
    };
  };

@ -28,7 +28,7 @@ rustPlatform.buildRustPackage {
     llvm-sys requires a specific version of llvmPackages,
     that is not the same as the one included by default with rustPlatform.
  */
-  nativeBuildInputs = [ llvmPackages_13.llvm ];
+  nativeBuildInputs = [ llvmPackages_16.llvm ];
  buildInputs = [ libffi libxml2 ncurses ];

  postPatch = ''
@ -37,13 +37,13 @@ rustPlatform.buildRustPackage {
  '';
  preBuild =
    let
-      major = lib.versions.major llvmPackages_13.llvm.version;
-      minor = lib.versions.minor llvmPackages_13.llvm.version;
+      major = lib.versions.major llvmPackages_16.llvm.version;
+      minor = lib.versions.minor llvmPackages_16.llvm.version;
      llvm-sys-ver = "${major}${builtins.substring 0 1 minor}";
    in
    ''
      # On some architectures llvm-sys is not using the package listed inside nativeBuildInputs
-      export LLVM_SYS_${llvm-sys-ver}_PREFIX=${llvmPackages_13.llvm.dev}
+      export LLVM_SYS_${llvm-sys-ver}_PREFIX=${llvmPackages_16.llvm.dev}
      export ANTE_STDLIB_DIR=$out/lib
      mkdir -p $ANTE_STDLIB_DIR
      cp -r $src/stdlib/* $ANTE_STDLIB_DIR
--- a/pkgs/development/compilers/gcc/common/configure-flags.nix
+++ b/pkgs/development/compilers/gcc/common/configure-flags.nix
@ -251,6 +251,11 @@ let
    ++ lib.optionals (targetPlatform.isMips && targetPlatform.parsed.abi.name == "gnu" && lib.versions.major version == "12") [
      "--disable-libsanitizer"
    ]
+    ++ lib.optionals targetPlatform.isAlpha [
+      # Workaround build failures like:
+      #   cc1: error: fp software completion requires '-mtrap-precision=i' [-Werror]
+      "--disable-werror"
+    ]
  ;

 in configureFlags
--- a/pkgs/development/compilers/gcc/common/libgcc-buildstuff.nix
+++ b/pkgs/development/compilers/gcc/common/libgcc-buildstuff.nix
@ -48,6 +48,6 @@ in
  # https://www.openwall.com/lists/musl/2022/11/09/3
  #
  # 'parsed.cpu.family' won't be correct for every platform.
-+ lib.optionalString (stdenv.targetPlatform.isLoongArch64 || stdenv.targetPlatform.isS390) ''
+ lib.optionalString (stdenv.targetPlatform.isLoongArch64 || stdenv.targetPlatform.isS390 || stdenv.targetPlatform.isAlpha) ''
  touch libgcc/config/${stdenv.targetPlatform.parsed.cpu.family}/crt{i,n}.S
 ''
--- a/pkgs/development/embedded/stm32/stm32cubemx/default.nix
+++ b/pkgs/development/embedded/stm32/stm32cubemx/default.nix
@ -1,17 +1,17 @@
 { fdupes
+, buildFHSEnv
 , fetchzip
 , icoutils
 , imagemagick
 , jdk17
 , lib
 , makeDesktopItem
-, stdenv
+, stdenvNoCC
 }:

 let
  iconame = "STM32CubeMX";
-in
-stdenv.mkDerivation rec {
+  package = stdenvNoCC.mkDerivation rec {
    pname = "stm32cubemx";
    version = "6.10.0";

@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
      chmod +rx $out/opt/STM32CubeMX/STM32CubeMX

      cat << EOF > $out/bin/${pname}
-    #!${stdenv.shell}
+      #!${stdenvNoCC.shell}
      ${jdk17}/bin/java -jar $out/opt/STM32CubeMX/STM32CubeMX
      EOF
      chmod +x $out/bin/${pname}
@ -79,6 +79,37 @@ stdenv.mkDerivation rec {
      sourceProvenance = with sourceTypes; [ binaryBytecode ];
      license = licenses.unfree;
      maintainers = with maintainers; [ angaz wucke13 ];
-    platforms = platforms.all;
+      platforms = [ "x86_64-linux" ];
    };
+  };
+  in
+  buildFHSEnv {
+    inherit (package) pname meta;
+    runScript = "${package.outPath}/bin/stm32cubemx";
+    targetPkgs = pkgs:
+      with pkgs; [
+        alsa-lib
+        at-spi2-atk
+        cairo
+        cups
+        dbus
+        expat
+        glib
+        gtk3
+        libdrm
+        libGL
+        libudev0-shim
+        libxkbcommon
+        mesa
+        nspr
+        nss
+        pango
+        xorg.libX11
+        xorg.libxcb
+        xorg.libXcomposite
+        xorg.libXdamage
+        xorg.libXext
+        xorg.libXfixes
+        xorg.libXrandr
+      ];
 }
--- a/pkgs/development/libraries/avro-c++/default.nix
+++ b/pkgs/development/libraries/avro-c++/default.nix
@ -1,13 +1,30 @@
-{ lib, stdenv, fetchurl, cmake, boost, python3 }:
+{ lib
+, stdenv
+, fetchurl
+, fetchpatch
+, cmake
+, boost
+, python3
+}:

 stdenv.mkDerivation rec {
  pname = "avro-c++";
-  version = "1.11.0";
+  version = "1.11.3";

  src = fetchurl {
    url = "mirror://apache/avro/avro-${version}/cpp/avro-cpp-${version}.tar.gz";
-    sha256 = "sha256-73DKihz+7XAX3LLA7VkTdN6rFhuGvmyksxK8JMranFY=";
+    hash = "sha256-+6JCrvd+yBnQdWH8upN1FyGVbejQyujh8vMAtUszG64=";
  };
+  patches = [
+    # This patch fixes boost compatibility and can be removed when
+    # upgrading beyond 1.11.3 https://github.com/apache/avro/pull/1920
+    (fetchpatch {
+      name = "fix-boost-compatibility.patch";
+      url = "https://github.com/apache/avro/commit/016323828f147f185d03f50d2223a2f50bfafce1.patch";
+      hash = "sha256-hP/5J2JzSplMvg8EjEk98Vim8DfTyZ4hZ/WGiVwvM1A=";
+    })
+  ];
+  patchFlags = [ "-p3" ];

  nativeBuildInputs = [ cmake python3 ];
  buildInputs = [ boost ];
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@ -86,7 +86,7 @@
 , withVaapi ? withHeadlessDeps && (with stdenv; isLinux || isFreeBSD) # Vaapi hardware acceleration
 , withVdpau ? withSmallDeps # Vdpau hardware acceleration
 , withVidStab ? withFullDeps # Video stabilization
-, withVmaf ? withFullDeps && withGPLv3 && !stdenv.isAarch64 # Netflix's VMAF (Video Multi-Method Assessment Fusion)
+, withVmaf ? withFullDeps && withGPLv3 && !stdenv.isAarch64 && lib.versionAtLeast version "5" # Netflix's VMAF (Video Multi-Method Assessment Fusion)
 , withVoAmrwbenc ? withFullDeps # AMR-WB encoder
 , withVorbis ? withHeadlessDeps # Vorbis de/encoding, native encoder exists
 , withVpx ? withHeadlessDeps && stdenv.buildPlatform == stdenv.hostPlatform # VP8 & VP9 de/encoding
--- a/pkgs/development/libraries/libdwarf/default.nix
+++ b/pkgs/development/libraries/libdwarf/default.nix
@ -1,8 +1,12 @@
-{ callPackage, zlib }:
+{ callPackage
+, zlib
+, zstd
+}:
+
 callPackage ./common.nix rec {
-  version = "0.4.2";
+  version = "0.9.0";
  url = "https://www.prevanders.net/libdwarf-${version}.tar.xz";
-  hash = "sha512-bSo+vwEENi3Zzs7CcpNWhPl32xGYEO6g7siMn1agQvJgpPbtO7q96Fkv4W+Yy9gbSrKHgAUUDgXI9HXfY4DRwg==";
-  buildInputs = [ zlib ];
+  hash = "sha512-KC2Q38nacE62SkuhFB8q5mD+6xS78acjdzhmmOMSSSi0SmkU2OiOYUGrCINc5yOtCQqFOtV9vLQ527pXJV+1iQ==";
+  buildInputs = [ zlib zstd ];
  knownVulnerabilities = [];
 }
--- a/pkgs/development/libraries/liboqs/default.nix
+++ b/pkgs/development/libraries/liboqs/default.nix
@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-h3mXoGRYgPg0wKQ1u6uFP7wlEUMQd5uIBt4Hr7vjNtA=";
  };

+  patches = [ ./fix-openssl-detection.patch ];
+
  nativeBuildInputs = [ cmake ];
  buildInputs = [ openssl ];

--- a/pkgs/development/libraries/liboqs/fix-openssl-detection.patch
+++ b/pkgs/development/libraries/liboqs/fix-openssl-detection.patch
@ -0,0 +1,36 @@
+From 6bdcf53de74ac2afba42deea63522939ca51f871 Mon Sep 17 00:00:00 2001
+From: Raphael Robatsch <raphael-git@tapesoftware.net>
+Date: Mon, 25 Dec 2023 16:15:29 +0000
+Subject: [PATCH] Do not forcibly set OPENSSL_ROOT_DIR.
+
+CMake can already find OpenSSL via pkg-config. Setting OPENSSL_ROOT_DIR
+forcibly to "/usr" breaks this.
+---
+ CMakeLists.txt | 11 -----------
+ 1 file changed, 11 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 288bcbe8..9750fae6 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -119,17 +119,6 @@ include(.CMake/compiler_opts.cmake)
+ include(.CMake/alg_support.cmake)
+ 
+ if(${OQS_USE_OPENSSL})
+-    if(NOT DEFINED OPENSSL_ROOT_DIR)
+-        if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Darwin")
+-            if(EXISTS "/usr/local/opt/openssl@1.1")
+-                set(OPENSSL_ROOT_DIR "/usr/local/opt/openssl@1.1")
+-            elseif(EXISTS "/opt/homebrew/opt/openssl@1.1")
+-                set(OPENSSL_ROOT_DIR "/opt/homebrew/opt/openssl@1.1")
+-            endif()
+-        elseif(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Linux")
+-            set(OPENSSL_ROOT_DIR "/usr")
+-        endif()
+-    endif()
+     find_package(OpenSSL 1.1.1 REQUIRED)
+ endif()
+ 
+-- 
+2.42.0
+
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@ -87,6 +87,15 @@ let
      platforms   = platforms.all;
      maintainers = with maintainers; [ thoughtpolice fpletz ];
      inherit knownVulnerabilities;
+
+      # OpenBSD believes that PowerPC should be always-big-endian;
+      # this assumption seems to have propagated into recent
+      # releases of libressl.  Since libressl is aliased to many
+      # other packages (e.g. netcat) it's important to fail early
+      # here, otherwise it's very difficult to figure out why
+      # libressl is getting dragged into a failing build.
+      badPlatforms = with lib.systems.inspect.patterns;
+        [ (lib.recursiveUpdate isPower64 isLittleEndian) ];
    };
  };

--- a/pkgs/development/libraries/librist/darwin.patch
+++ b/pkgs/development/libraries/librist/darwin.patch
@ -1,3 +1,5 @@
+diff --git a/tools/srp_shared.c b/tools/srp_shared.c
+index f782126..23e82a5 100644
 --- a/tools/srp_shared.c
 +++ b/tools/srp_shared.c
@@ -173,7 +173,11 @@ void user_verifier_lookup(char * username,
@ -5,9 +7,9 @@
 		return;
 
 +#if defined(__APPLE__)
-+	*generation = (buf.st_mtimespec.tv_sec << 32) | buf.st_mtimespec.tv_nsec;
+	*generation = ((uint64_t)buf.st_mtimespec.tv_sec << 32) | buf.st_mtimespec.tv_nsec;
 +#else
- 	*generation = (buf.st_mtim.tv_sec << 32) | buf.st_mtim.tv_nsec;
+ 	*generation = ((uint64_t)buf.st_mtim.tv_sec << 32) | buf.st_mtim.tv_nsec;
 +#endif
 #endif
 
--- a/pkgs/development/libraries/librist/default.nix
+++ b/pkgs/development/libraries/librist/default.nix
@ -11,14 +11,14 @@

 stdenv.mkDerivation rec {
  pname = "librist";
-  version = "0.2.8";
+  version = "0.2.10";

  src = fetchFromGitLab {
    domain = "code.videolan.org";
    owner = "rist";
    repo = "librist";
    rev = "v${version}";
-    hash = "sha256-E12TS+N47UQapkF6oO0Lx66Z3lHAyP0R4tVnx/uKBwQ=";
+    hash = "sha256-8N4wQXxjNZuNGx/c7WVAV5QS48Bff5G3t11UkihT+K0=";
  };

  patches = [
--- a/pkgs/development/python-modules/colorful/default.nix
+++ b/pkgs/development/python-modules/colorful/default.nix
@ -7,7 +7,7 @@

 buildPythonPackage rec {
  pname = "colorful";
-  version = "0.5.5";
+  version = "0.5.6";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
    owner = "timofurrer";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-fgxbj1WE9JcGt+oEcBguL0wQEWIn5toRTLWsvCFO3k8=";
+    hash = "sha256-8rHJIsHiyfjmjlGiEyrzvEwKgi1kP4Njm731mlFDMIU=";
  };

  nativeCheckInputs = [
--- a/pkgs/development/python-modules/dsnap/default.nix
+++ b/pkgs/development/python-modules/dsnap/default.nix
@ -17,7 +17,7 @@
 buildPythonPackage rec {
  pname = "dsnap";
  version = "1.0.0";
-  format = "pyproject";
+  pyproject = true;

  disabled = pythonOlder "3.7";

@ -28,6 +28,12 @@ buildPythonPackage rec {
    hash = "sha256-yKch+tKjFhvZfzloazMH378dkERF8gnZEX1Som+d670=";
  };

+  postPatch = ''
+    # Is no direct dependency
+    substituteInPlace pyproject.toml \
+      --replace 'urllib3 = "^1.26.4"' 'urllib3 = "*"'
+  '';
+
  nativeBuildInputs = [
    poetry-core
  ];
--- a/pkgs/development/python-modules/griffe/default.nix
+++ b/pkgs/development/python-modules/griffe/default.nix
@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "griffe";
-  version = "0.38.1";
+  version = "0.39.0";
  format = "pyproject";

  disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "mkdocstrings";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-j0j13bJtHlPc00pjmfpg/QJKzYQQcyA+jE7q538Uu08=";
+    hash = "sha256-mVIGT7kb8+eQcTAF7/S+0KraQiDzS9VdyrBsxzqpBHI=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/homematicip/default.nix
+++ b/pkgs/development/python-modules/homematicip/default.nix
@ -11,24 +11,31 @@
 , pytest-aiohttp
 , pytest-asyncio
 , requests
+, setuptools
+, setuptools-scm
 , websocket-client
 , websockets
 }:

 buildPythonPackage rec {
  pname = "homematicip";
-  version = "1.0.16";
-  format = "setuptools";
+  version = "1.1.0";
+  pyproject = true;

-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.10";

  src = fetchFromGitHub {
    owner = "hahn-th";
    repo = "homematicip-rest-api";
    rev = "refs/tags/${version}";
-    hash = "sha256-rvjdhsvGYllVeenVkU/ikwil4OVHPRIaXs+85q0pM/w=";
+    hash = "sha256-tx7/amXG3rLdUFgRPQcuf57qkBLAPxPWjLGSO7MrcWU=";
  };

+  nativeBuildInputs = [
+    setuptools
+    setuptools-scm
+  ];
+
  propagatedBuildInputs = [
    aenum
    aiohttp
--- a/pkgs/development/python-modules/pex/default.nix
+++ b/pkgs/development/python-modules/pex/default.nix
@ -1,24 +1,24 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, flit-core
+, setuptools
 , pythonOlder
 }:

 buildPythonPackage rec {
  pname = "pex";
-  version = "2.1.156";
+  version = "2.1.159";
  pyproject = true;

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-VC7LRXwh9a6Pp0mJQJjhxU6GOWKO/ucOzn+J2mAqpMI=";
+    hash = "sha256-hBlwfyQ1PbD6AyCsra2yZwt0x8+iGtDisU9coTSJRZI=";
  };

  nativeBuildInputs = [
-    flit-core
+    setuptools
  ];

  # A few more dependencies I don't want to handle right now...
--- a/pkgs/development/python-modules/pipdeptree/default.nix
+++ b/pkgs/development/python-modules/pipdeptree/default.nix
@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "pipdeptree";
-  version = "2.13.1";
+  version = "2.13.2";
  format = "pyproject";

  disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "tox-dev";
    repo = "pipdeptree";
    rev = "refs/tags/${version}";
-    hash = "sha256-rlnJmGe9LYwIJxV02IjiKtT1iS1O9ik8dAfjsPHsa8U=";
+    hash = "sha256-eDgulAKq78HRW/7GhO40hxr+F1hOfgXqAzaCw5pFjD8=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/python-bsblan/default.nix
+++ b/pkgs/development/python-modules/python-bsblan/default.nix
@ -16,7 +16,7 @@

 buildPythonPackage rec {
  pname = "python-bsblan";
-  version = "0.5.16";
+  version = "0.5.18";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -25,7 +25,7 @@ buildPythonPackage rec {
    owner = "liudger";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-m80lnNd1ANddV0d/w3S7+QWzIPRklDZsWMO2g1hgEoQ=";
+    hash = "sha256-SJUIJhsVn4LZiUx9h3Q2uWoeaQiKoIRrijTfPgCHnAA=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/rasterio/default.nix
+++ b/pkgs/development/python-modules/rasterio/default.nix
@ -30,7 +30,7 @@

 buildPythonPackage rec {
  pname = "rasterio";
-  version = "4";
+  version = "1.3.9";
  format = "pyproject";

  disabled = pythonOlder "3.8";
@ -38,8 +38,8 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "rasterio";
    repo = "rasterio";
-    rev = "refs/tags/release-test-${version}";
-    hash = "sha256-YO0FnmIEt+88f6k2mdXDSQg7UKq1Swr8wqVUGdRyQR4=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-Tp6BSU33FaszrIXQgU0Asb7IMue0C939o/atAKz+3Q4=";
  };

  patches = [
--- a/pkgs/development/python-modules/reolink-aio/default.nix
+++ b/pkgs/development/python-modules/reolink-aio/default.nix
@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "reolink-aio";
-  version = "0.8.6";
+  version = "0.8.7";
  format = "setuptools";

  disabled = pythonOlder "3.9";
@ -19,7 +19,7 @@ buildPythonPackage rec {
    owner = "starkillerOG";
    repo = "reolink_aio";
    rev = "refs/tags/${version}";
-    hash = "sha256-uc13IJb4b6sXNL35UUc3Sv4gh4BVVk0a+esA+ouhsFg=";
+    hash = "sha256-+Yhw7Wbt0K7BLXatd/UANnnNWPkxgk8SqAyV9Kk4hos=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/sphinx-multitoc-numbering/default.nix
+++ b/pkgs/development/python-modules/sphinx-multitoc-numbering/default.nix
@ -2,25 +2,38 @@
 , buildPythonPackage
 , fetchPypi
 , sphinx
+, pythonOlder
+, setuptools
 }:

 buildPythonPackage rec {
  pname = "sphinx-multitoc-numbering";
  version = "0.1.3";
-  format = "pyproject";
+  pyproject = true;
+
+  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "c9607671ac511236fa5d61a7491c1031e700e8d498c9d2418e6c61d1251209ae";
+    hash = "sha256-yWB2caxREjb6XWGnSRwQMecA6NSYydJBjmxh0SUSCa4=";
  };

-  propagatedBuildInputs = [ sphinx ];
+  nativeBuildInputs = [
+    setuptools
+  ];

-  pythonImportsCheck = [ "sphinx_multitoc_numbering" ];
+  propagatedBuildInputs = [
+    sphinx
+  ];
+
+  pythonImportsCheck = [
+    "sphinx_multitoc_numbering"
+  ];

  meta = with lib; {
    description = "Supporting continuous HTML section numbering";
    homepage = "https://github.com/executablebooks/sphinx-multitoc-numbering";
+    changelog = "https://github.com/executablebooks/sphinx-multitoc-numbering/blob/v${version}/CHANGELOG.md";
    license = licenses.mit;
    maintainers = with maintainers; [ marsam ];
  };
--- a/pkgs/development/tools/misc/gef/default.nix
+++ b/pkgs/development/tools/misc/gef/default.nix
@ -21,13 +21,13 @@ let

 in stdenv.mkDerivation rec {
  pname = "gef";
-  version = "2023.08";
+  version = "2024.01";

  src = fetchFromGitHub {
    owner = "hugsy";
    repo = "gef";
    rev = version;
-    sha256 = "sha256-MqpII3jhSc6aP/WQDktom2wxAvCkxCwfs1AFWij5J7A=";
+    sha256 = "sha256-uSUr2NFvj7QIlvG3RWYm7A9Xx7a4JYkbAQld7c7+C7g=";
  };

  dontBuild = true;
--- a/pkgs/development/tools/rust/cargo-mutants/default.nix
+++ b/pkgs/development/tools/rust/cargo-mutants/default.nix
@ -7,16 +7,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "cargo-mutants";
-  version = "24.1.0";
+  version = "24.1.1";

  src = fetchFromGitHub {
    owner = "sourcefrog";
    repo = "cargo-mutants";
    rev = "v${version}";
-    hash = "sha256-hWM8QtzWUrhWHTAv4Fgq9F3ZIZS2HVP4R8J/HIh8T+0=";
+    hash = "sha256-n7fpfgbDvLMMA834BUSAEYD+mXVxGGFPLlLjDxpKuSA=";
  };

-  cargoHash = "sha256-dKhxyhLWeaP9/qYZLMDFGF2DmKhzPXOT5qXHP3D3MjY=";
+  cargoHash = "sha256-lEeNIwNvq6K+xRCUTXs9Sh7o8q3u5GcBKntVMhPQqMU=";

  buildInputs = lib.optionals stdenv.isDarwin [
    darwin.apple_sdk.frameworks.SystemConfiguration
--- a/pkgs/games/airshipper/default.nix
+++ b/pkgs/games/airshipper/default.nix
@ -113,7 +113,7 @@ rustPlatform.buildRustPackage {
  cargoTestFlags = [ "--package" "airshipper" ];

  meta = with lib; {
-    description = "Provides automatic updates for the voxel RPG Veloren.";
+    description = "Provides automatic updates for the voxel RPG Veloren";
    homepage = "https://www.veloren.net";
    license = licenses.gpl3;
    maintainers = with maintainers; [ yusdacra ];
--- a/pkgs/games/black-hole-solver/default.nix
+++ b/pkgs/games/black-hole-solver/default.nix
@ -8,12 +8,6 @@ stdenv.mkDerivation rec {
  pname = "black-hole-solver";
  version = "1.12.0";

-  meta = with lib; {
-    homepage = "https://www.shlomifish.org/open-source/projects/black-hole-solitaire-solver/";
-    description = "A solver for Solitaire variants Golf, Black Hole, and All in a Row.";
-    license = licenses.mit;
-  };
-
  src = fetchurl {
    url = "https://fc-solve.shlomifish.org/downloads/fc-solve/${pname}-${version}.tar.xz";
    sha256 = "sha256-0y8yU291cykliPQbsNha5C1WE3bCGNxKtrrf5JBKN6c=";
@ -27,4 +21,9 @@ stdenv.mkDerivation rec {
    patchShebangs ./scripts
  '';

+  meta = with lib; {
+    description = "A solver for Solitaire variants Golf, Black Hole, and All in a Row";
+    homepage = "https://www.shlomifish.org/open-source/projects/black-hole-solitaire-solver/";
+    license = licenses.mit;
+  };
 }
--- a/pkgs/games/corsix-th/default.nix
+++ b/pkgs/games/corsix-th/default.nix
@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
  '';

  meta = with lib; {
-    description = "A reimplementation of the 1997 Bullfrog business sim Theme Hospital.";
+    description = "A reimplementation of the 1997 Bullfrog business sim Theme Hospital";
    homepage = "https://corsixth.com/";
    license = licenses.mit;
    maintainers = with maintainers; [ hughobrien ];
--- a/pkgs/games/ddnet/default.nix
+++ b/pkgs/games/ddnet/default.nix
@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
  '';

  meta = with lib; {
-    description = "A Teeworlds modification with a unique cooperative gameplay.";
+    description = "A Teeworlds modification with a unique cooperative gameplay";
    longDescription = ''
      DDraceNetwork (DDNet) is an actively maintained version of DDRace,
      a Teeworlds modification with a unique cooperative gameplay.
--- a/pkgs/games/dwarf-fortress/twbt/default.nix
+++ b/pkgs/games/dwarf-fortress/twbt/default.nix
@ -76,7 +76,7 @@ stdenvNoCC.mkDerivation rec {
  '';

  meta = with lib; {
-    description = "A plugin for Dwarf Fortress / DFHack that improves various aspects the game interface.";
+    description = "A plugin for Dwarf Fortress / DFHack that improves various aspects the game interface";
    maintainers = with maintainers; [ Baughn numinit ];
    license = licenses.mit;
    platforms = platforms.linux;
--- a/pkgs/games/marble-marcher-ce/default.nix
+++ b/pkgs/games/marble-marcher-ce/default.nix
@ -54,8 +54,7 @@ stdenv.mkDerivation rec {
  ];

  meta = with lib; {
-    description = "A fractal physics game.";
-    longDescription = "A community-developed version of the original Marble Marcher - a fractal physics game.";
+    description = "A community-developed version of the original Marble Marcher - a fractal physics game";
    homepage = "https://michaelmoroz.itch.io/mmce";
    license = with licenses; [
      gpl2Plus # Code
--- a/pkgs/games/openra/build-engine.nix
+++ b/pkgs/games/openra/build-engine.nix
@ -72,7 +72,7 @@ buildDotnetModule rec {
  '';

  meta = with lib; {
-    description = "Open Source real-time strategy game engine for early Westwood games such as Command & Conquer: Red Alert. ${engine.build} version.";
+    description = "Open Source real-time strategy game engine for early Westwood games such as Command & Conquer: Red Alert. ${engine.build} version";
    homepage = "https://www.openra.net/";
    license = licenses.gpl3;
    maintainers = with maintainers; [ mdarocha ];
--- a/pkgs/games/pegasus-frontend/default.nix
+++ b/pkgs/games/pegasus-frontend/default.nix
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
  ];

  meta = with lib; {
-    description = "A cross platform, customizable graphical frontend for launching emulators and managing your game collection.";
+    description = "A cross platform, customizable graphical frontend for launching emulators and managing your game collection";
    homepage = "https://pegasus-frontend.org/";
    license = licenses.gpl3Plus;
    maintainers = with maintainers; [ tengkuizdihar ];
--- a/pkgs/games/theforceengine/default.nix
+++ b/pkgs/games/theforceengine/default.nix
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
  '';

  meta = with lib; {
-    description = "Modern \"Jedi Engine\" replacement supporting Dark Forces, mods, and in the future Outlaws.";
+    description = "Modern \"Jedi Engine\" replacement supporting Dark Forces, mods, and in the future, Outlaws";
    homepage = "https://theforceengine.github.io";
    license = licenses.gpl2Only;
    maintainers = with maintainers; [ devusb ];
--- a/pkgs/games/uchess/default.nix
+++ b/pkgs/games/uchess/default.nix
@ -24,7 +24,7 @@ buildGoModule rec {
  '';

  meta = with lib; {
-    description = "Play chess against UCI engines in your terminal.";
+    description = "Play chess against UCI engines in your terminal";
    homepage = "https://tmountain.github.io/uchess/";
    maintainers = with maintainers; [ tmountain ];
    license = licenses.mit;
--- a/pkgs/games/xgalaga++/default.nix
+++ b/pkgs/games/xgalaga++/default.nix
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {

  meta = with lib; {
    homepage = "https://marc.mongenet.ch/OSS/XGalaga/";
-    description = "XGalaga++ is a classic single screen vertical shoot ’em up. It is inspired by XGalaga and reuses most of its sprites.";
+    description = "XGalaga++ is a classic single screen vertical shoot ’em up. It is inspired by XGalaga and reuses most of its sprites";
    license = licenses.gpl2Plus;
    platforms = platforms.linux;
  };
--- a/pkgs/misc/g810-led/default.nix
+++ b/pkgs/misc/g810-led/default.nix
@ -5,14 +5,14 @@
 , profile ? "/etc/g810-led/profile"
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "g810-led";
  version = "0.4.3";

  src = fetchFromGitHub {
    owner = "MatMoul";
-    repo = pname;
-    rev = "refs/tags/v${version}";
+    repo = "g810-led";
+    rev = "refs/tags/v${finalAttrs.version}";
    hash = "sha256-GKHtQ7DinqfhclDdPO94KtTLQhhonAoWS4VOvs6CMhY=";
  };

@ -22,6 +22,9 @@ stdenv.mkDerivation rec {
      --replace "/etc/g810-led/profile" "${profile}"
  '';

+  # GCC 13 cannot find `uint16_t` and other similar types by default anymore
+  env.CXXFLAGS = "-include cstdint";
+
  buildInputs = [
    hidapi
  ];
@ -48,4 +51,4 @@ stdenv.mkDerivation rec {
    maintainers = with maintainers; [ fab ];
    platforms = platforms.linux;
  };
-}
+})
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@ -11,9 +11,9 @@ let
  };
  # ./update-zen.py lqx
  lqxVariant = {
-    version = "6.6.11"; #lqx
+    version = "6.6.12"; #lqx
    suffix = "lqx1"; #lqx
-    sha256 = "0vsfpbkkj73hcncrihviqbmy20id1hx08c537by1a6hfc0f9y55z"; #lqx
+    sha256 = "13wj7w66mrkabf7f03svq8x9dqy7w3dnh9jqpkr2hdkd6l2nf6c3"; #lqx
    isLqx = true;
  };
  zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
--- a/pkgs/servers/mail/rspamd/default.nix
+++ b/pkgs/servers/mail/rspamd/default.nix
@ -1,7 +1,6 @@
 { stdenv
 , lib
 , fetchFromGitHub
-, fetchpatch2
 , cmake
 , perl
 , glib
@ -28,23 +27,15 @@ assert withHyperscan -> stdenv.isx86_64;

 stdenv.mkDerivation rec {
  pname = "rspamd";
-  version = "3.7.4";
+  version = "3.7.5";

  src = fetchFromGitHub {
    owner = "rspamd";
    repo = "rspamd";
    rev = version;
-    hash = "sha256-Bg0EFgxk/sRwE8/7a/m8J4cTgooR4fobQil8pbWtkoc=";
+    hash = "sha256-Y9Xq6mEq52AeTBGMQOh4jO4BUcSS9YfCs1/Wka5zkK4=";
  };

-  patches = [
-    (fetchpatch2 {
-      name = "no-hyperscan-fix.patch";
-      url = "https://github.com/rspamd/rspamd/commit/d907a95ac2e2cad6f7f65c4323f031f7931ae18b.patch";
-      hash = "sha256-bMmgiJSy0QrzvBAComzT0aM8UF8OKeV0VgMr0wwrM6w=";
-    })
-  ];
-
  hardeningEnable = [ "pie" ];

  nativeBuildInputs = [ cmake pkg-config perl ];
--- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "snmp_exporter";
-  version = "0.22.0";
+  version = "0.25.0";

  src = fetchFromGitHub {
    owner = "prometheus";
    repo = "snmp_exporter";
    rev = "v${version}";
-    sha256 = "sha256-HncffOX0/z8XIEXTOkt6bcnAfY7xwgNBGhUwC3FIJjo=";
+    sha256 = "sha256-6Y2zJwY5gToJlY6iLug2jNXXtNLNz98WoTKGcWgYzaA=";
  };

-  vendorHash = "sha256-n0LPKmGPxLZgvzdpyuE67WOJv7MKN28m7PtQpWYdtMk=";
+  vendorHash = "sha256-8soLDI/hBzSZB6Lfj1jVkIWfIkMPJmp84bu7TKg7jeo=";

  buildInputs = [ net-snmp ];

@ -23,6 +23,6 @@ buildGoModule rec {
    description = "SNMP Exporter for Prometheus";
    homepage = "https://github.com/prometheus/snmp_exporter";
    license = licenses.asl20;
-    maintainers = with maintainers; [ oida willibutz Frostman ];
+    maintainers = with maintainers; [ oida Frostman ];
  };
 }
--- a/pkgs/shells/oil/default.nix
+++ b/pkgs/shells/oil/default.nix
@ -24,6 +24,10 @@ stdenv.mkDerivation rec {

  strictDeps = true;
  buildInputs = lib.optional withReadline readline;
+  # As of 0.19.0 the build generates an error on MacOS (using clang version 16.0.6 in the builder),
+  # whereas running it outside of Nix with clang version 15.0.0 generates just a warning. The shell seems to
+  # work just fine though, so we disable the error here.
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types";
  configureFlags = [
    "--datarootdir=${placeholder "out"}"
  ] ++ lib.optionals withReadline [
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@ -66,6 +66,7 @@ let

        meta = with lib; {
          description = "A robust and highly flexible tunneling application";
+          mainProgram = "openvpn";
          downloadPage = "https://openvpn.net/community-downloads/";
          homepage = "https://openvpn.net/";
          license = licenses.gpl2Only;
--- a/pkgs/tools/security/grype/default.nix
+++ b/pkgs/tools/security/grype/default.nix
@ -7,13 +7,13 @@

 buildGoModule rec {
  pname = "grype";
-  version = "0.74.0";
+  version = "0.74.1";

  src = fetchFromGitHub {
    owner = "anchore";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-M/PBsCZPMh2RSrTWqe5XjErVrSi39DbQpqSzbKXA/wI=";
+    hash = "sha256-/s23QSg4+reF+BTbbk1MXtUC0ytdgd8olaiUTqR7LqM=";
    # populate values that require us to use git. By doing this in postFetch we
    # can delete .git afterwards and maintain better reproducibility of the src.
    leaveDotGit = true;
@ -28,7 +28,7 @@ buildGoModule rec {

  proxyVendor = true;

-  vendorHash = "sha256-h/rpDF1weo54DSHRM3eV//+WjSOI24zo1YmpTa3MRnE=";
+  vendorHash = "sha256-LNyYwnQhGZfsHrA02fHdXKRTJ83Xii3q//Tfrq3sLFc=";

  nativeBuildInputs = [
    installShellFiles
--- a/pkgs/tools/security/ioccheck/default.nix
+++ b/pkgs/tools/security/ioccheck/default.nix
@ -13,7 +13,7 @@ let
          owner = "carpedm20";
          repo = "emoji";
          rev = "v${version}";
-          sha256 = "sha256-vKQ51RP7uy57vP3dOnHZRSp/Wz+YDzeLUR8JnIELE/I=";
+          hash = "sha256-vKQ51RP7uy57vP3dOnHZRSp/Wz+YDzeLUR8JnIELE/I=";
        };
      };

@ -26,29 +26,35 @@ let
          owner = "tweepy";
          repo = "tweepy";
          rev = "v${version}";
-          sha256 = "0k4bdlwjna6f1k19jki4xqgckrinkkw8b9wihzymr1l04rwd05nw";
+          hash = "sha256-3BbQeCaAhlz9h5GnhficNubJHu4kTpnCDM4oKzlti0w=";
        };
        doCheck = false;
      };
    };
  };
-in
-with py.pkgs;
-
-buildPythonApplication rec {
+in py.pkgs.buildPythonApplication rec {
  pname = "ioccheck";
  version = "unstable-2021-09-29";
-  format = "pyproject";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "ranguli";
-    repo = pname;
+    repo = "ioccheck";
    rev = "db02d921e2519b77523a200ca2d78417802463db";
    hash = "sha256-qf5tHIpbj/BfrzUST+EzohKh1hUg09KwF+vT0tj1+FE=";
  };

  nativeBuildInputs = with py.pkgs; [
    poetry-core
+    pythonRelaxDepsHook
+  ];
+
+  pythonRelaxDeps = [
+    "backoff"
+    "pyfiglet"
+    "tabulate"
+    "termcolor"
+    "vt-py"
  ];

  propagatedBuildInputs = with py.pkgs; [
@ -73,11 +79,7 @@ buildPythonApplication rec {
  postPatch = ''
    # Can be removed with the next release
    substituteInPlace pyproject.toml \
-      --replace '"hurry.filesize" = "^0.9"' "" \
-      --replace 'vt-py = ">=0.6.1,<0.8.0"' 'vt-py = ">=0.6.1"' \
-      --replace 'backoff = "^1.10.0"' 'backoff = ">=1.10.0"' \
-      --replace 'termcolor = "^1.1.0"' 'termcolor = "*"' \
-      --replace 'tabulate = "^0.8.9"' 'tabulate = "*"'
+      --replace '"hurry.filesize" = "^0.9"' ""
  '';

  pythonImportsCheck = [
--- a/pkgs/tools/text/qgrep/default.nix
+++ b/pkgs/tools/text/qgrep/default.nix
@ -1,45 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, CoreServices, CoreFoundation, fetchpatch }:
-
-stdenv.mkDerivation rec {
-  version = "1.1";
-  pname = "qgrep";
-
-  src = fetchFromGitHub {
-    owner = "zeux";
-    repo = "qgrep";
-    rev = "v${version}";
-    sha256 = "046ccw34vz2k5jn6gyxign5gs2qi7i50jy9b74wqv7sjf5zayrh0";
-    fetchSubmodules = true;
-  };
-
-  patches = lib.optionals stdenv.isDarwin [
-    (fetchpatch {
-      url = "https://github.com/zeux/qgrep/commit/21c4d1a5ab0f0bdaa0b5ca993c1315c041418cc6.patch";
-      sha256 = "0wpxzrd9pmhgbgby17vb8279xwvkxfdd99gvv7r74indgdxqg7v8";
-    })
-  ];
-
-  buildInputs = lib.optionals stdenv.isDarwin [ CoreServices CoreFoundation ];
-
-  env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [
-    # Needed with GCC 12 but breaks on darwin (with clang) or older gcc
-    "-Wno-error=mismatched-new-delete"
-  ]);
-
-  postPatch = lib.optionalString stdenv.isAarch64 ''
-    substituteInPlace Makefile \
-      --replace "-msse2" "" --replace "-DUSE_SSE2" ""
-  '';
-
-  installPhase = ''
-    install -Dm755 qgrep $out/bin/qgrep
-  '';
-
-  meta = with lib; {
-    description = "Fast regular expression grep for source code with incremental index updates";
-    homepage = "https://github.com/zeux/qgrep";
-    license = licenses.mit;
-    maintainers = [ maintainers.yrashk ];
-    platforms = platforms.all;
-  };
-}
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -12507,10 +12507,6 @@ with pkgs;

  qdigidoc = libsForQt5.callPackage ../tools/security/qdigidoc { } ;

-  qgrep = pin-to-gcc12-if-gcc13 (callPackage ../tools/text/qgrep {
-    inherit (darwin.apple_sdk.frameworks) CoreServices CoreFoundation;
-  });
-
  qhull = callPackage ../development/libraries/qhull { };

  qjournalctl = libsForQt5.callPackage ../applications/system/qjournalctl { };
@ -36376,8 +36372,6 @@ with pkgs;
    stdenv = if stdenv.cc.isClang then gccStdenv else stdenv;
  };

-  websploit = python3Packages.callPackage ../tools/security/websploit { };
-
  webssh = with python3Packages; toPythonApplication webssh;

  webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop {