make nix conform to xdg

update default lix settings
update nixpkgs and lix, fix lix-plugins
2025-04-19 23:59:50 -04:00 · 2025-04-19 03:12:18 -04:00 · 2025-04-19 02:49:57 -04:00 · 2025-04-16 18:12:51 -04:00 · 2025-04-07 12:48:59 -04:00 · 2025-03-27 19:29:47 -04:00
26 changed files with 225 additions and 877 deletions
--- a/flake.lock
+++ b/flake.lock
@ -3,43 +3,43 @@
    "lix": {
      "flake": false,
      "locked": {
-        "lastModified": 1751235704,
-        "narHash": "sha256-J4ycLoXHPsoBoQtEXFCelL4xlq5pT8U9tNWNKm43+YI=",
-        "rev": "22be6ff62626c8cdbb9cdb59a3e4bd910fedd0d6",
+        "lastModified": 1737234286,
+        "narHash": "sha256-CCKIAE84dzkrnlxJCKFyffAxP3yfsOAbdvydUGqq24g=",
+        "rev": "2837da71ec1588c1187d2e554719b15904a46c8b",
        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/22be6ff62626c8cdbb9cdb59a3e4bd910fedd0d6.tar.gz?rev=22be6ff62626c8cdbb9cdb59a3e4bd910fedd0d6"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2837da71ec1588c1187d2e554719b15904a46c8b.tar.gz?rev=2837da71ec1588c1187d2e554719b15904a46c8b"
      },
      "original": {
        "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/lix/archive/2.93.2.tar.gz"
+        "url": "https://git.lix.systems/lix-project/lix/archive/2.92.0.tar.gz"
      }
    },
    "lix-module": {
      "flake": false,
      "locked": {
-        "lastModified": 1751240025,
-        "narHash": "sha256-SXUAlxpjPRkArRMHy5+Hdi+PiC+ND9yzzIjiaHmTvQU=",
-        "rev": "8b1094356f4723d6e89d3f8a95b333ee16d9ab02",
+        "lastModified": 1742943028,
+        "narHash": "sha256-fprwZKE1uMzO9tiWWOrmLWBW3GPkMayQfb0xOvVFIno=",
+        "rev": "868d97695bab9d21f6070b03957bcace249fbe3c",
        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/8b1094356f4723d6e89d3f8a95b333ee16d9ab02.tar.gz?rev=8b1094356f4723d6e89d3f8a95b333ee16d9ab02"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/868d97695bab9d21f6070b03957bcace249fbe3c.tar.gz?rev=868d97695bab9d21f6070b03957bcace249fbe3c"
      },
      "original": {
        "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.2-1.tar.gz"
+        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-3.tar.gz"
      }
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1753939845,
-        "narHash": "sha256-K2ViRJfdVGE8tpJejs8Qpvvejks1+A4GQej/lBk5y7I=",
+        "lastModified": 1744440957,
+        "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "94def634a20494ee057c76998843c015909d6311",
+        "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "nixos-24.11",
        "repo": "nixpkgs",
        "type": "github"
      }
--- a/flake.nix
+++ b/flake.nix
@ -2,15 +2,15 @@
  description = "dragnpkgs together with nixpkgs and lix";

  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";

    lix-module = {
-      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.2-1.tar.gz";
+      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-3.tar.gz";
      flake = false;
    };

    lix = {
-      url = "https://git.lix.systems/lix-project/lix/archive/2.93.2.tar.gz";
+      url = "https://git.lix.systems/lix-project/lix/archive/2.92.0.tar.gz";
      flake = false;
    };
  };
@ -22,10 +22,6 @@
        (import "${lix-module}/overlay.nix" { inherit lix; })
      ];
      forAllSystems = nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed;
-      libVersionInfoOverlay = import "${nixpkgs}/lib/flake-version-info.nix" nixpkgs;
-      # this is taken from upstream. if upstream changes, the code here needs to be updated to match
-      addLibVersionInfo = lib: lib.extend libVersionInfoOverlay;
-      lib-base = addLibVersionInfo (import "${nixpkgs}/lib");
    in {
      # we don't just use nix.registry.whatever.flake = self
      # the reason for this is to be able to handle a flake.lock containing an entry for this
@ -33,54 +29,21 @@
      # self reference in the registry to be downloadable by URL in case it makes it into a
      # flake.lock
      meta.registry-entry = {
-        from = { id = "dragnpkgs-unstable"; type = "indirect"; };
+        from = { id = "dragnpkgs"; type = "indirect"; };
        to = {
          type = "git";
          url = "https://git.lain.faith/haskal/dragnpkgs.git";
-          ref = "main";
+          ref = "nixos-24.11-tmp";
        } // self.lib.filterAttrs
          (n: _: n == "lastModified" || n == "rev" || n == "revCount" || n == "narHash")
          self;
      };

      # the nix path entry for self
-      meta.path-entry = "dragnpkgs-unstable=flake:dragnpkgs-unstable";
+      meta.path-entry = "dragnpkgs=flake:dragnpkgs";

-      lib = (lib-base.extend (import ./lib/overlay.nix)).extend (final: prev: {
-        # initializes regular upstream nixpkgs with the given arguments
-        nixpkgs-custom = { system, ... } @ args: (
-          (import "${nixpkgs}" args).extend (final: prev: {
-            lib = addLibVersionInfo prev.lib;
-          })
-        );
-
-        # initializes dragnpkgs with its overlays and default config using the given arguments
-        dragnpkgs-custom = { system, ... } @ args: let
-          unsafeConf = if builtins.hasAttr "extraBuiltins" builtins then (
-            let conf = builtins.extraBuiltins; in
-            if builtins.isAttrs conf then conf else {}
-          ) else {};
-          possiblyCommitCrimes =
-          if
-            builtins.hasAttr "dragnpkgs" unsafeConf &&
-            builtins.isAttrs unsafeConf.dragnpkgs &&
-            builtins.hasAttr "possiblyCommitCrimes" unsafeConf.dragnpkgs &&
-            builtins.isBool unsafeConf.dragnpkgs.possiblyCommitCrimes
-          then
-            unsafeConf.dragnpkgs.possiblyCommitCrimes
-          else
-            false;
-        in
-          final.nixpkgs-custom (args // {
-            overlays = overlays ++ (args.overlays or []);
-            config = (args.config or {}) // {
-              allowlistedLicenses = (final.optionals
-                possiblyCommitCrimes
-                [ final.licenses.fyptl ]) ++ (args.config.allowlistedLicenses or []);
-            };
-          });
-
-        nixos = import "${nixpkgs}/nixos/lib" { lib = final; };
+      lib = nixpkgs.lib.extend (final: prev: {
+        licenses = prev.licenses // { fyptl = import ./lib/licenses/fyptl.nix; };

        nixosSystem = args:
          import "${nixpkgs}/nixos/lib/eval-config.nix" (
@ -159,17 +122,17 @@
                    };
                  };

-                  config.nix.registry.dragnpkgs-unstable =
+                  config.nix.registry.dragnpkgs =
                    lib.mkIf config.dragnpkgs.setFlakeRegistry self.meta.registry-entry;

                  config.nix.registry.nixpkgs = lib.mkIf config.dragnpkgs.setNixpkgsFlakeAlias {
                    from = { id = "nixpkgs"; type = "indirect"; };
-                    to = { id = "dragnpkgs-unstable"; type = "indirect"; };
+                    to = { id = "dragnpkgs"; type = "indirect"; };
                  };

                  config.nix.registry.templates = lib.mkIf config.dragnpkgs.setTemplatesFlakeAlias {
                    from = { id = "templates"; type = "indirect"; };
-                    to = { id = "dragnpkgs-unstable"; type = "indirect"; };
+                    to = { id = "dragnpkgs"; type = "indirect"; };
                  };

                  config.nix.nixPath = lib.mkIf config.dragnpkgs.setNixPath [
@ -190,19 +153,18 @@
                      lib.mkForce "/etc/nix/extra-builtins.nix"
                    );

-                  config.environment.etc = lib.mkIf config.dragnpkgs.possiblyCommitCrimes {
-                    "nix/extra-builtins.nix".text =
-                      let
-                        possiblyCommitCrimes =
-                          lib.boolToString config.dragnpkgs.possiblyCommitCrimes;
-                      in ''
-                        { ... }: {
-                          dragnpkgs = {
-                            possiblyCommitCrimes = ${possiblyCommitCrimes};
-                          };
-                        }
-                      '';
-                  };
+                  config.environment.etc."nix/extra-builtins.nix".text =
+                    lib.mkIf config.dragnpkgs.possiblyCommitCrimes (
+                    let
+                      possiblyCommitCrimes =
+                        lib.boolToString config.dragnpkgs.possiblyCommitCrimes;
+                    in ''
+                      { ... }: {
+                        dragnpkgs = {
+                          possiblyCommitCrimes = ${possiblyCommitCrimes};
+                        };
+                      }
+                    '');
                })

                (import ./module.nix)
@ -222,8 +184,7 @@
            ));
          in
            builtins.mapAttrs (name: value:
-              if name == "packages" || name == "legacyPackages" || name == "devShells" ||
-                 name == "apps" then
+              if name == "packages" || name == "legacyPackages" || name == "devShells" then
                rewritePerSystem value
              else
                value
@ -231,19 +192,41 @@
      });

      legacyPackages = forAllSystems (system:
-        self.lib.dragnpkgs-custom { inherit system; }
+        let
+          unsafeConf = if builtins.hasAttr "extraBuiltins" builtins then (
+            let conf = builtins.extraBuiltins; in
+            if builtins.isAttrs conf then conf else {}
+          ) else {};
+          possiblyCommitCrimes =
+          if
+            builtins.hasAttr "dragnpkgs" unsafeConf &&
+            builtins.isAttrs unsafeConf.dragnpkgs &&
+            builtins.hasAttr "possiblyCommitCrimes" unsafeConf.dragnpkgs &&
+            builtins.isBool unsafeConf.dragnpkgs.possiblyCommitCrimes
+          then
+            unsafeConf.dragnpkgs.possiblyCommitCrimes
+          else
+            false;
+        in
+        nixpkgs.legacyPackages.${system}.appendOverlays (overlays ++
+          [(final: prev: {
+            stdenv = prev.stdenv.override {
+              config = prev.config // {
+                allowlistedLicenses = final.lib.optionals
+                  possiblyCommitCrimes
+                  [ final.lib.licenses.fyptl ];
+              };
+            };
+          })])
      );

+      nixosModules = nixpkgs.nixosModules;
+
      templates = {
        default = {
          path = ./templates/default;
          description = "A very basic flake (with dragnpkgs)";
        };
-
-        beamer = {
-          path = ./templates/beamer;
-          description = "A very basic presentation with Beamer";
-        };
      };

      defaultTemplate = self.templates.default;
