14 files changed, 306 insertions, 29 deletions
diff --git a/pkgs/by-name/an/ananicy-cpp/match-wrappers.patch b/pkgs/by-name/an/ananicy-cpp/match-wrappers.patch
new file mode 100644
index 0000000000000..3b352925e2710
--- /dev/null
+++ b/pkgs/by-name/an/ananicy-cpp/match-wrappers.patch
@@ -0,0 +1,16 @@
+diff --git a/src/worker.cpp b/src/worker.cpp
+index 0cf8955..b9dc70f 100644
+--- a/src/worker.cpp
++++ b/src/worker.cpp
+@@ -29,7 +29,10 @@ void Worker::work(const std::stop_token &stop_token) {
+   while (!stop_token.stop_requested()) {
+     while ((proc = process_queue->poll(500ms)).has_value()) {
+       const auto &p = proc.value();
+-      const auto &rule = rules->get_rule(p.name);
++      auto name = p.name;
++      if (name.starts_with('.') && name.ends_with("-wrapped"))
++        name = name.substr(1, name.find_last_of('-') - 1);
++      const auto &rule = rules->get_rule(name);
+ 
+       processed_count++;
+ 
diff --git a/pkgs/by-name/an/ananicy-cpp/package.nix b/pkgs/by-name/an/ananicy-cpp/package.nix
new file mode 100644
index 0000000000000..a17e199a5ca71
--- /dev/null
+++ b/pkgs/by-name/an/ananicy-cpp/package.nix
@@ -0,0 +1,88 @@
+{ lib
+, clangStdenv
+, fetchFromGitLab
+, fetchpatch
+, cmake
+, pkg-config
+, spdlog
+, nlohmann_json
+, systemd
+, libbpf
+, elfutils
+, bpftools
+, pcre2
+, zlib
+}:
+
+clangStdenv.mkDerivation rec {
+  pname = "ananicy-cpp";
+  version = "1.1.1";
+
+  src = fetchFromGitLab {
+    owner = "ananicy-cpp";
+    repo = "ananicy-cpp";
+    rev = "v${version}";
+    fetchSubmodules = true;
+    sha256 = "sha256-oPinSc00+Z6SxjfTh7DttcXSjsLv1X0NI+O37C8M8GY=";
+  };
+
+  patches = [
+    # FIXME: remove this when updating to next stable release
+    (fetchpatch {
+      name = "allow-regex-pattern-matching.patch";
+      url = "https://gitlab.com/ananicy-cpp/ananicy-cpp/-/commit/6ea2dccceec39b6c4913f617dad81d859aa20f24.patch";
+      hash = "sha256-C+7x/VpVwewXEPwibi7GxGfjuhDkhcjTyGbZHlYL2Bs=";
+    })
+    ./match-wrappers.patch
+  ];
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    bpftools
+  ];
+
+  buildInputs = [
+    pcre2
+    spdlog
+    nlohmann_json
+    systemd
+    libbpf
+    elfutils
+    zlib
+  ];
+
+  # BPF A call to built-in function '__stack_chk_fail' is not supported.
+  hardeningDisable = [ "stackprotector" ];
+
+  cmakeFlags = [
+    "-DUSE_EXTERNAL_JSON=ON"
+    "-DUSE_EXTERNAL_SPDLOG=ON"
+    "-DUSE_EXTERNAL_FMTLIB=ON"
+    "-DUSE_BPF_PROC_IMPL=ON"
+    "-DBPF_BUILD_LIBBPF=OFF"
+    "-DENABLE_SYSTEMD=ON"
+    "-DENABLE_REGEX_SUPPORT=ON"
+    "-DVERSION=${version}"
+  ];
+
+  postInstall = ''
+    rm -rf "$out"/include
+    rm -rf "$out"/lib/cmake
+  '';
+
+  meta = {
+    homepage = "https://gitlab.com/ananicy-cpp/ananicy-cpp";
+    description = "Rewrite of ananicy in c++ for lower cpu and memory usage";
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
+      artturin
+      johnrtitor
+      diniamo
+    ];
+    mainProgram = "ananicy-cpp";
+  };
+}
diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
new file mode 100644
index 0000000000000..bdf485ac19a5b
--- /dev/null
+++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  unstableGitUpdater,
+}:
+
+stdenvNoCC.mkDerivation {
+  pname = "ananicy-rules-cachyos";
+  version = "0-unstable-2024-06-19";
+
+  src = fetchFromGitHub {
+    owner = "CachyOS";
+    repo = "ananicy-rules";
+    rev = "167915d1c6e4f46932a9857b1a4aeb3e813a8538";
+    hash = "sha256-hIrjc80DuuENLbD5MxAku6aY05kdfXWLPSCSssadmr8=";
+  };
+
+  dontConfigure = true;
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/etc/ananicy.d
+    rm README.md LICENSE
+    cp -r * $out/etc/ananicy.d
+    runHook postInstall
+  '';
+
+  passthru.updateScript = unstableGitUpdater {
+    hardcodeZeroVersion = true;
+  };
+
+  meta = {
+    homepage = "https://github.com/CachyOS/ananicy-rules";
+    description = "CachyOS' ananicy-rules meant to be used with ananicy-cpp";
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
+      artturin
+      diniamo
+      johnrtitor
+    ];
+  };
+}
diff --git a/pkgs/by-name/an/anime4k/package.nix b/pkgs/by-name/an/anime4k/package.nix
index eef64ffc3ae91..7b8d1fbfc1ef8 100644
--- a/pkgs/by-name/an/anime4k/package.nix
+++ b/pkgs/by-name/an/anime4k/package.nix
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   '';
 
   meta = with lib; {
-    description = "A high-quality real time upscaler for anime";
+    description = "High-quality real time upscaler for anime";
     homepage = "https://github.com/bloc97/Anime4K";
     license = licenses.mit;
     maintainers = with maintainers; [ surfaceflinger ];
diff --git a/pkgs/by-name/an/annotator/package.nix b/pkgs/by-name/an/annotator/package.nix
index 3d2498e335009..115d6db2d8cb5 100644
--- a/pkgs/by-name/an/annotator/package.nix
+++ b/pkgs/by-name/an/annotator/package.nix
@@ -5,7 +5,7 @@
 , meson
 , ninja
 , vala
-, wrapGAppsHook
+, wrapGAppsHook3
 , desktop-file-utils
 , libgee
 , pantheon
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     meson
     ninja
     vala
-    wrapGAppsHook
+    wrapGAppsHook3
     desktop-file-utils
   ];
 
diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix
index 82cafc40bd74c..5645e92aa1bac 100644
--- a/pkgs/by-name/an/ansel/package.nix
+++ b/pkgs/by-name/an/ansel/package.nix
@@ -54,7 +54,7 @@
 , libgpg-error
 , libxkbcommon
 , osm-gps-map
-, wrapGAppsHook
+, wrapGAppsHook3
 , rav1e
 , dav1d
 , libgcrypt
@@ -77,7 +77,7 @@ let
 in
 stdenv.mkDerivation {
   pname = "ansel";
-  version = "unstable-2024-02-23";
+  version = "0-unstable-2024-02-23";
 
   src = fetchFromGitHub {
     owner = "aurelienpierreeng";
@@ -98,7 +98,7 @@ stdenv.mkDerivation {
     pkg-config
     perlPackages.perl
     python3Packages.jsonschema
-    wrapGAppsHook
+    wrapGAppsHook3
   ];
 
   buildInputs = [
@@ -160,10 +160,13 @@ stdenv.mkDerivation {
     )
   '';
 
-  passthru.updateScript = unstableGitUpdater { };
+  passthru.updateScript = unstableGitUpdater {
+    # Tags inherited from Darktable, + a "nightly" 0.0.0 tag that new artefacts get attached to
+    hardcodeZeroVersion = true;
+  };
 
   meta = {
-    description = "A darktable fork minus the bloat plus some design vision";
+    description = "Darktable fork minus the bloat plus some design vision";
     homepage = "https://ansel.photos/";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ eclairevoyant ];
diff --git a/pkgs/by-name/an/antares/package.nix b/pkgs/by-name/an/antares/package.nix
index 7e2537d211bbd..99725d863dffd 100644
--- a/pkgs/by-name/an/antares/package.nix
+++ b/pkgs/by-name/an/antares/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "antares";
-  version = "0.7.23";
+  version = "0.7.24";
 
   src = fetchFromGitHub {
     owner = "antares-sql";
     repo = "antares";
     rev = "v${version}";
-    hash = "sha256-7bj0f7JrUgHr2g489ABjNLfRERQFx0foDP0YqBTNkzI=";
+    hash = "sha256-jMtUDqxWwfXl9x61ycohTaacNAhWawL3Z4+OPW5nbOI=";
   };
 
-  npmDepsHash = "sha256-pRrg7fY5P2awds1ncsnD/lDvKmiOKhzjNcKXKy70bcs=";
+  npmDepsHash = "sha256-GC1hdRO8rrM97AMYCxWeNtJhyVdbKgitKLkWX7kGCwg=";
 
   buildInputs = [ nodejs ];
 
diff --git a/pkgs/by-name/an/antimatter-dimensions/app.js b/pkgs/by-name/an/antimatter-dimensions/app.js
new file mode 100644
index 0000000000000..4d15eb3a10c04
--- /dev/null
+++ b/pkgs/by-name/an/antimatter-dimensions/app.js
@@ -0,0 +1,14 @@
+const { app, BrowserWindow } = require('electron');
+
+app.setName(process.env.ELECTRON_APP_NAME || 'Antimatter Dimensions');
+
+app.whenReady().then(() => {
+  const mainWindow = new BrowserWindow({
+    autoHideMenuBar: true,
+  });
+  mainWindow.loadFile('index.html');
+});
+
+app.on('window-all-closed', () => {
+  app.quit();
+});
diff --git a/pkgs/by-name/an/antimatter-dimensions/package.nix b/pkgs/by-name/an/antimatter-dimensions/package.nix
new file mode 100644
index 0000000000000..388faf9d41cc5
--- /dev/null
+++ b/pkgs/by-name/an/antimatter-dimensions/package.nix
@@ -0,0 +1,82 @@
+{ buildNpmPackage
+, copyDesktopItems
+, electron
+, fetchFromGitHub
+, lib
+, makeDesktopItem
+, unstableGitUpdater
+, writeScriptBin
+, electronAppName ? "Antimatter Dimensions"
+}:
+
+let
+  # build doesn't provide app.js, only index.html as entry point.
+  # app.js is used to change the directory where data is stored
+  # instead of default Electron. This workaround will be removed
+  # when this file will be available in upstream repository.
+  dummyElectronApp = ./app.js;
+in
+buildNpmPackage rec {
+  pname = "antimatter-dimensions";
+  version = "0-unstable-2024-05-11";
+  src = fetchFromGitHub {
+    owner = "IvarK";
+    repo = "AntimatterDimensionsSourceCode";
+    rev = "b3a254af60207a03d04473bb81726e921f5b2c61";
+    hash = "sha256-+G9mNilt5Ewja5P+Bt312EcCJknMu7FOMn5b4FseAyQ=";
+  };
+  nativeBuildInputs = [
+    copyDesktopItems
+    # build script calls git to get git hash, message and author
+    # since fetchFromGitHub doesn't provide this information
+    # and in order to keep determinism (#8567), create a dummy git
+    (writeScriptBin "git" ''
+      echo "unknown"
+    '')
+  ];
+
+  npmDepsHash = "sha256-aG+oysgitQvdFM0QyzJ3DBxsanBHYI+UPJPhj6bf00Q=";
+  npmFlags = [ "--legacy-peer-deps" ];
+  npmBuildScript = "build:release";
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/antimatter-dimensions
+    cp -Tr dist $out/share/antimatter-dimensions
+    mkdir -p $out/share/icons/hicolor/256x256/apps
+    ln -rs $out/share/antimatter-dimensions/icon.png $out/share/icons/hicolor/256x256/apps/antimatter-dimensions.png
+    cp ${dummyElectronApp} $out/share/antimatter-dimensions/app.js
+
+    makeWrapper ${lib.getExe electron} $out/bin/antimatter-dimensions \
+      --add-flags $out/share/antimatter-dimensions/app.js \
+      --set ELECTRON_APP_NAME "${electronAppName}"
+
+    runHook postInstall
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "antimatter-dimensions";
+      exec = "antimatter-dimensions";
+      icon = "antimatter-dimensions";
+      desktopName = electronAppName;
+      comment = meta.description;
+      categories = [ "Game" ];
+      terminal = false;
+    })
+  ];
+
+  passthru.updateScript = unstableGitUpdater {
+    hardcodeZeroVersion = true;
+  };
+
+  meta = {
+    homepage = "https://github.com/IvarK/AntimatterDimensionsSourceCode";
+    description = "Idle incremental game with multiple prestige layers.";
+    license = lib.licenses.mit;
+    mainProgram = "antimatter-dimensions";
+    maintainers = with lib.maintainers; [ amozeo ];
+    inherit (electron.meta) platforms;
+  };
+}
diff --git a/pkgs/by-name/an/anyk/package.nix b/pkgs/by-name/an/anyk/package.nix
index dfd97fd622731..4e9a92081d5d2 100644
--- a/pkgs/by-name/an/anyk/package.nix
+++ b/pkgs/by-name/an/anyk/package.nix
@@ -15,13 +15,11 @@
 , python3
 }:
 let
