about summary refs log tree commit diff
diff options
context:
space:
mode:
authorsternenseemann <sternenseemann@systemli.org>2022-11-28 18:28:51 +0100
committersternenseemann <sternenseemann@systemli.org>2022-11-28 18:30:15 +0100
commit32b8af8c826fb7be143e692d3f13b9572841d318 (patch)
tree48fa5f96b082a3a2bcceac23cc4daf32fd06292d
parent059d086311514de38002c5bc083cddaae8e20e79 (diff)
pkgs/sternenseemann: remove everything shakti
Since shakti's k9 is no longer available for download, this is quite
nonsensical to keep around. When it becomes available again, I'll be
better off downloading it and saving it locally somewhere. Nixified
shakti will just end up being garbage collected…

The k-gpp idea wasn't bad, but not great either.
-rw-r--r--pkgs/sternenseemann/default.nix3
-rw-r--r--pkgs/sternenseemann/scripts/default.nix25
-rw-r--r--pkgs/sternenseemann/shakti/default.nix36
3 files changed, 1 insertions, 63 deletions
diff --git a/pkgs/sternenseemann/default.nix b/pkgs/sternenseemann/default.nix
index 8f9b4e33..e1755141 100644
--- a/pkgs/sternenseemann/default.nix
+++ b/pkgs/sternenseemann/default.nix
@@ -58,7 +58,6 @@ lib.fix (self: {
 
   scripts = dontRecurseIntoAttrs (callPackage ./scripts {
     inherit (writers) writeBashBin;
-    inherit (self) shakti;
     inherit getBins;
   });
 
@@ -111,6 +110,4 @@ lib.fix (self: {
 
   # packaged 3rd party software
   saneterm = pkgs.python39Packages.callPackage ./saneterm { };
-
-  shakti = callPackage ./shakti { };
 })
diff --git a/pkgs/sternenseemann/scripts/default.nix b/pkgs/sternenseemann/scripts/default.nix
index 010bd6cd..35e2cf70 100644
--- a/pkgs/sternenseemann/scripts/default.nix
+++ b/pkgs/sternenseemann/scripts/default.nix
@@ -5,7 +5,6 @@
 , ghostscript
 , openssl
 , perl, mandoc
-, shakti
 , gpp
 }:
 
@@ -32,10 +31,7 @@ let
     /home/lukas/files/serverkram/minecraft/
   '';
 
-  bins = (getBins shakti [ "k-repl" ])
-      // (getBins gpp [ "gpp" ])
-      // (getBins perl [ "perl" ])
-      // (getBins cryptsetup [ "cryptsetup" ])
+  bins = (getBins cryptsetup [ "cryptsetup" ])
       // (getBins borgbackup [ "borg" ])
       // (getBins mandoc [ "man" ])
       // (getBins openssl [ "openssl" ])
@@ -197,23 +193,4 @@ lib.fix (self: {
       printf '\a'
     fi
   '';
-
-  k-gpp = writeBashBin "k-gpp" ''
-    if [[ $# > 1 ]]; then
-      echo "$0: max one argument allowed" >&2
-      exit 1
-    fi
-
-    if [[ ! -z "$1" ]]; then
-      preprocessed="$(mktemp --suffix=".k")"
-      echo "gpp $1 -o $preprocessed" >&2
-      ${bins.gpp} "$1" -o "$preprocessed"
-      ${bins.k-repl} "$preprocessed"
-      status=$?
-      rm "$preprocessed"
-      exit $status
-    else
-      ${bins.k-repl}
-    fi
-  '';
 })
diff --git a/pkgs/sternenseemann/shakti/default.nix b/pkgs/sternenseemann/shakti/default.nix
deleted file mode 100644
index 6046cae3..00000000
--- a/pkgs/sternenseemann/shakti/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ lib, stdenv, fetchurl, patchelf, rlwrap, makeWrapper }:
-
-stdenv.mkDerivation {
-  pname = "shakti";
-  version = "unstable-2021-08-23";
-
-  src = fetchurl {
-    # mi2.0 would be for darwin but idc
-    url = "https://shakti.com/download/li2.0?eula=shakti.com/license";
-    sha256 = "17gpicya5cywpzzn4cj6m4dcw1dn71wi6z284q3czli5risk3vwy";
-  };
-
-  dontUnpack = true;
-
-  nativeBuildInputs = [ patchelf makeWrapper ];
-
-  installPhase = ''
-    install -Dm755 $src $out/bin/k
-    patchelf \
-      --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-      $out/bin/k
-
-    makeWrapper "${rlwrap}/bin/rlwrap" "$out/bin/k-repl" \
-      --add-flags "$out/bin/k" --argv0 k-repl
-  '';
-
-  meta = with lib; {
-    homepage = "https://shakti.com";
-    description = "k9 programming language";
-    license = licenses.unfree;
-    # https://shakti.com/download/license
-    platforms = platforms.linux;
-    # hash breakes every few weeks
-    hydraPlatforms = [];
-  };
-}