From 77b03dbc7112cd20bcebce3f0b7e288f4bc12791 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 7 Jul 2012 20:11:06 +0400 Subject: [PATCH 1/2] update-upstream-data: Fix a small bug --- pkgs/build-support/upstream-updater/attrset-to-dir.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/upstream-updater/attrset-to-dir.sh b/pkgs/build-support/upstream-updater/attrset-to-dir.sh index 0e0c50e12598..2d99ef110a1c 100755 --- a/pkgs/build-support/upstream-updater/attrset-to-dir.sh +++ b/pkgs/build-support/upstream-updater/attrset-to-dir.sh @@ -1,8 +1,8 @@ #! /bin/sh [ -n "$2" ] && NIXPKGS_ALL="$2"; -[ -z "$NIXPKGS_ALL" ] && [ -f "/etc/nixos/nixpkgs" ] && NIXPKGS_ALL="/etc/nixos/nixpkgs"; -[ -z "$NIXPKGS_ALL" ] && [ -f "$HOME/nixpkgs" ] && NIXPKGS_ALL="$HOME/nixpkgs"; +[ -z "$NIXPKGS_ALL" ] && [ -d "/etc/nixos/nixpkgs" ] && NIXPKGS_ALL="/etc/nixos/nixpkgs"; +[ -z "$NIXPKGS_ALL" ] && [ -d "$HOME/nixpkgs" ] && NIXPKGS_ALL="$HOME/nixpkgs"; [ -z "$NIXPKGS_ALL" ] && { echo "Cannot find Nixpkgs source. Please specify it via NIXPKGS_ALL or second command line argument" exit 1 From 253c129f78295b2e4b9d485f0c69d49b541d5b31 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 7 Jul 2012 20:11:55 +0400 Subject: [PATCH 2/2] SBCL: update to 1.0.57 It looks like SBCL 1.0.58 is not coming soon, so I update to the latest release now. --- pkgs/development/compilers/sbcl/src-for-default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/sbcl/src-for-default.nix b/pkgs/development/compilers/sbcl/src-for-default.nix index 66e389947a0a..467ed05a6a44 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.56"; - name="sbcl-1.0.56"; - hash="0cq5hyzv3nnva0y1y6zjyd7rfdwwpxswnvmbfmqvhihz72ivyl1w"; - url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.56/sbcl-1.0.56-source.tar.bz2"; - advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.56/sbcl-1.0.56-source.tar.bz2"; + version="1.0.57"; + name="sbcl-1.0.57"; + hash="1vvifyq0lapx6p6wz6jknsgch3lbyr7m785844wdgkdx2hh8ch51"; + url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.57/sbcl-1.0.57-source.tar.bz2"; + advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.57/sbcl-1.0.57-source.tar.bz2"; }