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

Merge remote-tracking branch 'origin/master' into staging

Browse Source 
Conflicts:
	pkgs/stdenv/generic/default.nix
This commit is contained in:
Eelco Dolstra
2014-11-06 10:16:39 +01:00
parent c964077200 782a12e450
commit 0518ccf5af
232 changed files with 3422 additions and 1035 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/cmucl/binary.nix
View File

@@ -35,7 +35,7 @@ stdenv.mkDerivation {
which runs on most major Unix platforms. It mainly conforms to the
ANSI Common Lisp standard.
'';
license = "free"; # public domain
license = stdenv.lib.licenses.free; # public domain
homepage = http://www.cons.org/cmucl/;
};
}

2
pkgs/development/compilers/emscripten-fastcomp/default.nix
View File

@@ -37,6 +37,6 @@ stdenv.mkDerivation rec {
homepage = https://github.com/kripken/emscripten-fastcomp;
description = "emscripten llvm";
maintainers = with maintainers; [ bosu ];
license = "University of Illinois/NCSA Open Source License";
license = stdenv.lib.licenses.ncsa;
};
}

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

@@ -23,6 +23,6 @@ stdenv.mkDerivation {
meta = {
description = "Intel ACPI Compiler";
homepage = http://www.acpica.org/;
license = "iasl"; # FIXME: is this a free software license?
license = stdenv.lib.licenses.iasl;
};
}

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

@@ -56,6 +56,6 @@ stdenv.mkDerivation rec {
description = "Cross platform, open source .NET development framework";
platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice ];
license = "free"; # Combination of LGPL/X11/GPL ?
license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ?
};
}

8
pkgs/development/compilers/ocaml/3.10.0.nix
View File

@@ -1,9 +1,9 @@
{ stdenv, fetchurl, x11, ncurses }:
stdenv.mkDerivation (rec {
name = "ocaml-3.10.0";
src = fetchurl {
url = "http://caml.inria.fr/pub/distrib/ocaml-3.10/${name}.tar.bz2";
sha256 = "1ihmx1civ78s7k2hfc05z1s9vbyx2qw7fg8lnbxnfd6zxkk8878d";
@@ -13,7 +13,7 @@ stdenv.mkDerivation (rec {
configureFlags = ["-no-tk" "-x11lib" x11];
buildFlags = "world bootstrap world.opt";
buildInputs = [x11 ncurses];
installTargets = "install installopt";
installTargets = "install installopt";
patchPhase = ''
CAT=$(type -tp cat)
sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
@@ -25,7 +25,7 @@ stdenv.mkDerivation (rec {
meta = {
homepage = http://caml.inria.fr/ocaml;
license = "QPL, LGPL2 (library part)";
license = with stdenv.lib.licenses; [ qpl lgpl2 ];
description = "Most popular variant of the Caml language";
};

8
pkgs/development/compilers/ocaml/metaocaml-3.09.nix
View File

@@ -1,9 +1,9 @@
{ stdenv, fetchurl, x11, ncurses }:
stdenv.mkDerivation (rec {
name = "metaocaml-3.09-alpha-30";
src = fetchurl {
url = "http://www.metaocaml.org/dist/old/MetaOCaml_309_alpha_030.tar.gz";
sha256 = "0migbn0zwfb7yb24dy7qfqi19sv3drqcv4369xi7xzpds2cs35fd";
@@ -13,7 +13,7 @@ stdenv.mkDerivation (rec {
configureFlags = ["-no-tk" "-x11lib" x11];
buildFlags = "world bootstrap world.opt";
buildInputs = [x11 ncurses];
installTargets = "install installopt";
installTargets = "install installopt";
patchPhase = ''
CAT=$(type -tp cat)
sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
@@ -25,7 +25,7 @@ stdenv.mkDerivation (rec {
meta = {
homepage = http://www.metaocaml.org/;
license = "QPL, LGPL2 (library part)";
license = with stdenv.lib.licenses; [ qpl lgpl2 ];
desctiption = "A compiled, type-safe, multi-stage programming language";
};

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

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://www.dcc.fc.up.pt/~vsc/Yap/";
description = "Yap Prolog System is a ISO-compatible high-performance Prolog compiler";
license = "artistic";
license = stdenv.lib.licenses.artistic2;
maintainers = [ stdenv.lib.maintainers.simons ];
platforms = stdenv.lib.platforms.linux;