diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-10-09 11:24:35 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-10-09 11:24:35 +0200 |
| commit | 994036d8573155da8b39ea6ea9c8a0b4f29cb60a (patch) | |
| tree | 0b13fa47e4c2a6904df384da3668f07e6b6ef633 /pkgs/development/tools | |
| parent | 416979f3f77a855b4460fa15cab52445378f660e (diff) | |
| parent | 28cd0f240a0fc73e579899adb9a6296adf3bd761 (diff) | |
| download | nixlib-994036d8573155da8b39ea6ea9c8a0b4f29cb60a.tar nixlib-994036d8573155da8b39ea6ea9c8a0b4f29cb60a.tar.gz nixlib-994036d8573155da8b39ea6ea9c8a0b4f29cb60a.tar.bz2 nixlib-994036d8573155da8b39ea6ea9c8a0b4f29cb60a.tar.lz nixlib-994036d8573155da8b39ea6ea9c8a0b4f29cb60a.tar.xz nixlib-994036d8573155da8b39ea6ea9c8a0b4f29cb60a.tar.zst nixlib-994036d8573155da8b39ea6ea9c8a0b4f29cb60a.zip | |
Merge branch 'master' into staging
Hydra: ?compare=1400181
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/devtodo/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/ocaml/oasis/default.nix | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/development/tools/devtodo/default.nix b/pkgs/development/tools/devtodo/default.nix index 36c489b1171a..a0b0ee571d95 100644 --- a/pkgs/development/tools/devtodo/default.nix +++ b/pkgs/development/tools/devtodo/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { description = "A hierarchical command-line task manager"; license = licenses.gpl2; maintainers = [ maintainers.woffs ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix index 6ff5ee72666e..2364058729e8 100644 --- a/pkgs/development/tools/ocaml/oasis/default.nix +++ b/pkgs/development/tools/ocaml/oasis/default.nix @@ -1,6 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4 -, ocaml_data_notation, type_conv, ocamlmod, ocamlify, ounit, expect -}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocamlmod, ocamlify }: stdenv.mkDerivation rec { version = "0.4.10"; @@ -17,11 +15,9 @@ stdenv.mkDerivation rec { buildInputs = [ - ocaml findlib ocamlbuild type_conv ocamlmod ocamlify ounit camlp4 + ocaml findlib ocamlbuild ocamlmod ocamlify ]; - propagatedBuildInputs = [ ocaml_data_notation ]; - configurePhase = "ocaml setup.ml -configure --prefix $out"; buildPhase = "ocaml setup.ml -build"; installPhase = "ocaml setup.ml -install"; |