Merge staging-next into staging

2024-10-05 12:08:02 +03:00 · 2024-08-06 06:01:44 +00:00 · 2024-08-06 06:01:44 +00:00 · eddd97e1fd
commit eddd97e1fd
parent 3b5460f093 e0f09e4712
54 changed files with 659 additions and 506 deletions
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@ -318,6 +318,8 @@
 - `security.pam.u2f` now follows RFC42.
  All module options are now settable through the freeform `.settings`.

+- Gollum was upgraded to major version 6. Read their [migration notes](https://github.com/gollum/gollum/wiki/6.0-Release-Notes).
+
 - The hooks `yarnConfigHook` and `yarnBuildHook` were added. These should replace `yarn2nix.mkYarnPackage` and other `yarn2nix` related tools. The motivation to get rid of `yarn2nix` tools is the fact that they are too complex and hard to maintain, and they rely upon too much Nix evaluation which is problematic if import-from-derivation is not allowed (see more details at [#296856](https://github.com/NixOS/nixpkgs/issues/296856). The transition from `mkYarnPackage` to `yarn{Config,Build}Hook` is tracked at [#324246](https://github.com/NixOS/nixpkgs/issues/324246).

 - Cinnamon has been updated to 6.2.
--- a/nixos/modules/services/misc/gollum.nix
+++ b/nixos/modules/services/misc/gollum.nix
@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:

 with lib;

@ -7,6 +12,17 @@ let
 in

 {
+  imports = [
+    (mkRemovedOptionModule
+      [
+        "services"
+        "gollum"
+        "mathjax"
+      ]
+      "MathJax rendering might be discontinued in the future, use services.gollum.math instead to enable KaTeX rendering or file a PR if you really need Mathjax"
+    )
+  ];
+
  options.services.gollum = {
    enable = mkEnableOption "Gollum, a git-powered wiki service";

@ -28,20 +44,30 @@ in
      description = "Content of the configuration file";
    };

-    mathjax = mkOption {
+    math = mkOption {
      type = types.bool;
      default = false;
-      description = "Enable support for math rendering using MathJax";
+      description = "Enable support for math rendering using KaTeX";
    };

    allowUploads = mkOption {
-      type = types.nullOr (types.enum [ "dir" "page" ]);
+      type = types.nullOr (
+        types.enum [
+          "dir"
+          "page"
+        ]
+      );
      default = null;
      description = "Enable uploads of external files";
    };

    user-icons = mkOption {
-      type = types.nullOr (types.enum [ "gravatar" "identicon" ]);
+      type = types.nullOr (
+        types.enum [
+          "gravatar"
+          "identicon"
+        ]
+      );
      default = null;
      description = "Enable specific user icons for history view";
    };
@ -109,9 +135,7 @@ in

    users.groups."${cfg.group}" = { };

-    systemd.tmpfiles.rules = [
-      "d '${cfg.stateDir}' - ${cfg.user} ${cfg.group} - -"
-    ];
+    systemd.tmpfiles.rules = [ "d '${cfg.stateDir}' - ${cfg.user} ${cfg.group} - -" ];

    systemd.services.gollum = {
      description = "Gollum wiki";
@ -134,7 +158,7 @@ in
            --host ${cfg.address} \
            --config ${pkgs.writeText "gollum-config.rb" cfg.extraConfig} \
            --ref ${cfg.branch} \
-            ${optionalString cfg.mathjax "--mathjax"} \
+            ${optionalString cfg.math "--math"} \
            ${optionalString cfg.emoji "--emoji"} \
            ${optionalString cfg.h1-title "--h1-title"} \
            ${optionalString cfg.no-edit "--no-edit"} \
@ -147,5 +171,8 @@ in
    };
  };

-  meta.maintainers = with lib.maintainers; [ erictapen bbenno ];
+  meta.maintainers = with lib.maintainers; [
+    erictapen
+    bbenno
+  ];
 }
--- a/nixos/modules/services/web-apps/meme-bingo-web.nix
+++ b/nixos/modules/services/web-apps/meme-bingo-web.nix
@ -17,7 +17,7 @@ in {

      baseUrl = mkOption {
        description = ''
-          URL to be used for the HTML <base> element on all HTML routes.
+          URL to be used for the HTML \<base\> element on all HTML routes.
        '';
        type = types.str;
        default = "http://localhost:41678/";
@ -36,7 +36,7 @@ in {

  config = mkIf cfg.enable {
    systemd.services.meme-bingo-web = {
-      description = "A web app for playing meme bingos.";
+      description = "A web app for playing meme bingos";
      wantedBy = [ "multi-user.target" ];

      environment = {
@ -59,6 +59,7 @@ in {
        # Hardening
        CapabilityBoundingSet = [ "" ];
        DeviceAllow = [ "/dev/random" ];
+        InaccessiblePaths = [ "/dev/shm" "/sys" ];
        LockPersonality = true;
        PrivateDevices = true;
        PrivateUsers = true;
@ -73,6 +74,7 @@ in {
        ProtectKernelTunables = true;
        ProtectProc = "invisible";
        RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
+        RestrictFilesystems = [ "@basic-api" "~sysfs" ];
        RestrictNamespaces = true;
        RestrictRealtime = true;
        SystemCallArchitectures = "native";
--- a/pkgs/applications/audio/redux/default.nix
+++ b/pkgs/applications/audio/redux/default.nix
@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchurl
+, writeScript
 , libX11
 , libXext
 , alsa-lib
@ -16,12 +17,15 @@

 stdenv.mkDerivation rec {
  pname = "redux";
-  version = "1.3.2";
+  version = "1.3.5";

  src = if releasePath != null then releasePath
    else fetchurl {
-      url = "https://files.renoise.com/demo/Renoise_Redux_${lib.replaceStrings ["."] ["_"] version}_Demo_Linux_x86_64.tar.gz";
-      sha256 = "sha256-wafOeNvVIHc8pOHoNQcCwV8+OwnuevJo1EcRQKRX4YA=";
+      urls = [
+        "https://files.renoise.com/demo/Renoise_Redux_${lib.replaceStrings ["."] ["_"] version}_Demo_Linux_x86_64.tar.gz"
+        "https://files.renoise.com/demo/archive/Renoise_Redux_${lib.replaceStrings ["."] ["_"] version}_Demo_Linux_x86_64.tar.gz"
+      ];
+      sha256 = "sha256-eznsdLzgdJ7MyWe5WAEg1MHId5VlfyanoZ6+I9nI/0I=";
    };

  nativeBuildInputs = [
@ -45,6 +49,23 @@ stdenv.mkDerivation rec {
    runHook postInstall
  '';

+
+  passthru.updateScript = writeScript "update-redux" ''
+    #!/usr/bin/env nix-shell
+    #!nix-shell -I nixpkgs=./. -i bash -p curl htmlq common-updater-scripts
+    set -euo pipefail
+
+    new_version="$(
+      curl 'https://files.renoise.com/demo/' \
+        | htmlq a --text \
+        | grep -E '^Renoise_Redux_([0-9]+_?)+_Demo_Linux_x86_64\.tar\.gz$' \
+        | grep -Eo '[0-9]+(_[0-9]+)*' \
+        | head -n1 \
+        | tr _ .
+    )"
+    update-source-version redux "$new_version" --system="x86_64-linux"
+  '';
+
  meta = with lib; {
    description = "Sample-based instrument, with a powerful phrase sequencer";
    homepage = "https://www.renoise.com/products/redux";
--- a/pkgs/applications/audio/renoise/default.nix
+++ b/pkgs/applications/audio/renoise/default.nix
@ -1,5 +1,6 @@
 { lib
 , stdenv
+, writeScript
 , alsa-lib
 , fetchurl
 , libjack2
@ -23,17 +24,17 @@ let
  platforms = {
    x86_64-linux = {
      archSuffix = "x86_64";
-      hash = "sha256-Etz6NaeLMysSkcQGC3g+IqUy9QrONCrbkyej63uLflo=";
+      hash = "sha256-b+YXBVnxu54HfC/tWapcs/ZYzwBOJswYbEbEU3SVNss=";
    };
    aarch64-linux = {
      archSuffix = "arm64";
-      hash = "sha256-PVpgxhJU8RY6QepydqImQnisWBjbrsuW4j49Xot3C6Y=";
+      hash = "sha256-l54FAtT+Rj4Mv3GuOF0/9WuKdJowgbZDZYo7VCh6Flg=";
    };
  };

 in stdenv.mkDerivation rec {
  pname = "renoise";
-  version = "3.4.3";
+  version = "3.4.4";

  src = if releasePath != null then
    releasePath
@ -42,8 +43,10 @@ in stdenv.mkDerivation rec {
      platform = platforms.${stdenv.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
      urlVersion = lib.replaceStrings [ "." ] [ "_" ] version;
    in fetchurl {
-      url =
-        "https://files.renoise.com/demo/Renoise_${urlVersion}_Demo_Linux_${platform.archSuffix}.tar.gz";
+      urls = [
+        "https://files.renoise.com/demo/Renoise_${urlVersion}_Demo_Linux_${platform.archSuffix}.tar.gz"
+        "https://files.renoise.com/demo/archive/Renoise_${urlVersion}_Demo_Linux_${platform.archSuffix}.tar.gz"
+      ];
      hash = platform.hash;
    };

@ -103,6 +106,27 @@ in stdenv.mkDerivation rec {
      --replace Exec=renoise Exec=$out/bin/renoise
  '';

+  passthru.updateScript = writeScript "update-renoise" ''
+    #!/usr/bin/env nix-shell
+    #!nix-shell -I nixpkgs=./. -i bash -p curl htmlq common-updater-scripts
+    set -euo pipefail
+
+    new_version="$(
+      curl 'https://files.renoise.com/demo/' \
+        | htmlq a --text \
+        | grep -E '^Renoise_([0-9]+_?)+_Demo_Linux_x86_64\.tar\.gz$' \
+        | grep -Eo '[0-9]+(_[0-9]+)*' \
+        | head -n1 \
+        | tr _ .
+    )"
+    hash_x86_64="$(nix-prefetch-url "https://files.renoise.com/demo/Renoise_$(echo "$new_version" | tr . _)_Demo_Linux_x86_64.tar.gz")"
+    hash_arm64="$( nix-prefetch-url "https://files.renoise.com/demo/Renoise_$(echo "$new_version" | tr . _)_Demo_Linux_arm64.tar.gz")"
+    sri_x86_64="$(nix --extra-experimental-features nix-command hash to-sri --type sha256 "$hash_x86_64")"
+    sri_arm64="$( nix --extra-experimental-features nix-command hash to-sri --type sha256 "$hash_arm64")"
+    update-source-version renoise "$new_version" "$sri_x86_64" --system="x86_64-linux"  --ignore-same-version
+    update-source-version renoise "$new_version" "$sri_arm64"  --system="aarch64-linux" --ignore-same-version
+  '';
+
  meta = {
    description = "Modern tracker-based DAW";
    homepage = "https://www.renoise.com/";
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@ -11088,6 +11088,18 @@ final: prev:
    meta.homepage = "https://github.com/luc-tielen/telescope_hoogle/";
  };

+  templ-vim = buildVimPlugin {
+    pname = "templ.vim";
+    version = "2023-10-30";
+    src = fetchFromGitHub {
+      owner = "joerdav";
+      repo = "templ.vim";
+      rev = "5cc48b93a4538adca0003c4bc27af844bb16ba24";
+      sha256 = "12w1cplgz5f02c61v42acgsf11078xcwp46j2b3lzmq9hj57rmb1";
+    };
+    meta.homepage = "https://github.com/joerdav/templ.vim/";
+  };
+
  template-string-nvim = buildVimPlugin {
    pname = "template-string.nvim";
    version = "2023-12-26";
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@ -1465,3 +1465,4 @@ https://github.com/ziglang/zig.vim/,,
 https://github.com/mickael-menu/zk-nvim/,HEAD,
 https://github.com/troydm/zoomwintab.vim/,,
 https://github.com/nanotee/zoxide.vim/,,
+https://github.com/joerdav/templ.vim,HEAD,
--- a/pkgs/applications/graphics/komikku/default.nix
+++ b/pkgs/applications/graphics/komikku/default.nix
@ -19,7 +19,7 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "komikku";
-  version = "1.51.1";
+  version = "1.52.0";

  format = "other";

@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec {
    owner = "valos";
    repo = "Komikku";
    rev = "v${version}";
-    hash = "sha256-b4RyAA32qQHbnX7AC0w64BM+y5uZCeZgd9SKQdJaJWc=";
+    hash = "sha256-Ls8haijbd5rPQwnJCYjLbA1KAVZhPk0aRRe2TtzmTCs=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/misc/gollum/Gemfile.lock
+++ b/pkgs/applications/misc/gollum/Gemfile.lock
@ -2,51 +2,48 @@ GEM
  remote: https://rubygems.org/
  specs:
    RedCloth (4.3.4)
-    asciidoctor (2.0.22)
+    asciidoctor (2.0.23)
    base64 (0.2.0)
-    builder (3.2.4)
-    concurrent-ruby (1.2.3)
+    builder (3.3.0)
+    concurrent-ruby (1.3.3)
    crass (1.0.6)
    creole (0.5.0)
-    execjs (2.9.1)
    expression_parser (0.9.0)
-    ffi (1.16.3)
    gemojione (4.3.3)
      json
    github-markup (4.0.2)
-    gollum (5.3.3)
+    gollum (6.0.1)
      gemojione (~> 4.1)
-      gollum-lib (>= 5.2.3, < 6.0)
+      gollum-lib (~> 6.0)
      i18n (~> 1.8)
      kramdown (~> 2.3)
      kramdown-parser-gfm (~> 1.1.0)
      mustache-sinatra (~> 2.0)
-      octicons (~> 12.0)
+      octicons (~> 19.0)
+      rack (>= 3.0)
+      rackup (~> 2.1)
      rdoc (~> 6)
-      rss (~> 0.2.9)
-      sass (~> 3.5)
-      sinatra (~> 2.0)
-      sinatra-contrib (~> 2.0)
-      sprockets (~> 3.7)
+      rss (~> 0.3)
+      sinatra (~> 4.0)
+      sinatra-contrib (~> 4.0)
+      sprockets (~> 4.1)
      sprockets-helpers (~> 1.2)
      therubyrhino (~> 2.1.0)
-      uglifier (~> 4.2)
      useragent (~> 0.16.2)
      webrick (~> 1.7)
-    gollum-lib (5.2.4)
+    gollum-lib (6.0)
      gemojione (~> 4.1)
      github-markup (~> 4.0)
-      gollum-rugged_adapter (~> 2.0)
+      gollum-rugged_adapter (~> 3.0)
      loofah (~> 2.3)
      nokogiri (~> 1.8)
-      octicons (~> 12.0)
      rouge (~> 3.1)
      twitter-text (= 1.14.7)
-    gollum-rugged_adapter (2.1.0)
+    gollum-rugged_adapter (3.0)
      mime-types (~> 3.4)
      rugged (~> 1.5)
    htmlentities (4.3.4)
-    i18n (1.14.4)
+    i18n (1.14.5)
      concurrent-ruby (~> 1.0)
    json (2.7.2)
    kramdown (2.4.0)
@ -58,70 +55,67 @@ GEM
      nokogiri (>= 1.12.0)
    mime-types (3.5.2)
      mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.0305)
-    mini_portile2 (2.8.6)
+    mime-types-data (3.2024.0702)
+    mini_portile2 (2.8.7)
    multi_json (1.15.0)
    mustache (1.1.1)
    mustache-sinatra (2.0.0)
      mustache (~> 1.0)
-    mustermann (2.0.2)
+    mustermann (3.0.0)
      ruby2_keywords (~> 0.0.1)
-    nokogiri (1.16.4)
+    nokogiri (1.16.7)
      mini_portile2 (~> 2.8.2)
      racc (~> 1.4)
-    octicons (12.1.0)
-      nokogiri (>= 1.6.3.1)
+    octicons (19.11.0)
    org-ruby (0.9.12)
      rubypants (~> 0.2)
    psych (5.1.2)
      stringio
-    racc (1.7.3)
-    rack (2.2.9)
-    rack-protection (2.2.4)
-      rack
-    rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
-      ffi (~> 1.0)
-    rdoc (6.6.3.1)
+    racc (1.8.0)
+    rack (3.1.7)
+    rack-protection (4.0.0)
+      base64 (>= 0.1.0)
+      rack (>= 3.0.0, < 4)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
+    rackup (2.1.0)
+      rack (>= 3)
+      webrick (~> 1.8)
+    rdoc (6.7.0)
      psych (>= 4.0.0)
-    rexml (3.2.6)
+    rexml (3.3.2)
+      strscan
    rouge (3.30.0)
-    rss (0.2.9)
+    rss (0.3.0)
      rexml
    ruby2_keywords (0.0.5)
    rubypants (0.7.1)
    rugged (1.7.2)
-    sass (3.7.4)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    sinatra (2.2.4)
-      mustermann (~> 2.0)
-      rack (~> 2.2)
-      rack-protection (= 2.2.4)
+    sinatra (4.0.0)
+      mustermann (~> 3.0)
+      rack (>= 3.0.0, < 4)
+      rack-protection (= 4.0.0)
+      rack-session (>= 2.0.0, < 3)
      tilt (~> 2.0)
-    sinatra-contrib (2.2.4)
-      multi_json
-      mustermann (~> 2.0)
-      rack-protection (= 2.2.4)
-      sinatra (= 2.2.4)
+    sinatra-contrib (4.0.0)
+      multi_json (>= 0.0.2)
+      mustermann (~> 3.0)
+      rack-protection (= 4.0.0)
+      sinatra (= 4.0.0)
      tilt (~> 2.0)
-    sprockets (3.7.3)
-      base64
+    sprockets (4.2.1)
      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
+      rack (>= 2.2.4, < 4)
    sprockets-helpers (1.4.0)
      sprockets (>= 2.2)
-    stringio (3.1.0)
+    stringio (3.1.1)
+    strscan (3.1.0)
    therubyrhino (2.1.2)
      therubyrhino_jar (>= 1.7.4, < 1.7.9)
    therubyrhino_jar (1.7.8)
-    tilt (2.3.0)
+    tilt (2.4.0)
    twitter-text (1.14.7)
      unf (~> 0.1.0)
-    uglifier (4.2.0)
-      execjs (>= 0.3.0, < 3)
    unf (0.1.4)
      unf_ext
    unf_ext (0.0.9.1)
@ -146,4 +140,4 @@ DEPENDENCIES
  wikicloth

 BUNDLED WITH
-   2.5.7
+   2.5.16
--- a/pkgs/applications/misc/gollum/gemset.nix
+++ b/pkgs/applications/misc/gollum/gemset.nix
@ -4,10 +4,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1mnan6dxw4aqii9kcmp1s3sc91jiwaqkdpsg6g01fdisb6xz3n56";
+      sha256 = "1wyxgwmnz9bw377r3lba26b090hbsq9qnbw8575a1prpy83qh82j";
      type = "gem";
    };
-    version = "2.0.22";
+    version = "2.0.23";
  };
  base64 = {
    groups = ["default"];
@ -24,20 +24,20 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr";
+      sha256 = "0pw3r2lyagsxkm71bf44v5b74f7l9r7di22brbyji9fwz791hya9";
      type = "gem";
    };
-    version = "3.2.4";
+    version = "3.3.0";
  };
  concurrent-ruby = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2";
+      sha256 = "0skwdasxq7mnlcccn6aqabl7n9r3jd7k19ryzlzzip64cn4x572g";
      type = "gem";
    };
-    version = "1.2.3";
+    version = "1.3.3";
  };
  crass = {
    groups = ["default"];
@ -59,16 +59,6 @@
    };
    version = "0.5.0";
  };
-  execjs = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1yywajqlpjhrj1m43s3lfg3i4lkb6pxwccmwps7qw37ndmphdzg8";
-      type = "gem";
-    };
-    version = "2.9.1";
-  };
  expression_parser = {
    groups = ["default"];
    platforms = [];
@ -79,16 +69,6 @@
    };
    version = "0.9.0";
  };
-  ffi = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd";
-      type = "gem";
-    };
-    version = "1.16.3";
-  };
  gemojione = {
    dependencies = ["json"];
    groups = ["default"];
@ -111,26 +91,26 @@
    version = "4.0.2";
  };
  gollum = {
-    dependencies = ["gemojione" "gollum-lib" "i18n" "kramdown" "kramdown-parser-gfm" "mustache-sinatra" "octicons" "rdoc" "rss" "sass" "sinatra" "sinatra-contrib" "sprockets" "sprockets-helpers" "therubyrhino" "uglifier" "useragent" "webrick"];
+    dependencies = ["gemojione" "gollum-lib" "i18n" "kramdown" "kramdown-parser-gfm" "mustache-sinatra" "octicons" "rack" "rackup" "rdoc" "rss" "sinatra" "sinatra-contrib" "sprockets" "sprockets-helpers" "therubyrhino" "useragent" "webrick"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0k94yba33ccvx3h7vl3d4jkx8j8y45a7qy3angf8094b0hy2p1fi";
+      sha256 = "01gk8zb1mfr7ypspbg765fn3m6rdh0b6jpyxfninabl9dzazyvpi";
      type = "gem";
    };
-    version = "5.3.3";
+    version = "6.0.1";
  };
  gollum-lib = {
-    dependencies = ["gemojione" "github-markup" "gollum-rugged_adapter" "loofah" "nokogiri" "octicons" "rouge" "twitter-text"];
+    dependencies = ["gemojione" "github-markup" "gollum-rugged_adapter" "loofah" "nokogiri" "rouge" "twitter-text"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "15nkslf8vm4gr8wbicm5xwsmgqy22zy3gb6pgdzdm78vyqva055d";
+      sha256 = "1vgvdmz5rh3ciww95llwax7pz93n4iljsz2q5f2hhynx6csvhriw";
      type = "gem";
    };
-    version = "5.2.4";
+    version = "6.0";
  };
  gollum-rugged_adapter = {
    dependencies = ["mime-types" "rugged"];
@ -138,10 +118,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "05v24lpkssn1k07n28bw4yh7w1ygsv4cfwz046jn9lmrh3v8q4d1";
+      sha256 = "00l1fmgjv3sq97c5lw7qcrf37v970yz89dm6b73ah2y4qn8zd7qk";
      type = "gem";
    };
-    version = "2.1.0";
+    version = "3.0";
  };
  htmlentities = {
    groups = ["default"];
@ -159,10 +139,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0lbm33fpb3w06wd2231sg58dwlwgjsvym93m548ajvl6s3mfvpn7";
+      sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16";
      type = "gem";
    };
-    version = "1.14.4";
+    version = "1.14.5";
  };
  json = {
    groups = ["default"];
@ -223,20 +203,20 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "00x7w5xqsj9m33v3vkmy23wipkkysafksib53ypzn27p5g81w455";
+      sha256 = "104r7glqjal9fgvnv49wjzp4ssai9hmyn3npkari51s2ska3jnr0";
      type = "gem";
    };
-    version = "3.2024.0305";
+    version = "3.2024.0702";
  };
  mini_portile2 = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "149r94xi6b3jbp6bv72f8383b95ndn0p5sxnq11gs1j9jadv0ajf";
+      sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk";
      type = "gem";
    };
-    version = "2.8.6";
+    version = "2.8.7";
  };
  multi_json = {
    groups = ["default"];
@ -275,10 +255,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0m70qz27mlv2rhk4j1li6pw797gmiwwqg02vcgxcxr1rq2v53rnb";
+      sha256 = "0rwbq20s2gdh8dljjsgj5s6wqqfmnbclhvv2c2608brv7jm6jdbd";
      type = "gem";
    };
-    version = "2.0.2";
+    version = "3.0.0";
  };
  nokogiri = {
    dependencies = ["mini_portile2" "racc"];
@ -286,21 +266,20 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0i8g0i370jhn2sclml0bg9qlrgf4csi6sy7czbhx8kjbl71idhb2";
+      sha256 = "15gysw8rassqgdq3kwgl4mhqmrgh7nk2qvrcqp4ijyqazgywn6gq";
      type = "gem";
    };
-    version = "1.16.4";
+    version = "1.16.7";
  };
  octicons = {
-    dependencies = ["nokogiri"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0kpy7h7pffjqb2xbmld7nwnb2x6rll3yz5ccr7nrqnrk2d3cmpmn";
+      sha256 = "07nb9i9yl3xk6dr7aacxx3dfrrslrw9cn9a55gn9rrhgckb3pymy";
      type = "gem";
    };
-    version = "12.1.0";
+    version = "19.11.0";
  };
  org-ruby = {
    dependencies = ["rubypants"];
@ -329,52 +308,53 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp";
+      sha256 = "021s7maw0c4d9a6s07vbmllrzqsj2sgmrwimlh8ffkvwqdjrld09";
      type = "gem";
    };
-    version = "1.7.3";
+    version = "1.8.0";
  };
  rack = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0hj0rkw2z9r1lcg2wlrcld2n3phwrcgqcp7qd1g9a7hwgalh2qzx";
