Merge master into haskell-updates

2026-09-18 13:50:04 +00:00 · 2024-08-05 00:15:43 +00:00
parent 0689847252 61466761c4
commit a76bd42a24
435 changed files with 10291 additions and 4457 deletions
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -156,3 +156,6 @@ bdfde18037f8d9f9b641a4016c8ada4dc4cbf856

 # nixos/nvidia: apply nixfmt-rfc-style (#313440)
 fbdcdde04a7caa007e825a8b822c75fab9adb2d6
+
+# step-cli: format package.nix with nixfmt (#331629)
+fc7a83f8b62e90de5679e993d4d49ca014ea013d
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -159,6 +159,12 @@
    github = "13r0ck";
    githubId = 58987761;
  };
+  _1nv0k32 = {
+    name = "Armin";
+    email = "Armin.Mahdilou@gmail.com";
+    github = "1nv0k32";
+    githubId = 30079271;
+  };
  _21CSM = {
    name = "21CSM";
    email = "21CSM@tutanota.com";
@@ -12400,6 +12406,13 @@
    githubId = 115060;
    name = "Marek Maksimczyk";
  };
+  Mange = {
+    name = "Magnus Bergmark";
+    email = "me@mange.dev";
+    github = "Mange";
+    githubId = 1599;
+    keys = [ { fingerprint = "2EA6 F4AA 110A 1BF2 2275  19A9 0443 C69F 6F02 2CDE"; } ];
+  };
  mangoiv = {
    email = "contact@mangoiv.com";
    github = "mangoiv";
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -13,6 +13,8 @@
 - `authelia` has been upgraded to version 4.38. This version brings several features and improvements which are detailed in the [release blog post](https://www.authelia.com/blog/4.38-release-notes/).
  This release also deprecates some configuration keys, which are likely to be removed in future version 5.0, but they are still supported and expected to be working in the current version.

+- `compressDrv` can compress selected files in a derivation. `compressDrvWeb` compresses files for common web server usage (`.gz` with `zopfli`, `.br` with `brotli`).
+
 - `hardware.display` is a new module implementing workarounds for misbehaving monitors
  through setting up custom EDID files and forcing kernel/framebuffer modes.

@@ -110,6 +112,8 @@
  it is set, instead of the previous hardcoded default of
  `${networking.hostName}.${security.ipa.domain}`.

+- The `MSMTP_QUEUE` and `MSMTP_LOG` environment variables accepted by `msmtpq` have now been renamed to `MSMTPQ_Q` and `MSMTPQ_LOG` respectively.
+
 - The fcgiwrap module now allows multiple instances running as distinct users.
  The option `services.fgciwrap` now takes an attribute set of the
  configuration of each individual instance.
--- a/nixos/modules/hardware/video/webcam/ipu6.nix
+++ b/nixos/modules/hardware/video/webcam/ipu6.nix
@@ -26,9 +26,9 @@ in

  config = mkIf cfg.enable {

-    boot.extraModulePackages = with config.boot.kernelPackages; [
-      ipu6-drivers
-    ];
+    # Module is upstream as of 6.10
+    boot.extraModulePackages = with config.boot.kernelPackages;
+      optional (kernelOlder "6.10") ipu6-drivers;

    hardware.firmware = with pkgs; [
      ipu6-camera-bins
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1466,6 +1466,7 @@
  ./services/web-apps/pretix.nix
  ./services/web-apps/prosody-filer.nix
  ./services/web-apps/rimgo.nix
+  ./services/web-apps/screego.nix
  ./services/web-apps/sftpgo.nix
  ./services/web-apps/suwayomi-server.nix
  ./services/web-apps/rss-bridge.nix
--- a/nixos/modules/services/web-apps/mediawiki.nix
+++ b/nixos/modules/services/web-apps/mediawiki.nix
@@ -19,7 +19,7 @@ let
  stateDir = "/var/lib/mediawiki";

  # https://www.mediawiki.org/wiki/Compatibility
-  php = pkgs.php81;
+  php = pkgs.php82;

  pkg = pkgs.stdenv.mkDerivation rec {
    pname = "mediawiki-full";
--- a/nixos/modules/services/web-apps/screego.nix
+++ b/nixos/modules/services/web-apps/screego.nix
@@ -0,0 +1,96 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  inherit (lib) mkOption types mkIf;
+  cfg = config.services.screego;
+  defaultSettings = {
+    SCREEGO_SERVER_ADDRESS = "127.0.0.1:5050";
+    SCREEGO_TURN_ADDRESS = "0.0.0.0:3478";
+    SCREEGO_TURN_PORT_RANGE = "50000:55000";
+    SCREEGO_SESSION_TIMEOUT_SECONDS = "0";
+    SCREEGO_CLOSE_ROOM_WHEN_OWNER_LEAVES = "true";
+    SCREEGO_AUTH_MODE = "turn";
+    SCREEGO_LOG_LEVEL = "info";
+  };
+in
+{
+  meta.maintainers = with lib.maintainers; [ pinpox ];
+
+  options.services.screego = {
+
+    enable = lib.mkEnableOption "screego screen-sharing server for developers";
+
+    openFirewall = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Open the firewall port(s).
+      '';
+    };
+
+    environmentFile = mkOption {
+      default = null;
+      description = ''
+        Environment file (see {manpage}`systemd.exec(5)` "EnvironmentFile="
+        section for the syntax) passed to the service. This option can be
+        used to safely include secrets in the configuration.
+      '';
+      example = "/run/secrets/screego-envfile";
+      type = with types; nullOr path;
+    };
+
+    settings = lib.mkOption {
+      type = types.attrsOf types.str;
+      description = ''
+        Screego settings passed as Nix attribute set, they will be merged with
+        the defaults. Settings will be passed as environment variables.
+
+        See https://screego.net/#/config for possible values
+      '';
+      default = defaultSettings;
+      example = {
+        SCREEGO_EXTERNAL_IP = "dns:example.com";
+      };
+    };
+  };
+
+  config =
+    let
+      # User-provided settings should be merged with default settings,
+      # overwriting where necessary
+      mergedConfig = defaultSettings // cfg.settings;
+      turnUDPPorts = lib.splitString ":" mergedConfig.SCREEGO_TURN_PORT_RANGE;
+      turnPort = lib.toInt (builtins.elemAt (lib.splitString ":" mergedConfig.SCREEGO_TURN_ADDRESS) 1);
+    in
+    mkIf (cfg.enable) {
+
+      networking.firewall = lib.mkIf cfg.openFirewall {
+        allowedTCPPorts = [ turnPort ];
+        allowedUDPPorts = [ turnPort ];
+        allowedUDPPortRanges = [
+          {
+            from = lib.toInt (builtins.elemAt turnUDPPorts 0);
+            to = lib.toInt (builtins.elemAt turnUDPPorts 1);
+          }
+        ];
+      };
+
+      systemd.services.screego = {
+        wantedBy = [ "multi-user.target" ];
+        after = [ "network.target" ];
+        description = "screego screen-sharing for developers";
+        environment = mergedConfig;
+        serviceConfig = {
+          DynamicUser = true;
+          ExecStart = "${lib.getExe pkgs.screego} serve";
+          Restart = "on-failure";
+          RestartSec = "5s";
+        } // lib.optionalAttrs (cfg.environmentFile != null) { EnvironmentFile = cfg.environmentFile; };
+      };
+    };
+}
--- a/nixos/modules/services/web-apps/wordpress.nix
+++ b/nixos/modules/services/web-apps/wordpress.nix
@@ -70,7 +70,7 @@ let
        require_once(ABSPATH . 'wp-settings.php');
      ?>
    '';
-    checkPhase = "${pkgs.php81}/bin/php --syntax-check $target";
+    checkPhase = "${pkgs.php}/bin/php --syntax-check $target";
  };

  mkPhpValue = v: let
--- a/nixos/modules/virtualisation/oci-containers.nix
+++ b/nixos/modules/virtualisation/oci-containers.nix
@@ -148,12 +148,17 @@ let
            somewhere within the specified `hostPort` range.
            Example: `1234-1236:1234/tcp`

+            Publishing a port bypasses the NixOS firewall. If the port is not
+            supposed to be shared on the network, make sure to publish the
+            port to localhost.
+            Example: `127.0.0.1:1234:1234`
+
            Refer to the
            [Docker engine documentation](https://docs.docker.com/engine/reference/run/#expose-incoming-ports) for full details.
          '';
          example = literalExpression ''
            [
-              "8080:9000"
+              "127.0.0.1:8080:9000"
            ]
          '';
        };
--- a/nixos/tests/web-apps/pixelfed/standard.nix
+++ b/nixos/tests/web-apps/pixelfed/standard.nix
@@ -1,7 +1,6 @@
-import ../../make-test-python.nix ({pkgs, ...}:
-{
+import ../../make-test-python.nix {
  name = "pixelfed-standard";
-  meta.maintainers = with pkgs.lib.maintainers; [ raitobezarius ];
+  meta.maintainers = [ ];

  nodes = {
    server = { pkgs, ... }: {
@@ -35,4 +34,4 @@ import ../../make-test-python.nix ({pkgs, ...}:
    # server.succeed("pixelfed-manage passport:client --personal")
    # server.succeed("curl -H 'Host: pixefed.local' -H 'Accept: application/json' -H 'Authorization: Bearer secret' -F'status'='test' http://localhost/api/v1/statuses")
  '';
-})
+}
--- a/pkgs/applications/audio/praat/default.nix
+++ b/pkgs/applications/audio/praat/default.nix
@@ -11,13 +11,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "praat";
-  version = "6.4.13";
+  version = "6.4.14";

  src = fetchFromGitHub {
    owner = "praat";
    repo = "praat";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-rvaW4ifXZNAmON+2OZR2JLGPzaTEzk2miKeFHQ7Bp6M=";
+    hash = "sha256-AY/OSoCWlWSjtLcve16nL72HidPlJqJgAOvUubMqvj0=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/blockchains/ergo/default.nix
+++ b/pkgs/applications/blockchains/ergo/default.nix
@@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "ergo";
-  version = "5.0.21";
+  version = "5.0.22";

  src = fetchurl {
    url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
-    sha256 = "sha256-WtBsChSHnYbRBojxRUGdMnXlG+45hp4ZSd8GLx5n/88=";
+    sha256 = "sha256-fuea76l6kIjk9n/LlktZmJ1B8wiwSfEeHUkTr+I1a2c=";
  };

  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix
+++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
@@ -2,11 +2,11 @@

 let
  pname = "ledger-live-desktop";
-  version = "2.84.0";
+  version = "2.84.1";

  src = fetchurl {
    url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
-    hash = "sha256-VqPiFcquR1AbtH3oZJ5l+/KmvFUGCdBrwZuPAJ+26nw=";
+    hash = "sha256-V/bOCddc7UhmN8zlHmKj+H4v+ZZ/qn8jRj0jH4EtwMI=";
  };

  appimageContents = appimageTools.extractType2 {
--- a/pkgs/applications/blockchains/polkadot/Cargo.lock
+++ b/pkgs/applications/blockchains/polkadot/Cargo.lock
--- a/pkgs/applications/blockchains/polkadot/default.nix
+++ b/pkgs/applications/blockchains/polkadot/default.nix
@@ -17,13 +17,13 @@ let
 in
 rustPlatform.buildRustPackage rec {
  pname = "polkadot";
-  version = "1.14.0";
+  version = "stable2407";

  src = fetchFromGitHub {
    owner = "paritytech";
    repo = "polkadot-sdk";
-    rev = "polkadot-v${version}";
-    hash = "sha256-IKKhGjWHyHUrDVGJo1d1JXzagkydgdfd/u6jk76qxHU=";
+    rev = "polkadot-${version}";
+    hash = "sha256-g+jReHOAkaWjr1yJILFL4mSYGEfRBlSCrUHp8ro22SA=";

    # the build process of polkadot requires a .git folder in order to determine
    # the git commit hash that is being built and add it to the version string.
@@ -47,12 +47,7 @@ rustPlatform.buildRustPackage rec {
  cargoLock = {
    lockFile = ./Cargo.lock;
    outputHashes = {
-      "ark-secret-scalar-0.0.2" = "sha256-91sODxaj0psMw0WqigMCGO5a7+NenAsRj5ZmW6C7lvc=";
-      "common-0.1.0" = "sha256-LHz2dK1p8GwyMimlR7AxHLz1tjTYolPwdjP7pxork1o=";
-      "fflonk-0.1.0" = "sha256-+BvZ03AhYNP0D8Wq9EMsP+lSgPA6BBlnWkoxTffVLwo=";
      "simple-mermaid-0.1.0" = "sha256-IekTldxYq+uoXwGvbpkVTXv2xrcZ0TQfyyE2i2zH+6w=";
-      "sp-ark-bls12-381-0.4.2" = "sha256-nNr0amKhSvvI9BlsoP+8v6Xppx/s7zkf0l9Lm3DW8w8=";
-      "sp-crypto-ec-utils-0.4.1" = "sha256-/Sw1ZM/JcJBokFE4y2mv/P43ciTL5DEm0PDG0jZvMkI=";
    };
  };

--- a/pkgs/applications/editors/gnome-builder/default.nix
+++ b/pkgs/applications/editors/gnome-builder/default.nix
@@ -42,13 +42,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "gnome-builder";
-  version = "46.2";
+  version = "46.3";

  outputs = [ "out" "devdoc" ];

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-builder/${lib.versions.major finalAttrs.version}/gnome-builder-${finalAttrs.version}.tar.xz";
-    hash = "sha256-DIV7iQA7JHh/Kx0qrhLSdaB0xmhLSIA7SMACdtk3GWM=";
+    hash = "sha256-EvJ8DipKcxb59+IYWd9r8bd1cNKWb5V6QzBvaZ7FRhI=";
  };

  patches = [
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2020,8 +2020,8 @@ let
        mktplcRef = {
          publisher = "github";
          name = "copilot";
-          version = "1.219.1019"; # compatible with vscode ^1.91.0
-          hash = "sha256-W39hZyJ5XtDghkKu4Ml99M0/jZ1tVMGesKAKPquTkb8=";
+          version = "1.219.1028"; # compatible with vscode ^1.92.0
+          hash = "sha256-5f1P/CV6+Rp2kS9oSz5Ko5jMUt/Q6pWa9a+3nPyin6k=";
        };

        meta = {
@@ -2037,8 +2037,8 @@ let
        mktplcRef = {
          publisher = "github";
          name = "copilot-chat";
-          version = "0.17.2024062801"; # compatible with vscode ^1.91.0
-          hash = "sha256-aDTqHDGdWE/CG5bt/9um62sGFngHsJJvTl38NEqNq8E=";
+          version = "0.19.2024073102"; # compatible with vscode ^1.92.0
+          hash = "sha256-ekRBmJiAav1gITWlqBOuWtZMt1YZeseF+3fw326db/s=";
        };
        meta = {
          description = "GitHub Copilot Chat is a companion extension to GitHub Copilot that houses experimental chat features";
--- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
@@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
    name = "tinymist";
    publisher = "myriad-dreamin";
    inherit (tinymist) version;
-    hash = "sha256-AB+jLcY9VfJgqcbh8PEZ9nRiJPv4EcSG1arSeW6dCBo=";
+    hash = "sha256-eM9FVeMPpNtd3ytTzrB8aVF+h25pUI+F5rXhv+vQmg0=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/misc/notesnook/default.nix
+++ b/pkgs/applications/misc/notesnook/default.nix
@@ -2,7 +2,7 @@

 let
  pname = "notesnook";
-  version = "3.0.8";
+  version = "3.0.11";

  inherit (stdenv.hostPlatform) system;
  throwSystem = throw "Unsupported system: ${system}";
@@ -16,7 +16,7 @@ let
  src = fetchurl {
    url = "https://github.com/streetwriters/notesnook/releases/download/v${version}/notesnook_${suffix}";
    hash = {
-      x86_64-linux = "sha256-H25PGhCD5uqh2BHMMjb7GyftinBsRs2O5+9xNNV+5m4=";
+      x86_64-linux = "sha256-QnjfeN6CoLiyZvJY4mAZFJ58LxHhe/QUzpI4Fbz5Etg=";
      x86_64-darwin = "sha256-uT4xo4LT70jq7bHmiYu4FL8Fldppc2ai8yEZzGMzM6Q=";
      aarch64-darwin = "sha256-D5KIXHhzXXBOEcoOn2QKKUbVGMWhRW+L7fgxRxLpX/0=";
    }.${system} or throwSystem;
--- a/pkgs/applications/misc/protonup-qt/default.nix
+++ b/pkgs/applications/misc/protonup-qt/default.nix
@@ -1,10 +1,10 @@
 { appimageTools, fetchurl, lib }:
 let
  pname = "protonup-qt";
-  version = "2.9.2";
+  version = "2.10.2";
  src = fetchurl {
    url = "https://github.com/DavidoTek/ProtonUp-Qt/releases/download/v${version}/ProtonUp-Qt-${version}-x86_64.AppImage";
-    hash = "sha256-d1UjyhU7BezOoQZBnmrk96gD0MbYST0XR+PWVYmvGFQ=";
+    hash = "sha256-WWLAA5FryvqwgEQysnE1w2k9Wq4y7yNJ4Drojg1SKYg=";
  };
  appimageContents = appimageTools.extractType2 { inherit pname version src; };
 in
--- a/pkgs/applications/misc/rofi-bluetooth/default.nix
+++ b/pkgs/applications/misc/rofi-bluetooth/default.nix
@@ -2,6 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , makeWrapper
+, bc
 , bluez
 }:

@@ -25,7 +26,7 @@ stdenv.mkDerivation {
    install -D --target-directory=$out/bin/ ./rofi-bluetooth

    wrapProgram $out/bin/rofi-bluetooth \
-      --prefix PATH ":" ${lib.makeBinPath [ bluez ] }
+      --prefix PATH ":" ${lib.makeBinPath [ bc bluez ] }

    runHook postInstall
  '';
--- a/pkgs/applications/misc/rofi-emoji/default.nix
+++ b/pkgs/applications/misc/rofi-emoji/default.nix
@@ -15,61 +15,58 @@
 , rofi-unwrapped
 , wl-clipboard
 , xclip
-, xsel
 , xdotool
 , wtype
 }:

-stdenv.mkDerivation rec {
-  pname = "rofi-emoji";
-  version = "3.4.0";
+import ./versions.nix ({ version, hash, patches}:
+  stdenv.mkDerivation rec {
+    pname = "rofi-emoji";
+    inherit version;

-  src = fetchFromGitHub {
-    owner = "Mange";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-tF3yAKRUix+if+45rxg5vq83Pu33TQ6oUKWPIs/l4X0=";
-  };
+    src = fetchFromGitHub {
+      owner = "Mange";
+      repo = "rofi-emoji";
+      rev = "v${version}";
+      inherit hash;
+    };

-  patches = [
-    # Look for plugin-related files in $out/lib/rofi
-    ./0001-Patch-plugindir-to-output.patch
-  ];
+    inherit patches;

-  postPatch = ''
-    patchShebangs clipboard-adapter.sh
-  '';
+    postPatch = ''
+      patchShebangs clipboard-adapter.sh
+    '';

-  postFixup = ''
-    chmod +x $out/share/rofi-emoji/clipboard-adapter.sh
-    wrapProgram $out/share/rofi-emoji/clipboard-adapter.sh \
-     --prefix PATH ":" ${lib.makeBinPath ([ libnotify wl-clipboard xclip xsel ]
-       ++ lib.optionals waylandSupport [ wtype ]
-       ++ lib.optionals x11Support [ xdotool ])}
-  '';
+    postFixup = ''
+      chmod +x $out/share/rofi-emoji/clipboard-adapter.sh
+      wrapProgram $out/share/rofi-emoji/clipboard-adapter.sh \
+       --prefix PATH ":" ${lib.makeBinPath ([ libnotify ]
+         ++ lib.optionals waylandSupport [ wl-clipboard wtype ]
+         ++ lib.optionals x11Support [ xclip xdotool ])}
+    '';


-  nativeBuildInputs = [
-    autoreconfHook
-    pkg-config
-    makeWrapper
-  ];
+    nativeBuildInputs = [
+      autoreconfHook
+      pkg-config
+      makeWrapper
+    ];

-  buildInputs = [
-    cairo
-    glib
-    libnotify
-    rofi-unwrapped
-    wl-clipboard
-    xclip
-    xsel
-  ];
+    buildInputs = [
+      cairo
+      glib
+      libnotify
+      rofi-unwrapped
+    ]
+      ++ lib.optionals waylandSupport [ wl-clipboard wtype ]
+      ++ lib.optionals x11Support [ xclip ];

-  meta = with lib; {
-    description = "Emoji selector plugin for Rofi";
-    homepage = "https://github.com/Mange/rofi-emoji";
-    license = licenses.mit;
-    maintainers = with maintainers; [ cole-h ];
-    platforms = platforms.linux;
-  };
-}
+    meta = with lib; {
+      description = "Emoji selector plugin for Rofi (built against ${rofi-unwrapped.pname})";
+      homepage = "https://github.com/Mange/rofi-emoji";
+      license = licenses.mit;
+      maintainers = with maintainers; [ cole-h Mange ];
+      platforms = platforms.linux;
+    };
+  }
+)
--- a/pkgs/applications/misc/rofi-emoji/versions.nix
+++ b/pkgs/applications/misc/rofi-emoji/versions.nix
@@ -0,0 +1,18 @@
+generic: {
+  v4 = generic {
+    version = "4.0.0";
+    hash = "sha256-864Mohxfc3EchBKtSNifxy8g8T8YBUQ/H7+8Ti6TiFo=";
+    patches = [
+      # Look for plugin-related files in $out/lib/rofi
+      ./0001-Patch-plugindir-to-output.patch
+    ];
+  };
+  v3 = generic {
+    version = "3.4.1";
+    hash = "sha256-ZHhgYytPB14zj2MS8kChRD+LTqXzHRrz7YIikuQD6i0=";
+    patches = [
+      # Look for plugin-related files in $out/lib/rofi
+      ./0001-Patch-plugindir-to-output.patch
+    ];
+  };
+}
--- a/pkgs/applications/misc/tellico/default.nix
+++ b/pkgs/applications/misc/tellico/default.nix
@@ -24,14 +24,14 @@

 mkDerivation rec {
  pname = "tellico";
-  version = "3.5.3";
+  version = "3.5.5";

  src = fetchFromGitLab {
    domain = "invent.kde.org";
    owner = "office";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-hg2sfBEh3jjVwMFmkgu9nXuXARsPqvlxzxX7kjSI/JU=";
+    hash = "sha256-0I4oDMLYWomAF+wpPeA1NQk4nnhUV1RT6IYKJdOUcas=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/networking/cluster/aiac/default.nix
+++ b/pkgs/applications/networking/cluster/aiac/default.nix
@@ -2,14 +2,14 @@

 buildGoModule rec {
  pname = "aiac";
-  version = "5.0.1";
+  version = "5.2.1";
  excludedPackages = [".ci"];

  src = fetchFromGitHub {
    owner = "gofireflyio";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-1kWXvmnfdx44HYjW3vHuj2oU1uMabeGcZutkpszWg7Y=";
+    hash = "sha256-8LMuhUeH/KNOf3IPYMSwZDxeY8M7oDYF4Q7X7ImQSMw=";
  };

  vendorHash = "sha256-uXYin6JITpy3bc7FI/3aJqvCD9cGwGL1qjB8hBUWLQE=";
--- a/pkgs/applications/networking/cluster/helm-docs/default.nix
+++ b/pkgs/applications/networking/cluster/helm-docs/default.nix
@@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "helm-docs";
-  version = "1.13.1";
+  version = "1.14.2";

  src = fetchFromGitHub {
    owner = "norwoodj";
    repo = "helm-docs";
    rev = "v${version}";
-    hash = "sha256-lSGgT+aWp4NgiIoCnR4TNdecEqIZVnKMmGtEingq05o=";
+    hash = "sha256-a7alzjh+vjJPw/g9yaYkOUvwpgiqCrtKTBkV1EuGYtk=";
  };

-  vendorHash = "sha256-LpARmDupT+vUPqUwFnvOGKOaBQbTuTvQnWc5Q2bGBaY=";
+  vendorHash = "sha256-9VSjxnc804A+PTMy0ZoNWNkHAjh3/kMK0XoEfI/LgEY=";

  subPackages = [ "cmd/helm-docs" ];
  ldflags = [
--- a/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix
+++ b/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix
@@ -5,16 +5,16 @@

 buildGoModule rec {
  pname = "kubectl-cnpg";
-  version = "1.23.2";
+  version = "1.23.3";

  src = fetchFromGitHub {
    owner = "cloudnative-pg";
    repo = "cloudnative-pg";
    rev = "v${version}";
-    hash = "sha256-/h2hvyjC/rHOkyZbt0kYn0TcQeXutU4rxYBD7Mh948Q=";
+    hash = "sha256-78XvVPWhsvu7shbU2fJ+/7NnGxUXLLOeR28OPkUUw2A=";
  };

-  vendorHash = "sha256-MY4yU0UpN3V3RxsFWqxZOsZZA1kma3NNTHE9e/gquno=";
+  vendorHash = "sha256-Y5HmoxMLs2rvpLycH5bMd9awHrNeIOkwn7m53hCAWug=";

  subPackages = [ "cmd/kubectl-cnpg" ];

--- a/pkgs/applications/networking/cluster/tfupdate/default.nix
+++ b/pkgs/applications/networking/cluster/tfupdate/default.nix
@@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "tfupdate";
-  version = "0.8.2";
+  version = "0.8.4";

  src = fetchFromGitHub {
    owner = "minamijoyo";
    repo = "tfupdate";
    rev = "v${version}";
-    sha256 = "sha256-RewBCiUNdXA30gwcnBu+wBoMNbVjaIWkCQV+Bat6l0o=";
+    sha256 = "sha256-/wkCd73SrspHccbOZV6lq0Htk+Vjgbu2uTZLiEeZAdc=";
  };

-  vendorHash = "sha256-fs61aMsRGF2zmyLro5ySWi3P1qPPgvISTqCvuVWAvz0=";
+  vendorHash = "sha256-/ZNWVuGInZY/t0s317FQstEPeJpTKWMXUVo8cE44GkI=";

  # Tests start http servers which need to bind to local addresses:
  # panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: bind: operation not permitted
--- a/pkgs/applications/networking/gnmic/default.nix
+++ b/pkgs/applications/networking/gnmic/default.nix
@@ -8,16 +8,16 @@

 buildGoModule rec {
  pname = "gnmic";
-  version = "0.38.0";
+  version = "0.38.1";

  src = fetchFromGitHub {
    owner = "openconfig";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-sFjr43rHFnhTpOutwgt7yg5wJtpSe2+ShUggb1QVCWE=";
+    hash = "sha256-Js5l6bVZtnR6uOo2+3L2CAvFj/i0O2FFGEiGOkc2qDQ=";
  };

-  vendorHash = "sha256-+TrSvGbpQSTanf5rm955WE8jj/RlZGtacbBo6JsOW4Y=";
+  vendorHash = "sha256-4TTxhcP06YuhWWufVTAVK2wTf8mCc3WLAjzFe5wKChY=";

  ldflags = [
    "-s" "-w"
--- a/pkgs/applications/networking/instant-messengers/beeper/default.nix
+++ b/pkgs/applications/networking/instant-messengers/beeper/default.nix
@@ -10,10 +10,10 @@
 }:
 let
  pname = "beeper";
-  version = "3.107.2";
+  version = "3.108.3";
  src = fetchurl {
-    url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.107.2-build-240624c0qmp116e-x86_64.AppImage";
-    hash = "sha256-DFzPPVw8OCM7K6COQcC68ZntEZiqBW58IpiD4rpgguc=";
+    url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.108.3-build-2407188w36frwla-x86_64.AppImage";
+    hash = "sha256-mlbw5K7+xZqz05FWKgKnro5SiVG+uSTI7muErAt8PM0=";
  };
  appimage = appimageTools.wrapType2 {
    inherit version pname src;
--- a/pkgs/applications/networking/instant-messengers/fractal/Cargo.lock
+++ b/pkgs/applications/networking/instant-messengers/fractal/Cargo.lock
--- a/pkgs/applications/networking/instant-messengers/fractal/default.nix
+++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix
@@ -25,23 +25,21 @@

 stdenv.mkDerivation rec {
  pname = "fractal";
-  version = "7";
+  version = "8";

  src = fetchFromGitLab {
    domain = "gitlab.gnome.org";
    owner = "World";
    repo = "fractal";
    rev = "refs/tags/${version}";
-    hash = "sha256-IfcThpsGATMD3Uj9tvw/aK7IVbiVT8sdZ088gRUqnlg=";
+    hash = "sha256-a77+lPH2eqWTLFrYfcBXSvbyyYC52zSo+Rh/diqKYx4=";
  };

  cargoDeps = rustPlatform.importCargoLock {
    lockFile = ./Cargo.lock;
    outputHashes = {
-      "mas-http-0.8.0" = "sha256-IiYxF9qT/J/n8t/cVT/DRV3gl2MTA6/YfjshVIic/n4=";
-      "matrix-sdk-0.7.1" = "sha256-quwt9Dx0K6LDMwHBipc52Ek59zz5mlTAdOj+RXZBU3Q=";
-      "ruma-0.9.4" = "sha256-tp0EFS39UTXZJQPUDjeQixb8wzsMCzyFggVj6M8TRYg=";
-      "vodozemac-0.5.1" = "sha256-Hm0C696RmNX6n1Jx+hqkKMjpdbArliuzdiS4wCv3OIM=";
+      "matrix-sdk-0.7.1" = "sha256-ZlkxGXGrmZ8VQV7UY7A7BBfcqFCAB9Ep7l65irx4Dy8=";
+      "ruma-0.10.1" = "sha256-C/GJ0hDWJ9/grfjMuPSatJq2SrVkV0jxQlAAASkUWqg=";
    };
  };

--- a/pkgs/applications/networking/juju/default.nix
+++ b/pkgs/applications/networking/juju/default.nix
@@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "juju";
-  version = "3.5.2";
+  version = "3.5.3";

  src = fetchFromGitHub {
    owner = "juju";
    repo = "juju";
    rev = "v${version}";
-    hash = "sha256-HdV6bRAMQ7LynEGjrFOX36g7+1Zb9AiFtF6O4yu7+NU=";
+    hash = "sha256-PdNUmPfPYqOYEphY0ZlwEikUV/bKSPOGQuAJsi8+g/E=";
  };

  vendorHash = "sha256-FCN+0Wx2fYQcj5CRgPubAWbGGyVQcSSfu/Om6SUB6TQ=";
--- a/pkgs/applications/networking/ktailctl/default.nix
+++ b/pkgs/applications/networking/ktailctl/default.nix
@@ -23,20 +23,20 @@
 }:

 let
-  version = "0.17.1";
+  version = "0.17.2";

  src = fetchFromGitHub {
    owner = "f-koehler";
    repo = "KTailctl";
    rev = "v${version}";
-    hash = "sha256-urB8NcdQMF6RNX8F2CpzOd0ZkRi3IS4XFyOOXIeChpY=";
+    hash = "sha256-jACcTRIdzYiSLy7zw5QuDu9tZfee9ufhlEecbTbSr+4=";
  };

  goDeps = (buildGoModule {
    pname = "ktailctl-go-wrapper";
    inherit src version;
    modRoot = "src/wrapper";
-    vendorHash = "sha256-Ls4MVppMJbUUukaKkDAN8Lx/s09JRJTf/RMgk0iDcnw=";
+    vendorHash = "sha256-V4Bn5/VaoFOZlNGBedA4Ly8Kocw0BWyfIHv8IU6Eay4=";
  }).goModules;
 in
 stdenv.mkDerivation {
--- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix
+++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix
@@ -22,11 +22,11 @@

 stdenv.mkDerivation rec {
  pname = "evolution-ews";
-  version = "3.52.3";
+  version = "3.52.4";

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-H9Y4L9X9MAQ4Rc/F3Ew0/gErzINRK2AwFUJQvGGAaMA=";
+    hash = "sha256-QI1VBWyA5K1kR+PHeINodYIfbCYdNepxF1YocPAvY7o=";
  };

  patches = [
--- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
+++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
@@ -45,11 +45,11 @@

 stdenv.mkDerivation rec {
  pname = "evolution";
-  version = "3.52.3";
+  version = "3.52.4";

  src = fetchurl {
    url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-HCL1O1VU4mCkjpF/PWaYNNJOTTrVoSTL4EKipKzkQcU=";
+    hash = "sha256-9XkpgB1uQBphHWUh71kiTYGzBQA1ekuePkYkXslGGBk=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -47,7 +47,7 @@ let
  };

 in rec {
-  thunderbird = thunderbird-115;
+  thunderbird = thunderbird-128;

  thunderbird-115 = common {
    version = "115.13.0";
--- a/pkgs/applications/networking/mpop/default.nix
+++ b/pkgs/applications/networking/mpop/default.nix
@@ -16,11 +16,11 @@ assert lib.assertOneOf "sslLibrary" sslLibrary ["gnutls" "openssl" "no"];

 stdenv.mkDerivation rec {
  pname = "mpop";
-  version = "1.4.19";
+  version = "1.4.20";

  src = fetchurl {
    url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz";
-    sha256 = "sha256-I8QeE8b/68qt4sNsn9RivyX2I+SBuwYnz+CT4DpVXIo=";
+    sha256 = "sha256-Ncx94X492spHQ4Y0ZEiPjIKoOsGzdk/d1/QjiBQ1v0s=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/networking/msmtp/default.nix
+++ b/pkgs/applications/networking/msmtp/default.nix
@@ -25,13 +25,13 @@
 let
  inherit (lib) getBin getExe optionals;

-  version = "1.8.22";
+  version = "1.8.25";

  src = fetchFromGitHub {
    owner = "marlam";
-    repo = "msmtp-mirror";
+    repo = "msmtp";
    rev = "msmtp-${version}";
-    hash = "sha256-Jt/uvGBrYYr6ua6LVPiP0nuRiIkxBJASdgHBNHivzxQ=";
+    hash = "sha256-UZKUpF/ZwYPM2rPDudL1O8e8LguKJh9sTcJRT3vgsf4=";
  };

  meta = with lib; {
@@ -68,7 +68,10 @@ let
    pname = "msmtp-scripts";
    inherit version src meta;

-    patches = [ ./paths.patch ];
+    patches = [
+      ./msmtpq-remove-binary-check.patch
+      ./msmtpq-systemd-logging.patch
+    ];

    postPatch = ''
      substituteInPlace scripts/msmtpq/msmtpq \
--- a/pkgs/applications/networking/msmtp/msmtpq-remove-binary-check.patch
+++ b/pkgs/applications/networking/msmtp/msmtpq-remove-binary-check.patch
@@ -0,0 +1,13 @@
+diff --git a/scripts/msmtpq/msmtpq b/scripts/msmtpq/msmtpq
+index bcb384e..9622e47 100755
+--- a/scripts/msmtpq/msmtpq
+++ b/scripts/msmtpq/msmtpq
+@@ -60,8 +60,6 @@ err() { dsp '' "$@" '' ; exit 1 ; }
+ ##   export the location of the msmtp executable before running this script  (no quotes !!)
+ ##   e.g. ( export MSMTP=/path/to/msmtp )
+ MSMTP="${MSMTP:-msmtp}"
+-"$MSMTP" --version >/dev/null 2>&1 || \
+-  log_later -e 1 "msmtpq : can't run the msmtp executable [ $MSMTP ]"   # if not found - complain ; quit
+ ##
+ ## set the queue var to the location of the msmtp queue directory
+ ##   if the queue dir doesn't yet exist, create it (0700)
--- a/pkgs/applications/networking/msmtp/msmtpq-systemd-logging.patch
+++ b/pkgs/applications/networking/msmtp/msmtpq-systemd-logging.patch
@@ -0,0 +1,41 @@
+diff --git a/scripts/msmtpq/msmtpq b/scripts/msmtpq/msmtpq
+index bcb384e..dbaf1b5 100755
+--- a/scripts/msmtpq/msmtpq
+++ b/scripts/msmtpq/msmtpq
+@@ -92,6 +92,8 @@ if [ ! -v MSMTPQ_LOG ] ; then
+   fi
+ fi
+ [ -d "$(dirname "$MSMTPQ_LOG")" ] || mkdir -p "$(dirname "$MSMTPQ_LOG")"
+
+JOURNAL=@journal@
+ ## ======================================================================================
+ 
+ ## msmtpq can use the following environment variables :
+@@ -144,6 +146,7 @@ on_exit() {                          # unlock the queue on exit if the lock was
+ ## display msg to user, as well
+ ##
+ log() {
+  local NAME=msmtpq
+   local ARG RC PFX
+   PFX="$('date' +'%Y %d %b %H:%M:%S')"
+                                      # time stamp prefix - "2008 13 Mar 03:59:45 "
+@@ -161,10 +164,19 @@ log() {
+     done
+   fi
+ 
+  if [ "$JOURNAL" = "Y" ]; then
+    for ARG; do
+      [ -n "$ARG" ] &&
+        echo "$ARG" | systemd-cat -t "$NAME" -p info
+    done
+  fi
+
+   if [ -n "$RC" ] ; then             # an error ; leave w/error return
+     [ -n "$LKD" ] && lock_queue -u   # unlock here (if locked)
+     [ -n "$MSMTPQ_LOG" ] && \
+       echo "    exit code = $RC" >> "$MSMTPQ_LOG" # logging ok ; send exit code to log
+    [ "$JOURNAL" = "Y" ] && \
+      echo "exit code= $RC" | systemd-cat -t "$NAME" -p emerg
+     exit "$RC"                       # exit w/return code
+   fi
+ }
--- a/pkgs/applications/networking/msmtp/paths.patch
+++ b/pkgs/applications/networking/msmtp/paths.patch
@@ -1,64 +0,0 @@
-diff --git a/scripts/msmtpq/msmtpq b/scripts/msmtpq/msmtpq
-index d8b4039..1f2a7b5 100755
--- a/scripts/msmtpq/msmtpq
-+++ b/scripts/msmtpq/msmtpq
-@@ -60,8 +60,8 @@ err() { dsp '' "$@" '' ; exit 1 ; }
- ##   e.g. ( export MSMTP=/path/to/msmtp )
- if [ "$MSMTP" = "" ] ; then  # If MSMTP is unset or empty...
-   MSMTP=msmtp
-elif [ ! -x "$MSMTP" ] ; then
-  log -e 1 "msmtpq : can't find the msmtp executable [ $MSMTP ]"   # if not found - complain ; quit
-+# elif [ ! -x "$MSMTP" ] ; then
-+#   log -e 1 "msmtpq : can't find the msmtp executable [ $MSMTP ]"   # if not found - complain ; quit
- fi
- ##
- ## set the queue var to the location of the msmtp queue directory
-@@ -71,7 +71,7 @@ fi
- ##            ( chmod 0700 msmtp.queue )
- ##
- ## the queue dir - export this variable to reflect where you'd like it to be  (no quotes !!)
-Q=${Q:-~/.msmtp.queue}
-+Q=${MSMTP_QUEUE:-~/.msmtp.queue}
- [ -d "$Q" ] || mkdir -m 0700 -p "$Q" || \
-   err '' "msmtpq : can't find or create msmtp queue directory [ $Q ]" ''     # if not present - complain ; quit
- ##
-@@ -85,8 +85,10 @@ Q=${Q:-~/.msmtp.queue}
- ##
- ## the queue log file - export this variable to change where logs are stored  (but no quotes !!)
- ##                      Set it to "" (empty string) to disable logging.
-[ -v LOG ] || LOG=~/log/msmtp.queue.log
-+LOG=${MSMTP_LOG:-~/log/msmtp.queue.log}
- [ -d "$(dirname "$LOG")" ] || mkdir -p "$(dirname "$LOG")"
-+
-+JOURNAL=@journal@
- ## ======================================================================================
- 
- ## msmtpq can use the following environment variables :
-@@ -139,6 +141,7 @@ on_exit() {                          # unlock the queue on exit if the lock was
- ## display msg to user, as well
- ##
- log() {
-+  local NAME=msmtpq
-   local ARG RC PFX
-   PFX="$('date' +'%Y %d %b %H:%M:%S')"
-                                      # time stamp prefix - "2008 13 Mar 03:59:45 "
-@@ -156,10 +159,19 @@ log() {
-     done
-   fi
- 
-+  if [ "$JOURNAL" = "Y" ]; then
-+    for ARG; do
-+      [ -n "$ARG" ] &&
-+        echo "$ARG" | systemd-cat -t "$NAME" -p info
-+    done
-+  fi
-+
-   if [ -n "$RC" ] ; then             # an error ; leave w/error return
-     [ -n "$LKD" ] && lock_queue -u   # unlock here (if locked)
-     [ -n "$LOG" ] && \
-       echo "    exit code = $RC" >> "$LOG" # logging ok ; send exit code to log
-+    [ "$JOURNAL" = "Y" ] && \
-+      echo "exit code= $RC" | systemd-cat -t "$NAME" -p emerg
-     exit "$RC"                       # exit w/return code
-   fi
- }
--- a/pkgs/applications/networking/seafile-client/default.nix
+++ b/pkgs/applications/networking/seafile-client/default.nix
@@ -15,13 +15,13 @@

 stdenv.mkDerivation rec {
  pname = "seafile-client";
-  version = "9.0.6";
+  version = "9.0.7";

  src = fetchFromGitHub {
    owner = "haiwen";
    repo = "seafile-client";
    rev = "v${version}";
-    sha256 = "sha256-JjicVgDqiuIuVn7swbVekqQ+3Ly64Nd7qKu5UymTEYE=";
+    sha256 = "sha256-Q/Dimm4oJH6mh0mCbVhkqJuRI9wytGmeBGNjMWiPil4=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/office/planify/default.nix
+++ b/pkgs/applications/office/planify/default.nix
@@ -28,13 +28,13 @@

 stdenv.mkDerivation rec {
  pname = "planify";
-  version = "4.9.0";
+  version = "4.10.5";

  src = fetchFromGitHub {
    owner = "alainm23";
    repo = "planify";
    rev = version;
-    hash = "sha256-zNQe0w8Vbe+ZIYTer1ISwJ6yA4dOdDtuWme5txcbY3w=";
+    hash = "sha256-tjU7/JZjJqH9H/EWMoAbRurJtIDv8BTT938EnJicTv4=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/science/biology/nest/default.nix
+++ b/pkgs/applications/science/biology/nest/default.nix
@@ -19,13 +19,13 @@

 stdenv.mkDerivation rec {
  pname = "nest";
-  version = "3.7";
+  version = "3.8";

  src = fetchFromGitHub {
    owner = "nest";
    repo = "nest-simulator";
    rev = "v${version}";
-    hash = "sha256-EwhpsfRmBLJnPiH6hXQXgG9jSNoC2oqq5lZ6t038VpI=";
+    hash = "sha256-hysOe1ZZpCClVOGo0+UeCP7imAakXrZlnJ4V95zfiyA=";
  };

  postPatch = ''
--- a/pkgs/applications/science/biology/neuron/default.nix
+++ b/pkgs/applications/science/biology/neuron/default.nix
@@ -23,7 +23,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "neuron";
-  version = "8.2.4";
+  version = "8.2.6";

  # format is for pythonModule conversion
  format = "other";
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
  ] ++ optionals useMpi [
    python3.pkgs.mpi4py
  ] ++ optionals useRx3d [
-    python3.pkgs.cython_0 # NOTE: cython<3 is required as of 8.2.4
+    python3.pkgs.cython_0 # NOTE: cython<3 is required as of 8.2.6
    python3.pkgs.numpy
  ];

@@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
    repo = "nrn";
    rev = finalAttrs.version;
    fetchSubmodules = true;
-    hash = "sha256-KsULc+LHoWmrkGYebpoUot6DhStKidbLQf5a3S+pi4s=";
+    hash = "sha256-xASBpsF8rIzrb5G+4Qi6rvWC2wqL7nAGlSeMsBAI6WM=";
  };

  meta = with lib; {
--- a/pkgs/applications/science/chemistry/jmol/default.nix
+++ b/pkgs/applications/science/chemistry/jmol/default.nix
@@ -25,14 +25,14 @@ let
  };
 in
 stdenv.mkDerivation rec {
-  version = "16.2.19";
+  version = "16.2.21";
  pname = "jmol";

  src = let
    baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
  in fetchurl {
    url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
-    hash = "sha256-uOPRdTmEbU376G7a7om5UpBjemkN170PwGCskJY41HE=";
+    hash = "sha256-9gIOrHoy0JyoPXaHOfBDHCL+ykmmHNam+Um12sHqZsE=";
  };

  patchPhase = ''
--- a/pkgs/applications/science/logic/beluga/default.nix
+++ b/pkgs/applications/science/logic/beluga/default.nix
@@ -2,13 +2,13 @@

 ocamlPackages.buildDunePackage rec {
  pname = "beluga";
-  version = "1.1.1";
+  version = "1.1.2";

  src = fetchFromGitHub {
    owner = "Beluga-lang";
    repo = "Beluga";
    rev = "refs/tags/v${version}";
-    hash = "sha256-l/C77czLtlLnpadVx4d9ve9jv/e11jsOgzrbXt+Zo5s=";
+    hash = "sha256-QUZ3mmd0gBQ+hnAeo/TbvFsETnThAdAoQyfpz2F//4g=";
  };

  duneVersion = "3";
--- a/pkgs/applications/version-management/ghorg/default.nix
+++ b/pkgs/applications/version-management/ghorg/default.nix
@@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "ghorg";
-  version = "1.9.12";
+  version = "1.9.13";

  src = fetchFromGitHub {
    owner = "gabrie30";
    repo = "ghorg";
    rev = "v${version}";
-    sha256 = "sha256-8M8ovb3T7iSHXepG1eH3ByX+g5iVRl4/pctigQ4I0Pk=";
+    sha256 = "sha256-RXXDWz8sXvn0+6JFf6cHNRwg9xAGrCHGRM/M8MQpMko=";
  };

  doCheck = false;
--- a/pkgs/applications/version-management/git-cola/default.nix
+++ b/pkgs/applications/version-management/git-cola/default.nix
@@ -10,14 +10,14 @@

 python3Packages.buildPythonApplication rec {
  pname = "git-cola";
-  version = "4.8.0";
+  version = "4.8.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "git-cola";
    repo = "git-cola";
    rev = "v${version}";
-    hash = "sha256-sm/a790PiSqGYbftxvLiLMifKbMyi3a5Rvlhr9plyrU=";
+    hash = "sha256-3SCfsLYB4qhvsVo0Ji4WPwIDGcMwQ4M4zKnCOsXGTS0=";
  };

  buildInputs = lib.optionals stdenv.isLinux [
--- a/pkgs/applications/version-management/git-machete/default.nix
+++ b/pkgs/applications/version-management/git-machete/default.nix
@@ -10,13 +10,13 @@

 buildPythonApplication rec {
  pname = "git-machete";
-  version = "3.26.2";
+  version = "3.26.3";

  src = fetchFromGitHub {
    owner = "virtuslab";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-AvHRl+xP4VSBP9p2BoRr/z/BT6c7zlOWUlWmfp5VvfA=";
+    hash = "sha256-UCaJiYLYeHI4R8IJfhgmT4Ji++CtQgvIJrKH1EXl83o=";
  };

  nativeBuildInputs = [ installShellFiles ];
--- a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix
@@ -9,13 +9,13 @@

 stdenv.mkDerivation rec {
  pname = "obs-vertical-canvas";
-  version = "1.4.5";
+  version = "1.4.7";

  src = fetchFromGitHub {
    owner = "Aitum";
    repo = "obs-vertical-canvas";
    rev = version;
-    sha256 = "sha256-4BmTp/PrR01H9IrKNX9ZpK4kLaiNG/G9rTMf9dsoV0s=";
+    sha256 = "sha256-JF/ZI0bJjHMoI4hpGPuMGDHMrd7tw0Kvwm/VhACLUfo=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/applications/window-managers/weston/default.nix
+++ b/pkgs/applications/window-managers/weston/default.nix
@@ -27,10 +27,10 @@ stdenv.mkDerivation rec {
  };

  postPatch = ''
-    # raise neatvnc version bound to 0.8.0
+    # raise neatvnc version bound to < 0.9.0
    # https://gitlab.freedesktop.org/wayland/weston/-/issues/890
    substituteInPlace libweston/backend-vnc/meson.build \
-      --replace-fail "'neatvnc', version: ['>= 0.7.0', '< 0.8.0']" "'neatvnc', version: ['>= 0.7.0', '<= 0.8.0']"
+      --replace-fail "'neatvnc', version: ['>= 0.7.0', '< 0.8.0']" "'neatvnc', version: ['>= 0.7.0', '< 0.9.0']"
  '';

  depsBuildBuild = [ pkg-config ];
--- a/pkgs/build-support/compress-drv/default.nix
+++ b/pkgs/build-support/compress-drv/default.nix
@@ -0,0 +1,63 @@
+{
+  lib,
+  xorg,
+  runCommand,
+}:
+/**
+  #  compressDrv compresses files in a given derivation.
+
+  ## Inputs:
+
+  `formats` ([String])
+
+  : List of file extensions to compress. Example: `["txt" "svg" "xml"]`.
+
+  `compressors` (String -> String)
+
+  : Map a desired extension (e.g. `gz`) to a compress program.
+
+  The compressor program that will be executed to get the `COMPRESSOR` extension.
+  The program should have a single " {}", which will be the replaced with the
+  target filename.
+
+  Compressor must:
+  - read symlinks (thus --force is needed to gzip, zstd, xz).
+  - keep the original file in place (--keep).
+
+  Example:
+
+  ```
+  {
+    xz = "${xz}/bin/xz --force --keep {}";
+  }
+  ```
+
+  See compressDrvWeb, which is a wrapper on top of compressDrv, for broader use
+  examples.
+*/
+drv:
+{ formats, compressors, ... }:
+let
+  validProg =
+    ext: prog:
+    let
+      matches = (builtins.length (builtins.split "\\{}" prog) - 1) / 2;
+    in
+    lib.assertMsg (
+      matches == 1
+    ) "compressor ${ext} needs to have exactly one '{}', found ${builtins.toString matches}";
+  mkCmd =
+    ext: prog:
+    assert validProg ext prog;
+    ''
+      find -L $out -type f -regextype posix-extended -iregex '.*\.(${formatsPipe})' -print0 \
+        | xargs -0 -P$NIX_BUILD_CORES -I{} ${prog}
+    '';
+  formatsPipe = builtins.concatStringsSep "|" formats;
+in
+runCommand "${drv.name}-compressed" { } ''
+  mkdir $out
+  (cd $out; ${xorg.lndir}/bin/lndir ${drv})
+
+  ${lib.concatStringsSep "\n\n" (lib.mapAttrsToList mkCmd compressors)}
+''
--- a/pkgs/build-support/compress-drv/test.nix
+++ b/pkgs/build-support/compress-drv/test.nix
@@ -0,0 +1,42 @@
+{
+  gzip,
+  runCommand,
+  compressDrv,
+}:
+let
+  example = runCommand "sample-drv" { } ''
+    mkdir $out
+    echo 42 > $out/1.txt
+    echo 43 > $out/1.md
+    touch $out/2.png
+  '';
+  drv = compressDrv example {
+    formats = [ "txt" ];
+    compressors.gz = "${gzip}/bin/gzip --force --keep --fast {}";
+  };
+  wrapped = compressDrv drv {
+    formats = [ "md" ];
+    compressors.gz = "${gzip}/bin/gzip --force --keep --fast {}";
+  };
+in
+runCommand "test-compressDrv" { } ''
+  set -ex
+
+  ls -l ${drv}
+  test -h ${drv}/1.txt
+  test -f ${drv}/1.txt.gz
+  cmp ${drv}/1.txt <(${gzip}/bin/zcat ${drv}/1.txt.gz)
+
+  test -h ${drv}/2.png
+  test ! -a ${drv}/2.png.gz
+
+  # compressDrv always points to the final file, no matter how many times
+  # it's been wrapped
+  cmp <(readlink -e ${drv}/1.txt) <(readlink -e ${wrapped}/1.txt)
+
+  test -f ${wrapped}/1.txt.gz
+  test -f ${wrapped}/1.md.gz
+  test ! -f ${drv}/1.md.gz
+
+  mkdir $out
+''
--- a/pkgs/build-support/compress-drv/web.nix
+++ b/pkgs/build-support/compress-drv/web.nix
@@ -0,0 +1,103 @@
+{
+  zopfli,
+  brotli,
+  compressDrv,
+}:
+/**
+  # compressDrvWeb compresses a derivation for common web server use.
+
+  Useful when one wants to pre-compress certain static assets and pass them to
+  the web server. For example, `pkgs.gamja` creates this derivation:
+
+      /nix/store/2wn1qbk8gp4y2m8xvafxv1b2dcdqj8fz-gamja-1.0.0-beta.9/
+      ├── index.2fd01148.js
+      ├── index.2fd01148.js.map
+      ├── index.37aa9a8a.css
+      ├── index.37aa9a8a.css.map
+      ├── index.html
+      └── manifest.webmanifest
+
+  `pkgs.compressDrvWeb pkgs.gamja`:
+
+      /nix/store/f5ryid7zrw2hid7h9kil5g5j29q5r2f7-gamja-1.0.0-beta.9-compressed
+      ├── index.2fd01148.js -> /nix/store/2wn1qbk8gp4y2m8xvafxv1b2dcdqj8fz-gamja-1.0.0-beta.9/index.2fd01148.js
+      ├── index.2fd01148.js.br
+      ├── index.2fd01148.js.gz
+      ├── index.2fd01148.js.map -> /nix/store/2wn1qbk8gp4y2m8xvafxv1b2dcdqj8fz-gamja-1.0.0-beta.9/index.2fd01148.js.map
+      ├── index.2fd01148.js.map.br
+      ├── index.2fd01148.js.map.gz
+      ├── index.37aa9a8a.css -> /nix/store/2wn1qbk8gp4y2m8xvafxv1b2dcdqj8fz-gamja-1.0.0-beta.9/index.37aa9a8a.css
+      ├── index.37aa9a8a.css.br
+      ├── index.37aa9a8a.css.gz
+      ├── index.37aa9a8a.css.map -> /nix/store/2wn1qbk8gp4y2m8xvafxv1b2dcdqj8fz-gamja-1.0.0-beta.9/index.37aa9a8a.css.map
+      ├── index.37aa9a8a.css.map.br
+      ├── index.37aa9a8a.css.map.gz
+      ├── index.html -> /nix/store/2wn1qbk8gp4y2m8xvafxv1b2dcdqj8fz-gamja-1.0.0-beta.9/index.html
+      ├── index.html.br
+      ├── index.html.gz
+      ├── manifest.webmanifest -> /nix/store/2wn1qbk8gp4y2m8xvafxv1b2dcdqj8fz-gamja-1.0.0-beta.9/manifest.webmanifest
+      ├── manifest.webmanifest.br
+      └── manifest.webmanifest.gz
+
+  When this `-compressed` directory is passed to a properly configured web
+  server, it will serve those pre-compressed files:
+
+      $ curl -I -H 'Accept-Encoding: br' https://irc.example.org/
+      <...>
+      content-encoding: br
+      <...>
+
+  For example, a caddy configuration snippet for gamja to serve
+  the static assets (JS, CSS files) pre-compressed:
+
+      virtualHosts."irc.example.org".extraConfig = ''
+        root * ${pkgs.compressDrvWeb pkgs.gamja {}}
+        file_server browse {
+            precompressed br gzip
+        }
+      '';
+
+  This feature is also available in nginx via `ngx_brotli` and
+  `ngx_http_gzip_static_module`.
+
+  ## Inputs
+
+  `formats` ([String])
+
+  : List of file extensions to compress. Default is common formats that compress
+  well. The list may be expanded.
+
+  `extraFormats` ([String])
+
+  : Extra extensions to compress in addition to `formats`.
+
+  `compressors` (String -> String)
+
+  : See parameter `compressors` of compressDrv.
+*/
+drv:
+{
+  formats ? [
+    "css"
+    "js"
+    "svg"
+    "ttf"
+    "eot"
+    "txt"
+    "xml"
+    "map"
+    "html"
+    "json"
+    "webmanifest"
+  ],
+  extraFormats ? [ ],
+  compressors ? {
+    "gz" = "${zopfli}/bin/zopfli --keep {}";
+    "br" = "${brotli}/bin/brotli --keep --no-copy-stat {}";
+  },
+  ...
+}:
+compressDrv drv {
+  formats = formats ++ extraFormats;
+  compressors = compressors;
+}
--- a/pkgs/build-support/singularity-tools/default.nix
+++ b/pkgs/build-support/singularity-tools/default.nix
@@ -1,19 +1,24 @@
-{ runCommand
-, lib
-, stdenv
-, storeDir ? builtins.storeDir
-, writeScript
-, singularity
-, writeClosure
-, bash
-, vmTools
-, gawk
-, util-linux
-, runtimeShell
-, e2fsprogs
+{
+  lib,
+  # Build helpers
+  stdenv,
+  runCommand,
+  vmTools,
+  writeClosure,
+  writeScript,
+  # Native build inputs
+  e2fsprogs,
+  gawk,
+  util-linux,
+  # Build inputs
+  bash,
+  runtimeShell,
+  singularity,
+  storeDir ? builtins.storeDir,
 }:
 rec {
-  shellScript = name: text:
+  shellScript =
+    name: text:
    writeScript name ''
      #!${runtimeShell}
      set -e
@@ -21,15 +26,13 @@ rec {
    '';

  mkLayer =
-    { name
-    , contents ? [ ]
+    {
+      name,
+      contents ? [ ],
      # May be "apptainer" instead of "singularity"
-    , projectName ? (singularity.projectName or "singularity")
+      projectName ? (singularity.projectName or "singularity"),
    }:
-    runCommand "${projectName}-layer-${name}"
-      {
-        inherit contents;
-      } ''
+    runCommand "${projectName}-layer-${name}" { inherit contents; } ''
      mkdir $out
      for f in $contents ; do
        cp -ra $f $out/
@@ -40,13 +43,14 @@ rec {
    let
      defaultSingularity = singularity;
    in
-    { name
-    , contents ? [ ]
-    , diskSize ? 1024
-    , runScript ? "#!${stdenv.shell}\nexec /bin/sh"
-    , runAsRoot ? null
-    , memSize ? 1024
-    , singularity ? defaultSingularity
+    {
+      name,
+      contents ? [ ],
+      diskSize ? 1024,
+      memSize ? 1024,
+      runAsRoot ? null,
+      runScript ? "#!${stdenv.shell}\nexec /bin/sh",
+      singularity ? defaultSingularity,
    }:
    let
      projectName = singularity.projectName or "singularity";
@@ -55,7 +59,12 @@ rec {
      result = vmTools.runInLinuxVM (
        runCommand "${projectName}-image-${name}.img"
          {
-            buildInputs = [ singularity e2fsprogs util-linux gawk ];
+            buildInputs = [
+              singularity
+              e2fsprogs
+              util-linux
+              gawk
+            ];
            layerClosure = writeClosure contents;
            preVM = vmTools.createEmptyImage {
              size = diskSize;
@@ -110,7 +119,8 @@ rec {
            echo "root:x:0:0:System administrator:/root:/bin/sh" > /etc/passwd
            echo > /etc/resolv.conf
            TMPDIR=$(pwd -P) ${projectName} build $out ./img
-          '');
+          ''
+      );

    in
    result;
--- a/pkgs/by-name/al/alpaca-proxy/package.nix
+++ b/pkgs/by-name/al/alpaca-proxy/package.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+buildGoModule rec {
+  pname = "alpaca-proxy";
+  version = "2.0.9";
+
+  src = fetchFromGitHub {
+    owner = "samuong";
+    repo = "alpaca";
+    rev = "v${version}";
+    hash = "sha256-Rf8//4FeruVZZ//uba80z20XGUxycwF91Aa09fosRXI=";
+  };
+
+  vendorHash = "sha256-JEiHgyPJvWmtPf8R4aX/qlevfZRdKajre324UsgRm5Y=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X=main.BuildVersion=v${version}"
+  ];
+
+  postInstall = ''
+    # executable is renamed to alpaca-proxy, to avoid collision with the alpaca python application
+    mv $out/bin/alpaca $out/bin/alpaca-proxy
+  '';
+
+  meta = with lib; {
+    description = "HTTP forward proxy with PAC and NTLM authentication support";
+    homepage = "https://github.com/samuong/alpaca";
+    changelog = "https://github.com/samuong/alpaca/releases/tag/v${src.rev}";
+    license = licenses.asl20;
+    platforms = platforms.linux ++ platforms.darwin;
+    maintainers = with maintainers; [ _1nv0k32 ];
+    mainProgram = "alpaca-proxy";
+  };
+}
--- a/pkgs/by-name/al/alsa-firmware/package.nix
+++ b/pkgs/by-name/al/alsa-firmware/package.nix
@@ -1,6 +1,13 @@
-{ lib, buildPackages, stdenvNoCC, autoreconfHook, fetchurl, fetchpatch }:
+{
+  lib,
+  stdenv,
+  buildPackages,
+  autoreconfHook,
+  fetchurl,
+  fetchpatch,
+}:

-stdenvNoCC.mkDerivation rec {
+stdenv.mkDerivation rec {
  pname = "alsa-firmware";
  version = "1.2.4";

@@ -17,12 +24,13 @@ stdenvNoCC.mkDerivation rec {
    })
  ];

-  depsBuildBuild = [ buildPackages.stdenv.cc ];
  nativeBuildInputs = [ autoreconfHook ];

-  configureFlags = [
-    "--with-hotplug-dir=$(out)/lib/firmware"
-  ];
+  configureFlags = [ "--with-hotplug-dir=$(out)/lib/firmware" ];
+
+  depsBuildBuild = lib.optional (
+    stdenv.buildPlatform != stdenv.hostPlatform || stdenv.hostPlatform.isAarch64
+  ) buildPackages.stdenv.cc;

  dontStrip = true;

--- a/pkgs/by-name/as/asm-lsp/package.nix
+++ b/pkgs/by-name/as/asm-lsp/package.nix
@@ -6,7 +6,7 @@
 }:
 let
  pname = "asm-lsp";
-  version = "0.7.3";
+  version = "0.7.4";
 in
 rustPlatform.buildRustPackage {
  inherit pname version;
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage {
    owner = "bergercookie";
    repo = "asm-lsp";
    rev = "v${version}";
-    hash = "sha256-LWsawBh1czS7LUX70IXrJHUonIt2XEN8L26iP5cVyRk=";
+    hash = "sha256-tgwiCAlHuFdeMr1GA4vPg8i94zfRj+uyPMAXYh+Smo4=";
  };

  nativeBuildInputs = [
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage {
    openssl
  ];

-  cargoHash = "sha256-pIjOelOQ5X8jl/ZtE8IzXPtcLmANDtWsJaNXno8CT6Y=";
+  cargoHash = "sha256-UBYD0rs7bEtVZatu/kRgyCwKHvcgYJWRgyfBi3ooPGQ=";

  # tests expect ~/.cache/asm-lsp to be writable
  preCheck = ''
--- a/pkgs/by-name/at/atac/package.nix
+++ b/pkgs/by-name/at/atac/package.nix
@@ -9,16 +9,16 @@
 }:
 rustPlatform.buildRustPackage rec {
  pname = "atac";
-  version = "0.15.1";
+  version = "0.16.0";

  src = fetchFromGitHub {
    owner = "Julien-cpsn";
    repo = "ATAC";
    rev = "v${version}";
-    hash = "sha256-WDO6HDmjlXU4uelAJIWJN2sOJTioR7i2WzQpqg6dtKo=";
+    hash = "sha256-PTslXzgZCzmy45zI2omv4Ef5h4gJdfWcK5ko7ulHnXo=";
  };

-  cargoHash = "sha256-+dBEl1qk1/3WuSypsxV4x7DEmnMxa2z0MC03IZaON3s=";
+  cargoHash = "sha256-ZQyj2+gsZnayWD29dYZDh1zYTstaQluzzF7pXf0yoY4=";

  nativeBuildInputs = [
    pkg-config
--- a/pkgs/by-name/au/auto-changelog/package.json
+++ b/pkgs/by-name/au/auto-changelog/package.json
@@ -1,100 +0,0 @@
-{
-  "name": "auto-changelog",
-  "version": "2.4.0",
-  "description": "Command line tool for generating a changelog from git tags and commit history",
-  "main": "./src/index.js",
-  "bin": {
-    "auto-changelog": "./src/index.js"
-  },
-  "engines": {
-    "node": ">=8.3"
-  },
-  "scripts": {
-    "lint": "standard --verbose | snazzy",
-    "lint-fix": "standard --fix",
-    "lint-markdown": "markdownlint README.md test/data/*.md",
-    "test": "cross-env NODE_ENV=test mocha -r @babel/register test",
-    "test-coverage": "cross-env NODE_ENV=test nyc mocha test",
-    "report-coverage": "nyc report --reporter=json && codecov -f coverage/coverage-final.json",
-    "preversion": "npm run lint && npm run test",
-    "version": "node src/index.js --package && git add CHANGELOG.md",
-    "generate-test-data": "cross-env NODE_ENV=test node scripts/generate-test-data.js"
-  },
-  "author": "Pete Cook <pete@cookpete.com> (https://github.com/cookpete)",
-  "homepage": "https://github.com/CookPete/auto-changelog",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/CookPete/auto-changelog.git"
-  },
-  "bugs": {
-    "url": "https://github.com/CookPete/auto-changelog/issues"
-  },
-  "keywords": [
-    "auto",
-    "automatic",
-    "changelog",
-    "change",
-    "log",
-    "generator",
-    "git",
-    "commit",
-    "commits",
-    "history"
-  ],
-  "license": "MIT",
-  "dependencies": {
-    "commander": "^7.2.0",
-    "handlebars": "^4.7.7",
-    "node-fetch": "^2.6.1",
-    "parse-github-url": "^1.0.2",
-    "semver": "^7.3.5"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.14.3",
-    "@babel/register": "^7.13.16",
-    "babel-plugin-istanbul": "^6.0.0",
-    "babel-plugin-rewire": "^1.2.0",
-    "chai": "^4.3.4",
-    "codecov": "^3.8.2",
-    "cross-env": "^7.0.3",
-    "markdownlint-cli": "^0.30.0",
-    "mocha": "^9.2.0",
-    "nyc": "^15.1.0",
-    "snazzy": "^9.0.0",
-    "standard": "^16.0.3"
-  },
-  "babel": {
-    "env": {
-      "test": {
-        "plugins": [
-          "istanbul",
-          "rewire"
-        ]
-      }
-    }
-  },
-  "standard": {
-    "ignore": [
-      "test/data/"
-    ]
-  },
-  "nyc": {
-    "all": true,
-    "include": "src",
-    "exclude": "src/index.js",
-    "sourceMap": false,
-    "instrument": false,
-    "report-dir": "./coverage",
-    "temp-dir": "./coverage/.nyc_output",
-    "require": [
-      "@babel/register"
-    ],
-    "reporter": [
-      "text",
-      "html"
-    ]
-  },
-  "auto-changelog": {
-    "breakingPattern": "Breaking change"
-  }
-}
--- a/pkgs/by-name/au/auto-changelog/package.nix
+++ b/pkgs/by-name/au/auto-changelog/package.nix
@@ -1,25 +1,45 @@
 {
  lib,
-  mkYarnPackage,
+  stdenv,
  fetchYarnDeps,
-  fetchFromGitHub
-}: mkYarnPackage rec {
+  fetchFromGitHub,
+  yarnConfigHook,
+  npmHooks,
+  nodejs,
+  git,
+}:
+stdenv.mkDerivation (finalAttrs: {
  pname = "auto-changelog";
  version = "2.4.0";

  src = fetchFromGitHub {
    owner = "cookpete";
    repo = "auto-changelog";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
    hash = "sha256-qgJ/TVyViMhISt/EfCWV7XWQLXKTeZalGHFG905Ma5I=";
  };

-  packageJSON = ./package.json;
-  offlineCache = fetchYarnDeps {
-    yarnLock = "${src}/yarn.lock";
+  yarnOfflineCache = fetchYarnDeps {
+    yarnLock = "${finalAttrs.src}/yarn.lock";
    hash = "sha256-rP/Xt0txwfEUmGZ0CyHXSEG9zSMtv8wr5M2Na+6PbyQ=";
  };

+  nativeBuildInputs = [
+    yarnConfigHook
+    npmHooks.npmInstallHook
+    nodejs
+  ];
+
+  doCheck = true;
+
+  nativeCheckInputs = [ git ];
+
+  checkPhase = ''
+    runHook preCheck
+    yarn --offline run test -i -g 'compileTemplate'
+    runHook postCheck
+  '';
+
  meta = {
    description = "Command line tool for generating a changelog from git tags and commit history";
    homepage = "https://github.com/cookpete/auto-changelog";
@@ -28,4 +48,4 @@
    mainProgram = "auto-changelog";
    maintainers = with lib.maintainers; [ pyrox0 ];
  };
-}
+})
--- a/pkgs/applications/misc/bazecor/10-dygma.rules
+++ b/pkgs/applications/misc/bazecor/10-dygma.rules
--- a/pkgs/applications/misc/bazecor/default.nix
+++ b/pkgs/applications/misc/bazecor/default.nix
--- a/pkgs/by-name/bl/bluesnarfer/package.nix
+++ b/pkgs/by-name/bl/bluesnarfer/package.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  stdenv,
+  fetchzip,
+  bluez,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "bluesnarfer";
+  version = "0.1";
+
+  src = fetchzip {
+    url = "http://www.alighieri.org/tools/bluesnarfer.tar.gz";
+    stripRoot = false;
+    hash = "sha256-HGdrJZohKIsOkLETBdHz80w6vxmG25aMEWXrQlpMgRw=";
+  };
+
+  sourceRoot = finalAttrs.src.name + "/bluesnarfer";
+
+  buildInputs = [ bluez ];
+
+  strictDeps = true;
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm755 bluesnarfer $out/bin/bluesnarfer
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Bluetooth bluesnarfing utility";
+    homepage = "http://www.alighieri.org/project.html";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ fgaz ];
+    platforms = lib.platforms.linux;
+  };
+})
--- a/pkgs/by-name/bo/boogie/package.nix
+++ b/pkgs/by-name/bo/boogie/package.nix
@@ -2,13 +2,13 @@

 buildDotnetModule rec {
  pname = "Boogie";
-  version = "3.2.1";
+  version = "3.2.3";

  src = fetchFromGitHub {
    owner = "boogie-org";
    repo = "boogie";
    rev = "v${version}";
-    sha256 = "sha256-89S3yBjEUHbQbuWWLe/pTMaDOCqDR04hNJwIRzh5xaI=";
+    sha256 = "sha256-dMJ6A2ggBb20vuHL1g/Zx3pl9tXE8oayMGOqpChcg2U=";
  };

  projectFile = [ "Source/Boogie.sln" ];
--- a/pkgs/development/tools/cddl/Gemfile
+++ b/pkgs/development/tools/cddl/Gemfile
--- a/pkgs/development/tools/cddl/Gemfile.lock
+++ b/pkgs/development/tools/cddl/Gemfile.lock
--- a/pkgs/development/tools/cddl/gemset.nix
+++ b/pkgs/development/tools/cddl/gemset.nix
--- a/pkgs/development/tools/cddl/default.nix
+++ b/pkgs/development/tools/cddl/default.nix
--- a/pkgs/by-name/ce/centrifugo/package.nix
+++ b/pkgs/by-name/ce/centrifugo/package.nix
@@ -14,16 +14,16 @@ let
 in
 buildGoModule rec {
  pname = "centrifugo";
-  version = "5.4.1";
+  version = "5.4.2";

  src = fetchFromGitHub {
    owner = "centrifugal";
    repo = "centrifugo";
    rev = "v${version}";
-    hash = "sha256-rIsc+abyfhHncogxZnx7Dmvc/JRm+L4YKZOOW/Qtddg=";
+    hash = "sha256-rFS4oBYUtuy+buCJjS7lN3W9BINjAZ/Cxc4UXCASrDU=";
  };

-  vendorHash = "sha256-+fZnoDH5nbzrGWrr8ayBqzJoAji6y+CYI+TvEISxPRs=";
+  vendorHash = "sha256-rFbYTPwuOn6VtJnPQC5eIIPcXvRTjmxrZzPdQsjRcSQ=";

  ldflags = [
    "-s"
--- a/pkgs/by-name/co/codux/package.nix
+++ b/pkgs/by-name/co/codux/package.nix
@@ -5,11 +5,11 @@

 let
  pname = "codux";
-  version = "15.30.0";
+  version = "15.32.0";

  src = fetchurl {
    url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage";
-    sha256 = "sha256-TMtZq58UswbhMgY3FCqVuZaSQ8b4mBYA9wEykMXF9Kc=";
+    sha256 = "sha256-Uk7QUbcYqbWgu6pKs4iiRwPJASZTDmN1Kv338ZKJQgk=";
  };

  appimageContents = appimageTools.extractType2 { inherit pname version src; };
--- a/pkgs/by-name/co/cosmic-icons/package.nix
+++ b/pkgs/by-name/co/cosmic-icons/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenvNoCC.mkDerivation rec {
  pname = "cosmic-icons";
-  version = "0-unstable-2024-07-17";
+  version = "0-unstable-2024-08-04";

  src = fetchFromGitHub {
    owner = "pop-os";
    repo = pname;
-    rev = "73be037ba266b08a2fa7b544d78e7f143a2894c5";
-    sha256 = "sha256-Lyn9VneGr7RcfMPREOs3tP/HzpoRcnmw/nyo7kzOKCw=";
+    rev = "f93dcdfa1060c2cf3f8cf0b56b0338292edcafa5";
+    sha256 = "sha256-KvEKFmsh7ljt9JbaqyZfTUiFZHZM2Ha1TwUDljXXLDw=";
  };

  nativeBuildInputs = [ just ];
--- a/pkgs/by-name/di/diagnostic-languageserver/package.json
+++ b/pkgs/by-name/di/diagnostic-languageserver/package.json
@@ -1,33 +0,0 @@
-{
-  "name": "diagnostic-languageserver",
-  "version": "1.15.0",
-  "description": "diagnostic language server",
-  "main": "./lib/index.js",
-  "repository": "git@github.com:iamcco/diagnostic-languageserver.git",
-  "author": "iamcco <ooiss@qq.com>",
-  "license": "MIT",
-  "scripts": {
-    "build": "tsc -p ./",
-    "watch": "tsc -w -p ./"
-  },
-  "bin": {
-    "diagnostic-languageserver": "./bin/index.js"
-  },
-  "dependencies": {
-    "commander": "^5.1.0",
-    "find-up": "^4.1.0",
-    "lodash": "^4.17.15",
-    "rxjs": "^6.5.5",
-    "tempy": "^0.7.1",
-    "tslib": "^1.11.2",
-    "vscode-languageserver": "^6.1.1",
-    "vscode-languageserver-textdocument": "^1.0.1",
-    "vscode-uri": "^2.1.1"
-  },
-  "devDependencies": {
-    "@types/lodash": "^4.14.150",
-    "@types/node": "^11.11.3",
-    "ignore": "^5.1.8",
-    "typescript": "^3.8.3"
-  }
-}
--- a/pkgs/by-name/di/diagnostic-languageserver/package.nix
+++ b/pkgs/by-name/di/diagnostic-languageserver/package.nix
@@ -1,41 +1,45 @@
 {
  lib,
-  mkYarnPackage,
+  stdenv,
  fetchYarnDeps,
  fetchFromGitHub,
-  nix-update-script
-}: mkYarnPackage rec {
+  nix-update-script,
+  yarnConfigHook,
+  yarnBuildHook,
+  npmHooks,
+  nodejs,
+}:
+stdenv.mkDerivation (finalAttrs: {
  pname = "diagnostic-languageserver";
  version = "1.15.0";

  src = fetchFromGitHub {
    owner = "iamcco";
    repo = "diagnostic-languageserver";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
    hash = "sha256-EFkvxMvtA5L6ZiDxrZxGnNAphNn/P3ra6ZrslplScZg=";
  };

-  packageJSON = ./package.json;
-  offlineCache = fetchYarnDeps {
-    yarnLock = "${src}/yarn.lock";
+  yarnOfflineCache = fetchYarnDeps {
+    yarnLock = "${finalAttrs.src}/yarn.lock";
    hash = "sha256-T8ppt8EDljtMhGp9i0VleU2Nw3tJexE2ufT6C4EtAz0=";
  };

-  buildPhase = ''
-    runHook preBuild
-    yarn --offline build
-    runHook postBuild
-  '';
-  doDist = false;
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    npmHooks.npmInstallHook
+    nodejs
+  ];

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

  meta = {
    description = "General purpose Language Server that integrate with linter to support diagnostic features";
    homepage = "https://github.com/iamcco/diagnostic-languageserver";
-    changelog = "https://github.com/iamcco/diagnostic-languageserver/releases/tag/v${version}";
+    changelog = "https://github.com/iamcco/diagnostic-languageserver/releases/tag/v${finalAttrs.version}";
    license = lib.licenses.mit;
    mainProgram = "diagnostic-languageserver";
    maintainers = with lib.maintainers; [ pyrox0 ];
  };
-}
+})
--- a/pkgs/by-name/di/diagrams-as-code/package.nix
+++ b/pkgs/by-name/di/diagrams-as-code/package.nix
@@ -0,0 +1,57 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  runCommand,
+  diagrams-as-code,
+}:
+
+python3Packages.buildPythonPackage rec {
+  pname = "diagrams-as-code";
+  version = "0.0.4";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "dmytrostriletskyi";
+    repo = "diagrams-as-code";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-cd602eQvNCUQuCdn/RpcfURcDHjXLZ0gAG+SObB++Q0=";
+  };
+
+  build-system = [ python3Packages.setuptools ];
+
+  dependencies = with python3Packages; [
+    diagrams
+    pydantic
+    pyyaml
+  ];
+
+  pythonRelaxDeps = [
+    "diagrams"
+    "pydantic"
+  ];
+
+  pythonImportsCheck = [ "diagrams_as_code" ];
+
+  doCheck = false; # no tests
+
+  passthru.tests = {
+    simple = runCommand "${pname}-test" { } ''
+      # giving full path to diagrams-as-code causes
+      # a bad path concatenation
+      cp ${diagrams-as-code.src}/examples/all-fields.yaml .
+
+      ${lib.getExe diagrams-as-code} all-fields.yaml
+
+      cp web-services-architecture-aws.jpg $out
+    '';
+  };
+
+  meta = {
+    description = "Declarative configurations using YAML for drawing cloud system architectures";
+    homepage = "https://github.com/dmytrostriletskyi/diagrams-as-code";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ sigmanificient ];
+    mainProgram = "diagrams-as-code";
+  };
+}
--- a/pkgs/by-name/ei/eigenlayer/package.nix
+++ b/pkgs/by-name/ei/eigenlayer/package.nix
@@ -6,16 +6,16 @@
 }:
 buildGoModule rec {
  pname = "eigenlayer";
-  version = "0.8.2";
+  version = "0.9.2";

  src = fetchFromGitHub {
    owner = "Layr-Labs";
    repo = "eigenlayer-cli";
    rev = "v${version}";
-    hash = "sha256-VC2qUHdFulOCYuAb8vHxc+9GJV/3iiKO1hJS/7gj278=";
+    hash = "sha256-KdSCXvzUCEw5BTvKOejxUP+KXKXCpXvtvFmZ2JmihK4=";
  };

-  vendorHash = "sha256-+VKjsHFqWVqOxzC49GToxymD5AyI0j1ZDXQW2YnJysw=";
+  vendorHash = "sha256-uC6HMIf+wbHx2/Ico1UOj+S27xtVe1mCrcBy1CacIVs=";

  ldflags = ["-s" "-w"];
  subPackages = ["cmd/eigenlayer"];
--- a/pkgs/by-name/eo/eog/package.nix
+++ b/pkgs/by-name/eo/eog/package.nix
@@ -32,13 +32,13 @@

 stdenv.mkDerivation rec {
  pname = "eog";
-  version = "45.3";
+  version = "45.4";

  outputs = [ "out" "dev" "devdoc" ];

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-hlD2YtSSHYOnkE9rucokW69zX3F7R/rFs38NkOXokag=";
+    sha256 = "sha256-tQ8yHHCsZK97yqW0Rg3GdbPKYP2tOFYW86x7dw4GZv4=";
  };

  patches = [
--- a/pkgs/by-name/ev/evince/package.nix
+++ b/pkgs/by-name/ev/evince/package.nix
@@ -21,6 +21,7 @@
 , djvulibre
 , libspectre
 , libarchive
+, libgxps
 , libhandy
 , libsecret
 , wrapGAppsHook3
@@ -35,20 +36,18 @@
 , gst_all_1
 , gi-docgen
 , supportMultimedia ? true # PDF multimedia
-, libgxps
-, supportXPS ? true # Open XML Paper Specification via libgxps
 , withLibsecret ? true
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "evince";
-  version = "46.3";
+  version = "46.3.1";

  outputs = [ "out" "dev" "devdoc" ];

  src = fetchurl {
    url = "mirror://gnome/sources/evince/${lib.versions.major finalAttrs.version}/evince-${finalAttrs.version}.tar.xz";
-    hash = "sha256-vA0dQbnX/8di6Z0qv6+sv3RRgvCzHYbbXuyMZ/XzAGs=";
+    hash = "sha256-lFwgpvI4ObDVMycpFxRY6QaA2oJk6Zxvn0HCGcfu7nw=";
  };

  depsBuildBuild = [
@@ -81,6 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
    gspell
    gtk3
    libarchive
+    libgxps
    libhandy
    librsvg
    libspectre
@@ -90,8 +90,6 @@ stdenv.mkDerivation (finalAttrs: {
    texlive.bin.core # kpathsea for DVI support
  ] ++ lib.optionals withLibsecret [
    libsecret
-  ] ++ lib.optionals supportXPS [
-    libgxps
  ] ++ lib.optionals supportMultimedia (with gst_all_1; [
    gstreamer
    gst-plugins-base
--- a/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch
+++ b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch
@@ -152,10 +152,10 @@ index 5b4debf..77c8d9c 100644
 	if (g_settings_get_boolean (settings, "limit-operations-in-power-saver-mode")) {
 		GPowerProfileMonitor *power_monitor;
 diff --git a/src/calendar/backends/contacts/e-cal-backend-contacts.c b/src/calendar/backends/contacts/e-cal-backend-contacts.c
-index 43bd383..4dce824 100644
+index 047fb97..960f44c 100644
 --- a/src/calendar/backends/contacts/e-cal-backend-contacts.c
 +++ b/src/calendar/backends/contacts/e-cal-backend-contacts.c
-@@ -1369,7 +1369,18 @@ e_cal_backend_contacts_init (ECalBackendContacts *cbc)
+@@ -1333,7 +1333,18 @@ e_cal_backend_contacts_init (ECalBackendContacts *cbc)
 		(GDestroyNotify) g_free,
 		(GDestroyNotify) contact_record_free);
 
@@ -202,7 +202,7 @@ index 2525856..7ecc1a8 100644
 				g_clear_object (&settings);
 			}
 diff --git a/src/calendar/libecal/e-reminder-watcher.c b/src/calendar/libecal/e-reminder-watcher.c
-index 44ba49c..dfac2a2 100644
+index a83d3d3..dc7acac 100644
 --- a/src/calendar/libecal/e-reminder-watcher.c
 +++ b/src/calendar/libecal/e-reminder-watcher.c
@@ -2826,8 +2826,33 @@ e_reminder_watcher_init (EReminderWatcher *watcher)
--- a/pkgs/by-name/ev/evolution-data-server/package.nix
+++ b/pkgs/by-name/ev/evolution-data-server/package.nix
@@ -50,13 +50,13 @@

 stdenv.mkDerivation rec {
  pname = "evolution-data-server";
-  version = "3.52.3";
+  version = "3.52.4";

  outputs = [ "out" "dev" ];

  src = fetchurl {
    url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-6fbIDBQgM7GAG8yqYiHEU9406tTqCJsghrGQhvmpwuQ=";
+    hash = "sha256-GzaoOdscjYmAZuGb54uZWTCgovKohvFJ5PZOF1XwZPc=";
  };

  patches = [
--- a/pkgs/by-name/ff/fflogs/package.nix
+++ b/pkgs/by-name/ff/fflogs/package.nix
@@ -5,10 +5,10 @@

 let
  pname = "fflogs";
-  version = "8.6.0";
+  version = "8.12.0";
  src = fetchurl {
    url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage";
-    hash = "sha256-fJOZHvnGOB+b67w2F8kJ+1hogc0DTmtujvNw3W8WWSU=";
+    hash = "sha256-2hpCcA/RN7fpNhaqMAyVC4d1fTRhp+lwYf/Wc0FjXxI=";
  };
  extracted = appimageTools.extractType2 { inherit pname version src; };
 in
--- a/pkgs/by-name/fl/fluent-bit/package.nix
+++ b/pkgs/by-name/fl/fluent-bit/package.nix
@@ -14,13 +14,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "fluent-bit";
-  version = "3.1.3";
+  version = "3.1.4";

  src = fetchFromGitHub {
    owner = "fluent";
    repo = "fluent-bit";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-bRgRpCnMt20JEuKqW5VetW8HyMgjNuqEgoeBG7sm++Y=";
+    hash = "sha256-TXFVvnjEitEFwQAuqNCgV0xbABcDxGS9KfCUenKN448=";
  };

  # optional only to avoid linux rebuild
--- a/pkgs/by-name/fz/fzf-make/package.nix
+++ b/pkgs/by-name/fz/fzf-make/package.nix
@@ -10,16 +10,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "fzf-make";
-  version = "0.35.0";
+  version = "0.36.0";

  src = fetchFromGitHub {
    owner = "kyu08";
    repo = "fzf-make";
    rev = "v${version}";
-    hash = "sha256-hrPBuNCtwYOynv0JUcEq0lVZ9k3iVPNyn04l8zVbkN4=";
+    hash = "sha256-IlPkJK4pYszrJ43HSTq9Xwpz3K9XnUpoF0Ry7ox85KE=";
  };

-  cargoHash = "sha256-O7rQp70ukw7LiC+m7rlqEGHVJw3Lo93WEmL3PFD7kBM=";
+  cargoHash = "sha256-mMDPpiIWhGMl0a4v1msNfcQqmq5ziB+ppw7RxYNAPaI=";

  nativeBuildInputs = [ makeBinaryWrapper ];

--- a/pkgs/by-name/ge/get-graphql-schema/package.json
+++ b/pkgs/by-name/ge/get-graphql-schema/package.json
@@ -1,35 +0,0 @@
-{
-  "name": "get-graphql-schema",
-  "bin": "dist/index.js",
-  "files": [
-    "README.md",
-    "dist/"
-  ],
-  "version": "2.1.1",
-  "description": "Downloads the GraphQL Schema of an GraphQL endpoint URL",
-  "scripts": {
-    "build": "tsc",
-    "prepublish": "npm run build && chmod +x dist/index.js",
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/graphcool/get-graphql-schema.git"
-  },
-  "author": "Johannes Schickling <johannes@graph.cool>",
-  "license": "MIT",
-  "dependencies": {
-    "@types/chalk": "^0.4.31",
-    "@types/graphql": "^0.8.6",
-    "@types/minimist": "^1.2.0",
-    "@types/node": "^7.0.4",
-    "@types/node-fetch": "^1.6.7",
-    "chalk": "^1.1.3",
-    "graphql": "^0.9.1",
-    "minimist": "^1.2.0",
-    "node-fetch": "^1.6.3"
-  },
-  "devDependencies": {
-    "typescript": "^2.1.5"
-  }
-}
--- a/pkgs/by-name/ge/get-graphql-schema/package.nix
+++ b/pkgs/by-name/ge/get-graphql-schema/package.nix
@@ -1,43 +1,41 @@
 {
  lib,
-  mkYarnPackage,
+  stdenv,
  fetchYarnDeps,
  fetchFromGitHub,
-  nodejs_22
-}: mkYarnPackage rec {
+  nodejs,
+  yarnConfigHook,
+  yarnBuildHook,
+  npmHooks,
+}:
+stdenv.mkDerivation (finalAttrs: {
  pname = "get-graphql-schema";
  version = "2.1.1";

  src = fetchFromGitHub {
    owner = "prisma-labs";
    repo = "get-graphql-schema";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
    hash = "sha256-ujc0LGAqmo4SmItm4VcbBOtmUvL6aV1ppMm4fMmuSRs=";
  };

-  packageJSON = ./package.json;
-  offlineCache = fetchYarnDeps {
-    yarnLock = "${src}/yarn.lock";
+  yarnOfflineCache = fetchYarnDeps {
+    yarnLock = "${finalAttrs.src}/yarn.lock";
    hash = "sha256-TZGNX8UHbolLyBmQNGTnFjgx3/3f2HNVQf/h9rIVJKs=";
  };

-  buildPhase = ''
-    runHook preBuild
-    yarn --offline build
-    runHook postBuild
-  '';
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    npmHooks.npmInstallHook
+    nodejs
+  ];

-  postFixup = ''
-    substituteInPlace $out/libexec/get-graphql-schema/deps/get-graphql-schema/dist/index.js \
-      --replace-fail "#!/usr/bin/env node" "#!${lib.getExe nodejs_22}"
-    chmod +x $out/bin/get-graphql-schema
-  '';
  meta = {
-    description = "Command line tool for generating a changelog from git tags and commit history";
-    homepage = "https://github.com/cookpete/auto-changelog";
-    changelog = "https://github.com/cookpete/auto-changelog/blob/master/CHANGELOG.md";
+    description = "Fetch and print the GraphQL schema from a GraphQL HTTP endpoint.";
+    homepage = "https://github.com/prisma-labs/get-graphql-schema";
    license = lib.licenses.mit;
    mainProgram = "get-graphql-schema";
    maintainers = with lib.maintainers; [ pyrox0 ];
  };
-}
+})
--- a/pkgs/by-name/gh/gh-actions-cache/package.nix
+++ b/pkgs/by-name/gh/gh-actions-cache/package.nix
--- a/pkgs/by-name/gh/gh-dash/package.nix
+++ b/pkgs/by-name/gh/gh-dash/package.nix
@@ -7,13 +7,13 @@

 buildGoModule rec {
  pname = "gh-dash";
-  version = "4.4.0";
+  version = "4.5.0";

  src = fetchFromGitHub {
    owner = "dlvhdr";
    repo = "gh-dash";
    rev = "v${version}";
-    hash = "sha256-HNGg3e6QoAkcio/78u2U1u0EhX707yXmA4fyGIqJHX0=";
+    hash = "sha256-zLKQbw9d20KKuK5j9RhZPLSDRrw5SQ8vycIEfRmUEzI=";
  };

  vendorHash = "sha256-JOd2czYWVgE1jBfeuoVRp+oE/asyk50o5Pf021jD5mY=";
--- a/pkgs/by-name/gh/gh-markdown-preview/package.nix
+++ b/pkgs/by-name/gh/gh-markdown-preview/package.nix
--- a/pkgs/by-name/gi/gitea/package.nix
+++ b/pkgs/by-name/gi/gitea/package.nix
@@ -6,15 +6,13 @@
 , git
 , bash
 , coreutils
+, compressDrvWeb
 , gitea
 , gzip
 , openssh
 , pam
 , sqliteSupport ? true
 , pamSupport ? stdenv.hostPlatform.isLinux
-, runCommand
-, brotli
-, xorg
 , nixosTests
 , buildNpmPackage
 }:
@@ -90,19 +88,7 @@ in buildGoModule rec {
  '';

  passthru = {
-    data-compressed = runCommand "gitea-data-compressed" {
-      nativeBuildInputs = [ brotli xorg.lndir ];
-    } ''
-      mkdir -p $out/{options,public,templates}
-      lndir ${frontend}/public $out/public
-      lndir ${gitea.data}/options $out/options
-      lndir ${gitea.data}/templates $out/templates
-
-      # Create static gzip and brotli files
-      find -L $out -type f -regextype posix-extended -iregex '.*\.(css|html|js|svg|ttf|txt)' \
-        -exec gzip --best --keep --force {} ';' \
-        -exec brotli --best --keep --no-copy-stat {} ';'
-    '';
+    data-compressed = lib.warn "gitea.passthru.data-compressed is deprecated. Use \"compressDrvWeb gitea.data\"." (compressDrvWeb gitea.data);

    tests = nixosTests.gitea;
  };
--- a/pkgs/by-name/gi/gitlab-ci-local/package.nix
+++ b/pkgs/by-name/gi/gitlab-ci-local/package.nix
@@ -6,16 +6,16 @@

 buildNpmPackage rec {
  pname = "gitlab-ci-local";
-  version = "4.52.1";
+  version = "4.52.2";

  src = fetchFromGitHub {
    owner = "firecow";
    repo = "gitlab-ci-local";
    rev = version;
-    hash = "sha256-yNOlcb1I8BiR9rbqxeE7PEshEAudw62M77QBgTCBETg=";
+    hash = "sha256-x63am8FIfczA4CkoBkDeZTkp2sqc7nN5CV1hiq+vvjU=";
  };

-  npmDepsHash = "sha256-8Fxkd3JPyspcZeENpvvuguPNXbnWL1WrcYL9c77+Gok=";
+  npmDepsHash = "sha256-t26QoIBw5XGqHn8FHSL2MSfFV2wGuQWf3GH2GvSYByg=";

  postPatch = ''
    # remove cleanup which runs git commands
--- a/pkgs/by-name/gm/gmid/package.nix
+++ b/pkgs/by-name/gm/gmid/package.nix
@@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "gmid";
-  version = "2.0.5";
+  version = "2.1";

  src = fetchFromGitHub {
    owner = "omar-polo";
    repo = pname;
    rev = version;
-    hash = "sha256-xuA5yLtRu9GDrSr7FBlAwEjCjFVRmnOuBM62AHOHDhc=";
+    hash = "sha256-C9CheVP0ZFf44J26KKa3+fkp8MB1sNVHnsHiNuNPKwQ=";
  };

  nativeBuildInputs = [ bison ];
--- a/pkgs/by-name/gr/gr-framework/package.nix
+++ b/pkgs/by-name/gr/gr-framework/package.nix
@@ -2,51 +2,50 @@
  lib,
  stdenv,
  fetchFromGitHub,
-  nix-update-script,
-  qt5,

  cmake,
+  ninja,
+  qt6,

  cairo,
  ffmpeg,
-  freetype,
  ghostscript,
  glfw,
-  libjpeg,
  libtiff,
  qhull,
+  xercesc,
  xorg,
  zeromq,
+
+  nix-update-script,
 }:

 stdenv.mkDerivation rec {
  pname = "gr-framework";
-  version = "0.73.6";
+  version = "0.73.7";

  src = fetchFromGitHub {
    owner = "sciapp";
    repo = "gr";
    rev = "v${version}";
-    hash = "sha256-XzOII13XwxkPZhtL4USkmUmJTL7dZImx4yVYJmhcn08=";
+    hash = "sha256-Xd1x6RUlre/5oxq0wiVKkIAuGKgtoNY/5aa7dvmn71U=";
  };

-  patches = [ ./use-the-module-mode-to-search-for-the-LibXml2-package.patch ];
-
  nativeBuildInputs = [
    cmake
-    qt5.wrapQtAppsHook
+    ninja
+    qt6.wrapQtAppsHook
  ];

  buildInputs = [
    cairo
    ffmpeg
-    freetype
    ghostscript
    glfw
-    libjpeg
    libtiff
    qhull
-    qt5.qtbase
+    qt6.qtbase
+    xercesc
    xorg.libX11
    xorg.libXft
    xorg.libXt
--- a/pkgs/by-name/gr/gr-framework/use-the-module-mode-to-search-for-the-LibXml2-package.patch
+++ b/pkgs/by-name/gr/gr-framework/use-the-module-mode-to-search-for-the-LibXml2-package.patch
@@ -1,25 +0,0 @@
-From 47063bf00060dd6e8ccb384770a7c04dc534dce0 Mon Sep 17 00:00:00 2001
-From: Pavel Sobolev <paveloomm@gmail.com>
-Date: Wed, 19 Jun 2024 21:17:33 +0300
-Subject: [PATCH] Use the module mode to search for the `LibXml2` package.
-
---
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ed36d99d..6031dc77 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -123,7 +123,7 @@ else()
-   # Therefore, disable the inspection of the `PATH` variable by setting `NO_SYSTEM_ENVIRONMENT_PATH` option.
-   # See <https://cmake.org/cmake/help/v3.30/command/find_package.html#:~:text=Search the standard system environment
-   # variables> for more details.
-  find_package(LibXml2 NO_MODULE NO_SYSTEM_ENVIRONMENT_PATH)
-+  find_package(LibXml2 MODULE)
- endif()
-
- # Find the following packages only in 3rdparty, if `GR_USE_BUNDLED_LIBRARIES` is set
--
-2.45.1
-
--- a/pkgs/by-name/gr/gruvbox-plus-icons/package.nix
+++ b/pkgs/by-name/gr/gruvbox-plus-icons/package.nix
@@ -10,13 +10,13 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "gruvbox-plus-icons";
-  version = "5.4.0";
+  version = "5.5.0";

  src = fetchFromGitHub {
    owner = "SylEleuth";
    repo = "gruvbox-plus-icon-pack";
    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-mtOYoaejK6ZGPcM4IxXs6l6oXGP9WSMw5N7JIF3n67s=";
+    sha256 = "sha256-G7F+69K2aJVBM3yOQIMTH2pDXBfLmYScKIIAza3YNw8=";
  };

  nativeBuildInputs = [ gtk3 ];
--- a/pkgs/by-name/ha/halo/package.nix
+++ b/pkgs/by-name/ha/halo/package.nix
@@ -7,10 +7,10 @@
 }:
 stdenv.mkDerivation rec {
  pname = "halo";
-  version = "2.17.2";
+  version = "2.18.0";
  src = fetchurl {
    url = "https://github.com/halo-dev/halo/releases/download/v${version}/${pname}-${version}.jar";
-    hash = "sha256-8adbW13DsNCWzME7hRA5AUr/bOZVXl4LlVuIFZwpmXM=";
+    hash = "sha256-XFV+cdqtBJID/s0I3Z6TBfeyzN/e9euUoQVTWy64NYM=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/ha/handheld-daemon/package.nix
+++ b/pkgs/by-name/ha/handheld-daemon/package.nix
@@ -8,14 +8,14 @@
 }:
 python3.pkgs.buildPythonApplication rec {
  pname = "handheld-daemon";
-  version = "3.2.1";
+  version = "3.3.3";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "hhd-dev";
    repo = "hhd";
    rev = "refs/tags/v${version}";
-    hash = "sha256-oRmaF9ciULhN6Rvig34Ibtn4w7fcb/ulRXcApQ+QLWs=";
+    hash = "sha256-n7UtzI4wYVMldDl7FcK9hhIOTl9jkvATGFjR+pV545U=";
  };

  propagatedBuildInputs = with python3.pkgs; [
--- a/pkgs/by-name/ha/handlr-regex/package.nix
+++ b/pkgs/by-name/ha/handlr-regex/package.nix
@@ -10,16 +10,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "handlr-regex";
-  version = "0.10.1";
+  version = "0.11.2";

  src = fetchFromGitHub {
    owner = "Anomalocaridid";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-6ASljvJF/qbl8nvAZKQ2rQ8CQPovTF7FLKp8enIjIP4=";
+    hash = "sha256-xYt+pntqfq1RwaLAoTIH6zaJZWgyl58I/2xWCWe+bBs=";
  };

-  cargoHash = "sha256-4tm7N8l7ScKhhOFxt/1ssArdF9fgvCyrDrBASaiOusI=";
+  cargoHash = "sha256-w5eZm+wHx4aU6zsNZhg8mehDSzpd6k6PpV/V7tzukIA=";

  nativeBuildInputs = [
    installShellFiles
--- a/pkgs/by-name/id/ida-free/package.nix
+++ b/pkgs/by-name/id/ida-free/package.nix
@@ -121,6 +121,10 @@ stdenv.mkDerivation rec {
      ln -s $IDADIR/$bb $out/bin/$bb
    done

+    # runtimeDependencies don't get added to non-executables, and openssl is needed
+    #  for cloud decompilation
+    patchelf --add-needed libcrypto.so $IDADIR/libida64.so
+
    runHook postInstall
  '';

--- a/Show More
+++ b/Show More