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

Merge remote-tracking branch 'hydra/master' into x-updates

Browse Source 
Conflicts (taken from @7c6f434c):
	pkgs/development/libraries/libgphoto2/default.nix
This commit is contained in:
Vladimír Čunát
2013-06-08 15:41:39 +00:00
parent ba6c764a51 8c4a613f3a
commit 7db886fdb9
60 changed files with 1231 additions and 864 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/compilers/bigloo/default.nix
View File

@@ -1,10 +1,11 @@
{ fetchurl, stdenv }:
stdenv.mkDerivation rec {
name = "bigloo3.7a";
name = "bigloo-${version}";
version = "3.7a";
src = fetchurl {
url = "ftp://ftp-sop.inria.fr/indes/fp/Bigloo/${name}.tar.gz";
url = "ftp://ftp-sop.inria.fr/indes/fp/Bigloo/bigloo${version}.tar.gz";
sha256 = "0y8i87c2bpqzap8rhzgpyfgdzq21py5xq6mgp0w6xv4rjcj9d0v1";
};

2
pkgs/development/compilers/hugs/default.nix
View File

@@ -4,7 +4,7 @@ let edf = composableDerivation.edf;
wwf = composableDerivation.wwf; in
composableDerivation.composableDerivation {} {
name = "hugs98";
name = "hugs98-200609";
src = fetchurl {
url = http://cvs.haskell.org/Hugs/downloads/2006-09/hugs98-Sep2006.tar.gz;