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

Merge branch 'master' into staging

Browse Source 
Hydra: ?compare=1400181
This commit is contained in:
Vladimír Čunát
2017-10-09 11:24:35 +02:00
parent 416979f3f7 28cd0f240a
commit 994036d857
30 changed files with 448 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/tools/devtodo/default.nix
View File

@@ -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;
};
}

8
pkgs/development/tools/ocaml/oasis/default.nix
View File

@@ -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";