diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2014-11-16 19:38:12 +0300 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2014-11-16 19:57:12 +0300 |
| commit | 47ae07c56eb931095fb6d572b13a4c07544ccea8 (patch) | |
| tree | 9b5108d65f47ec00044324707847133765ebc1e6 /pkgs/development/lisp-modules/from-quicklisp | |
| parent | 2f53f2ed163e114c4f356faf73d621d543b0940a (diff) | |
| download | nixlib-47ae07c56eb931095fb6d572b13a4c07544ccea8.tar nixlib-47ae07c56eb931095fb6d572b13a4c07544ccea8.tar.gz nixlib-47ae07c56eb931095fb6d572b13a4c07544ccea8.tar.bz2 nixlib-47ae07c56eb931095fb6d572b13a4c07544ccea8.tar.lz nixlib-47ae07c56eb931095fb6d572b13a4c07544ccea8.tar.xz nixlib-47ae07c56eb931095fb6d572b13a4c07544ccea8.tar.zst nixlib-47ae07c56eb931095fb6d572b13a4c07544ccea8.zip | |
Add ironclad
Diffstat (limited to 'pkgs/development/lisp-modules/from-quicklisp')
| -rwxr-xr-x | pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh | 9 | ||||
| -rw-r--r-- | pkgs/development/lisp-modules/from-quicklisp/tmp.nix | 0 |
2 files changed, 5 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 |