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

treewide: move to ocaml-ng system

Browse Source
This commit is contained in:
Kirill Boltaev
2016-09-26 02:36:49 +03:00
parent 8967a3f798
commit e61663a233
21 changed files with 804 additions and 762 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/ocaml/ocaml-top/default.nix
+5 -4
View File
@@ -1,4 +1,6 @@
{ stdenv, fetchzip, ncurses, ocamlPackages, opam }:
{ stdenv, fetchzip, ncurses
, ocaml, ocpBuild, findlib, lablgtk, ocp-index
, opam }:
stdenv.mkDerivation {
name = "ocaml-top-1.1.2";
@@ -7,8 +9,7 @@ stdenv.mkDerivation {
sha256 = "10wfz8d6c1lbh31kayvlb5fj7qmgh5c6xhs3q595dnf9skrf091j";
};
buildInputs = [ ncurses opam ]
++ (with ocamlPackages; [ ocaml ocpBuild findlib lablgtk ocp-index ]);
buildInputs = [ ncurses opam ocaml ocpBuild findlib lablgtk ocp-index ];
configurePhase = ''
export TERM=xterm
@@ -25,7 +26,7 @@ stdenv.mkDerivation {
homepage = http://www.typerex.org/ocaml-top.html;
license = stdenv.lib.licenses.gpl3;
description = "A simple cross-platform OCaml code editor built for top-level evaluation";
platforms = ocamlPackages.ocaml.meta.platforms or [];
platforms = ocaml.meta.platforms or [];
maintainers = with stdenv.lib.maintainers; [ vbgl ];
};
}
pkgs/development/tools/ocaml/opam/1.0.0.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, fetchurl, ocaml, unzip, ncurses, curl }:
{ stdenv, lib, fetchgit, fetchurl, ocaml, unzip, ncurses, curl }:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12.1";
assert lib.versionAtLeast ocaml.version "3.12.1";
let
srcs = {
pkgs/development/tools/ocaml/opam/1.1.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, fetchurl, ocaml, unzip, ncurses, curl }:
{ stdenv, lib, fetchgit, fetchurl, ocaml, unzip, ncurses, curl }:
# Opam 1.1 only works with ocaml >= 3.12.1 according to ./configure
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12.1";
assert lib.versionAtLeast ocaml.version "3.12.1";
let
srcs = {
pkgs/development/tools/ocaml/opam/default.nix
+2 -2
View File
@@ -1,9 +1,9 @@
{ stdenv, fetchgit, fetchurl, makeWrapper,
{ stdenv, lib, fetchgit, fetchurl, makeWrapper,
ocaml, unzip, ncurses, curl,
aspcudSupport ? !stdenv.isDarwin, aspcud
}:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12.1";
assert lib.versionAtLeast ocaml.version "3.12.1";
let
srcs = {