+      sha256 = "12z55b90vvr4sh93az2yfr3fg91jivsag8lcg0k360d99vdq568f";
      type = "gem";
    };
-    version = "2.2.9";
+    version = "3.1.7";
  };
  rack-protection = {
+    dependencies = ["base64" "rack"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1xmvcxgm1jq92hqxm119gfk95wzl0d46nb2c2c6qqsm4ra2n3nyh";
+      type = "gem";
+    };
+    version = "4.0.0";
+  };
+  rack-session = {
    dependencies = ["rack"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1d6irsigm0i4ig1m47c94kixi3wb8jnxwvwkl8qxvyngmb73srl2";
+      sha256 = "10afdpmy9kh0qva96slcyc59j4gkk9av8ilh58cnj0qq7q3b416v";
      type = "gem";
    };
-    version = "2.2.4";
+    version = "2.0.0";
  };
-  rb-fsevent = {
+  rackup = {
+    dependencies = ["rack" "webrick"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1zmf31rnpm8553lqwibvv3kkx0v7majm1f341xbxc0bk5sbhp423";
+      sha256 = "0kbcka30g681cqasw47pq93fxjscq7yvs5zf8lp3740rb158ijvf";
      type = "gem";
    };
-    version = "0.11.2";
-  };
-  rb-inotify = {
-    dependencies = ["ffi"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005";
-      type = "gem";
-    };
-    version = "0.10.1";
+    version = "2.1.0";
  };
  rdoc = {
    dependencies = ["psych"];
@ -382,10 +362,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0ib3cnf4yllvw070gr4bz94sbmqx3haqc5f846fsvdcs494vgxrr";
+      sha256 = "0ygk2zk0ky3d88v3ll7qh6xqvbvw5jin0hqdi1xkv1dhaw7myzdi";
      type = "gem";
    };
-    version = "6.6.3.1";
+    version = "6.7.0";
  };
  RedCloth = {
    groups = ["default"];
@ -398,14 +378,15 @@
    version = "4.3.4";
  };
  rexml = {
+    dependencies = ["strscan"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0";
+      sha256 = "0zr5qpa8lampaqzhdcjcvyqnrqcjl7439mqjlkjz43wdhmpnh4s5";
      type = "gem";
    };
-    version = "3.2.6";
+    version = "3.3.2";
  };
  rouge = {
    groups = ["default"];
@ -423,10 +404,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1b1zx07kr64kkpm4lssd4r1a1qyr829ppmfl85i4adcvx9mqfid0";
+      sha256 = "1wv27axi39hhr0nmaffdl5bdjqiafcvp9xhfgnsgfczsblja50sn";
      type = "gem";
    };
