Add ironclad

3 files changed, 30 insertions, 4 deletions

diff --git a/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh b/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh
index 742e880c4f13..8693a304899a 100755
--- a/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh
+++ b/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh
@@ -130,20 +130,21 @@ url="${ql_src##* }"
 }
 
 [ "$ql_src_type" = froydware-http ] && {
-  dirurl = "http://method-combination.net/lisp/files/";
-  url="$("$(dirname "$0")/../../../build-support/upstream-updater/urls-from-page.sh" "$dirurl" | grep "/$url_" | tail -n 1)"
+  dirurl="http://method-combination.net/lisp/files/";
+  url="$("$(dirname "$0")/../../../build-support/upstream-updater/urls-from-page.sh" "$dirurl" |
+    grep "/${url}_" | grep -v "[.]asc\$" | tail -n 1)"
   ql_src_type=http
 }
 
 [ "$ql_src_type" = http ] && {
   fetcher="pkgs.fetchurl";
-  version="$(echo "$url" | sed -re 's@.*-([0-9.]+)[-._].*@\1@')"
+  version="$(echo "$url" | sed -re 's@.*[-_]([0-9.]+)[-._].*@\1@')"
   hash="$(nix-prefetch-url "$url" | grep . | tail -n 1)"
 }
 
 [ "$ql_src_type" = https ] && {
   fetcher="pkgs.fetchurl";
-  version="$(echo "$url" | sed -re 's@.*-([0-9.]+)[-._].*@\1@')"
+  version="$(echo "$url" | sed -re 's@.*[-_]([0-9.]+)[-._].*@\1@')"
   hash="$(nix-prefetch-url "$url" | grep . | tail -n 1)"
 }
 
diff --git a/pkgs/development/lisp-modules/from-quicklisp/tmp.nix b/pkgs/development/lisp-modules/from-quicklisp/tmp.nix
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/pkgs/development/lisp-modules/from-quicklisp/tmp.nix
+++ /dev/null
diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index af50ba75bdf4..a0b8602a0a1d 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -507,5 +507,30 @@ let lispPackages = rec {
       rev = ''b21e8757210a1eb2a47104a563f58bf82ba9a579'';
     };
   };
+
+  nibbles = buildLispPackage rec {
+    baseName = "nibbles";
+    version = "git-20141116";
+    description = "A library for accessing octet-addressed blocks of data";
+    deps = [];
+    # Source type: git
+    src = pkgs.fetchgit {
+      url = ''https://github.com/froydnj/nibbles'';
+      sha256 = "39ad95be2b9f9ea80dbccd205a0ed6f9c5ef175a10da6eec55b7ba09a8f1a76a";
+      rev = ''ace095d85e48b18bf9cf9e21249ba7fb57e3efe2'';
+    };
+  };
+
+  ironclad = buildLispPackage rec {
+    baseName = "ironclad";
+    version = "0.33.0";
+    description = "A cryptographic toolkit written in pure Common Lisp";
+    deps = [nibbles];
+    # Source type: http
+    src = pkgs.fetchurl {
+      url = ''http://method-combination.net/lisp/files/ironclad_0.33.0.tar.gz'';
+      sha256 = "1ld0xz8gmi566zxl1cva5yi86aw1wb6i6446gxxdw1lisxx3xwz7";
+    };
+  };
 };
 in lispPackages