diff options
author | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2014-11-06 00:44:33 +0000 |
---|---|---|
committer | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2014-11-06 00:48:16 +0000 |
commit | 007f80c1d0440b89970000b92f78ce76186d99a5 (patch) | |
tree | 4e1b441ae8f3d451ebecde034fd4bc8456286f0c /pkgs/development/compilers | |
parent | d91986c24f1abc34b9785d9e4cd6dbe0bf398853 (diff) | |
download | nixlib-007f80c1d0440b89970000b92f78ce76186d99a5.tar nixlib-007f80c1d0440b89970000b92f78ce76186d99a5.tar.gz nixlib-007f80c1d0440b89970000b92f78ce76186d99a5.tar.bz2 nixlib-007f80c1d0440b89970000b92f78ce76186d99a5.tar.lz nixlib-007f80c1d0440b89970000b92f78ce76186d99a5.tar.xz nixlib-007f80c1d0440b89970000b92f78ce76186d99a5.tar.zst nixlib-007f80c1d0440b89970000b92f78ce76186d99a5.zip |
Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me. Relevant: issue #2999, issue #739
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/cmucl/binary.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/emscripten-fastcomp/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/iasl/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/mono/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/ocaml/3.10.0.nix | 8 | ||||
-rw-r--r-- | pkgs/development/compilers/ocaml/metaocaml-3.09.nix | 8 | ||||
-rw-r--r-- | pkgs/development/compilers/yap/default.nix | 2 |
7 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/development/compilers/cmucl/binary.nix b/pkgs/development/compilers/cmucl/binary.nix index 55f64234a32e..c3a960388bb4 100644 --- a/pkgs/development/compilers/cmucl/binary.nix +++ b/pkgs/development/compilers/cmucl/binary.nix @@ -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/; }; } diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten-fastcomp/default.nix index 3eb9aef528c0..a8180947f4a0 100644 --- a/pkgs/development/compilers/emscripten-fastcomp/default.nix +++ b/pkgs/development/compilers/emscripten-fastcomp/default.nix @@ -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; }; } diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix index 09245ba6d4bd..973a07b1295f 100644 --- a/pkgs/development/compilers/iasl/default.nix +++ b/pkgs/development/compilers/iasl/default.nix @@ -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; }; } diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix index 1b9e9118d56f..e098f48a24ce 100644 --- a/pkgs/development/compilers/mono/default.nix +++ b/pkgs/development/compilers/mono/default.nix @@ -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 ? }; } diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/pkgs/development/compilers/ocaml/3.10.0.nix index 1d68585d93a1..69a6a1f5f676 100644 --- a/pkgs/development/compilers/ocaml/3.10.0.nix +++ b/pkgs/development/compilers/ocaml/3.10.0.nix @@ -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"; }; diff --git a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix index 4313dcd7537e..9b340f69e90b 100644 --- a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix +++ b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix @@ -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"; }; diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix index a29c0de65b87..dea7d3cd6e84 100644 --- a/pkgs/development/compilers/yap/default.nix +++ b/pkgs/development/compilers/yap/default.nix @@ -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; |