-    version = "0.2.9";
+    version = "0.3.0";
  };
  ruby2_keywords = {
    groups = ["default"];
@ -458,60 +439,38 @@
    };
    version = "1.7.2";
  };
-  sass = {
-    dependencies = ["sass-listen"];
+  sinatra = {
+    dependencies = ["mustermann" "rack" "rack-protection" "rack-session" "tilt"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0p95lhs0jza5l7hqci1isflxakz83xkj97lkvxl919is0lwhv2w0";
-      type = "gem";
-    };
-    version = "3.7.4";
-  };
-  sass-listen = {
-    dependencies = ["rb-fsevent" "rb-inotify"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df";
+      sha256 = "0za92lv4s7xhgkkm6xxf7ib0b3bsyj8drxgkrskgsb5g3mxnixjl";
      type = "gem";
    };
    version = "4.0.0";
  };
-  sinatra = {
-    dependencies = ["mustermann" "rack" "rack-protection" "tilt"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0wkc079h6hzq737j4wycpnv7c38mhd0rl33pszyy7768zzvyjc9y";
-      type = "gem";
-    };
-    version = "2.2.4";
-  };
  sinatra-contrib = {
    dependencies = ["multi_json" "mustermann" "rack-protection" "sinatra" "tilt"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0s6c1k3zzxp3xa7libvlpqaby27124rccyyxcsly04ih904cxk33";
+      sha256 = "0r9khg85m60w0i77jpnm2irh9m4k0ia4mlicapj8dr7s6ykqd9dh";
      type = "gem";
    };
-    version = "2.2.4";
+    version = "4.0.0";
  };
  sprockets = {
-    dependencies = ["base64" "concurrent-ruby" "rack"];
+    dependencies = ["concurrent-ruby" "rack"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0lyc6mx4yalsnxc9yp4a5xra4nz1nwwbk5634wlfncml0ll1bnnw";
+      sha256 = "15rzfzd9dca4v0mr0bbhsbwhygl0k9l24iqqlx0fijig5zfi66wm";
      type = "gem";
    };
-    version = "3.7.3";
+    version = "4.2.1";
  };
  sprockets-helpers = {
    dependencies = ["sprockets"];
@ -529,7 +488,17 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "063psvsn1aq6digpznxfranhcpmi0sdv2jhra5g0459sw0x2dxn1";
+      sha256 = "07mfqb40b2wh53k33h91zva78f9zwcdnl85jiq74wnaw2wa6wiak";
+      type = "gem";
+    };
+    version = "3.1.1";
+  };
+  strscan = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01";
      type = "gem";
    };
    version = "3.1.0";
@ -560,10 +529,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0p3l7v619hwfi781l3r7ypyv1l8hivp09r18kmkn6g11c4yr1pc2";
+      sha256 = "0kds7wkxmb038cwp6ravnwn8k65ixc68wpm8j5jx5bhx8ndg4x6z";
      type = "gem";
    };
-    version = "2.3.0";
+    version = "2.4.0";
  };
  twitter-text = {
    dependencies = ["unf"];
@ -576,17 +545,6 @@
    };
    version = "1.14.7";
  };
-  uglifier = {
-    dependencies = ["execjs"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0wgh7bzy68vhv9v68061519dd8samcy8sazzz0w3k8kqpy3g4s5f";
-      type = "gem";
-    };
-    version = "4.2.0";
-  };
  unf = {
    dependencies = ["unf_ext"];
    groups = ["default"];
--- a/pkgs/applications/misc/wallust/default.nix
+++ b/pkgs/applications/misc/wallust/default.nix
@ -7,7 +7,7 @@
 , installShellFiles
 }:
 let
