From e12a19abf505dbc6128c4e5b6f7b8ac0c129892a Mon Sep 17 00:00:00 2001
From: xfnw <xfnw@riseup.net>
Date: Thu, 27 May 2021 19:08:05 +0000
Subject: [PATCH] moar packages

---
 blix.nix         |  6 +++---
 pkgs/catgirl.nix | 26 --------------------------
 2 files changed, 3 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/catgirl.nix

diff --git a/blix.nix b/blix.nix
index 38c5d84..9b93750 100644
--- a/blix.nix
+++ b/blix.nix
@@ -74,8 +74,8 @@ TE5AAAAIDBUk5IjB3+trnVO6pncivFbOetUL8BPTl3CwAtk4532 xfnw@raven" ];
     # disk analysis
     testdisk squashfs-tools-ng ddrescue volatility
     stegseek apktool adbfs-rootless ursadb android-udev-rules
-    valgrind dos2unix file exiftool foremost pngcheck steghide
-    docker
+    valgrind dos2unix file exiftool foremost pngcheck
+    docker xcd
 
     # exploit
     doona metasploit twa wifite2 burpsuite wpscan wfuzz
@@ -99,7 +99,7 @@ TE5AAAAIDBUk5IjB3+trnVO6pncivFbOetUL8BPTl3CwAtk4532 xfnw@raven" ];
     python3Packages.binwalk
 
     # disclosure
-    cherrytree (callPackage ./pkgs/catgirl.nix { })
+    catgirl
   ];
 
   environment.variables.GC_INITIAL_HEAP_SIZE = "1M";
diff --git a/pkgs/catgirl.nix b/pkgs/catgirl.nix
deleted file mode 100644
index 607686f..0000000
--- a/pkgs/catgirl.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-
-{lib, stdenv, fetchurl, ncurses, libressl, man, pkg-config, ctags}:
-
-stdenv.mkDerivation rec {
-  pname = "catgirl";
-  version = "1.6";
-
-  src = fetchurl {
-    url = "https://git.causal.agency/catgirl/snapshot/${pname}-${version}.tar.gz";
-    sha256 = "0shg02zidqqmvywqqsaazlgg9rd5lhhrvjx6n0lzmdfaawxywciv";
-  };
-
-  nativeBuildInputs = [ pkg-config ctags ];
-  buildInputs = [ ncurses libressl man ];
-  strictDeps = true;
-
-  meta = with lib; {
-    homepage = "https://git.causal.agency/catgirl/about/";
-    license = licenses.gpl3Plus;
-    description = "A TLS-only terminal IRC client";
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ xfnw ];
-  };
-}
-
-