diff options
| author | Profpatsch <mail@profpatsch.de> | 2016-11-04 12:24:57 +0100 |
|---|---|---|
| committer | Profpatsch <mail@profpatsch.de> | 2016-11-04 12:24:57 +0100 |
| commit | 2bd86e9e47d82acf296b353e2bd6b5cb6b7ba213 (patch) | |
| tree | 947e0194e8689d45eb9d83aaa27c3471bcbfd350 /pkgs/development/ocaml-modules/uuseg | |
| parent | c5cac5051af83b41c3601e7e7116f7b49c8dd010 (diff) | |
| download | nixpkgs-2bd86e9e47d82acf296b353e2bd6b5cb6b7ba213.tar nixpkgs-2bd86e9e47d82acf296b353e2bd6b5cb6b7ba213.tar.gz nixpkgs-2bd86e9e47d82acf296b353e2bd6b5cb6b7ba213.tar.bz2 nixpkgs-2bd86e9e47d82acf296b353e2bd6b5cb6b7ba213.tar.lz nixpkgs-2bd86e9e47d82acf296b353e2bd6b5cb6b7ba213.tar.xz nixpkgs-2bd86e9e47d82acf296b353e2bd6b5cb6b7ba213.tar.zst nixpkgs-2bd86e9e47d82acf296b353e2bd6b5cb6b7ba213.zip | |
Revert "Merge pull request #20090 from sternenseemann/master"
Reason: https://github.com/NixOS/nixpkgs/pull/20090#commitcomment-19686426 This reverts commit 9ffcb1b2503303bfdb4a8fc31c8e4160184eb74c, reversing changes made to a6283c1126676d30de3abfb3ee8865505da0ed43.
Diffstat (limited to 'pkgs/development/ocaml-modules/uuseg')
| -rw-r--r-- | pkgs/development/ocaml-modules/uuseg/default.nix | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/pkgs/development/ocaml-modules/uuseg/default.nix b/pkgs/development/ocaml-modules/uuseg/default.nix index 2ba3dd02683..3c7a4ff5c58 100644 --- a/pkgs/development/ocaml-modules/uuseg/default.nix +++ b/pkgs/development/ocaml-modules/uuseg/default.nix @@ -1,39 +1,40 @@ -{ stdenv, buildOcaml, fetchurl, ocaml, findlib, ocamlbuild, opam, uucp, uutf, cmdliner }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, uucp, uutf, cmdliner }: let + inherit (stdenv.lib) getVersion versionAtLeast; + pname = "uuseg"; + version = "0.8.0"; webpage = "http://erratique.ch/software/${pname}"; in -buildOcaml rec { +assert versionAtLeast (getVersion ocaml) "4.01"; - minimumSupportedOcamlVersion = "4.01"; +stdenv.mkDerivation { - name = pname; - version = "0.9.0"; + name = "ocaml-${pname}-${version}"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; sha256 = "00n4zi8dyw2yzi4nr2agcrr33b0q4dr9mgnkczipf4c0gm5cm50h"; }; - buildInputs = [ ocaml findlib ocamlbuild opam ]; - propagatedBuildInputs = [ uucp uutf cmdliner ]; + buildInputs = [ ocaml findlib ocamlbuild opam cmdliner ]; + propagatedBuildInputs = [ uucp uutf ]; createFindlibDestdir = true; unpackCmd = "tar xjf $src"; buildPhase = '' - ocaml pkg/git.ml ocaml pkg/build.ml \ native=true native-dynlink=true \ uutf=true cmdliner=true ''; installPhase = '' - opam-installer --prefix $out --script | sh - ln -s $out/lib/uuseg $out/lib/ocaml/${ocaml.version}/site-lib/ + opam-installer --script --prefix=$out ${pname}.install | sh + ln -s $out/lib/${pname} $out/lib/ocaml/${getVersion ocaml}/site-lib/${pname} ''; meta = with stdenv.lib; { |