-  # Downloads can be found here: https://nav.gov.hu/nyomtatvanyok/letoltesek/nyomtatvanykitolto_programok/nyomtatvany_apeh/keretprogramok/AbevJava
-  # There are no versioned download URLs but archive.org can be used to preserve them.
-  # The original download URL is: https://nav.gov.hu/pfile/programFile?path=/nyomtatvanyok/letoltesek/nyomtatvanykitolto_programok/nyomtatvany_apeh/keretprogramok/AbevJava
-  # You can put the URL here to create a fresh archive URL: https://web.archive.org/save
-  abevjavaSrc = fetchzip {
-    url = "https://web.archive.org/web/20231106112510if_/https://nav.gov.hu/pfile/programFile?path=/nyomtatvanyok/letoltesek/nyomtatvanykitolto_programok/nyomtatvany_apeh/keretprogramok/AbevJava";
-    sha256 = "sha256-qt0mHv3HI6C8OltFjSR47+RLSnmB2Si5U8rXEvdN4/c=";
+  # Run update.py to update this file.
+  inherit (lib.importJSON ./version.json) version url sha256;
+
+  src = fetchzip {
+    inherit url sha256;
     extension = "zip";
     stripRoot = false;
   };
@@ -49,7 +47,7 @@ let
     (runCommandLocal "anyk-patch" {} ''
       mkdir $out
       cd $out
-      ${unzip}/bin/unzip ${abevjavaSrc}/application/abevjava.jar hu/piller/enykp/niszws/ClientStubBuilder.class
+      ${unzip}/bin/unzip ${src}/application/abevjava.jar hu/piller/enykp/niszws/ClientStubBuilder.class
       ${python3}/bin/python ${./patch_paths.py} hu/piller/enykp/niszws/ClientStubBuilder.class
     '')
   ];