-  version = "3.0.0-beta";
+  version = "3.0.0";
 in
 rustPlatform.buildRustPackage {
  pname = "wallust";
@ -18,10 +18,10 @@ rustPlatform.buildRustPackage {
    owner = "explosion-mental";
    repo = "wallust";
    rev = version;
-    hash = "sha256-gGyxRdv2I/3TQWrTbUjlJGsaRv4SaNE+4Zo9LMWmxk8";
+    hash = "sha256-vZTHlonepK1cyxHhGu3bVBuOmExPtRFrAnYp71Jfs8c=";
  };

-  cargoHash = "sha256-dkHS8EOzmn5VLiKP3SMT0ZGAsk2wzvQeioG7NuGGUzA=";
+  cargoHash = "sha256-o6VRekazqbKTef6SLjHqs9/z/Q70auvunP+yFDkclpg=";

  nativeBuildInputs = [ makeWrapper installShellFiles ];

--- a/pkgs/applications/science/biology/febio-studio/default.nix
+++ b/pkgs/applications/science/biology/febio-studio/default.nix
@ -1,62 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, cmake, zlib, libglvnd, libGLU, wrapQtAppsHook
-, sshSupport ? true, openssl, libssh
-, tetgenSupport ? true, tetgen
-, ffmpegSupport ? true, ffmpeg_4
-, dicomSupport  ? false, dcmtk
-, withModelRepo ? true
-, withCadFeatures ? false
-}:
-
-stdenv.mkDerivation rec {
-  pname = "febio-studio";
-  version = "1.6.1";
-
-  src = fetchFromGitHub {
-    owner = "febiosoftware";
-    repo = "FEBioStudio";
-    rev = "v${version}";
-    sha256 = "0r6pg49i0q9idp7pjymj7mlxd63qjvmfvg0l7fmx87y1yd2hfw4h";
-  };
-
-  patches = [
-    ./febio-studio-cmake.patch # Fix Errors that appear with certain Cmake flags
-  ];
-
-  cmakeFlags = [
-    "-DQt_Ver=5"
-    "-DNOT_FIRST=On"
-    "-DOpenGL_GL_PREFERENCE=GLVND"
-  ]
-    ++ lib.optional sshSupport "-DUSE_SSH=On"
-    ++ lib.optional tetgenSupport "-DUSE_TETGEN=On"
-    ++ lib.optional ffmpegSupport "-DUSE_FFMPEG=On"
-    ++ lib.optional dicomSupport "-DUSE_DICOM=On"
-    ++ lib.optional withModelRepo "-DMODEL_REPO=On"
-    ++ lib.optional withCadFeatures "-DCAD_FEATURES=On"
-  ;
-
-
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out/
-    cp -R bin $out/
-    runHook postInstall
-  '';
-
-  nativeBuildInputs = [ cmake wrapQtAppsHook ];
-  buildInputs = [ zlib libglvnd libGLU openssl libssh ]
-    ++ lib.optional sshSupport openssl
-    ++ lib.optional tetgenSupport tetgen
-    ++ lib.optional ffmpegSupport ffmpeg_4
-    ++ lib.optional dicomSupport dcmtk
-  ;
-
-  meta = with lib; {
-    description = "FEBio Suite Solver";
-    mainProgram = "FEBioStudio";
-    license = with licenses; [ mit ];
-    homepage = "https://febio.org/";
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ Scriptkiddi ];
-  };
-}
--- a/pkgs/applications/science/biology/febio-studio/febio-studio-cmake.patch
+++ b/pkgs/applications/science/biology/febio-studio/febio-studio-cmake.patch
@ -1,38 +0,0 @@
-diff --git a/FEBioStudio/RepositoryPanel.cpp b/FEBioStudio/RepositoryPanel.cpp
-index 382db303..314cdc68 100644
--- a/FEBioStudio/RepositoryPanel.cpp
-+++ b/FEBioStudio/RepositoryPanel.cpp
-@@ -1364,10 +1364,10 @@ void CRepositoryPanel::loadingPageProgress(qint64 bytesSent, qint64 bytesTotal)
- 
- #else
- 
-CRepositoryPanel::CRepositoryPanel(CMainWindow* pwnd, QWidget* parent){}
-+CRepositoryPanel::CRepositoryPanel(CMainWindow* pwnd, QDockWidget* parent){}
- CRepositoryPanel::~CRepositoryPanel(){}
- void CRepositoryPanel::OpenLink(const QString& link) {}
-// void CRepositoryPanel::Raise() {}
-+void CRepositoryPanel::Raise() {}
- void CRepositoryPanel::SetModelList(){}
- void CRepositoryPanel::ShowMessage(QString message) {}
- void CRepositoryPanel::ShowWelcomeMessage(QByteArray messages) {}
-@@ -1396,6 +1396,7 @@ void CRepositoryPanel::on_actionSearch_triggered() {}
- void CRepositoryPanel::on_actionClearSearch_triggered() {}
- void CRepositoryPanel::on_actionDeleteRemote_triggered() {}
- void CRepositoryPanel::on_actionModify_triggered() {}
-+void CRepositoryPanel::on_actionCopyPermalink_triggered() {}
- void CRepositoryPanel::on_treeWidget_itemSelectionChanged() {}
- void CRepositoryPanel::on_treeWidget_customContextMenuRequested(const QPoint &pos) {}
- void CRepositoryPanel::DownloadItem(CustomTreeWidgetItem *item) {}
-diff --git a/FEBioStudio/WzdUpload.cpp b/FEBioStudio/WzdUpload.cpp
-index 5ce74346..20062e06 100644
--- a/FEBioStudio/WzdUpload.cpp
-+++ b/FEBioStudio/WzdUpload.cpp
-@@ -1183,7 +1183,7 @@ void CWzdUpload::on_saveJson_triggered()
- 		getProjectJson(&projectInfo);
- 
- 		QFile file(filedlg.selectedFiles()[0]);
-		file.open(QIODeviceBase::WriteOnly);
-+		file.open(QIODevice::WriteOnly);
- 		file.write(projectInfo);
- 		file.close();
- 	}
--- a/pkgs/applications/science/geometry/tetgen/default.nix
+++ b/pkgs/applications/science/geometry/tetgen/default.nix
@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
    mainProgram = "tetgen";
    homepage = "http://tetgen.org/";
    license = lib.licenses.agpl3Plus;
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
  };
 }
--- a/pkgs/by-name/di/digikam/package.nix
+++ b/pkgs/by-name/di/digikam/package.nix
@ -12,6 +12,7 @@
  bison,
  wrapGAppsHook3,

+  exiftool,
  opencv,
  libtiff,
  libpng,
@ -181,12 +182,13 @@ stdenv.mkDerivation (finalAttrs: {
        gnumake
        hugin
        enblend-enfuse
+        exiftool
      ]
    })
    qtWrapperArgs+=(--suffix DK_PLUGIN_PATH : ${placeholder "out"}/${kdePackages.qtbase.qtPluginPrefix}/digikam)
    substituteInPlace $out/bin/digitaglinktree \