--- a/lib/overlay.nix
+++ b/lib/overlay.nix
@ -1,3 +0,0 @@
-final: prev: {
-  licenses = prev.licenses // { fyptl = import ./licenses/fyptl.nix; };
-}
--- a/module.nix
+++ b/module.nix
@ -8,7 +8,7 @@
  # set some nix settings defaults
  config.nix.settings = {
    repl-overlays = [ ./repl-overlay.nix ];
-    experimental-features = "nix-command flakes pipe-operator";
+    experimental-features = "nix-command flakes repl-flake pipe-operator";
    temp-dir = "/var/tmp";

    # we're disabling the default flake registry because i don't like it
--- a/overlay.nix
+++ b/overlay.nix
@ -1,5 +1,7 @@
 final: prev: {
-  lib = prev.lib.extend (import ./lib/overlay.nix);
+  lib = prev.lib.extend (lfinal: lprev: {
+    licenses = lprev.licenses // { fyptl = import ./lib/licenses/fyptl.nix; };
+  });

  fetchFromSteam = prev.callPackage ./lib/fetchsteam {};
  fetchb4 = prev.callPackage ./lib/fetchb4 {};
@ -49,15 +51,11 @@ final: prev: {
  lix-plugins = prev.callPackage ./pkgs/lix/lix-plugins {};
  nix-plugins = builtins.throw "nix-plugins is not supported. see pkgs.lix-plugins";

-  zfs_2_3 = prev.zfs_2_3.overrideAttrs {
+  zfs_2_2 = prev.zfs_2_2.overrideAttrs {
    patches = [ ./pkgs/zfs/0001-ZED-add-support-for-desktop-notifications-D-Bus.patch ];
  };

  pympress = prev.pympress.overrideDerivation (oldAttrs: {
    patches = [ ./pkgs/python/pympress/0001-Fix-KDE-window-icon.patch ];
  });
-
-  texliveDragonPackages = {
-    moloch = prev.callPackage ./pkgs/tex/moloch {};
-  };
 }
--- a/pkgs/bootstrap/archlinux/default.nix
+++ b/pkgs/bootstrap/archlinux/default.nix
@ -16,8 +16,8 @@
  zstd,

  repos ? ["core" "community" "extra"],
-  keyring-version ? "20250123-1",
-  keyring-hash ? "sha256-JW3z8MHVecayQ3heLbhPB+rMCuZ3QsjAYiFnVNfUeH0=",
+  keyring-version ? "20241015-1",
+  keyring-hash ? "sha256-7IegfprKTNn0aPRMgTw34SEc/GRCfy92mE9CVI4rxr0=",
  mirror ? "https://mirror.rackspace.com/archlinux/$repo/os/$arch",
 }: rec {
  keyring = (fetchzip.override { withUnzip = false; }) {
--- a/pkgs/ghidra-xenia-v2/0001-Use-protobuf-gradle-plugin.patch
+++ b/pkgs/ghidra-xenia-v2/0001-Use-protobuf-gradle-plugin.patch
@ -1,26 +1,48 @@
-From be4c852769e260e3a9b516bb5626a6a6a68a2cd3 Mon Sep 17 00:00:00 2001
+From ffb6777d58f068db7e14372415154cd93f77766e Mon Sep 17 00:00:00 2001
 From: roblabla <unfiltered@roblab.la>
 Date: Wed, 31 Jan 2024 13:19:55 +0100
 Subject: [PATCH] Use com.google.protobuf:protobuf-gradle-plugin

 ---
+ Ghidra/Debug/Debugger-gadp/build.gradle      |  7 +-
 Ghidra/Debug/Debugger-isf/build.gradle       |  8 +-
- Ghidra/Debug/Debugger-rmi-trace/build.gradle | 16 ++--
+ Ghidra/Debug/Debugger-rmi-trace/build.gradle | 14 +--
 build.gradle                                 |  6 ++
- gradle/hasProtobuf.gradle                    | 94 --------------------
- 4 files changed, 22 insertions(+), 102 deletions(-)
- delete mode 100644 gradle/hasProtobuf.gradle
+ gradle/hasProtobuf.gradle           | 94 --------------------
+ 5 files changed, 26 insertions(+), 103 deletions(-)

-diff --git a/Ghidra/Debug/Debugger-isf/build.gradle b/Ghidra/Debug/Debugger-isf/build.gradle
-index f6c8464405..396b52d188 100644
--- a/Ghidra/Debug/Debugger-isf/build.gradle
-+++ b/Ghidra/Debug/Debugger-isf/build.gradle
-@@ -18,11 +18,17 @@ apply from: "${rootProject.projectDir}/gradle/javaProject.gradle"
+diff --git a/Ghidra/Debug/Debugger-gadp/build.gradle b/Ghidra/Debug/Debugger-gadp/build.gradle
+index 9e1c57faf..3a3242eb5 100644
+--- a/Ghidra/Debug/Debugger-gadp/build.gradle
+++ b/Ghidra/Debug/Debugger-gadp/build.gradle
+@@ -18,11 +18,16 @@ apply from: "${rootProject.projectDir}/gradle/javaProject.gradle"
 apply from: "${rootProject.projectDir}/gradle/jacocoProject.gradle"
 apply from: "${rootProject.projectDir}/gradle/javaTestProject.gradle"
 apply from: "${rootProject.projectDir}/gradle/distributableGhidraModule.gradle"
 -apply from: "${rootProject.projectDir}/gradle/hasProtobuf.gradle"
+apply plugin: 'com.google.protobuf'
 
+ apply plugin: 'eclipse'
+ eclipse.project.name = 'Debug Debugger-gadp'
+ 
+buildscript {
+	dependencies {
+		classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18'
+	}
+}
+ dependencies {
+ 	api project(':Framework-AsyncComm')
+ 	api project(':Framework-Debugging')
+diff --git a/Ghidra/Debug/Debugger-isf/build.gradle b/Ghidra/Debug/Debugger-isf/build.gradle
+index d135294a0..785681ca2 100644
+--- a/Ghidra/Debug/Debugger-isf/build.gradle
+++ b/Ghidra/Debug/Debugger-isf/build.gradle
+@@ -18,11 +18,15 @@ apply from: "${rootProject.projectDir}/gradle/javaProject.gradle"
+ apply from: "${rootProject.projectDir}/gradle/jacocoProject.gradle"
+ apply from: "${rootProject.projectDir}/gradle/javaTestProject.gradle"
+ apply from: "${rootProject.projectDir}/gradle/distributableGhidraModule.gradle"
+-apply from: "${rootProject.projectDir}/gradle/hasProtobuf.gradle"
+-
 +apply plugin: 'com.google.protobuf'
 apply plugin: 'eclipse'
 eclipse.project.name = 'Debug Debugger-isf'
@ -30,22 +52,21 @@ index f6c8464405..396b52d188 100644
 +		classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18'
 +	}
 +}
-+
 dependencies {
 	api project(':Framework-AsyncComm')
- 	api project(':ProposedUtils')
+ 	api project(':Framework-Debugging')
 diff --git a/Ghidra/Debug/Debugger-rmi-trace/build.gradle b/Ghidra/Debug/Debugger-rmi-trace/build.gradle
-index 8b6589f035..05da5a7a7e 100644
+index 40fbc17ab..7517ffe6e 100644
 --- a/Ghidra/Debug/Debugger-rmi-trace/build.gradle
 +++ b/Ghidra/Debug/Debugger-rmi-trace/build.gradle
-@@ -19,12 +19,17 @@ apply from: "${rootProject.projectDir}/gradle/helpProject.gradle"
+@@ -18,12 +18,17 @@ apply from: "${rootProject.projectDir}/gradle/javaProject.gradle"
 apply from: "${rootProject.projectDir}/gradle/jacocoProject.gradle"
 apply from: "${rootProject.projectDir}/gradle/javaTestProject.gradle"
 apply from: "${rootProject.projectDir}/gradle/distributableGhidraModule.gradle"
 -apply from: "${rootProject.projectDir}/gradle/hasProtobuf.gradle"
- apply from: "${rootProject.projectDir}/gradle/hasPythonPackage.gradle"
-
 +apply plugin: 'com.google.protobuf'
+ apply from: "${rootProject.projectDir}/gradle/hasPythonPackage.gradle"
+ 
 apply plugin: 'eclipse'
 eclipse.project.name = 'Debug Debugger-rmi-trace'
 
@ -54,7 +75,6 @@ index 8b6589f035..05da5a7a7e 100644
 +		classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18'
 +	}
 +}
-+
 dependencies {
 	api project(':Pty')
 	api project(':Debugger')
@ -74,11 +94,11 @@ index 8b6589f035..05da5a7a7e 100644
 			commandLine exe, "--python_out=$outdir", "-I$srcdir"
 			args src
 diff --git a/build.gradle b/build.gradle
-index 2d75307a08..aa8f1d7604 100644
+index b0c717fb1..5f56506a5 100644
 --- a/build.gradle
 +++ b/build.gradle
-@@ -80,6 +80,12 @@ if (flatRepo.isDirectory()) {
- 			mavenCentral()
+@@ -74,6 +74,12 @@ if (flatRepo.isDirectory()) {
+ 			jcenter()
 			flatDir name: "flat", dirs:["$flatRepo"]
 		}
 +		buildscript {
@ -91,10 +111,9 @@ index 2d75307a08..aa8f1d7604 100644
 }
 else {	
 diff --git a/gradle/hasProtobuf.gradle b/gradle/hasProtobuf.gradle
-deleted file mode 100644
-index 23b4ce74bb..0000000000
+index 23b4ce74b..e69de29bb 100644
 --- a/gradle/hasProtobuf.gradle
-+++ /dev/null
+++ b/gradle/hasProtobuf.gradle
@@ -1,94 +0,0 @@
 -/* ###
 - * IP: GHIDRA
@ -191,5 +210,5 @@ index 23b4ce74bb..0000000000
 -}
 -zipSourceSubproject.dependsOn generateProto
 -- 
-2.47.0
+2.42.0

--- a/pkgs/ghidra-xenia-v2/build-extension.nix
+++ b/pkgs/ghidra-xenia-v2/build-extension.nix
@ -12,12 +12,7 @@ let
    oldMeta:
    oldMeta
    // {
-      maintainers =
-        (oldMeta.maintainers or [ ])
-        ++ (with lib.maintainers; [
-          vringar
-          ivyfanchiang
-        ]);
+      maintainers = (oldMeta.maintainers or [ ]) ++ (with lib.maintainers; [ vringar ]);
      platforms = oldMeta.platforms or ghidra.meta.platforms;
    };

--- a/pkgs/ghidra-xenia-v2/build.nix
+++ b/pkgs/ghidra-xenia-v2/build.nix
@ -3,7 +3,7 @@
  fetchFromGitHub,
  lib,
  callPackage,
-  gradle_8,
+  gradle,
  makeBinaryWrapper,
  openjdk21,
  unzip,
@ -19,9 +19,7 @@

 let
  pname = "ghidra";
-  version = "11.3.2";
-
-  isMacArm64 = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64;
+  version = "11.2.1";

  releaseName = "NIX";
  distroPrefix = "ghidra_${version}_${releaseName}";
@ -29,7 +27,7 @@ let
    owner = "NationalSecurityAgency";
    repo = "Ghidra";
    rev = "Ghidra_${version}_build";
-    hash = "sha256-EvIOC/VIUaEl7eneVzgEt2fhLSP9DaawMAutk4ouFp8=";
+    hash = "sha256-UVX56yNZSAbUejiQ0AIn00r7R+fUW1DEjZmCr1iYwV4=";
    # populate values that require us to use git. By doing this in postFetch we
    # can delete .git afterwards and maintain better reproducibility of the src.
    leaveDotGit = true;
@ -65,7 +63,7 @@ let
    echo "application.revision.ghidra=$(cat COMMIT)" >> Ghidra/application.properties

    # Tells ghidra to use our own protoc binary instead of the prebuilt one.
-    tee -a Ghidra/Debug/Debugger-{isf,rmi-trace}/build.gradle <<HERE
+    cat >>Ghidra/Debug/Debugger-gadp/build.gradle <<HERE
    protobuf {
      protoc {
        path = '${protobuf}/bin/protoc'
@ -74,9 +72,6 @@ let
    HERE
  '';

-  # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
-  gradle = gradle_8;
-
 in
 stdenv.mkDerivation (finalAttrs: {
  inherit
@ -132,21 +127,7 @@ stdenv.mkDerivation (finalAttrs: {
    data = ./deps.json;
  };

-  gradleFlags =
-    [ "-Dorg.gradle.java.home=${openjdk21}" ]
-    ++ lib.optionals isMacArm64 [
-      # For some reason I haven't been able to figure out yet, ghidra builds for
-      # arm64 seems to build the x64 binaries of the decompiler. These fail to
-      # build due to trying to link the x64 object files with arm64 stdc++
-      # library, which obviously fails.
-      #
-      # Those binaries are entirely unnecessary anyways, since we're targeting
-      # arm64 build here, so let's exclude them from the build.
-      "-x"
-      "Decompiler:linkSleighMac_x86_64Executable"
-      "-x"
-      "Decompiler:linkDecompileMac_x86_64Executable"
-    ];
+  gradleFlags = [ "-Dorg.gradle.java.home=${openjdk21}" ];

  preBuild = ''
    export JAVA_TOOL_OPTIONS="-Duser.home=$NIX_BUILD_TOP/home"
--- a/pkgs/ghidra-xenia-v2/deps.json
+++ b/pkgs/ghidra-xenia-v2/deps.json
@ -7,135 +7,72 @@
  }
 },
 "https://files.pythonhosted.org/packages": {
-  "05/71/590b2a91b43763aa27eac2c63803542a2878a4d8c600b81aa694d3fde919/jpype1-1.5.2-cp39-cp39-macosx_10_9_x86_64": {
-   "whl": "sha256-i3XTPpOjvGVD3fl8JO4K21qGpp+2fw5PT6HIw5cLv5g="
-  },
-  "0b/7d/9fdbbc1a574be43f9820735ca8df0caf8b159856201d9b21fd73932342bc/jpype1-1.5.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64": {
-   "whl": "sha256-uQDhVIJqB2EY0HQWZZbx2BfhE+BwhL8MnEPYBkqGq3c="
-  },
-  "0e/78/95db2eb3c8a7311ee08a2c237cea24828859db6a6cb5e901971d3f5e49da/jpype1-1.5.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64": {
-   "whl": "sha256-pUp3HuViYPmOW5p3RVCE5KSAYZZ94T2r9ii9upyBIuA="
-  },
-  "0e/b9/4dfb38a7f4efb21f71df7344944a8d9a23e30d0503574e455af6ce4f1a56/jpype1-1.5.2-cp311-cp311-win_amd64": {
-   "whl": "sha256-Cg0Y1DhLPfLlUoJUVzffzxjGBFBPE4KtFPiAvvlg8mU="
-  },
-  "20/a3/00a265d424f7d47e0dc547df2320225ce0143fec671faf710def41404b8c/jpype1-1.5.2-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64": {
-   "whl": "sha256-wISAx9GBJWZKEr8KJEuWtJwFEFMGtlk32+/rBatLKEc="
-  },
-  "22/18/0a51845ca890ffdc72f4d71a0c2be334b887c5bb6812207efe5ad45afcb3/jpype1-1.5.2-cp310-cp310-win_amd64": {
-   "whl": "sha256-kksKDPk9Pd2z95KG++QPjJAceO1hIW7b4QhmYjTfQ+A="
-  },
  "27/d6/003e593296a85fd6ed616ed962795b2f87709c3eee2bca4f6d0fe55c6d00/wheel-0.37.1-py2.py3-none-any": {
   "whl": "sha256-S9zX2EATgIYSbNCSVNxhlftPxvAcBQodcjbyYw2x0io="
  },
-  "35/a0/638186a75026a02286041e4a0449b1dff799a3914dc1c0716ef9b9367b73/jpype1-1.5.2-cp311-cp311-macosx_10_9_universal2": {
-   "whl": "sha256-yfarjdKEwW4mF6aX1Uw9AwSwgCCjc4btlhA6EpORotk="
-  },
  "50/8f/518a37381e55a8857a638afa86143efa5508434613541402d20611a1b322/comtypes-1.4.1-py3-none-any": {
   "whl": "sha256-ogig48ocClNic12g/2YYIoAdzocxK4lNfXUq3QEKIbA="
  },
-  "6d/d0/191db2e9ab6ae7029368a488c9d88235966843b185aba7925e54aa0c0013/jpype1-1.5.2-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64": {
-   "whl": "sha256-Qv6NtmrU5cZvY39cTegvyogLppYQTh9KfldYhZI96tg="
-  },
-  "74/dd/7408d4beae755de6fcd07c76b2f0bacabc0461b43fba83811c1f7c22440e/jpype1-1.5.2-cp312-cp312-win_amd64": {
-   "whl": "sha256-x7HC120hHKtgvhZQXTKms8n//FHOecaOgaPUjl7//y0="
-  },
-  "74/f3/1cd4332076ed0421e703412f47f15f43af170809435c57ba3162edc80d4b/jpype1-1.5.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64": {
-   "whl": "sha256-tbH7K0MKUPCB6g7iTRkjKuDQPb/j3QduxfiuQrMKZW8="
-  },
-  "76/be/b37005bec457b94eaaf637a663073b7c5df70113fd4ae4865f6e386c612f/jpype1-1.5.2-cp313-cp313-macosx_10_13_universal2": {
-   "whl": "sha256-SssJjLFpixS25ceeJ19McNzAGw+5NCXyBtCl44DkPGY="
-  },
-  "77/6b/130fb6d0c43976b4e129c6bc19daf0e25c42fc38c5096ed92c4105bfd2c4/jpype1-1.5.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64": {
-   "whl": "sha256-6iG8pM7OdSzT7oj81izo9ET+rI3HJER1/bnA6HEuB+o="
-  },
-  "77/91/f08a719461a390b48d9096b50f1f4a49ee281007ec192e51073090d3d8b7/jpype1-1.5.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64": {
-   "whl": "sha256-VHRCZe82Zl0RDROaS4HRBTJpTGB3sj72DzYJ/q3CLTA="
-  },
  "83/1c/25b79fc3ec99b19b0a0730cc47356f7e2959863bf9f3cd314332bddb4f68/pywin32-306-cp312-cp312-win_amd64": {
   "whl": "sha256-NyV3lMGtOe6b5lLaBGLcLjlMgVnf2ROopOjrb9NG2g4="
  },
  "8d/14/619e24a4c70df2901e1f4dbc50a6291eb63a759172558df326347dce1f0d/protobuf-3.20.3-py2.py3-none-any": {
   "whl": "sha256-p8ptSIqo/38ynUxUWy262KwxRk8dixyHrRNGcXcx5Ns="
  },
-  "8d/e4/0c27352e8222dcc0e3ce44b298015072d2057d08dd353541c980a31d26c9/jpype1-1.5.2-cp312-cp312-macosx_10_9_universal2": {
-   "whl": "sha256-Hh25rJCa0q4OQLBMKqiMsUJQ1SRdaXFVYVB2gfKwiy8="
-  },
  "90/c7/6dc0a455d111f68ee43f27793971cf03fe29b6ef972042549db29eec39a2/psutil-5.9.8": {
   "tar.gz": "sha256-a+Em4yJUht/yhqj7mgYkalJT9MfFO0depfWsk05kGUw="
  },
-  "97/0a/cbe03759331c640aa5862f974028122a862b08935a0b11b8fa6f6e46c26b/jpype1-1.5.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64": {
-   "whl": "sha256-zcqTzHT42x9gTS6mrbdk3sTexoUo8e5oMI+j1SQJVzk="
-  },
-  "bd/68/47fa634cbd0418cbca86355e9421425f5892ee994f7338106327e49f9117/jpype1-1.5.2": {
-   "tar.gz": "sha256-dKQuzPIdMDlMGDKuw5haFJZfpTINoIe2UCnRcsDOxDs="
-  },
-  "c0/c6/63538d160c17e837f62d29ba4163bc444cef08c29cd3f3b8090691c1869c/jpype1-1.5.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64": {
-   "whl": "sha256-/PxcHUXWsQiADRcuqBe9pYXbfxZG1qmNFNqaymbg60Q="
-  },
  "c7/42/be1c7bbdd83e1bfb160c94b9cafd8e25efc7400346cf7ccdbdb452c467fa/setuptools-68.0.0-py3-none-any": {
   "whl": "sha256-EeUsZ0FaOB0Q1rRiztnPuXBmF58OhxOZ4AbEqxAfyF8="
  },
-  "c7/f2/b2efcad1ea5a541f125218e4eb1529ebb8ca18941264c879f3e89a36dc35/jpype1-1.5.2-cp310-cp310-macosx_10_9_universal2": {
-   "whl": "sha256-ey2pjBQoEspAoYpzWzPkfGURsD3r8el5Yw9M9HO2ioc="
-  },
  "ce/78/91db67e7fe1546dc8b02c38591b7732980373d2d252372f7358054031dd4/Pybag-2.2.12-py3-none-any": {
   "whl": "sha256-7aXubE6HOQKYG39SW0KgJCi4fHNo3yxb3+He0OaIQSY="
  },
  "d0/dd/b28df50316ca193dd1275a4c47115a720796d9e1501c1888c4bfa5dc2260/capstone-5.0.1-py3-none-win_amd64": {
   "whl": "sha256-G/pcgeaIDK9BoxlGzW0tBpwEi8wi7fEhJUtQGgSN5nU="
-  },
-  "e3/b7/e1787633b41d609320b41d0dd87fe3118598210609e4e3f6cef93cfcef40/jpype1-1.5.2-cp313-cp313-win_amd64": {
-   "whl": "sha256-K5Y2XxMC3y+zxq1zEX1v5FClW3VQ/X/sraw87FvHEXw="
-  },
-  "e5/cf/344e1f81f1e8c651ec23dfa9fe4b91f6e1d699b36f610a547ba85ee7fb16/jpype1-1.5.2-cp39-cp39-win_amd64": {
-   "whl": "sha256-aOHRGCAPxG9OpL8gkACBWH7ATeSEA3yZewo7fF63H+M="
-  },
-  "ec/1a/610693ac4ee14fcdf2d9bf3c493370e4f2ef7ae2e19217d7a237ff42367d/packaging-23.2-py3-none-any": {
-   "whl": "sha256-jEkRkAM6mvfh2THQtdrMLvR1CbNN0N5n7SCbUgP8iMc="
-  },
-  "fa/4c/e0200a6e3fed5cda79e926c2a8a610676f04948f89d7e38d93c7d4b21be9/jpype1-1.5.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64": {
-   "whl": "sha256-mU+3sxm0U/d61Lav8B4N1BgOp0pv5aAx5OnbktvpU3Y="
  }
 },
 "https://ftp.postgresql.org": {
-  "pub/source/v15.10/postgresql-15.10": {
-   "tar.gz": "sha256-FzNmYFJZqD3BicQyf/TDclSv7WW0+GbL2KXvLqRJ6PM="
+  "pub/source/v15.3/postgresql-15.3": {
+   "tar.gz": "sha256-CG04Uz4odHlmpNXx546kMuM6ePIdy5EzAQ7LUYn62Yw="
  }
 },
- "https://github.com/NationalSecurityAgency/ghidra-data/raw/Ghidra_11.3.2": {
-  "FunctionID/vs2012_x64": {
+ "https://github.com": {
+  "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2.1/FunctionID/vs2012_x64": {
   "fidb": "sha256-1OmKs/eQuDF5MhhDC7oNiySl+/TaZbDB/6jLDPvrDNw="
  },
-  "FunctionID/vs2012_x86": {
+  "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2.1/FunctionID/vs2012_x86": {
   "fidb": "sha256-pJDtfi7SHlh0Wf6urOcDa37eTOhOcuEN/YxXQ0ppGLY="
  },
-  "FunctionID/vs2015_x64": {
+  "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2.1/FunctionID/vs2015_x64": {
   "fidb": "sha256-4E6eQPnstgHIX02E7Zv2a0U2O+HR6CwWLkyZArjLUI8="
  },
-  "FunctionID/vs2015_x86": {
+  "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2.1/FunctionID/vs2015_x86": {
   "fidb": "sha256-tm7mlmU+LtNlkZ3qrviFEDEgx5LiLnmvcNEgnX4dhkQ="
  },
-  "FunctionID/vs2017_x64": {
+  "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2.1/FunctionID/vs2017_x64": {
   "fidb": "sha256-1fpfaXKYF0+lPSR9NZnmoSiEYFrRgce5VOI4DsHwvYk="
  },
-  "FunctionID/vs2017_x86": {
+  "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2.1/FunctionID/vs2017_x86": {
   "fidb": "sha256-04nLjXb/SlnKNfiRuFIccq1fDfluJTlzotIahhSkzIE="
  },
-  "FunctionID/vs2019_x64": {
+  "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2.1/FunctionID/vs2019_x64": {
   "fidb": "sha256-FQAHeW/DakBpZgrWJEmq2q890Rs4ZKXvIeeYMcnOkRg="
  },
-  "FunctionID/vs2019_x86": {
+  "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2.1/FunctionID/vs2019_x86": {
   "fidb": "sha256-62MKNvqlhqNx63NNwLvY0TzK72l/PbWHJZY1jz3SQyo="
  },
-  "FunctionID/vsOlder_x64": {
+  "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2.1/FunctionID/vsOlder_x64": {
   "fidb": "sha256-jDtR9GYM0n4aDWEKnz8tX7yDOmasnuQ5PuLySB6FWGY="
  },
-  "FunctionID/vsOlder_x86": {
+  "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2.1/FunctionID/vsOlder_x86": {
   "fidb": "sha256-mGBca2uSFKlF2ETkHIWGDVRkmkW8p4c+9pkcDpNyB4c="
  },
-  "lib/java-sarif-2.1-modified": {
+  "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2.1/lib/java-sarif-2.1-modified": {
   "jar": "sha256-f3NlZklHVtJxql5LGvbIncUNB0qxxjdKR9+CImQiawE="
+  },
+  "pxb1988/dex2jar/releases/download/v2.1/dex2jar-2.1": {
+   "zip": "sha256-epvfhD1D3k0elOwue29VglAXsMSn7jn/gmYOJJOkbwg="
  }
 },
 "https://repo.maven.apache.org/maven2": {
@ -151,10 +88,10 @@
   "jar": "sha256-FWvnNhmcmQMh2f93CQsZlinPyYZeLWwT980pG7FkGBc=",
   "pom": "sha256-F84MMunPlTZ4+CCuXyrZLu85bYQPZn/JnyOtwK0l0yg="
  },
-  "com/formdev#flatlaf/3.5.4": {
-   "jar": "sha256-PDS2rrLxcKlUxDWGR+tDtotEeiw1H/MRBy9xV6XU4v4=",
-   "module": "sha256-Rjx10DAKwDblv9OLBqPx8Ua/17YdoyYael79bebtqdU=",
-   "pom": "sha256-ymv/5ynY3zr6lZQM0Wz/dL4eiHIHGP5hCsD+Jv4XsWA="
+  "com/formdev#flatlaf/3.2.1": {
+   "jar": "sha256-fYMX/hOyYIiZTWZmOvjofBI5DugIf3unS2hjj0pV9EA=",
+   "module": "sha256-kU7FLZBJj8ctFju0F1UhHnW7yfy3ip5wTZn/Mvfzywg=",
+   "pom": "sha256-uKf+YYO269HIAaqwdGnF2UFRQFSftLdpkqyALuJeGtE="
  },
  "com/github/rotty3000#phidias/0.3.7": {
   "jar": "sha256-yNB2DOOw7RRT1DW83THjTwvjrAkCTn4amLijzr9Ka7U=",
@ -246,6 +183,9 @@
   "jar": "sha256-8CqV+hpele2z7YWf0Pt99wnRIaNSkO/4t03OKrf01u0=",
   "pom": "sha256-N/h3mLGDhRE8kYv6nhJ2/lBzXvj6hJtYAMUZ1U2/Efg="
  },
+  "com/google/protobuf#protobuf-bom/3.17.3": {
+   "pom": "sha256-bf431vImF9VqQUzNrf+NmFhaH3kXEr6HbCYWZxDR2N0="
+  },
  "com/google/protobuf#protobuf-bom/3.21.8": {
   "pom": "sha256-+7Ds/DyjGFddtifjOuRUwT1qTcp68UXRTT9m4IY8PPo="
  },
@ -253,17 +193,32 @@
   "jar": "sha256-RP2JrzepsvHdQcCUqbtzPAe/f8eg4jhooQuvbjUfpeA=",
   "pom": "sha256-Gwqekab09LYqWmB4wibudwqo3FdnueRzwvwY8KOImAQ="
  },
+  "com/google/protobuf#protobuf-java/3.17.3": {
+   "jar": "sha256-SsVJsZJpQUGVgEnwYKHIJqMzQvYZ4QjO2MF9mHf14+0=",
+   "pom": "sha256-Km8izVJli4uxTBANs+F5NT+MNR0ENzo79voKOzlGStw="
+  },
  "com/google/protobuf#protobuf-java/3.21.8": {
   "jar": "sha256-C4WBrYENLfrv0Nz78VabFFBEhlAjjX4v1rF2yTLQjJU=",
   "pom": "sha256-OJBUBuApx6MYaW8O4RnFXM7HizN+oR5MMZWfDgardAg="
  },
+  "com/google/protobuf#protobuf-parent/3.17.3": {
+   "pom": "sha256-T09Q5moqvM/o7SCbU/q3C4k+NfQ77FqB98GESbY+hrE="
+  },
  "com/google/protobuf#protobuf-parent/3.21.8": {
   "pom": "sha256-bHKyrDl1sAnR5FdQlVnp+onyV4vShD3LTWo+XPgRFws="
  },
+  "com/googlecode/json-simple#json-simple/1.1.1": {
+   "jar": "sha256-TmlpaJK4i0HFXUmrL9zCHurZK/VKzFiMAFBZbDt1GZw=",
+   "pom": "sha256-Zl9jWQ3vtj1irdIdNSU2LPk3z2ocBeSwFFuujailf4M="
+  },
  "com/h2database#h2/2.2.220": {
   "jar": "sha256-l4q4YwGNP5ZeOIgFccNik+qLEKgIYZQVnE1dILUPClc=",
   "pom": "sha256-tbp8XBcINbyupnWMWfo8EOvNepx5LiWzm4a559X72Mo="
  },
+  "com/jcraft#jsch/0.1.55": {
+   "jar": "sha256-1JKxWm0uo/HMOcQiyVPEDBIokHPb6DYNmMD2+ex0/EQ=",
+   "pom": "sha256-dHx0jR8BBx6j0PhHb2jUqCOjE7dycB2FUck+qqV/n5k="
+  },
  "com/opencsv#opencsv/5.4": {
   "jar": "sha256-n94e8+VEQE406u4V5L97p0uANV15gJOwUk1jpZk2JCs=",
   "pom": "sha256-uGQpmn0KIQIKgxaZQ499P4VAirJKNOkR+qmf9oTrdv0="
@ -299,39 +254,14 @@
   "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=",
   "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA="
  },
-  "de/femtopedia/dex2jar#d2j-base-cmd/2.4.24": {
-   "jar": "sha256-npdgWaiU74QPoAMunrk+psr60vGphpifoMXqcbvZFJ0=",
-   "module": "sha256-65mjqSTi2DV/NXoU2RN9XX8KH0FODoH9EfVBqInq2Bs=",
-   "pom": "sha256-s8X4M7/XHInxWe+0DG5BtsU0qglCXme9YIQxdW0cUzk="
-  },
-  "de/femtopedia/dex2jar#d2j-external/2.4.24": {
-   "jar": "sha256-PVAlQnJ6wWlu6/vwttvaU4uppYIq8r9LvgtgLvAsChA=",
-   "pom": "sha256-iurxTkKYs3mHap/0Bshvlvb1ItTNRgX/UHVb+9Wr6nw="
-  },
-  "de/femtopedia/dex2jar#dex-ir/2.4.24": {
-   "jar": "sha256-5wB1C3kGWPqw1ceC9oofvcWH74op+LMsgWv5JdKUWQA=",
-   "module": "sha256-bwx56rQdiS++RQReuV/x6+XW9kW/j75D1TkmjCfCP6I=",
-   "pom": "sha256-UpoS1s+bSCpK6lMusffK4pf96ez+/EzG3Toy5BFom+A="
-  },
-  "de/femtopedia/dex2jar#dex-reader-api/2.4.24": {
-   "jar": "sha256-gJvNGdys1pm6BILCdNMgtp0uFHEJh1uMVXcpquWTxKw=",
-   "module": "sha256-9KsAw3EWGfByHsgc5PMoSI0NSHkMqmJHg23KLqmFYBQ=",
-   "pom": "sha256-TwVdir25YI+lmnUa4LHLa5MCMxZzXj34idrMGQugXcc="
-  },
-  "de/femtopedia/dex2jar#dex-reader/2.4.24": {
-   "jar": "sha256-Sh8LEZ7oU/27K55XzBBziskG0RGotrAjTaePSNzrGrI=",
-   "module": "sha256-qlKoHHLESSxUL/oUZVts5tBwsB4CRmi/Yu5di6WHETY=",
-   "pom": "sha256-Z6TS45BHREEwK1Y9RvHU9B6plqXMKOvslFq9XG29vJ0="
-  },
-  "de/femtopedia/dex2jar#dex-translator/2.4.24": {
-   "jar": "sha256-1Uvxla4E3v1KbMQBv1hkTTTOKccAuVOl8A9/HXsD2lU=",
-   "module": "sha256-0KGW3NUxqnpbEZCwyypcG6BhF137Ey2S3P5a0pCpF9s=",
-   "pom": "sha256-YQbcNXGfyXyPjDoBP0w3Dn4genKLKQu8bdSwiaezL5s="
-  },
  "javax/help#javahelp/2.0.05": {
   "jar": "sha256-/PSSLTj/hRhPHSMoMXu2CCbhTalIq9YG7j1bjGpw3r0=",
   "pom": "sha256-uIEr4lGsoTl/S2pCO/Tt06KERONFOyIDtTSTNrmVgik="
  },
+  "junit#junit/4.10": {
+   "jar": "sha256-NqdHyh4LhvbqiAVbhyO7hwMNYndm2mKIvwd6/e6w91o=",
+   "pom": "sha256-IqG/C6rothBretgCbs8nxZ5+R920nWKXUDa+rbLGLrU="
+  },
  "junit#junit/4.12": {
   "jar": "sha256-WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=",
   "pom": "sha256-kPFj944/+28cetl96efrpO6iWAcUG4XW0SvmfKJUScQ="
@ -542,16 +472,15 @@
   "jar": "sha256-ZLAmkci51OdwD47i50Lc5+osboHmYrdSLJ7jv1aMBAo=",
   "pom": "sha256-3EzUOKNkYtATwjOMjiBtECoyKgDzNynolV7iGYWcnt4="
  },
+  "org/checkerframework#checker-qual/3.31.0": {
+   "module": "sha256-UYkl4iqnmMH71voXwYN0aR8f57G+fdNw1Omv7us7Ds8=",
+   "pom": "sha256-Q1ecPr5H54NYp/MvlnN471YXWyKUszUYNYTwvSNZUjE="
+  },
  "org/checkerframework#checker-qual/3.37.0": {
   "jar": "sha256-5M4TdswnNeHd4iC2KtCRP1EpdwTarRVaM/OGvF2w2fc=",
   "module": "sha256-clinadyqJrmBVNIp2FzHLls2ZrC8tjfS2vFuxJiVZjg=",
   "pom": "sha256-AjkvvUziGQH5RWFUcrHU1NNZGzqr3wExBfXJLsMstPA="
  },
-  "org/checkerframework#checker-qual/3.42.0": {
-   "jar": "sha256-zK7dM68LeJTZ8vO2RPTRnkOSjjKQLmGsTRB3eDD1qsc=",
-   "module": "sha256-4PpiK33mPq4RBH726RtMKtDx8OE8uQP/UggKR/V6V0Y=",
-   "pom": "sha256-v1/KqycvVMvPG753w72WPIIcmrrSBYcIvwvtPIdUlMo="
-  },
  "org/codehaus#codehaus-parent/3": {
   "pom": "sha256-UOslOs0LbuBI9DLZ/Do7NiZO+z2h/6f7B/bE1LeoyjE="
  },
@ -575,21 +504,6 @@
  "org/codehaus/mojo#mojo-parent/40": {
   "pom": "sha256-/GSNzcQE+L9m4Fg5FOz5gBdmGCASJ76hFProUEPLdV4="
  },
-  "org/commonmark#commonmark-ext-footnotes/0.23.0": {
-   "jar": "sha256-YwKKfV6V7sjibuBCSxQfh+nalccYTypaSbtD371TsQQ=",
-   "pom": "sha256-zMoEy/7Z60gzSM+6aexh9gvdyfPjwJJLZLsZ0cqy4s0="
-  },
-  "org/commonmark#commonmark-ext-heading-anchor/0.23.0": {
-   "jar": "sha256-7O27O1jbcgxhNXwb4boTKlweeczr4B8NPZo25VJCDL0=",
-   "pom": "sha256-95zHry5Zpgc70UwPNKezU0JDO5FxqhdLYzeHRaVuASw="
-  },
-  "org/commonmark#commonmark-parent/0.23.0": {
-   "pom": "sha256-zEC+Twqn9Lw5BEquYQVT5BfyYRkHNJVqXJl/Q50Tw94="
-  },
-  "org/commonmark#commonmark/0.23.0": {
-   "jar": "sha256-spUGEYOcwMDG4lwIPjprIpXrwyeDLsBzPn2bvJTnTrM=",
-   "pom": "sha256-3mdvxdpEpo0CntlaCSuJPVbo/ElogKIx5HHl1bKzvhY="
-  },
  "org/fusesource#fusesource-pom/1.12": {
   "pom": "sha256-xA2WDarc73sBwbHGZXr7rE//teUxaPj8sLKLhOb9zKE="
  },
@ -597,10 +511,17 @@
   "jar": "sha256-+dWXnFx7oxN8d/QYR16wIYn4/Ip1+nP/w/8dEv6UVWc=",
   "pom": "sha256-ywU3vsxjUsFUcz22+v0JAPlYRgOgsLnPjyJFVjEs2+E="
  },
+  "org/hamcrest#hamcrest-core/1.1": {
+   "jar": "sha256-A2HRST/w2U+GE1nv6pEgByBjUHITR5LvtyF/bgnVz/s=",
+   "pom": "sha256-OXOH9AbGjMtAP0d8y+wcgYz8a4/0+tpaM+Jhg6hBfIM="
+  },
  "org/hamcrest#hamcrest-core/1.3": {
   "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=",
   "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM="
  },
+  "org/hamcrest#hamcrest-parent/1.1": {
+   "pom": "sha256-FOaVChpimMvLg8+UKcrEFf8nMWf28Vh2hZQTsNbAfjo="
+  },
  "org/hamcrest#hamcrest-parent/1.3": {
   "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps="
  },
@ -697,13 +618,12 @@
   "jar": "sha256-cFPFfn19iP7GuQl5o68SXh0ruEcmijKKLx7WWtCkwYU=",
   "pom": "sha256-rcyK9ce+Z7BSEF4Mncq43ibaxvGbxamrcpRqMydscQA="
  },
+  "org/ow2#ow2/1.3": {
+   "pom": "sha256-USFcZ9LAaNi30vb4D1E3KgmAdd7MxEjUvde5h7qDKPs="
+  },
  "org/ow2#ow2/1.5.1": {
   "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU="
  },
-  "org/ow2/asm#asm-analysis/9.7.1": {
-   "jar": "sha256-hbKTcYhLoxu3bt8iMjwsJOFywyZ6ZxUuuj0czC4EHvI=",
-   "pom": "sha256-JcI3nyv8Kh5k5iw54rk8+w5IlweFKwjW/EcLHGpSue4="
-  },
  "org/ow2/asm#asm-bom/9.6": {
   "pom": "sha256-ig5fYk/ikwt6jWmVb0OORe9TKZa01kQJthbErvSxrE4="
  },
@ -711,37 +631,28 @@
   "jar": "sha256-eu/Q1cCQFwHGn3UT/tp2X7a+M68s56oXxXgfyHZXxRE=",
   "pom": "sha256-qYrkiVM0uvj/hr1mUWIQ29mgPxpuFeR92oKvz2tT13w="
  },
-  "org/ow2/asm#asm-commons/9.7.1": {
-   "jar": "sha256-mlebVNKSrZvhcdQxP9RznGNVksK1rDpFm70QSc3exqA=",
-   "pom": "sha256-C/HTHaDJ+djtwvJ9u/279z8acVtyzS+ijz8ZWZTXStE="
+  "org/ow2/asm#asm-debug-all/5.0.3": {
+   "jar": "sha256-KWk1asHkD+QUGUjFY2kCOPXXnXaux/2HNTaGejMe3oE=",
+   "pom": "sha256-nJnXpVVyW8L4N5l3k1zboW1ofZyTtuByXhlhgNSQyZU="
+  },
+  "org/ow2/asm#asm-parent/5.0.3": {
+   "pom": "sha256-wu2r9BKKU030uLSwubVi6U8kK6lawk3GFIVDK4oYjjI="
  },
  "org/ow2/asm#asm-tree/9.6": {
   "jar": "sha256-xD7PF7U5x3fhXae1uGVTs3fi05poPeYoVWfVKDiI5+8=",
   "pom": "sha256-G8tIHX/Ba5VbtgygfIz6JCS87ni9xAW7oxx9b13C0RM="
  },
-  "org/ow2/asm#asm-tree/9.7.1": {
-   "jar": "sha256-mSmIH1nra4QOhtVFcMd7Wc5yHRBObf16QJeJkcLTtB8=",
-   "pom": "sha256-E7kF9l5/1DynZ09Azao3Z5ukhYxsnZ+48Xp6/ZuqvJ4="
-  },
-  "org/ow2/asm#asm-util/9.7.1": {
-   "jar": "sha256-+IW+cbXJBVb18a0cT5J2spuWBXxJfUZmb+TdvsPLQ8Y=",
-   "pom": "sha256-f7XmM2Ky1S133KO3VK661jV1HT/FIBkelQDs6eI0W3E="
-  },
  "org/ow2/asm#asm/9.6": {
   "jar": "sha256-PG+sJCTbPUqFO2afTj0dnDxVIjXhmjGWc/iHCDwjA6E=",
   "pom": "sha256-ku7iS8PIQ+SIHUbB3WUFRx7jFC+s+0ZrQoz+paVsa2A="
  },
-  "org/ow2/asm#asm/9.7.1": {
-   "jar": "sha256-jK3UOsXrbQneBfrsyji5F6BAu5E5x+3rTMgcdAtxMoE=",
-   "pom": "sha256-cimwOzCnPukQCActnkVppR2FR/roxQ9SeEGu9MGwuqg="
+  "org/postgresql#postgresql/42.6.2": {
+   "jar": "sha256-gmKXVPMJwLVx0dQLp0+wU4VfhjdSpGyjB8ez5YYMSy4=",
+   "pom": "sha256-/5dcZtbZSN/YKp6SbsER7eldPkyRo6DYaQ8xox45NMY="
  },
-  "org/postgresql#postgresql/42.7.3": {
-   "jar": "sha256-omRMv7obqhRf9+jI71gqbu16fsTKeS9/BUEivex1Ymg=",
-   "pom": "sha256-wqy2hFfZlqjkntB3flklW3RlCXZSOVHxAa25QHXhWIU="
-  },
-  "org/python#jython-standalone/2.7.4": {
-   "jar": "sha256-H7oXae/8yLGfXhBDa8gnShWM6YhVnyV5J8JMc7sTfzw=",
-   "pom": "sha256-WjutObAFQl/DVMK4niUVrj0MmdizCk6UqxtaPBSF1TM="
+  "org/python#jython-standalone/2.7.3": {
+   "jar": "sha256-2n89gpsUi8+oawWdyWTjqFVv7bAhCWyNsH4wxm+qubQ=",
+   "pom": "sha256-moD1I2PkBVnKxMjaKsX4uil3ksbpEmN7dIUfKjMHDNI="
  },
  "org/slf4j#slf4j-api/1.7.25": {
   "jar": "sha256-GMSgCV1cHaa4F1kudnuyPSndL1YK1033X/OWHb3iW3k=",
@ -769,6 +680,9 @@
   "module": "sha256-rRt+JSAWcAXJFp2Gv8z/JvXF+b8Ls/qyRMtIIWU9wmE=",
   "pom": "sha256-IKx+12/5cPUQB6IPrIvbon7IeUT9Kb2oxnQJZ5LJFFE="
  },
+  "org/sonatype/oss#oss-parent/6": {
+   "pom": "sha256-tDBtE+j1OSRYobMIZvHP8WGz0uaZmojQWe6jkyyKhJk="
+  },
  "org/sonatype/oss#oss-parent/7": {
   "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
  },
@ -825,8 +739,8 @@
  }
 },
 "https://sourceforge.net/projects": {
-  "pydev/files/pydev/PyDev%209.3.0/PyDev%209.3.0": {
-   "zip": "sha256-RTmO3yrbVgeKgLyIqRmUFXjwwLNj773QEb/RWKmbES4="
+  "pydev/files/pydev/PyDev%206.3.1/PyDev%206.3.1": {
+   "zip": "sha256-TYH+nYr+dmW46iCETT9RB/RGdCknxZlz6t5PKYCbBpk="
  },
  "yajsw/files/yajsw/yajsw-stable-13.12/yajsw-stable-13.12": {
   "zip": "sha256-xvxZgV04ANFOyXeSaor9P2BqDr100s/WBgFndGbt6qI="
--- a/pkgs/ghidra-xenia-v2/extensions.nix
+++ b/pkgs/ghidra-xenia-v2/extensions.nix
@ -23,8 +23,6 @@ lib.makeScope newScope (self: {

  gnudisassembler = self.callPackage ./extensions/gnudisassembler { inherit ghidra; };

-  kaiju = self.callPackage ./extensions/kaiju { };
-
  lightkeeper = self.callPackage ./extensions/lightkeeper { };

  machinelearning = self.callPackage ./extensions/machinelearning { inherit ghidra; };
@ -33,5 +31,4 @@ lib.makeScope newScope (self: {

  sleighdevtools = self.callPackage ./extensions/sleighdevtools { inherit ghidra; };

-  wasm = self.callPackage ./extensions/wasm { inherit ghidra; };
 })
--- a/pkgs/ghidra-xenia-v2/extensions/findcrypt/default.nix
+++ b/pkgs/ghidra-xenia-v2/extensions/findcrypt/default.nix
@ -4,7 +4,7 @@
  buildGhidraExtension,
 }:
 let
-  version = "3.0.5";
+  version = "3.0.2";
 in
 buildGhidraExtension {
  pname = "findcrypt";
@ -14,7 +14,7 @@ buildGhidraExtension {
    owner = "antoniovazquezblanco";
    repo = "GhidraFindcrypt";
    rev = "v${version}";
-    hash = "sha256-gWVYy+PWpNXlcgD83jap4IFRv66qdhloOwvpQVU2TcI=";
+    hash = "sha256-SNmhn/X+POp6dRaB9etZ8GvpKf/5+mPg3E0HUQTthIY=";
  };

  meta = {
--- a/pkgs/ghidra-xenia-v2/extensions/ghidra-delinker-extension/default.nix
+++ b/pkgs/ghidra-xenia-v2/extensions/ghidra-delinker-extension/default.nix
@ -5,7 +5,7 @@
  fetchFromGitHub,
 }:
 let
-  version = "0.5.1";
+  version = "0.5.0";
  self = ghidra.buildGhidraExtension {
    pname = "ghidra-delinker-extension";
    inherit version;
@ -14,7 +14,7 @@ let
      owner = "boricj";
      repo = "ghidra-delinker-extension";
      rev = "v${version}";
-      hash = "sha256-h6F50Z7S6tPOl9mIhChLKoFxHuAkq/n36ysUEFwWGxI=";
+      hash = "sha256-y0afqqIsWN33b/zGsxJYn8O+R5IP4eD300CgzMymEA0=";
    };

    postPatch = ''
--- a/pkgs/ghidra-xenia-v2/extensions/kaiju/default.nix
+++ b/pkgs/ghidra-xenia-v2/extensions/kaiju/default.nix
@ -1,73 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  buildGhidraExtension,
-  z3,
-  gradle,
-}:
-let
-  ghidraPlatformName =
-    {
-      x86_64-linux = "linux_x86_64";
-      aarch64-linux = "linux_x86_64";
-      x86_64-darwin = "mac_x86_64";
-      aarch64-darwin = "mac_arm_64";
-    }
-    .${stdenv.hostPlatform.system}
-      or (throw "${stdenv.hostPlatform.system} is an unsupported platform");
-
-  z3_lib = (
-    z3.override {
-      javaBindings = true;
-      jdk = gradle.jdk;
-    }
-  );
-
-  self = buildGhidraExtension rec {
-    pname = "kaiju";
-    version = "250417";
-
-    src = fetchFromGitHub {
-      owner = "CERTCC";
-      repo = "kaiju";
-      rev = version;
-      hash = "sha256-SSvCb3xnOh0mb3H24RJTi11UmN2ARgFgsiiKlZXyufM=";
-    };
-
-    buildInputs = [
-      z3_lib
-    ];
-
-    # used to copy java bindings from nixpkgs z3 package instead of having kaiju's build.gradle build gradle from source
-    # https://github.com/CERTCC/kaiju/blob/c9dbb55484b3d2a6abd9dfca2197cd00fb7ee3c1/build.gradle#L189
-    preBuild = ''
-      mkdir -p build/cmake/z3/java-bindings
-      ln -s ${lib.getOutput "lib" z3_lib}/lib/com.microsoft.z3.jar build/cmake/z3/java-bindings
-      mkdir -p os/${ghidraPlatformName}
-      cp ${lib.getOutput "lib" z3_lib}/lib/* os/${ghidraPlatformName}
-    '';
-
-    gradleFlags = [ "-PKAIJU_SKIP_Z3_BUILD=true" ];
-
-    mitmCache = gradle.fetchDeps {
-      pkg = self;
-      data = ./deps.json;
-    };
-
-    meta = {
-      description = "A Java implementation of some features of the CERT Pharos Binary Analysis Framework for Ghidra";
-      homepage = "https://github.com/CERTCC/kaiju";
-      downloadPage = "https://github.com/CERTCC/kaiju/releases/tag/${version}";
-      license = lib.licenses.bsd3;
-      maintainers = [ lib.maintainers.ivyfanchiang ];
-      platforms = [
-        "x86_64-linux"
-        "aarch64-linux"
-        "x86_64-darwin"
-        "aarch64-darwin"
-      ];
-    };
-  };
-in
-self
--- a/pkgs/ghidra-xenia-v2/extensions/kaiju/deps.json
+++ b/pkgs/ghidra-xenia-v2/extensions/kaiju/deps.json
@ -1,163 +0,0 @@
-{
- "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
- "!version": 1,
- "https://plugins.gradle.org/m2": {
-  "com/adarshr#gradle-test-logger-plugin/4.0.0": {
-   "jar": "sha256-5nhoOjPSvINWcb3U5YcQAErR2TFqqfmlTP4iQZpPbvk=",
-   "module": "sha256-jERLLH/UQgDNSrMYJyJwHCCXWkOyPH6e35sCJgSavcI=",
-   "pom": "sha256-ienBpTqmJS2mx9fZscN/t/j8qQuysaNq+Ti8cNni3GE="
-  },
-  "com/adarshr/test-logger#com.adarshr.test-logger.gradle.plugin/4.0.0": {
-   "pom": "sha256-sobTcqzS2uG4vHsg/ouoT49kiXMdiBpB83NqYCCFotc="
-  },
-  "com/github/tomtzook#castle/2.0.0": {
-   "jar": "sha256-00zgaBUmlsBRQcXYStVP4PhRNglOxFNf7P+kBr0A7hg=",
-   "pom": "sha256-3uocEIH4TsePK074yLEPseyHxbdkreKq1Uelx+60//0="
-  },
-  "com/google/code/gson#gson-parent/2.8.5": {
-   "pom": "sha256-jx/scrkaceo57Dn193jE0RJLawl8bVWzpQtVSlIjeyc="
-  },
-  "com/google/code/gson#gson/2.8.5": {
-   "jar": "sha256-IzoBSfw2XJ9u29aDz+JmsZvcdzvpjqva9rPJJLSOfYE=",
-   "pom": "sha256-uDCFV6f8zJLZ/nyM0FmSWLNhKF0uzedontqYhDJVoJI="
-  },
-  "de/undercouch#gradle-download-task/5.5.0": {
-   "jar": "sha256-q/7DKUbJfz8N62qP5HDon99K7FYneLm/bPp8RAehPiI=",
-   "module": "sha256-5q+RV5vPUg0udBmtEPB4j13RBsCLzLCc40sNB3UvlEc=",
-   "pom": "sha256-HXoKzY/wjdfQnruzxz1j1mYYyFGNudC9J0J7/BjL9Hs="
-  },
-  "de/undercouch/download#de.undercouch.download.gradle.plugin/5.5.0": {
-   "pom": "sha256-WNFNTmP4TrzAgj/2tk1804/2bFRtUp9gLj3ML1xPEZk="
-  },
-  "io/github/tomtzook#plugin/1.2.2": {
-   "jar": "sha256-tTNTLIWad6fNX4McGhtFiTkQqujQ14MXhv4llB2TjYs=",
-   "module": "sha256-91tklOgQk0ObuwzAs8+kumszoLjzK36bNUIChrb91Cc=",
-   "pom": "sha256-HliRlUYwjo3HQu/JqktYsiJy/TJTdvYTSuyHPH/3xys="
-  },
-  "io/github/tomtzook/gradle-cmake#io.github.tomtzook.gradle-cmake.gradle.plugin/1.2.2": {
-   "pom": "sha256-xqnleYCaGEjSEkRXp5CwK67T9sAJaxIIliGoxZTnDJo="
-  },
-  "org/fusesource#fusesource-pom/1.12": {
-   "pom": "sha256-xA2WDarc73sBwbHGZXr7rE//teUxaPj8sLKLhOb9zKE="
-  },
-  "org/fusesource/jansi#jansi/2.4.0": {
-   "jar": "sha256-bNkZkTI917L7KMqT16wSr1qGovUyeeKzWCezAxP9C58=",
-   "pom": "sha256-rECp8tDB7mMfw7CO+OLwvRS6IgEcp2/xvPZftWnq3zU="
-  },
-  "org/slf4j#slf4j-api/1.7.25": {
-   "jar": "sha256-GMSgCV1cHaa4F1kudnuyPSndL1YK1033X/OWHb3iW3k=",
-   "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4="
-  },
-  "org/slf4j#slf4j-parent/1.7.25": {
-   "pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY="
-  },
-  "org/sonatype/oss#oss-parent/7": {
-   "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
-  }
- },
- "https://repo.maven.apache.org/maven2": {
-  "com/google/code/gson#gson-parent/2.8.6": {
-   "pom": "sha256-NzZGOFnsGSZyleiUlAroKo9oRBMDESL+Nc58/34wp3Q="
-  },
-  "com/google/code/gson#gson/2.8.6": {
-   "jar": "sha256-yPtIOQVNKAswM/gA0fWpfeLwKOuLoutFitKH5Tbz8l8=",
-   "pom": "sha256-IXRBWmRzMtMP2gS9HPxwij7MhOr3UX9ZYYjYJE4QORE="
-  },
-  "junit#junit/4.12": {
-   "pom": "sha256-kPFj944/+28cetl96efrpO6iWAcUG4XW0SvmfKJUScQ="
-  },
-  "junit#junit/4.13.2": {
-   "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=",
-   "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ="
-  },
-  "net/sf/jopt-simple#jopt-simple/5.0.4": {
-   "jar": "sha256-3ybMWPI19HfbB/dTulo6skPr5Xidn4ns9o3WLqmmbCg=",
-   "pom": "sha256-amd2O3avzZyAuV5cXiR4LRjMGw49m0VK0/h1THa3aBU="
-  },
-  "org/apiguardian#apiguardian-api/1.1.2": {
-   "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=",
-   "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=",
-   "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA="
-  },
-  "org/commonmark#commonmark-parent/0.17.1": {
-   "pom": "sha256-VQ6X1IOuWsZblW66NsnxqdlIV/bHs+qVmta7R2N4DiI="
-  },
-  "org/commonmark#commonmark/0.17.1": {
-   "jar": "sha256-5jrQgyZPWHdSJ0c8NduGbs3DhDxHvSvy8kdan65e938=",
-   "pom": "sha256-UFfBCkUrXNVyngvDZU+0vAx+VGAgCv/BqN1PfGOWPXI="
-  },
-  "org/hamcrest#hamcrest-core/1.3": {
-   "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=",
-   "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM="
-  },
-  "org/hamcrest#hamcrest-parent/1.3": {
-   "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps="
-  },
-  "org/junit#junit-bom/5.9.2": {
-   "module": "sha256-qxN7pajjLJsGa/kSahx23VYUtyS6XAsCVJdyten0zx8=",
-   "pom": "sha256-LtB9ZYRRMfUzaoZHbJpAVrWdC1i5gVqzZ5uw82819wU="
-  },
-  "org/junit/jupiter#junit-jupiter-api/5.9.2": {
-   "jar": "sha256-92ehcPlxJ7CtNYK/M1jqu7vpgdn5ZBGFPmKdknaSb9U=",
-   "module": "sha256-y9Ae2F1HTMhbIT/iBrzpgmbWdZzSjWxeQb/kUJCepHs=",
-   "pom": "sha256-EK9g+mkKzNzr85TsWECdzs/x3sNwJopnA2ChFfcxxVw="
-  },
-  "org/junit/jupiter#junit-jupiter-engine/5.9.2": {
-   "jar": "sha256-dM/Ek4j3YEE/80jKLJqzlSdIS1fe7NFX8idaX4pf6XE=",
-   "module": "sha256-WmigqdMTI0BieAXap0YY+zTEXMUZp8LsgzQedDixOTM=",
-   "pom": "sha256-nfOOgj4a3Zplas+5Wc5zsHAE32yffANnwmt0PmVrWa8="
-  },
-  "org/junit/jupiter#junit-jupiter-migrationsupport/5.9.2": {
-   "jar": "sha256-1DTOe1gzyuX+9ovSfSfyABPrJ9U7bcl9eL8yS7YaDgQ=",
-   "module": "sha256-0tnRvL9p+RLgxT3fNO/HonM/0gCAhCA0d3Sig2ZFVZM=",
-   "pom": "sha256-KkAZMJh5lh9z788rZrJsF3TSjqF1U/72qAbA9sNbgqY="
-  },
-  "org/junit/platform#junit-platform-commons/1.9.2": {
-   "jar": "sha256-Yko9dF7x0o6VWmpnr47boP38XJutaApz9npwu5UKaD0=",
-   "module": "sha256-a6TIRhPluJ5mjuaomXHw2Q0OG4FyG4tf4MgAWPDOue4=",
-   "pom": "sha256-JAI/IMI1ppYJ+y+Vpgc4VX/PlBPzrpKpLhMpVH1hRck="
-  },
-  "org/junit/platform#junit-platform-engine/1.9.2": {
-   "jar": "sha256-JfI9xTWgkencgMAI+vKdy5K+kC5pEfd6c2+68BmQg2c=",
-   "module": "sha256-HehRQa+fWBU+JFdQaaE3X7vt169dhEy+MoeWU0nLofc=",
-   "pom": "sha256-LflCCmsk5fTzFCNeAc2cO49kYoXbL26C2G7gbvevTiQ="
-  },
-  "org/junit/vintage#junit-vintage-engine/5.9.2": {
-   "jar": "sha256-QeFt0yyPRiu8AysrefI5RBkbMuw5jQWFi6212r/9BhI=",
-   "module": "sha256-jMz93WRdDOdyFmeJhOtqEruXJQk0SVgOepIxTIxj0qQ=",
-   "pom": "sha256-n0TiazxEQSZXNjh58YscZBQX6nrCm66O5yfi8g2w9Ck="
-  },
-  "org/opentest4j#opentest4j/1.2.0": {
-   "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=",
-   "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ="
-  },
-  "org/sonatype/oss#oss-parent/7": {
-   "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
-  },
-  "systems/manifold#manifold-core-parent/2023.1.28": {
-   "pom": "sha256-ahN15Fn/32/sBPQOta1Tp+cScHjqREz7iUUTtPCfdJA="
-  },
-  "systems/manifold#manifold-deps-parent/2023.1.28": {
-   "pom": "sha256-DE+CPr0aN18k0zh2D7G5WreDvyrnO5Wd0wDt88AJbkY="
-  },
-  "systems/manifold#manifold-parent/2023.1.28": {
-   "pom": "sha256-J0ChX+GyGJ9xJMda85n+tR1IfdE6Ij0hhtaHYSOtU6w="
-  },
-  "systems/manifold#manifold-preprocessor/2023.1.28": {
-   "jar": "sha256-vRIrrVT6SX3zuMVcfSwhL9nHE0oqfrtMNXuKzli2UB8=",
-   "pom": "sha256-Ov7/Z6wWQo+0mSc5K9t4Yw0aehDcnQEBDSpy9fnGMiU="
-  },
-  "systems/manifold#manifold-rt/2023.1.28": {
-   "jar": "sha256-4cn28jDYci2C2tUEizvJkdv6LRe/BrLwypEC6N0sGl0=",
-   "pom": "sha256-SAJid1Td0/ltrFi7w2YDNDlWhggDxFB+jynCG/rYaok="
-  },
-  "systems/manifold#manifold-util/2023.1.28": {
-   "jar": "sha256-WjY+1jmh4gvUHjvEbreQqoIB54HBfoNoOIILZs3IT80=",
-   "pom": "sha256-CF4FlMbIuKBRMfa1OjcnIQ7EVgulP739XXFkui2/JR0="
-  },
-  "systems/manifold#manifold/2023.1.28": {
-   "jar": "sha256-kPQeNEgFGZkZPz3zejWHU9+npn6RYRpMgOftt+bksRw=",
-   "pom": "sha256-R2kHxQVkoYLTSSIm/jJhjeRx4uObTuHlTSWVp+jBkpw="
-  }
- }
-}
--- a/pkgs/ghidra-xenia-v2/extensions/lightkeeper/default.nix
+++ b/pkgs/ghidra-xenia-v2/extensions/lightkeeper/default.nix
@ -5,13 +5,13 @@
 }:
 buildGhidraExtension rec {
  pname = "lightkeeper";
-  version = "1.2.4";
+  version = "1.1.1";

  src = fetchFromGitHub {
    owner = "WorksButNotTested";
    repo = "lightkeeper";
    rev = version;
-    hash = "sha256-aGMWg6VQleKH/txlxpSw19QOotWZSqeW5Ve2SpWGhgA=";
+    hash = "sha256-Emyo4GBrR725jDxRsStC6/4F9mYnRo3S3QY0GeB/BvI=";
  };
  preConfigure = ''
    cd lightkeeper
--- a/pkgs/ghidra-xenia-v2/extensions/wasm/default.nix
+++ b/pkgs/ghidra-xenia-v2/extensions/wasm/default.nix
@ -1,43 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  buildGhidraExtension,
-  ghidra,
-  ant,
-}:
-let
-  version = "2.3.1";
-in
-buildGhidraExtension {
-  pname = "wasm";
-  inherit version;
-
-  src = fetchFromGitHub {
-    owner = "nneonneo";
-    repo = "ghidra-wasm-plugin";
-    rev = "v${version}";
-    hash = "sha256-aoSMNzv+TgydiXM4CbvAyu/YsxmdZPvpkZkYEE3C+V4=";
-  };
-
-  nativeBuildInputs = [ ant ];
-
-  configurePhase = ''
-    runHook preConfigure
-
-    # this doesn't really compile, it compresses sinc into sla
-    pushd data
-    ant -f build.xml -Dghidra.install.dir=${ghidra}/lib/ghidra sleighCompile
-    popd
-
-    runHook postConfigure
-  '';
-
-  meta = {
-    description = "Ghidra Wasm plugin with disassembly and decompilation support";
-    homepage = "https://github.com/nneonneo/ghidra-wasm-plugin";
-    downloadPage = "https://github.com/nneonneo/ghidra-wasm-plugin/releases/tag/v${version}";
-    changelog = "https://github.com/nneonneo/ghidra-wasm-plugin/releases/tag/v${version}";
-    license = lib.licenses.gpl3;
-    maintainers = [ lib.maintainers.BonusPlay ];
-  };
-}
--- a/pkgs/lix/lix-plugins/0001-implement-lix-support.patch
+++ b/pkgs/lix/lix-plugins/0001-implement-lix-support.patch
@ -1,14 +1,14 @@
-From d9e022548aff94e90914baa921ddb4cd939c0e5c Mon Sep 17 00:00:00 2001
+From 10a24d7831f51549d8c05193a0fbc329cc327fbe Mon Sep 17 00:00:00 2001
 From: xenia <xenia@awoo.systems>
 Date: Sat, 21 Dec 2024 15:33:10 -0500
 Subject: [PATCH] implement lix support

 ---
- CMakeLists.txt          | 27 ------------
- extra-builtins.cc       | 91 ++++++++++++++++-------------------------
- meson.build             | 18 ++++++++
+ CMakeLists.txt          | 27 -------------
+ extra-builtins.cc       | 87 ++++++++++++++++-------------------------
+ meson.build             | 18 +++++++++
 nix-plugins-config.h.in |  3 --
- 4 files changed, 53 insertions(+), 86 deletions(-)
+ 4 files changed, 51 insertions(+), 84 deletions(-)
 delete mode 100644 CMakeLists.txt
 create mode 100644 meson.build
 delete mode 100644 nix-plugins-config.h.in
@ -47,7 +47,7 @@ index 9674fe8..0000000
 -
 -install(TARGETS nix-extra-builtins DESTINATION lib/nix/plugins)
 diff --git a/extra-builtins.cc b/extra-builtins.cc
-index 3a0f90e..95aef5e 100644
+index 3a0f90e..f2978f8 100644
 --- a/extra-builtins.cc
 +++ b/extra-builtins.cc
@@ -1,12 +1,8 @@
@ -68,12 +68,8 @@ index 3a0f90e..95aef5e 100644
 
 using namespace nix;
 
-@@ -21,42 +17,41 @@ static ExtraBuiltinsSettings extraBuiltinsSettings;
- 
- static GlobalConfig::Register rp(&extraBuiltinsSettings);
- 
-static void extraBuiltins(EvalState & state, const PosIdx pos,
-+static void extraBuiltins(EvalState & state,
+@@ -24,39 +20,38 @@ static GlobalConfig::Register rp(&extraBuiltinsSettings);
+ static void extraBuiltins(EvalState & state, const PosIdx pos,
     Value ** _args, Value & v)
 {
 -    static auto extraBuiltinsFile = state.rootPath(CanonPath(extraBuiltinsSettings.extraBuiltinsFile.to_string()));
@ -134,9 +130,8 @@ index 3a0f90e..95aef5e 100644
 +        Value* arg = state.ctx.mem.allocValue();
 +        arg->mkAttrs(attrs);
         v.mkApp(fun, arg);
-        state.forceValue(v, pos);
+         state.forceValue(v, pos);
 -    } catch (FileNotFound &) {
-+        state.forceValue(v, noPos);
 +    } catch (SysError &) {
         v.mkNull();
     }
@ -195,5 +190,5 @@ index 459fea8..0000000
 -#define NIX_CFLAGS_OTHER "@NIX_CFLAGS_OTHER@"
 -#define BOOST_INCLUDE_DIR "@BOOST_INCLUDE_DIR@"
 -- 
-2.49.0
+2.47.2

--- a/pkgs/lix/lix-plugins/default.nix
+++ b/pkgs/lix/lix-plugins/default.nix
@ -30,7 +30,6 @@
  buildInputs = [
    lix
    boost182
-    (lix.capnproto-lix)
  ];

  meta = {
--- a/pkgs/rust/zbasefind/default.nix
+++ b/pkgs/rust/zbasefind/default.nix
@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-orvXNhM1WKlJ6j5Nuap0kZarydcujoEmF+OrdX7iFmA=";
  };

-  cargoHash = "sha256-m8lXHfj6W/qltK+WrT0rE0gDNvvhghcXkeiX3Slx9X8=";
+  cargoHash = "sha256-7/SP+drJWg2c4bsd3d4ge8E9BJZykbWfjgC2lSJhqas=";

  meta = {
    description = "A firmware base address search tool";
--- a/pkgs/tex/moloch/default.nix
+++ b/pkgs/tex/moloch/default.nix
@ -1,94 +0,0 @@
-{
-  fetchFromGitea,
-  writeShellScript,
-  writableTmpDirAsHomeHook,
-
-  stdenvNoCC,
-
-  texlivePackages,
-  texliveBasic,
-}:
-let
-  texEnv = texliveBasic.withPackages (ps: with ps; [
-    # l3build
-    beamer
-    biblatex
-    enumitem
-    fileinfo
-    hypdoc
-    hyperref
-    listings
-    metalogo
-    parskip
-    pgf
-    pgfopts
-    setspace
-    xurl
-    microtype
-
-    latexmk
-  ]);
-in stdenvNoCC.mkDerivation rec {
-  pname = "moloch";
-  version = "1.0.2-DEV-xenia";
-
-  outputs = [
-    "tex"
-    "texdoc"
-  ];
-
-  passthru.tlDeps = with texlivePackages; [ latex ];
-
-  src = fetchFromGitea {
-    domain = "git.lain.faith";
-    owner = "haskal";
-    repo = "${pname}-dragon";
-    rev = "v${version}";
-    hash = "sha256-eMlhJj4a2HTDhDzkS9KR+d76lt81iH7x//WZOA39tno=";
-  };
-
-  dontConfigure = true;
-
-  nativeBuildInputs = [
-    texEnv
-
-    # multiple-outputs.sh fails if $out is not defined
-    (writeShellScript "force-tex-output.sh" ''
-      out="''${tex-}"
-    '')
-
-    writableTmpDirAsHomeHook # Need a writable $HOME for latexmk
-  ];
-
-  # we just build manually, but moloch's own method of building is using l3build
-  # i have no idea how to get that working, so for now just do it normal style
-  buildPhase = ''
-    runHook preBuild
-
-    # Generate the style files
-    cd src
-    latex beamertheme${pname}.ins
-
-    # Generate the documentation
-    cp ../doc/${pname}.tex .
-    latexmk -pdf ${pname}.tex
-
-    cd ..
-
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    path="$tex/tex/latex/${pname}"
-    mkdir -p "$path"
-    cp src/*.{cls,def,clo,sty} "$path/"
-
-    path="$texdoc/doc/tex/latex/${pname}"
-    mkdir -p "$path"
-    cp src/${pname}.pdf "$path/"
-
-    runHook postInstall
-  '';
-}
--- a/pkgs/zfs/0001-ZED-add-support-for-desktop-notifications-D-Bus.patch
+++ b/pkgs/zfs/0001-ZED-add-support-for-desktop-notifications-D-Bus.patch
@ -1,18 +1,18 @@
-From bf7fcd7f1213b4690dc95453117c55e12e5fa523 Mon Sep 17 00:00:00 2001
+From 4ec38cf16ad4cc5f7bb00b93c32cd8f1d313c14c Mon Sep 17 00:00:00 2001
 From: xenia <xenia@awoo.systems>
 Date: Mon, 3 Feb 2025 21:36:29 -0500
 Subject: [PATCH] ZED: add support for desktop notifications (D-Bus)

 ---
 cmd/zed/zed.d/zed-functions.sh | 85 ++++++++++++++++++++++++++++++++++
- cmd/zed/zed.d/zed.rc           |  8 ++++
- 2 files changed, 93 insertions(+)
+ cmd/zed/zed.d/zed.rc           |  7 +++
+ 2 files changed, 92 insertions(+)

 diff --git a/cmd/zed/zed.d/zed-functions.sh b/cmd/zed/zed.d/zed-functions.sh
-index 6e00f153b..472941d10 100644
+index 3a2519633..d47ef070b 100644
 --- a/cmd/zed/zed.d/zed-functions.sh
 +++ b/cmd/zed/zed.d/zed-functions.sh
-@@ -213,6 +213,10 @@ zed_notify()
+@@ -209,6 +209,10 @@ zed_notify()
     [ "${rv}" -eq 0 ] && num_success=$((num_success + 1))
     [ "${rv}" -eq 1 ] && num_failure=$((num_failure + 1))
 
@ -23,7 +23,7 @@ index 6e00f153b..472941d10 100644
     [ "${num_success}" -gt 0 ] && return 0
     [ "${num_failure}" -gt 0 ] && return 1
     return 2
-@@ -724,6 +728,87 @@ zed_notify_gotify()
+@@ -624,6 +628,87 @@ zed_notify_ntfy()
 }
 
 
@ -112,14 +112,13 @@ index 6e00f153b..472941d10 100644
 # zed_rate_limit (tag, [interval])
 #
 diff --git a/cmd/zed/zed.d/zed.rc b/cmd/zed/zed.d/zed.rc
-index af56147a9..7917552c5 100644
+index 859c6f9cb..567cd556a 100644
 --- a/cmd/zed/zed.d/zed.rc
 +++ b/cmd/zed/zed.d/zed.rc
-@@ -197,3 +197,11 @@ ZED_SYSLOG_SUBCLASS_EXCLUDE="history_event"
- # Gotify application associated with ZED_GOTIFY_APPTOKEN.
- # Value is an integer 0 and up.
- #ZED_GOTIFY_PRIORITY=""
-+
+@@ -176,3 +176,10 @@ ZED_SYSLOG_SUBCLASS_EXCLUDE="history_event"
+ #  <https://docs.ntfy.sh/install/>
+ # https://ntfy.sh by default; uncomment to enable an alternative service url.
+ #ZED_NTFY_URL="https://ntfy.sh"
 +
 +##
 +# Whether to send desktop notifications via D-Bus
@ -128,5 +127,5 @@ index af56147a9..7917552c5 100644
 +# Disabled by default; uncomment to enable.
 +#ZED_USE_DBUS=1
 -- 
-2.47.2
+2.47.0

--- a/templates/beamer/.envrc
+++ b/templates/beamer/.envrc
@ -1 +0,0 @@
-use flake
--- a/templates/beamer/.gitignore
+++ b/templates/beamer/.gitignore
@ -1,16 +0,0 @@
-/my-beamer-presentation.pdf
-
-*.aux
-*.fdb_latexmk
-*.fls
-*.log
-*.nav
-*.out
-*.snm
-*.synctex.gz
-*.toc
-
-result
-result-tex
-
-.direnv
--- a/templates/beamer/flake.nix
+++ b/templates/beamer/flake.nix
@ -1,46 +0,0 @@
-{
-  description = "A very basic presentation with Beamer";
-
-  outputs = { self, dragnpkgs } @ inputs: dragnpkgs.lib.mkFlake {
-    # Define a texlive environment to use
-    packages.texlive-custom = { texliveMedium, texliveDragonPackages }:
-      texliveMedium.withPackages (ps: with ps; [
-        fontawesome5
-        texliveDragonPackages.moloch
-      ]);
-
-    # Package definition for building the PDF
-    packages.default = { system, stdenvNoCC }: stdenvNoCC.mkDerivation rec {
-      pname = "my-beamer-presentation";
-
-      name = "${pname}.pdf";
-
-      nativeBuildInputs = [
-        self.packages.${system}.texlive-custom
-      ];
-
-      src = self;
-
-      buildPhase = ''
-        latexmk -pdf ${pname}.tex
-      '';
-
-      installPhase = ''
-        cp ${pname}.pdf $out
-      '';
-    };
-
-    # Runnable package (ie `nix run`) to start the presentation
-    apps.default = { lib, system, writeShellScript, pympress }: {
-      type = "app";
-      program = "${writeShellScript "start-presentation" ''
-        exec ${lib.getExe pympress} ${self.packages.${system}.default}
-      ''}";
-    };
-
-    # Devshell definition to expose the texlive environment to eg nvim
-    devShells.default = { mkShell, system }: mkShell {
-      packages = [ self.packages.${system}.texlive-custom ];
-    };
-  };
-}
--- a/templates/beamer/my-beamer-presentation.tex
+++ b/templates/beamer/my-beamer-presentation.tex
@ -1,93 +0,0 @@
-\documentclass[aspectratio=169]{beamer}
-\usepackage[english]{babel}
-\usepackage{fontawesome5}
-\usepackage{tikz}
-\usetikzlibrary{arrows,calc,fit,positioning}
-
-
-\usetheme{moloch}
-\usefonttheme[onlymath]{serif}
-
-
-% this can be commented out to produce a slide deck with no notes
-\setbeameroption{show notes}
-
-
-% useful tikz styles from previous slide decks
-\tikzset{%
-  icon/.value required,
-  icon/.style={%
-    node contents={\faIcon{#1}},
-    icon size=normal,
-  },
-  icon size/.is choice,
-  icon size/.default=normal,
-  icon size/normal/.style={%
-    font={\fontsize{20.74}{20.74}\selectfont}
-  },
-  icon size/small/.style={%
-    font={\fontsize{12}{12}\selectfont}
-  },
-  rounded box/.style={%
-    inner sep=0.3em,
-    draw,
-    rounded corners,
-    line width=0.1em
-  },
-  sequence diagram/.style={%
-    font=\small,
-    line width=1pt,
-    sequence/.style={%
-      every to/.style={%
-        to path={(\tikztostart) -- (\tikztostart -| \tikztotarget) \tikztonodes} % chktex 1 chktex 8
-      },
-      ->/.style={-stealth,every node/.style={above}},
-      <-/.style={stealth-,every node/.style={below}},
-    },
-    note/.style={%
-      color=example text.fg,
-    },
-  },
-}
-
-
-\title{My Beamer Presentation}
-\subtitle{(From the template)}
-\author{You}
-\institute{Institute of Swag Nix Templates}
-\date{Now}
-
-
-\begin{document}
-
-\maketitle
-
-\section{My Section}
-\subsection{My Subsection}
-
-\begin{frame}
-  \frametitle{Some Slide Title}
-
-  Sample text
-\end{frame}
-
-\begin{frame}
-  \frametitle{Some Other Slide Title}
-
-  Sample text 2
-\end{frame}
-
-
-\appendix
-
-\begin{frame}[standout]
-  Backup Slides
-\end{frame}
-
-\begin{frame}
-  \frametitle{Backup slide 1}
-
-  Some backup slide content
-\end{frame}
-
-\end{document}
Author	SHA1	Message	Date
xenia	49725af5bf	make nix conform to xdg	2025-04-19 23:59:50 -04:00
xenia	df9143967c	update default lix settings	2025-04-19 03:12:18 -04:00
xenia	c61b3cc14c	update nixpkgs and lix, fix lix-plugins	2025-04-19 02:49:57 -04:00
xenia	8ccff327c0	fix python overlay	2025-04-16 18:12:51 -04:00
xenia	0607c2aac9	pkgs: add patch for pympress	2025-04-07 12:48:59 -04:00
xenia	00b9846621	pkgs: add megacom	2025-03-27 19:29:47 -04:00
xenia	a4b2ce70a8	update nixpkgs	2025-03-24 20:06:55 -04:00
xenia	f4348768df	change the way the zfs patch works	2025-02-05 15:38:24 -05:00
xenia	d0dfe01002	oops	2025-02-03 22:27:40 -05:00
xenia	87bf9f5e0c	add ZED libnotify patch to zfs	2025-02-03 21:55:32 -05:00
xenia	96d7aca602	treewide: add meta	2024-12-21 17:08:31 -05:00
xenia	444c47a548	oops 42071	2024-12-21 16:35:15 -05:00
xenia	e23d199b00	oops 42070	2024-12-21 16:26:30 -05:00
xenia	8347d35d44	oops 42069	2024-12-21 16:12:39 -05:00
xenia	81788bdb46	oops 4	2024-12-21 16:00:41 -05:00
xenia	d300bd56fb	oops 3	2024-12-21 15:58:22 -05:00
xenia	8a31dd880d	oops 2	2024-12-21 15:56:40 -05:00
xenia	fa40f2533e	oops	2024-12-21 15:55:18 -05:00
xenia	8ab9173e29	add user level version of crimes	2024-12-21 15:54:11 -05:00
xenia	be08f6b73e	oops	2024-12-17 02:33:34 -05:00
xenia	0b39734c7a	experiment	2024-12-17 02:30:37 -05:00
xenia	9e31048110	genericize	2024-12-17 01:57:06 -05:00
xenia	e5dd2071ec	oops 2	2024-12-17 01:50:04 -05:00
xenia	b4a1ccbd71	oops	2024-12-17 01:45:54 -05:00
xenia	ec2a795b9b	streamline unfree licensing	2024-12-17 01:41:49 -05:00
xenia	2c64b6a902	fix precedence	2024-12-17 01:13:54 -05:00
xenia	f1a03dbf33	lmao whoops	2024-12-17 00:54:22 -05:00
xenia	ff3680817c	ghidra: add back doc entries that are needed	2024-12-17 00:54:16 -05:00
xenia	64d9bae0ce	updoot nixpkgs	2024-12-15 19:35:15 -05:00
xenia	529b390d13	oops	2024-12-02 02:19:49 -05:00
xenia	e67fb3b037	add templates	2024-12-02 02:14:04 -05:00
xenia	984654610a	add option for nixpkgs reference in flake registry	2024-12-02 01:55:57 -05:00
xenia	4259429d0c	oops	2024-12-02 00:24:10 -05:00
xenia	c851c6f345	kicad patch needs update so use upstream for now	2024-12-01 23:44:05 -05:00
xenia	8a370b9c9d	update readme	2024-12-01 23:25:04 -05:00
xenia	f76206bc6f	unstable -> stable	2024-12-01 23:20:24 -05:00
xenia	c8a4d759b8	updates for 24.11 and other things	2024-12-01 23:19:10 -05:00
xenia	945e1f9915	use resholve	2024-12-01 22:11:18 -05:00
xenia	30d18a7b68	WIP archlinux bootstrap from nixos	2024-12-01 22:11:18 -05:00
xenia	17f9a4a758	pkgs: add ocaml-manual	2024-11-28 02:05:39 -05:00
xenia	80019480c4	mkFlake: passthrough derivations	2024-11-27 23:03:12 -05:00
xenia	3d44369166	update lix and nixpkgs	2024-11-27 22:49:12 -05:00
xenia	3577ecd90e	pkgs: add systemd-ml	2024-11-27 22:30:22 -05:00
xenia	00e10e615f	pkgs: add zbasefind	2024-11-27 22:30:22 -05:00
xenia	5d6ad133ed	feedvalidator to python3Packages	2024-11-27 22:30:22 -05:00
xenia	8050f32752	pkgs: update ghidra extensions	2024-11-21 13:05:16 -05:00
xenia	98f22d7a09	pkgs: cado-nfs: makeWrapper -> makeBinaryWrapper	2024-11-21 12:57:04 -05:00
xenia	c0912c19cf	pkgs: ghidra -> 11.2.1	2024-11-21 12:56:59 -05:00
xenia	366544005a	fork off 24.11	2024-11-21 12:34:53 -05:00