public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging' into modular-stdenv

Browse Source 
Conflicts:
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/stdenv/linux/default.nix
This commit is contained in:
Vladimír Čunát
2014-09-08 18:24:58 +02:00
parent 1e389c976c 152ae27aac
commit 82797f98f2
1452 changed files with 35052 additions and 23463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/lisp-modules/asdf/default.nix
View File

@@ -3,11 +3,11 @@ let
s = # Generated upstream information
rec {
baseName="asdf";
version="3.1.2";
version="3.1.3";
name="${baseName}-${version}";
hash="0d427908q4hcspmdhc5ps38dbvz113hy6687l9ypmfl79qfb2qki";
url="http://common-lisp.net/project/asdf/archives/asdf-3.1.2.tar.gz";
sha256="0d427908q4hcspmdhc5ps38dbvz113hy6687l9ypmfl79qfb2qki";
hash="11jgbl2ys98i7lir0z76g0msm89zmz1b91gwkdz0gnxr6gavj6cn";
url="http://common-lisp.net/project/asdf/archives/asdf-3.1.3.tar.gz";
sha256="11jgbl2ys98i7lir0z76g0msm89zmz1b91gwkdz0gnxr6gavj6cn";
};
buildInputs = [
texinfo texLive
@@ -29,7 +29,6 @@ stdenv.mkDerivation {
cp -r ./* "$out"/lib/common-lisp/asdf/
cp -r doc/* "$out"/share/doc/asdf/
'';
sourceRoot=".";
meta = {
inherit (s) version;
description = ''Standard software-system definition library for Common Lisp'';