-      --replace "/usr/bin/perl" "${perl}/bin/perl" \
-      --replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3"
+      --replace "/usr/bin/perl" "${lib.getExe perl}" \
+      --replace "/usr/bin/sqlite3" "${lib.getExe sqlite}"
  '';

  meta = {
--- a/pkgs/by-name/fe/febio-studio/cmake-install.patch
+++ b/pkgs/by-name/fe/febio-studio/cmake-install.patch
@ -0,0 +1,14 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7ad2c68eb2..0e3e978bd9 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -449,6 +449,9 @@
+ 	set_property(TARGET ${FBS_BIN_NAME} PROPERTY AUTOGEN_BUILD_DIR ${CMAKE_BINARY_DIR}/CMakeFiles/AutoGen/FEBioStudio_autogen)
+ endif()
+ 
+include(GNUInstallDirs)
+install(TARGETS ${FBS_BIN_NAME} BUNDLE DESTINATION Applications)
+
+ macro(addLib name)
+ 	add_library(${name} ${HDR_${name}} ${SRC_${name}})
+ 	set_property(TARGET ${name} PROPERTY AUTOGEN_BUILD_DIR ${CMAKE_BINARY_DIR}/CMakeFiles/AutoGen/${name}_autogen)
--- a/pkgs/by-name/fe/febio-studio/package.nix
+++ b/pkgs/by-name/fe/febio-studio/package.nix
@ -0,0 +1,89 @@
+{
+  lib,
+  stdenv,
+  overrideSDK,
+  fetchFromGitHub,
+  cmake,
+  ninja,
+  zlib,
+  libGLU,
+  qt6Packages,
+  febio,
+  glew,
+  sshSupport ? true,
+  openssl,
+  libssh,
+  tetgenSupport ? true,
+  tetgen,
+  ffmpegSupport ? true,
+  ffmpeg_7,
+  dicomSupport ? false,
+  dcmtk,
+  withModelRepo ? true,
+  withCadFeatures ? false,
+}:
+
+let
+  stdenv' =
+    if stdenv.isDarwin then
+      overrideSDK stdenv {
+        darwinSdkVersion = "11.0";
+        darwinMinVersion = "10.15";
+      }
+    else
+      stdenv;
+in
+
+stdenv'.mkDerivation (finalAttrs: {
+  pname = "febio-studio";
+  version = "2.7";
+
+  src = fetchFromGitHub {
+    owner = "febiosoftware";
+    repo = "FEBioStudio";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-ggIzz6bvNjqlI8s31EVnbM0TOspBSc9/myKpWukS3MU=";
+  };
+
+  patches = [ ./cmake-install.patch ];
+
+  cmakeFlags =
+    [ (lib.cmakeFeature "Qt_Root" "${qt6Packages.qtbase}") ]
+    ++ lib.optional sshSupport "-DUSE_SSH=On"
+    ++ lib.optional tetgenSupport "-DUSE_TETGEN=On"
+    ++ lib.optional ffmpegSupport "-DUSE_FFMPEG=On"
+    ++ lib.optional dicomSupport "-DUSE_DICOM=On"
+    ++ lib.optional withModelRepo "-DMODEL_REPO=On"
+    ++ lib.optional withCadFeatures "-DCAD_FEATURES=On";
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    qt6Packages.wrapQtAppsHook
+  ];
+
+  buildInputs =
+    [
+      zlib
+      libGLU
+      glew
+      qt6Packages.qtbase
+      febio
+    ]
+    ++ lib.optionals sshSupport [
+      openssl
+      libssh
+    ]
+    ++ lib.optional tetgenSupport tetgen
+    ++ lib.optional ffmpegSupport ffmpeg_7
+    ++ lib.optional dicomSupport dcmtk;
+
+  meta = {
+    description = "FEBio Suite Solver";
+    mainProgram = "FEBioStudio";
+    license = with lib.licenses; [ mit ];
+    homepage = "https://febio.org/";
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ Scriptkiddi ];
+  };
+})
--- a/pkgs/by-name/fe/febio/fix-cmake.patch
+++ b/pkgs/by-name/fe/febio/fix-cmake.patch
@ -0,0 +1,71 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c1bc953edf..f6aaf92fb5 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -2,6 +2,7 @@
+ set(CMAKE_CXX_STANDARD 14)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ mark_as_advanced(FORCE CMAKE_INSTALL_PREFIX)
+include(GNUInstallDirs)
+ 
+ project(FEBio)
+ set(FEBIO_LIBS FEBioFluid FEBioLib FEBioMech FEBioMix FEBioOpt FECore NumCore FEAMR FEBioRVE FEImgLib)
+@@ -51,7 +52,7 @@
+         find_library(TEMP NAMES ${libName}.lib ${ARGV3}.lib ${ARGV4}.lib ${ARGV5}.lib ${ARGV6}.lib
+             PATHS ${${libDir}} NO_DEFAULT_PATH)
+     else()
+-        find_library(TEMP NAMES lib${libName}.a lib${ARGV3}.a lib${ARGV4}.a lib${ARGV5}.a lib${ARGV6}.a
+        find_library(TEMP NAMES lib${libName}.a lib${ARGV3}.a lib${ARGV4}.a lib${ARGV5}.a lib${ARGV6}.a lib${libName}@so@ lib${ARGV3}@so@ lib${ARGV4}@so@ lib${ARGV5}@so@ lib${ARGV6}@so@
+             PATHS ${${libDir}} NO_DEFAULT_PATH)
+     endif()
+     
+@@ -154,7 +155,7 @@
+ ##### Find Source Files #####
+ 
+ macro(findHdrSrc name)
+-	file(GLOB HDR_${name} "${name}/*.h")
+	file(GLOB HDR_${name} "${name}/*.h" "${name}/*.hpp")
+ 	file(GLOB SRC_${name} "${name}/*.cpp")
+ endmacro()
+ 
+@@ -171,8 +172,9 @@
+ 
+ macro(addLib name TYPE)
+     string(TOLOWER ${name} lname)
+-	add_library(${lname} ${TYPE} ${HDR_${name}} ${SRC_${name}})
+	add_library(${lname} ${TYPE} ${SRC_${name}})
+ 	set_property(TARGET ${lname} PROPERTY AUTOGEN_BUILD_DIR ${CMAKE_BINARY_DIR}/CMakeFiles/AutoGen/${name}_autogen)
+    target_sources(${lname} PUBLIC FILE_SET HEADERS TYPE HEADERS FILES ${HDR_${name}})
+     
+     if(NOT WIN32)
+         set_property(TARGET ${lname} PROPERTY POSITION_INDEPENDENT_CODE ON)
+@@ -181,6 +183,8 @@
+     if(APPLE)
+         target_link_libraries(${lname} PRIVATE "-undefined dynamic_lookup")
+     endif()
+
+    install(TARGETS ${lname} FILE_SET HEADERS)
+ endmacro()
+ 
+ foreach(name IN LISTS FEBIO_LIBS)
+@@ -194,6 +198,7 @@
+ ##### Set up executable compilation #####
+ file(GLOB SOURCES "FEBio/*.cpp")
+ add_executable (febio4 ${SOURCES})
+install(TARGETS febio4)
+ 
+ if(WIN32)
+     target_compile_options(febio4 PRIVATE /openmp)
+@@ -269,7 +274,6 @@
+ mark_as_advanced(EXTRA_INC)
+ 
+ ##### Setup includes, defnitions, and linking options #####
+-include_directories(${PROJECT_SOURCE_DIR})
+ 
+ # Link LEVMAR
+ if(USE_LEVMAR)
+@@ -438,3 +442,4 @@
+     file(WRITE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/febio.xml "${filedata}")
+ endif()
+ 
+install(FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/febio.xml TYPE BIN)
--- a/pkgs/by-name/fe/febio/package.nix
+++ b/pkgs/by-name/fe/febio/package.nix
@ -0,0 +1,72 @@
+{
+  lib,
+  stdenv,
+  overrideSDK,
+  fetchFromGitHub,
+  fetchpatch2,
+  substituteAll,
+  cmake,
+  ninja,
+  zlib,
+  darwin,
+  mklSupport ? true,
+  mkl,
+}:
+
+let
+  stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;
+in
+
+stdenv'.mkDerivation (finalAttrs: {
+  pname = "FEBio";
+  version = "4.7";
+
+  src = fetchFromGitHub {
+    owner = "febiosoftware";
+    repo = "FEBio";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-RRdIOyXg4jYW76ABfJdMfVtCYMLYFdvyOI98nHXCof8=";
+  };
+
+  patches = [
+    # Fix library searching and installation
+    (substituteAll {
+      src = ./fix-cmake.patch;
+      so = stdenv.hostPlatform.extensions.sharedLibrary;
+    })
+
+    # Fixed missing header include for strcpy
+    # https://github.com/febiosoftware/FEBio/pull/92
+    (fetchpatch2 {
+      url = "https://github.com/febiosoftware/FEBio/commit/ad9e80e2aa8737828855458a703822f578db2fd3.patch?full_index=1";
+      hash = "sha256-/uLnJB/oAwLQnsZtJnUlaAEpyZVLG6o2riRwwMCH8rI=";
+    })
+  ];
+
+  cmakeFlags = lib.optionals mklSupport [
+    (lib.cmakeBool "USE_MKL" true)
+    (lib.cmakeFeature "MKLROOT" "${mkl}")
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+  ];
+
+  buildInputs =
+    [ zlib ]
+    ++ lib.optionals mklSupport [ mkl ]
+    ++ lib.optionals stdenv.isDarwin [
+      darwin.apple_sdk.frameworks.CoreGraphics
+      darwin.apple_sdk.frameworks.CoreVideo
+      darwin.apple_sdk.frameworks.Accelerate
+    ];
+
+  meta = {
+    description = "FEBio Suite Solver";
+    license = with lib.licenses; [ mit ];
+    homepage = "https://febio.org/";
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ Scriptkiddi ];
+  };
+})
--- a/pkgs/by-name/pl/plasmusic-toolbar/package.nix
+++ b/pkgs/by-name/pl/plasmusic-toolbar/package.nix
@ -2,6 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , kdePackages
+, nix-update-script
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "plasmusic-toolbar";
@ -21,6 +22,8 @@ stdenv.mkDerivation (finalAttrs: {
    runHook postInstall
  '';

+  passthru.updateScript = nix-update-script { };
+
  meta = {
    description = "KDE Plasma widget that shows currently playing song information and provide playback controls.";
    homepage = "https://github.com/ccatterina/plasmusic-toolbar";
--- a/pkgs/by-name/wa/warp-terminal/versions.json
+++ b/pkgs/by-name/wa/warp-terminal/versions.json
@ -1,10 +1,10 @@
 {
  "darwin": {
-    "hash": "sha256-SNSWXDOmZAjPv33ioDOHSEflC6BKTmVAcAvc/Bn4VwE=",
-    "version": "0.2024.07.16.08.02.stable_03"
+    "hash": "sha256-xTvLT6bYWBxF2mkICBGEKorGW/gFQ+9GNwnhfvqm8NE=",
+    "version": "0.2024.07.30.08.02.stable_01"
  },
  "linux": {
-    "hash": "sha256-rn97dcZ1XsQllzmQ9HbvLyvq5EsN42A5WHe1fVUjilY=",
-    "version": "0.2024.07.16.08.02.stable_03"
+    "hash": "sha256-z/EpRHn+P2QOn0dFzoa4EfhIGceX9VJXWdqLAZ45aK4=",
+    "version": "0.2024.07.30.08.02.stable_01"
  }
 }
--- a/pkgs/by-name/wr/wrangler/package.nix
+++ b/pkgs/by-name/wr/wrangler/package.nix
@ -6,6 +6,7 @@
  nodejs,
  pnpm_9,
  autoPatchelfHook,
+  cacert,
  llvmPackages,
  musl,
  xorg,
@ -70,7 +71,8 @@ stdenv.mkDerivation (finalAttrs: {
    makeWrapper ${lib.getExe nodejs} $out/bin/wrangler \
      --inherit-argv0 \
      --prefix-each NODE_PATH : "$${NODE_PATH_ARRAY[@]}" \
-      --add-flags $out/lib/packages/wrangler/bin/wrangler.js
+      --add-flags $out/lib/packages/wrangler/bin/wrangler.js \
+      --set-default SSL_CERT_FILE "${cacert}/etc/ssl/certs/ca-bundle.crt" # https://github.com/cloudflare/workers-sdk/issues/3264
    runHook postInstall
  '';

--- a/pkgs/by-name/zo/zola/package.nix
+++ b/pkgs/by-name/zo/zola/package.nix
@ -12,16 +12,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "zola";
-  version = "0.18.0";
+  version = "0.19.1";

  src = fetchFromGitHub {
    owner = "getzola";
    repo = "zola";
    rev = "v${version}";
-    hash = "sha256-kNlFmCqWEfU2ktAMxXNKe6dmAV25voHjHYaovBYsOu8=";
+    hash = "sha256-qvePWGTosOTWsuwcFeOVZ7MePFpMPkC3eosIgjlPRyY=";
  };

-  cargoHash = "sha256-JWYuolHh/qdWF+i6WTgz/uDrkQ6V+SDFhEzGGkUA0E4=";
+  cargoHash = "sha256-Q2Zx00Gf89TJcsOFqkq0b4e96clv/CLQE51gGONZZl0=";

  nativeBuildInputs = [
    pkg-config
--- a/pkgs/development/compilers/gleam/default.nix
+++ b/pkgs/development/compilers/gleam/default.nix
@ -12,13 +12,13 @@

 rustPlatform.buildRustPackage rec {
  pname = "gleam";
-  version = "1.4.0";
+  version = "1.4.1";

  src = fetchFromGitHub {
    owner = "gleam-lang";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-Wo8J8cv53kNWypb5VqUlKJas+zkCHZS6mICnpn0aZoc=";
+    hash = "sha256-z9xDMQXzVUeHne7KG4QsutQAiU01mgnV7ccdkjl+EkU=";
  };

  nativeBuildInputs = [ git pkg-config ];
@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
  buildInputs = [ openssl ] ++
    lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];

-  cargoHash = "sha256-ehQLNBDERLIZrqQfsS+epzZAIjap7HnBs18SsjdWuS4=";
+  cargoHash = "sha256-XKHcA4DSVsWZfUHT6BkRjK0Mzz90E+ohYrtwZKPMtTY=";

  passthru.updateScript = nix-update-script { };

--- a/pkgs/development/libraries/febio/default.nix
+++ b/pkgs/development/libraries/febio/default.nix
@ -1,61 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, cmake, boost, eigen, libxml2, mpi, python3
-, mklSupport ? true, mkl
-, substituteAll
-}:
-
-stdenv.mkDerivation rec {
-  pname = "FEBio";
-  version = "3.6";
-
-  src = fetchFromGitHub {
-    owner = "febiosoftware";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "187s4lyzr806xla3smq3lsvj3f6wxlhfkban89w0fnyfmfb8w9am";
-  };
-
-  patches = [
-    (substituteAll {
-      src = ./fix-cmake.patch;  # cannot find mkl libraries without this
-      so = stdenv.hostPlatform.extensions.sharedLibrary;
-    })
-  ];
-
-  cmakeFlags = lib.optional mklSupport "-DUSE_MKL=On"
-    ++ lib.optional mklSupport "-DMKLROOT=${mkl}"
-  ;
-
-  env.CXXFLAGS = lib.optionalString stdenv.isLinux "-include cstring";
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/include
-    cp -R lib bin $out/
-    cp -R ../FECore \
-      ../FEBioFluid \
-      ../FEBioLib \
-      ../FEBioMech \
-      ../FEBioMix \
-      ../FEBioOpt \
-      ../FEBioPlot \
-      ../FEBioXML \
-      ../NumCore \
-      $out/include
-
-    runHook postInstall
-  '';
-
-  nativeBuildInputs = [ cmake ];
-  buildInputs = [ boost eigen libxml2 mpi python3 python3.pkgs.numpy ]
-   ++ lib.optional mklSupport mkl
-  ;
-
-  meta = {
-    description = "FEBio Suite Solver";
-    license = with lib.licenses; [ mit ];
-    homepage = "https://febio.org/";
-    platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ Scriptkiddi ];
-  };
-}
--- a/pkgs/development/libraries/febio/fix-cmake.patch
+++ b/pkgs/development/libraries/febio/fix-cmake.patch
@ -1,26 +0,0 @@
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -47,7 +47,7 @@ function(findLib libName libDir libOut)
-         find_library(TEMP NAMES ${libName}.lib ${ARGV3}.lib ${ARGV4}.lib ${ARGV5}.lib ${ARGV6}.lib
-             PATHS ${${libDir}} NO_DEFAULT_PATH)
-     else()
-        find_library(TEMP NAMES lib${libName}.a lib${ARGV3}.a lib${ARGV4}.a lib${ARGV5}.a lib${ARGV6}.a
-+        find_library(TEMP NAMES lib${libName}.a lib${ARGV3}.a lib${ARGV4}.a lib${ARGV5}.a lib${ARGV6}.a lib${libName}@so@ lib${ARGV3}@so@ lib${ARGV4}@so@ lib${ARGV5}@so@ lib${ARGV6}@so@
-             PATHS ${${libDir}} NO_DEFAULT_PATH)
-     endif()
-     
-diff --git a/FindDependencies.cmake b/FindDependencies.cmake
-index 2d644005f..7261ba923 100644
--- a/FindDependencies.cmake
-+++ b/FindDependencies.cmake
-@@ -46,8 +46,8 @@ if(MKLROOT)
-             NO_DEFAULT_PATH)
-             
-         find_library(MKL_OMP_LIB 
-            NAMES iomp5 iomp5md libiomp5md.lib
-            PATHS ${MKLROOT}/../lib ${MKLROOT}/../compiler/lib
-+            NAMES libiomp5@so@ libiomp5 iomp5 iomp5md libiomp5md.lib
-+            PATHS ${MKLROOT}/lib ${MKLROOT}/../lib ${MKLROOT}/../compiler/lib
-             PATH_SUFFIXES "intel64" "intel32"
-             NO_DEFAULT_PATH
-             DOC "MKL OMP Library")
--- a/pkgs/development/libraries/highfive/default.nix
+++ b/pkgs/development/libraries/highfive/default.nix
@ -12,13 +12,13 @@ assert mpiSupport -> mpi != null;

 stdenv.mkDerivation rec {
  pname = "highfive${lib.optionalString mpiSupport "-mpi"}";
-  version = "2.9.0";
+  version = "2.10.0";

  src = fetchFromGitHub {
    owner = "BlueBrain";
    repo = "HighFive";
    rev = "v${version}";
-    sha256 = "sha256-4n7J0qf4josYVsbVF4u+NLdecpA9gqHXCfibr0QfyJ4=";
+    sha256 = "sha256-0ACT899G+CCc08UFsSC8SnUEZR2mrpQbqXW9FklRAjU=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/development/python-modules/aiojobs/default.nix
+++ b/pkgs/development/python-modules/aiojobs/default.nix
@ -6,6 +6,7 @@
  fetchFromGitHub,
  fetchpatch,
  pytest-aiohttp,
+  pytest-cov-stub,
  pytestCheckHook,
  pythonOlder,
  setuptools,
@ -32,11 +33,6 @@ buildPythonPackage rec {
    })
  ];

-  postPatch = ''
-    substituteInPlace pytest.ini \
-      --replace "--cov=aiojobs/ --cov=tests/ --cov-report term" ""
-  '';
-
  nativeBuildInputs = [ setuptools ];

  propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ async-timeout ];
@ -48,6 +44,7 @@ buildPythonPackage rec {
  nativeCheckInputs = [
    pytestCheckHook
    pytest-aiohttp
+    pytest-cov-stub
  ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);

  pythonImportsCheck = [ "aiojobs" ];
--- a/pkgs/development/python-modules/ambee/default.nix
+++ b/pkgs/development/python-modules/ambee/default.nix
@ -8,6 +8,7 @@
  yarl,
  aresponses,
  pytest-asyncio,
+  pytest-cov-stub,
  pytestCheckHook,
 }:

@ -34,14 +35,14 @@ buildPythonPackage rec {
  nativeCheckInputs = [
    aresponses
    pytest-asyncio
+    pytest-cov-stub
    pytestCheckHook
  ];

  postPatch = ''
    # Upstream doesn't set a version for the pyproject.toml
    substituteInPlace pyproject.toml \
-      --replace "0.0.0" "${version}" \
-      --replace "--cov" ""
+      --replace "0.0.0" "${version}"
  '';

  pythonImportsCheck = [ "ambee" ];
--- a/pkgs/development/python-modules/anonip/default.nix
+++ b/pkgs/development/python-modules/anonip/default.nix
@ -3,6 +3,7 @@
  buildPythonPackage,
  fetchFromGitHub,
  pytestCheckHook,
+  pytest-cov-stub,
  pythonOlder,
 }:

@ -20,12 +21,10 @@ buildPythonPackage rec {
    sha256 = "0cssdcridadjzichz1vv1ng7jwphqkn8ihh83hpz9mcjmxyb94qc";
  };

-  nativeCheckInputs = [ pytestCheckHook ];
-
-  postPatch = ''
-    substituteInPlace setup.cfg \
-      --replace " --cov=anonip --cov-report=term-missing --no-cov-on-fail" ""
-  '';
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-cov-stub
+  ];

  pytestFlagsArray = [ "tests.py" ];

--- a/pkgs/development/python-modules/batchspawner/default.nix
+++ b/pkgs/development/python-modules/batchspawner/default.nix
@ -8,6 +8,7 @@
  jupyterhub,
  pythonOlder,
  pytest-asyncio,
+  pytest-cov-stub,
  pytestCheckHook,
 }:

@ -35,13 +36,9 @@ buildPythonPackage rec {
    jupyterhub
  ];

-  preCheck = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "--cov=batchspawner" ""
-  '';
-
  nativeCheckInputs = [
    pytest-asyncio
+    pytest-cov-stub
    pytestCheckHook
  ];

--- a/pkgs/development/python-modules/birch/default.nix
+++ b/pkgs/development/python-modules/birch/default.nix
@ -6,6 +6,7 @@
  setuptools,
  strct,
  pytestCheckHook,
+  pytest-cov-stub,
  pyyaml,
 }:

@ -31,11 +32,6 @@ buildPythonPackage rec {
  ];

  postPatch = ''
-    substituteInPlace pytest.ini \
-      --replace-fail  \
-        "--cov" \
-        "#--cov"
-
    # configure correct version, which fails due to missing .git
    substituteInPlace versioneer.py birch/_version.py \
      --replace-fail '"0+unknown"' '"${version}"'
@ -54,6 +50,7 @@ buildPythonPackage rec {

  nativeCheckInputs = [
    pytestCheckHook
+    pytest-cov-stub
    pyyaml
  ];

--- a/pkgs/development/python-modules/cachier/default.nix
+++ b/pkgs/development/python-modules/cachier/default.nix
@ -7,6 +7,7 @@
  watchdog,
  portalocker,
  pytestCheckHook,
+  pytest-cov-stub,
  pymongo,
  dnspython,
  pymongo-inmemory,
@ -39,15 +40,9 @@ buildPythonPackage rec {
    portalocker
  ];

-  preCheck = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail  \
-        '"--cov' \
-        '#"--cov'
-  '';
-
  nativeCheckInputs = [
    pytestCheckHook
+    pytest-cov-stub
    pymongo
    dnspython
    pymongo-inmemory
--- a/pkgs/development/python-modules/cemm/default.nix
+++ b/pkgs/development/python-modules/cemm/default.nix
@ -7,6 +7,7 @@
  fetchpatch,
  poetry-core,
  pytest-asyncio,
+  pytest-cov-stub,
  pytestCheckHook,
  pythonOlder,
  yarl,
@ -37,8 +38,7 @@ buildPythonPackage rec {

  postPatch = ''
    substituteInPlace pyproject.toml \
-      --replace '"0.0.0"' '"${version}"' \
-      --replace 'addopts = "--cov"' ""
+      --replace '"0.0.0"' '"${version}"'
  '';

  nativeBuildInputs = [ poetry-core ];
@ -53,6 +53,7 @@ buildPythonPackage rec {
  nativeCheckInputs = [
    aresponses
    pytest-asyncio
+    pytest-cov-stub
    pytestCheckHook
  ];

--- a/pkgs/development/python-modules/discum/default.nix
+++ b/pkgs/development/python-modules/discum/default.nix
@ -0,0 +1,62 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  pythonRelaxDepsHook,
+  brotli,
+  colorama,
+  filetype,
+  requests,
+  requests-toolbelt,
+  ua-parser,
+  websocket-client,
+  pycryptodome,
+  pypng,
+  pyqrcode,
+}:
+
+buildPythonPackage rec {
+  pname = "discum";
+  version = "1.4.1";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-/8TaAmfSPv/7kuymockSvC2uxXgHfuP+FXN8vuA9WHY=";
+  };
+
+  build-system = [ setuptools ];
+
+  nativeBuildInputs = [ pythonRelaxDepsHook ];
+
+  dependencies = [
+    brotli
+    colorama
+    filetype
+    requests
+    requests-toolbelt
+    ua-parser
+    websocket-client
+  ];
+
+  passthru.optional-dependencies = {
+    ra = [
+      pycryptodome
+      pypng
+      pyqrcode
+    ];
+  };
+
+  pythonImportsCheck = [ "discum" ];
+
+  pythonRelaxDeps = [ "websocket-client" ];
+
+  meta = {
+    description = "Discord API Wrapper for Userbots/Selfbots written in Python";
+    homepage = "https://pypi.org/project/discum/";
+    changelog = "https://github.com/Merubokkusu/Discord-S.C.U.M/blob/v${version}/changelog.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jokatzke ];
+  };
+}
--- a/pkgs/development/python-modules/ffmpy/default.nix
+++ b/pkgs/development/python-modules/ffmpy/default.nix
@ -4,7 +4,7 @@
  buildPythonPackage,
  fetchFromGitHub,
  pythonOlder,
-  setuptools,
+  poetry-core,
  pytestCheckHook,
  go,
  ffmpeg-headless,
@ -12,22 +12,24 @@

 buildPythonPackage rec {
  pname = "ffmpy";
-  version = "0.3.2";
+  version = "0.4.0";
  pyproject = true;

-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.8.1";

  src = fetchFromGitHub {
    owner = "Ch00k";
    repo = "ffmpy";
    rev = "refs/tags/${version}";
-    hash = "sha256-q41JjAWcIiD2nJck5Zzb/lhfIZ3xJGU1I2crsMN0T8Q=";
+    hash = "sha256-XWI0Hq4vf9Q0/dRzmu1B7EQHdQRkWaNJaBaqusWW7YM=";
  };

  postPatch = ''
    # default to store ffmpeg
    substituteInPlace ffmpy.py \
-      --replace-fail 'executable="ffmpeg",' 'executable="${ffmpeg-headless}/bin/ffmpeg",'
+      --replace-fail \
+        'executable: str = "ffmpeg",' \
+        'executable: str = "${ffmpeg-headless}/bin/ffmpeg",'

    #  The tests test a mock that does not behave like ffmpeg. If we default to the nix-store ffmpeg they fail.
    for fname in tests/*.py; do
@ -37,7 +39,7 @@ buildPythonPackage rec {

  pythonImportsCheck = [ "ffmpy" ];

-  nativeBuildInputs = [ setuptools ];
+  nativeBuildInputs = [ poetry-core ];

  nativeCheckInputs = [
    pytestCheckHook
@ -52,8 +54,8 @@ buildPythonPackage rec {
  # the vendored ffmpeg mock binary assumes FHS
  preCheck = ''
    rm -v tests/ffmpeg/ffmpeg
-    HOME=$(mktemp -d) go build -o ffmpeg tests/ffmpeg/ffmpeg.go
-    export PATH=".:$PATH"
+    echo Building tests/ffmpeg/ffmpeg...
+    HOME=$(mktemp -d) go build -o tests/ffmpeg/ffmpeg tests/ffmpeg/ffmpeg.go
  '';

  meta = with lib; {
--- a/pkgs/development/python-modules/githubkit/default.nix
+++ b/pkgs/development/python-modules/githubkit/default.nix
@ -8,6 +8,7 @@
  poetry-core,
  pydantic,
  pyjwt,
+  pytest-cov-stub,
  pytest-xdist,
  pytestCheckHook,
  pythonOlder,
@ -28,11 +29,6 @@ buildPythonPackage rec {
    hash = "sha256-FTNLyCcwDU6EssQDJlwtmA7cQj57fsOaecvbpwswirU=";
  };

-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "--cov=githubkit --cov-append --cov-report=term-missing" ""
-  '';
-
  pythonRelaxDeps = [ "hishel" ];

  build-system = [ poetry-core ];
@ -61,6 +57,7 @@ buildPythonPackage rec {

  nativeCheckInputs = [
    pytestCheckHook
+    pytest-cov-stub
    pytest-xdist
  ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);

--- a/pkgs/development/python-modules/hickle/default.nix
+++ b/pkgs/development/python-modules/hickle/default.nix
@ -10,6 +10,7 @@
  scipy,
  pandas,
  pytestCheckHook,
+  pytest-cov-stub,
  setuptools,
 }:

@ -25,11 +26,6 @@ buildPythonPackage rec {
    hash = "sha256-An5RzK0nnRaBI6JEUl5shLrA22RgWzEbC9NJiRvgxT4=";
  };

-  postPatch = ''
-    substituteInPlace tox.ini \
-      --replace-fail "--cov=./hickle" ""
-  '';
-
  build-system = [ setuptools ];

  dependencies = [
@ -42,6 +38,7 @@ buildPythonPackage rec {
    astropy
    pandas
    pytestCheckHook
+    pytest-cov-stub
    scipy
  ];

--- a/pkgs/development/python-modules/litellm/default.nix
+++ b/pkgs/development/python-modules/litellm/default.nix
@ -37,7 +37,7 @@

 buildPythonPackage rec {
  pname = "litellm";
-  version = "1.41.28";
+  version = "1.42.12";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -46,7 +46,7 @@ buildPythonPackage rec {
    owner = "BerriAI";
    repo = "litellm";
    rev = "refs/tags/v${version}";
-    hash = "sha256-DNFzBl2K4liphEMVPRbLWMzzCxtIcvUgQxvppAnv/10=";
+    hash = "sha256-Wd6u2bOZjdL3jexT3CkiXX3zfcXwMlNEifG/6ak5Qbw=";
  };

  build-system = [ poetry-core ];
--- a/pkgs/development/python-modules/oauthenticator/default.nix
+++ b/pkgs/development/python-modules/oauthenticator/default.nix
@ -10,6 +10,7 @@
  mwoauth,
  pyjwt,
  pytest-asyncio,
+  pytest-cov-stub,
  pytestCheckHook,
  requests,
  requests-mock,
@ -31,11 +32,6 @@ buildPythonPackage rec {
    hash = "sha256-gFhhOCcmorkrLxrup9fICh5ueCrc64fxfuZXTQG1tMk=";
  };

-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail " --cov=oauthenticator" ""
-  '';
-
  build-system = [ setuptools ];

  dependencies = [
@ -58,6 +54,7 @@ buildPythonPackage rec {

  nativeCheckInputs = [
    pytest-asyncio
+    pytest-cov-stub
    pytestCheckHook
    requests-mock
  ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
--- a/pkgs/development/python-modules/pymarshal/default.nix
+++ b/pkgs/development/python-modules/pymarshal/default.nix
@ -4,6 +4,7 @@
  fetchFromGitHub,
  bson,
  pytestCheckHook,
+  pytest-cov-stub,
  pyyaml,
  setuptools,
 }:
@ -23,8 +24,6 @@ buildPythonPackage rec {
  postPatch = ''
    substituteInPlace setup.py \
      --replace "'pytest-runner'" ""
-    substituteInPlace setup.cfg \
-      --replace "--cov=pymarshal --cov-report=html --cov-report=term" ""
  '';

  nativeBuildInputs = [ setuptools ];
@ -33,6 +32,7 @@ buildPythonPackage rec {

  nativeCheckInputs = [
    pytestCheckHook
+    pytest-cov-stub
    bson
    pyyaml
  ];
--- a/pkgs/development/python-modules/pytest-postgresql/default.nix
+++ b/pkgs/development/python-modules/pytest-postgresql/default.nix
@ -4,6 +4,7 @@
  fetchFromGitHub,
  pythonOlder,
  pytestCheckHook,
+  pytest-cov-stub,
  setuptools,
  mirakuru,
  port-for,
@ -28,7 +29,6 @@ buildPythonPackage rec {

  postPatch = ''
    substituteInPlace pyproject.toml  \
-      --replace-fail "--cov" ""  \
      --replace-fail "--max-worker-restart=0" ""
    sed -i 's#/usr/lib/postgresql/.*/bin/pg_ctl#${postgresql}/bin/pg_ctl#' pytest_postgresql/plugin.py
  '';
@ -45,6 +45,7 @@ buildPythonPackage rec {
  nativeCheckInputs = [
    postgresql
    pytestCheckHook
+    pytest-cov-stub
  ];
  pytestFlagsArray = [
    "-p"
--- a/pkgs/development/python-modules/samarium/crossandra-2-fix.patch
+++ b/pkgs/development/python-modules/samarium/crossandra-2-fix.patch
@ -1,18 +0,0 @@
--- a/src/samarium/tokenizer.py	2024-06-07 13:07:38.731314161 +0200
-+++ b/src/samarium/tokenizer.py	2024-06-07 13:08:11.674488226 +0200
-@@ -26,12 +26,12 @@
-     Token,
-     ignore_whitespace=True,
-     rules=[
-        Rule(r"==<.*>==", converter=False, flags=re.M | re.S),
-        Rule(r"==[^\n]*", converter=False, flags=re.M | re.S),
-+        Rule(r"==<.*>==", flags=re.M | re.S, ignore=True),
-+        Rule(r"==[^\n]*", flags=re.M | re.S, ignore=True),
-         Rule(
-             common.DOUBLE_QUOTED_STRING.pattern,
-             lambda x: x.replace("\n", r"\n"),
-            re.S,
-+            flags=re.S,
-         ),
-         Rule(rf"{SM_BIT}+`?{SM_BIT}*|`{SM_BIT}*", to_number),
-         Rule(r"\w+"),
--- a/pkgs/development/python-modules/samarium/default.nix
+++ b/pkgs/development/python-modules/samarium/default.nix
@ -10,20 +10,19 @@

 buildPythonPackage rec {
  pname = "samarium";
-  version = "0.5.3";
+  version = "0.6.2";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "samarium-lang";
    repo = "samarium";
    rev = "refs/tags/${version}";
-    hash = "sha256-4WVkTLE6OboNJE/f+6zS3xT1jEHUwV4HSLjl/PBP0FU=";
+    hash = "sha256-sOkJ67B8LaIA2cwCHaFnc16lMG8uaegBJCzF6Li77vk=";
  };

  build-system = [ poetry-core pythonRelaxDepsHook ];
  dependencies = [ crossandra dahlia ];

-  patches = [ ./crossandra-2-fix.patch ];
  pythonRelaxDeps = [ "crossandra" ];

  meta = with lib; {
--- a/pkgs/development/python-modules/toggl-cli/default.nix
+++ b/pkgs/development/python-modules/toggl-cli/default.nix
@ -13,6 +13,7 @@
  prettytable,
  pytest-mock,
  pytestCheckHook,
+  pytest-cov-stub,
  pythonOlder,
  requests,
  setuptools,
@ -37,7 +38,7 @@ buildPythonPackage rec {
    substituteInPlace requirements.txt \
      --replace-fail "==" ">="
    substituteInPlace pytest.ini \
-      --replace ' --cov toggl -m "not premium"' ""
+      --replace ' -m "not premium"' ""
  '';

  build-system = [
@ -60,6 +61,7 @@ buildPythonPackage rec {

  nativeCheckInputs = [
    pytestCheckHook
+    pytest-cov-stub
    pytest-mock
    faker
    factory-boy
--- a/pkgs/development/python-modules/transformers/default.nix
+++ b/pkgs/development/python-modules/transformers/default.nix
@ -59,7 +59,7 @@

 buildPythonPackage rec {
  pname = "transformers";
-  version = "4.43.3";
+  version = "4.43.4";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -68,7 +68,7 @@ buildPythonPackage rec {
    owner = "huggingface";
    repo = "transformers";
    rev = "refs/tags/v${version}";
-    hash = "sha256-CMc+bI99/kN560X7qsXh1tSho0/V8iwJMy4TALambRE=";
+    hash = "sha256-NgCYBBFQpXF5QZEmvPBjiJfcoDvCg+aWx9+ljAcqv6Q=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/tools/language-servers/nil/default.nix
+++ b/pkgs/development/tools/language-servers/nil/default.nix
@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
  cargoHash = "sha256-lyKPmzuZB9rCBI9JxhxlyDtNHLia8FXGnSgV+D/dwgo=";

  nativeBuildInputs = [
-    (lib.getBin nixVersions.latest)
+    (lib.getBin nixVersions.nix_2_23)
  ];

  env.CFG_RELEASE = version;
--- a/pkgs/development/tools/nwjs/default.nix
+++ b/pkgs/development/tools/nwjs/default.nix
@ -87,7 +87,7 @@ let
    extraOutputsToInstall = [ "lib" "out" ];
  };

-  version = "0.89.0";
+  version = "0.90.0";
 in
 stdenv.mkDerivation {
  pname = "nwjs";
@ -98,10 +98,10 @@ stdenv.mkDerivation {
    in fetchurl {
      url = "https://dl.nwjs.io/v${version}/nwjs-${flavor}v${version}-linux-${bits}.tar.gz";
      hash = {
-        "sdk-ia32" = "sha256-gHZLxZRborfbwmblKQrgr6tf+Rwt1YqxrGELAHPM0so=";
-        "sdk-x64" = "sha256-NOQGS3jEdZumTwCmi0DUtnGlOaSAZi2rGYSLVioJDdg=";
-        "ia32" = "sha256-L3PGK2YZCUo+KfkakL9AjkPcnUWPFOn4S2GePi+rph0=";
-        "x64" = "sha256-epsbDjrpq4K7NnNDAcKoEJMcjfdehU2JjFcmA5exug8=";
+        "sdk-ia32" = "sha256-dETXtOdJ9/1wZ47l/j/K5moN4m+KNc7vu7wVGql8NXQ=";
+        "sdk-x64" = "sha256-mRIKIrFIdXQ+tLled3ygJvMCBDKP08bl3IlqTbQmYq0=";
+        "ia32" = "sha256-+nGIQuWdPfctPNzDu7mkEUOmLx1cwcJoVCAk6ImNBxQ=";
+        "x64" = "sha256-uEb0GTONaR58nhjGAan1HCOqQKtQ2JDrTaSL+SfRY6E=";
      }."${flavor + bits}";
    };

--- a/pkgs/development/tools/rust/cargo-deny/default.nix
+++ b/pkgs/development/tools/rust/cargo-deny/default.nix
@ -9,16 +9,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "cargo-deny";
-  version = "0.16.0";
+  version = "0.16.1";

  src = fetchFromGitHub {
    owner = "EmbarkStudios";
    repo = "cargo-deny";
    rev = version;
-    hash = "sha256-EaCG9KbL+4N0fFj69N66xqOFaVnu+8EOV1dpAjTRcgI=";
+    hash = "sha256-RfXKTACAVmQffOFHpQHDi/BgiMNRVuS8j4aLslMYL1Q=";
  };

-  cargoHash = "sha256-JphmHW/KxKZmcskLDUKu7hVA7m2AUAi0fYMJaeMqyaE=";
+  cargoHash = "sha256-ywDjdlPhqqs740zGcwA8Ee9/TQ/sEiulSgGSejY41oY=";

  nativeBuildInputs = [
    pkg-config
--- a/pkgs/servers/web-apps/meme-bingo-web/default.nix
+++ b/pkgs/servers/web-apps/meme-bingo-web/default.nix
@ -1,18 +1,23 @@
-{ lib, fetchFromGitea, rustPlatform, makeWrapper }:
+{ lib
+, fetchFromGitea
+, rustPlatform
+, makeWrapper
+, nix-update-script
+}:

 rustPlatform.buildRustPackage rec {
  pname = "meme-bingo-web";
-  version = "0.2.0";
+  version = "1.0.1";

  src = fetchFromGitea {
    domain = "codeberg.org";
    owner = "annaaurora";
    repo = "meme-bingo-web";
    rev = "v${version}";
-    hash = "sha256-6hQra+10TaaQGzwiYfL+WHmGc6f0Hn8Tybd0lA5t0qc=";
+    hash = "sha256-mOcN9WIXJYRK23tMX29mT5/eSRpqb++zlnJnMizzIfY=";
  };

-  cargoHash = "sha256-/hBymxNAzyfapUL5Whkg4NBLA7Fc8A1npXEa9MXTAz4=";
+  cargoHash = "sha256-JWVsmw8ha2TSkCXyLPf9Qe1eL2OHB5uu+bSfCaF0lV8=";

  nativeBuildInputs = [ makeWrapper ];

@ -25,6 +30,8 @@ rustPlatform.buildRustPackage rec {
      --set MEME_BINGO_STATIC $out/share/meme-bingo-web/static
  '';

+  passthru.updateScript = nix-update-script { };
+
  meta = with lib; {
    description = "Play meme bingo using this neat web app";
    mainProgram = "meme-bingo-web";
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@ -184,6 +184,21 @@ in lib.makeExtensible (self: ({
    self_attribute_name = "nix_2_23";
  };

+  nix_2_24 = (common {
+    version = "2.24.1";
+    hash = "sha256-3yFEvUDPB7GlCMI9I5VV+HXMVOT38h3lnw01nIXU2F4=";
+    self_attribute_name = "nix_2_24";
+  }).override (lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) {
+    # Fix the following error with the default x86_64-darwin SDK:
+    #
+    #     error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer
+    #
+    # Despite the use of the 10.13 deployment target here, the aligned
+    # allocation function Clang uses with this setting actually works
+    # all the way back to 10.6.
+    stdenv = overrideSDK stdenv { darwinMinVersion = "10.13"; };
+  });
+
  git = (common rec {
    version = "2.24.0";
    suffix = "pre20240723_${lib.substring 0 8 src.rev}";
@ -205,7 +220,7 @@ in lib.makeExtensible (self: ({
    stdenv = overrideSDK stdenv { darwinMinVersion = "10.13"; };
  });

-  latest = self.nix_2_23;
+  latest = self.nix_2_24;

  # The minimum Nix version supported by Nixpkgs
  # Note that some functionality *might* have been backported into this Nix version,
--- a/pkgs/tools/wayland/mpvpaper/default.nix
+++ b/pkgs/tools/wayland/mpvpaper/default.nix
@ -16,13 +16,13 @@

 stdenv.mkDerivation rec {
  pname = "mpvpaper";
-  version = "1.6";
+  version = "1.7";

  src = fetchFromGitHub {
    owner = "GhostNaN";
    repo = pname;
    rev = version;
-    sha256 = "sha256-/A2C6T7gP+VGON3Peaz2Y4rNC63UT+zYr4RNM2gdLUY=";
+    sha256 = "sha256-uBitJM2Z5RFH4nfgdJ6ZbqkcMumu+K+3f6S49G7nEx8=";
  };

  strictDeps = true;
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -20115,8 +20115,6 @@ with pkgs;

  fcl = callPackage ../development/libraries/fcl { };

-  febio = callPackage ../development/libraries/febio { };
-
  ffcast = callPackage ../tools/X11/ffcast { };

  fflas-ffpack = callPackage ../development/libraries/fflas-ffpack { };
@ -37023,8 +37021,6 @@ with pkgs;

  fastp = callPackage ../applications/science/biology/fastp { };

-  febio-studio = libsForQt5.callPackage ../applications/science/biology/febio-studio { };
-
  flywheel-cli = callPackage ../applications/science/biology/flywheel-cli { };

  hh-suite = callPackage ../applications/science/biology/hh-suite {
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -3125,6 +3125,8 @@ self: super: with self; {

  discovery30303 = callPackage ../development/python-modules/discovery30303 { };

+  discum = callPackage ../development/python-modules/discum { };
+
  diskcache = callPackage ../development/python-modules/diskcache { };

  dissect = callPackage ../development/python-modules/dissect { };