@@ -89,9 +87,7 @@ let
   '';
 in stdenv.mkDerivation {
   pname = "anyk";
-  version = "3.26.0";
-
-  src = abevjavaSrc;
+  inherit version src;
 
   dontConfigure = true;
   dontBuild = true;
diff --git a/pkgs/by-name/an/anyk/update.py b/pkgs/by-name/an/anyk/update.py
new file mode 100755
index 0000000000000..0d20a9017870c
--- /dev/null
+++ b/pkgs/by-name/an/anyk/update.py
@@ -0,0 +1,29 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i python3 -p "python3.withPackages (p: [p.waybackpy])"
+import subprocess
+from pathlib import Path
+import re
+import json
+import waybackpy
+
+# NAV doesn't provide stable versioned URLs so we put the download link in Wayback Machine to preserve it.
+
+print("Archiving...")
+save_api = waybackpy.WaybackMachineSaveAPI("https://nav.gov.hu/pfile/programFile?path=/nyomtatvanyok/letoltesek/nyomtatvanykitolto_programok/nyomtatvany_apeh/keretprogramok/AbevJava")
+
+url = save_api.save()
+
+print("Prefetching...")
+sha256, unpack_path = subprocess.check_output(["nix-prefetch-url", "--unpack", "--print-path", url], universal_newlines=True).split("\n")[:2]
+
+print("Extracting version...")
+manifest = (Path(unpack_path) / "META-INF" / "MANIFEST.MF").read_text()
+
+version = re.search("Implementation-Version: (.+)", manifest).group(1)
+
+print("Writing version.json...")
+(Path(__file__).parent / "version.json").write_text(json.dumps({
+  "url": url,
+  "sha256": sha256,
+  "version": version,
+}, indent=2) + "\n")
diff --git a/pkgs/by-name/an/anyk/version.json b/pkgs/by-name/an/anyk/version.json
new file mode 100644
index 0000000000000..8a1debce3d2c1
--- /dev/null
+++ b/pkgs/by-name/an/anyk/version.json
@@ -0,0 +1,5 @@
+{
+  "url": "https://web.archive.org/web/20240506155046/https://nav.gov.hu/pfile/programFile?path=/nyomtatvanyok/letoltesek/nyomtatvanykitolto_programok/nyomtatvany_apeh/keretprogramok/AbevJava",
+  "sha256": "1bvhk8b5b1f5f940zzmpx7xp858p2a27iwqij43fs4kqagz2v782",
+  "version": "3.33.0"
+}
diff --git a/pkgs/by-name/an/anyrun/package.nix b/pkgs/by-name/an/anyrun/package.nix
index 8d0ee80d7e8a7..6ea894c954942 100644
--- a/pkgs/by-name/an/anyrun/package.nix
+++ b/pkgs/by-name/an/anyrun/package.nix
@@ -2,7 +2,7 @@
 , rustPlatform
 , fetchFromGitHub
 , pkg-config
-, wrapGAppsHook
+, wrapGAppsHook3
 , atk
 , cairo
 , gdk-pixbuf
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [
     pkg-config
-    wrapGAppsHook
+    wrapGAppsHook3
   ];
 
   buildInputs = [
@@ -65,7 +65,7 @@ rustPlatform.buildRustPackage rec {
   passthru.updateScript = unstableGitUpdater { };
 
   meta = {
-    description = "A wayland-native, highly customizable runner";
+    description = "Wayland-native, highly customizable runner";
     homepage = "https://github.com/kirottu/anyrun";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ eclairevoyant NotAShelf ];
diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix
index 53c2996834f7b..fa00dee192eeb 100644
--- a/pkgs/by-name/an/anytype/package.nix
+++ b/pkgs/by-name/an/anytype/package.nix
@@ -2,19 +2,18 @@
 
 let
   pname = "anytype";
-  version = "0.40.8";
+  version = "0.41.1";
   name = "Anytype-${version}";
   src = fetchurl {
     url = "https://github.com/anyproto/anytype-ts/releases/download/v${version}/${name}.AppImage";
     name = "Anytype-${version}.AppImage";
-    hash = "sha256-Rvl52nKrOWQfT2qgssEpFjQCjva54zPvm6aEXmO0NTc=";
+    hash = "sha256-z/Htqq2HgCKNPzF81/nvLK/32KuMUYdHRTQbM8hZSIw=";
   };
   appimageContents = appimageTools.extractType2 { inherit name src; };
 in appimageTools.wrapType2 {
   inherit name src;
 
-  extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs)
-    ++ [ pkgs.libsecret ];
+  extraPkgs = pkgs: [ pkgs.libsecret ];
 
   extraInstallCommands = ''
     mv $out/bin/${name} $out/bin/${pname}