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

Merge branch 'master' into staging

Browse Source 
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
This commit is contained in:
Luca Bruno
2014-11-08 15:56:40 +01:00
parent 7f3c95e6b7 aa2fd47e9d
commit 83221f3886
129 changed files with 1760 additions and 814 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/ocaml/3.12.1.nix
+1
View File
@@ -36,6 +36,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://caml.inria.fr/ocaml;
branch = "3.12";
license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
description = "Most popular variant of the Caml language";
pkgs/development/compilers/ocaml/4.00.1.nix
+1
View File
@@ -35,6 +35,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://caml.inria.fr/ocaml;
branch = "4.00";
license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
description = "Most popular variant of the Caml language";
pkgs/development/compilers/ocaml/4.01.0.nix
+1
View File
@@ -50,6 +50,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://caml.inria.fr/ocaml;
branch = "4.01";
license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
description = "Most popular variant of the Caml language";
pkgs/development/compilers/ocaml/4.02.0.nix
+1
View File
@@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://caml.inria.fr/ocaml;
branch = "4.02";
license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
description = "Most popular variant of the Caml language";