diff --git a/pkgs/build-support/upstream-updater/update-upstream-data.sh b/pkgs/build-support/upstream-updater/update-upstream-data.sh index b3e0bbe6d30a..61c062518026 100755 --- a/pkgs/build-support/upstream-updater/update-upstream-data.sh +++ b/pkgs/build-support/upstream-updater/update-upstream-data.sh @@ -35,6 +35,7 @@ prefetchClause="" if [ -z "$forcedUrl" ] ; then freshUrl="$("$own_dir"/urls-from-page.sh "$(getAttr downloadPage)" | eval "egrep \"$(getAttr sourceRegexp '.*[.]tar[.].*')\"" | + eval "egrep -v \"$(getAttr blacklistRegexp '^$')\"" | eval "$(getAttr choiceCommand 'head -1')")" if ! egrep ':' <<< "$freshUrl" ; then diff --git a/pkgs/development/compilers/sbcl/src-for-default.nix b/pkgs/development/compilers/sbcl/src-for-default.nix index 356c0e27b5e7..9d4767838023 100644 --- a/pkgs/development/compilers/sbcl/src-for-default.nix +++ b/pkgs/development/compilers/sbcl/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="1.0.32"; - name="sbcl-1.0.32"; - hash="00qwj4wfpk4d5a2mskpr3l9ahnqbvz2av878lcmrc7yj1y64vdqs"; - url="http://prdownloads.sourceforge.net/sbcl/sbcl-1.0.32-source.tar.bz2"; - advertisedUrl="http://prdownloads.sourceforge.net/sbcl/sbcl-1.0.32-source.tar.bz2"; + version="1.0.31"; + name="sbcl-1.0.31"; + hash="16p0yaqla16ys79kzlq7zyxfxhsfsbkr94svf1fvv3rxgc1z9h61"; + url="http://sourceforge.net/projects/sbcl/files/sbcl/1.0.31/sbcl-1.0.31-source.tar.bz2"; + advertisedUrl="http://sourceforge.net/projects/sbcl/files/sbcl/1.0.31/sbcl-1.0.31-source.tar.bz2"; } diff --git a/pkgs/development/compilers/sbcl/src-info-for-default.nix b/pkgs/development/compilers/sbcl/src-info-for-default.nix index 51546654c112..b9ec961c5951 100644 --- a/pkgs/development/compilers/sbcl/src-info-for-default.nix +++ b/pkgs/development/compilers/sbcl/src-info-for-default.nix @@ -1,6 +1,8 @@ { baseName = "sbcl"; - downloadPage = "http://www.sbcl.org/platform-table.html"; - choiceCommand = "head -1 | sed -e 's/[?].*//'"; + downloadPage = "http://sourceforge.net/projects/sbcl/files/"; + choiceCommand = "head -1 | sed -e 's@/download@@'"; + sourceRegexp = "source[.]tar"; versionExtractorSedScript = "s/.*-([0-9.]+)-.*/\\1/"; + blacklistRegexp = "1[.]0[.]32"; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69fb913c7a54..835ce56965bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2207,7 +2207,7 @@ let sbcl = builderDefsPackage (import ../development/compilers/sbcl) { inherit makeWrapper; - clisp = clisp; + clisp = clisp_2_44_1; }; scala = import ../development/compilers/scala {