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

ocamlPackages.*: remove unnecessary unpackCmd

Browse Source
This commit is contained in:
Théo Zimmermann 2018-11-11 18:04:27 +01:00 committed by Vincent Laporte
parent 3ec657ab0c
commit 208aedb971
48 changed files with 7 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/languages-frameworks/ocaml.xml
View File

@ -67,9 +67,9 @@ buildDunePackage rec {
<para> <para>
Here is a second example, this time using a source archive generated with Here is a second example, this time using a source archive generated with
<literal>dune-release</literal>. The <literal>unpackCmd</literal> <literal>dune-release</literal>. It is a good idea to use this archive when
redefinition is necessary to be able to unpack the kind of tarball that it is available as it will usually contain substituted variables such as a
<literal>dune-release</literal> generates. This library does not depend <literal>%%VERSION%%</literal> field. This library does not depend
on any other OCaml library and no tests are run after building it. on any other OCaml library and no tests are run after building it.
</para> </para>
@ -87,8 +87,6 @@ buildDunePackage rec {
sha256 = "1msg3vycd3k8qqj61sc23qks541cxpb97vrnrvrhjnqxsqnh6ygq"; sha256 = "1msg3vycd3k8qqj61sc23qks541cxpb97vrnrvrhjnqxsqnh6ygq";
}; };
unpackCmd = "tar xjf $src";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/flowtype/ocaml-wtf8; homepage = https://github.com/flowtype/ocaml-wtf8;
description = "WTF-8 is a superset of UTF-8 that allows unpaired surrogates."; description = "WTF-8 is a superset of UTF-8 that allows unpaired surrogates.";

2
pkgs/development/ocaml-modules/astring/default.nix
View File

@ -9,8 +9,6 @@ stdenv.mkDerivation rec {
sha256 = "0ixjwc3plrljvj24za3l9gy0w30lsbggp8yh02lwrzw61ls4cri0"; sha256 = "0ixjwc3plrljvj24za3l9gy0w30lsbggp8yh02lwrzw61ls4cri0";
}; };
unpackCmd = "tar -xf $curSrc";
buildInputs = [ ocaml findlib ocamlbuild topkg ]; buildInputs = [ ocaml findlib ocamlbuild topkg ];
inherit (topkg) buildPhase installPhase; inherit (topkg) buildPhase installPhase;

2
pkgs/development/ocaml-modules/bos/default.nix
View File

@ -10,8 +10,6 @@ stdenv.mkDerivation rec {
sha256 = "1s10iqx8rgnxr5n93lf4blwirjf8nlm272yg5sipr7lsr35v49wc"; sha256 = "1s10iqx8rgnxr5n93lf4blwirjf8nlm272yg5sipr7lsr35v49wc";
}; };
unpackCmd = "tar xjf $src";
buildInputs = [ ocaml findlib ocamlbuild topkg ]; buildInputs = [ ocaml findlib ocamlbuild topkg ];
propagatedBuildInputs = [ astring fmt fpath logs rresult ]; propagatedBuildInputs = [ astring fmt fpath logs rresult ];

2
pkgs/development/ocaml-modules/cmdliner/default.nix
View File

@ -15,8 +15,6 @@ stdenv.mkDerivation rec {
sha256 = "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1"; sha256 = "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1";
}; };
unpackCmd = "tar xjf $src";
nativeBuildInputs = [ ocamlbuild topkg ]; nativeBuildInputs = [ ocamlbuild topkg ];
buildInputs = [ ocaml findlib ]; buildInputs = [ ocaml findlib ];
propagatedBuildInputs = [ result ]; propagatedBuildInputs = [ result ];

2
pkgs/development/ocaml-modules/cpuid/default.nix
View File

@ -8,8 +8,6 @@ stdenv.mkDerivation {
sha256 = "08k2558a3dnxn8msgpz8c93sfn0y027ganfdi2yvql0fp1ixv97p"; sha256 = "08k2558a3dnxn8msgpz8c93sfn0y027ganfdi2yvql0fp1ixv97p";
}; };
unpackCmd = "tar xjf $src";
buildInputs = [ ocaml findlib ocamlbuild topkg ocb-stubblr ]; buildInputs = [ ocaml findlib ocamlbuild topkg ocb-stubblr ];
inherit (topkg) buildPhase installPhase; inherit (topkg) buildPhase installPhase;

2
pkgs/development/ocaml-modules/cstruct/default.nix
View File

@ -9,8 +9,6 @@ buildDunePackage rec {
sha256 = "1x4jxsvd1lrfibnjdjrkfl7hqsc48rljnwbap6faanj9qhwwa6v2"; sha256 = "1x4jxsvd1lrfibnjdjrkfl7hqsc48rljnwbap6faanj9qhwwa6v2";
}; };
unpackCmd = "tar -xjf $curSrc";
propagatedBuildInputs = [ sexplib ocplib-endian ]; propagatedBuildInputs = [ sexplib ocplib-endian ];
meta = { meta = {

2
pkgs/development/ocaml-modules/cstruct/lwt.nix
View File

@ -2,7 +2,7 @@
buildDunePackage { buildDunePackage {
pname = "cstruct-lwt"; pname = "cstruct-lwt";
inherit (cstruct) version src unpackCmd meta; inherit (cstruct) version src meta;
minimumOCamlVersion = "4.02"; minimumOCamlVersion = "4.02";

2
pkgs/development/ocaml-modules/cstruct/ppx.nix
View File

@ -2,7 +2,7 @@
buildDunePackage { buildDunePackage {
pname = "ppx_cstruct"; pname = "ppx_cstruct";
inherit (cstruct) version src unpackCmd meta; inherit (cstruct) version src meta;
minimumOCamlVersion = "4.02"; minimumOCamlVersion = "4.02";

2
pkgs/development/ocaml-modules/cstruct/unix.nix
View File

@ -2,7 +2,7 @@
buildDunePackage { buildDunePackage {
pname = "cstruct-unix"; pname = "cstruct-unix";
inherit (cstruct) version src unpackCmd meta; inherit (cstruct) version src meta;
minimumOCamlVersion = "4.02"; minimumOCamlVersion = "4.02";

2
pkgs/development/ocaml-modules/csv/default.nix
View File

@ -9,8 +9,6 @@ buildDunePackage rec {
sha256 = "0cgfb6cwhwy7ypc1i3jyfz6sdnykp75aqi6kk0g1a2d81yjwzbcg"; sha256 = "0cgfb6cwhwy7ypc1i3jyfz6sdnykp75aqi6kk0g1a2d81yjwzbcg";
}; };
unpackCmd = "tar -xjf $src";
meta = { meta = {
description = "A pure OCaml library to read and write CSV files"; description = "A pure OCaml library to read and write CSV files";
license = stdenv.lib.licenses.lgpl21; license = stdenv.lib.licenses.lgpl21;

2
pkgs/development/ocaml-modules/digestif/default.nix
View File

@ -13,8 +13,6 @@ stdenv.mkDerivation rec {
sha256 = "0fsyfi5ps17j3wjav5176gf6z3a5xcw9aqhcr1gml9n9ayfbkhrd"; sha256 = "0fsyfi5ps17j3wjav5176gf6z3a5xcw9aqhcr1gml9n9ayfbkhrd";
}; };
unpackCmd = "tar -xjf $curSrc";
buildInputs = [ ocaml findlib ocamlbuild topkg ]; buildInputs = [ ocaml findlib ocamlbuild topkg ];
inherit (topkg) buildPhase installPhase; inherit (topkg) buildPhase installPhase;

2
pkgs/development/ocaml-modules/dtoa/default.nix
View File

@ -11,8 +11,6 @@ buildDunePackage rec {
sha256 = "0rzysj07z2q6gk0yhjxnjnba01vmdb9x32wwna10qk3rrb8r2pnn"; sha256 = "0rzysj07z2q6gk0yhjxnjnba01vmdb9x32wwna10qk3rrb8r2pnn";
}; };
unpackCmd = "tar xjf $src";
hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow"; hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow";
meta = with stdenv.lib; { meta = with stdenv.lib; {

3
pkgs/development/ocaml-modules/farfadet/default.nix
View File

@ -15,8 +15,6 @@ stdenv.mkDerivation rec {
sha256 = "06wvd57c8khpq0c2hvm15zng269zvabsw1lcaqphqdcckl67nsxr"; sha256 = "06wvd57c8khpq0c2hvm15zng269zvabsw1lcaqphqdcckl67nsxr";
}; };
unpackCmd = "tar -xjf $curSrc";
buildInputs = [ ocaml findlib ocamlbuild topkg ]; buildInputs = [ ocaml findlib ocamlbuild topkg ];
propagatedBuildInputs = [ faraday ]; propagatedBuildInputs = [ faraday ];
@ -31,4 +29,3 @@ stdenv.mkDerivation rec {
inherit (ocaml.meta) platforms; inherit (ocaml.meta) platforms;
}; };
} }

2
pkgs/development/ocaml-modules/fmt/default.nix
View File

@ -8,8 +8,6 @@ stdenv.mkDerivation {
sha256 = "1zj9azcxcn6skmb69ykgmi9z8c50yskwg03wqgh87lypgjdcz060"; sha256 = "1zj9azcxcn6skmb69ykgmi9z8c50yskwg03wqgh87lypgjdcz060";
}; };
unpackCmd = "tar xjf $src";
buildInputs = [ ocaml findlib ocamlbuild topkg cmdliner ]; buildInputs = [ ocaml findlib ocamlbuild topkg cmdliner ];
propagatedBuildInputs = [ result uchar ]; propagatedBuildInputs = [ result uchar ];

2
pkgs/development/ocaml-modules/fpath/default.nix
View File

@ -7,8 +7,6 @@ stdenv.mkDerivation {
sha256 = "1hr05d8bpqmqcfdavn4rjk9rxr7v2zl84866f5knjifrm60sxqic"; sha256 = "1hr05d8bpqmqcfdavn4rjk9rxr7v2zl84866f5knjifrm60sxqic";
}; };
unpackCmd = "tar xjf $src";
buildInputs = [ ocaml findlib ocamlbuild topkg ]; buildInputs = [ ocaml findlib ocamlbuild topkg ];
propagatedBuildInputs = [ astring ]; propagatedBuildInputs = [ astring ];

2
pkgs/development/ocaml-modules/functoria/default.nix
View File

@ -13,8 +13,6 @@ stdenv.mkDerivation rec {
sha256 = "019rl4rir4lwgjyqj2wq3ylw4daih1kxxgbc6ld6kzcq66mwr747"; sha256 = "019rl4rir4lwgjyqj2wq3ylw4daih1kxxgbc6ld6kzcq66mwr747";
}; };
unpackCmd = "tar xjf $src";
buildInputs = [ ocaml findlib ocamlbuild topkg ]; buildInputs = [ ocaml findlib ocamlbuild topkg ];
propagatedBuildInputs = [ bos cmdliner ocamlgraph ]; propagatedBuildInputs = [ bos cmdliner ocamlgraph ];

2
pkgs/development/ocaml-modules/gg/default.nix
View File

@ -23,8 +23,6 @@ stdenv.mkDerivation rec {
createFindlibDestdir = true; createFindlibDestdir = true;
unpackCmd = "tar xjf $src";
buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true";
installPhase = "opaline -libdir $OCAMLFIND_DESTDIR"; installPhase = "opaline -libdir $OCAMLFIND_DESTDIR";

2
pkgs/development/ocaml-modules/hex/default.nix
View File

@ -11,8 +11,6 @@ buildDunePackage rec {
sha256 = "17hqf7z5afp2z2c55fk5myxkm7cm74259rqm94hcxkqlpdaqhm8h"; sha256 = "17hqf7z5afp2z2c55fk5myxkm7cm74259rqm94hcxkqlpdaqhm8h";
}; };
unpackCmd = "tar -xjf $curSrc";
propagatedBuildInputs = [ cstruct ]; propagatedBuildInputs = [ cstruct ];
doCheck = true; doCheck = true;

2
pkgs/development/ocaml-modules/integers/default.nix
View File

@ -8,8 +8,6 @@ stdenv.mkDerivation {
sha256 = "08b1ljw88ny3l0mdq6xmffjk8anfc77igryva5jz1p6f4f746ywk"; sha256 = "08b1ljw88ny3l0mdq6xmffjk8anfc77igryva5jz1p6f4f746ywk";
}; };
unpackCmd = "tar xjf $src";
buildInputs = [ ocaml findlib ocamlbuild topkg ]; buildInputs = [ ocaml findlib ocamlbuild topkg ];
inherit (topkg) buildPhase installPhase; inherit (topkg) buildPhase installPhase;

2
pkgs/development/ocaml-modules/jsonm/default.nix
View File

@ -13,8 +13,6 @@ stdenv.mkDerivation {
buildInputs = [ ocaml findlib ocamlbuild topkg ]; buildInputs = [ ocaml findlib ocamlbuild topkg ];
propagatedBuildInputs = [ uutf ]; propagatedBuildInputs = [ uutf ];
unpackCmd = "tar xjf $src";
inherit (topkg) buildPhase installPhase; inherit (topkg) buildPhase installPhase;
meta = { meta = {

2
pkgs/development/ocaml-modules/logs/default.nix
View File

@ -16,8 +16,6 @@ stdenv.mkDerivation rec {
sha256 = "1khbn7jqpid83zn8rvyh1x1sirls7zc878zj4fz985m5xlsfy853"; sha256 = "1khbn7jqpid83zn8rvyh1x1sirls7zc878zj4fz985m5xlsfy853";
}; };
unpackCmd = "tar xjf $src";
buildInputs = [ ocaml findlib ocamlbuild topkg fmt cmdliner lwt ]; buildInputs = [ ocaml findlib ocamlbuild topkg fmt cmdliner lwt ];
propagatedBuildInputs = [ result ]; propagatedBuildInputs = [ result ];

2
pkgs/development/ocaml-modules/lru/default.nix
View File

@ -9,8 +9,6 @@ stdenv.mkDerivation rec {
sha256 = "0bd7js9rrma1fjjjjc3fgr9l5fjbhgihx2nsaf96g2b35iiaimd0"; sha256 = "0bd7js9rrma1fjjjjc3fgr9l5fjbhgihx2nsaf96g2b35iiaimd0";
}; };
unpackCmd = "tar -xjf $curSrc";
buildInputs = [ ocaml findlib ocamlbuild topkg ]; buildInputs = [ ocaml findlib ocamlbuild topkg ];
propagatedBuildInputs = [ psq ]; propagatedBuildInputs = [ psq ];

2
pkgs/development/ocaml-modules/mtime/default.nix
View File

@ -23,8 +23,6 @@ stdenv.mkDerivation {
inherit (param) sha256; inherit (param) sha256;
}; };
unpackCmd = "tar xjf $src";
buildInputs = [ ocaml findlib ocamlbuild topkg ] buildInputs = [ ocaml findlib ocamlbuild topkg ]
++ stdenv.lib.optional jsooSupport js_of_ocaml; ++ stdenv.lib.optional jsooSupport js_of_ocaml;

2
pkgs/development/ocaml-modules/nocrypto/default.nix
View File

@ -16,8 +16,6 @@ stdenv.mkDerivation rec {
sha256 = "0zshi9hlhcz61n5z1k6fx6rsi0pl4xgahsyl2jp0crqkaf3hqwlg"; sha256 = "0zshi9hlhcz61n5z1k6fx6rsi0pl4xgahsyl2jp0crqkaf3hqwlg";
}; };
unpackCmd = "tar xjf $curSrc";
patches = [ patches = [
(fetchpatch { (fetchpatch {
url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/nocrypto/nocrypto.0.5.4-1/files/0001-add-missing-runtime-dependencies-in-_tags.patch"; url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/nocrypto/nocrypto.0.5.4-1/files/0001-add-missing-runtime-dependencies-in-_tags.patch";

2
pkgs/development/ocaml-modules/notty/default.nix
View File

@ -19,8 +19,6 @@ stdenv.mkDerivation rec {
sha256 = "0wdfmgx1mz77s7m451vy8r9i4iqwn7s7b39kpbpckf3w9417riq0"; sha256 = "0wdfmgx1mz77s7m451vy8r9i4iqwn7s7b39kpbpckf3w9417riq0";
}; };
unpackCmd = "tar -xjf $curSrc";
buildInputs = [ ocaml findlib ocamlbuild topkg ocb-stubblr ]; buildInputs = [ ocaml findlib ocamlbuild topkg ocb-stubblr ];
propagatedBuildInputs = [ result uucp uuseg uutf ] ++ propagatedBuildInputs = [ result uucp uuseg uutf ] ++
optional withLwt lwt; optional withLwt lwt;

2
pkgs/development/ocaml-modules/octavius/default.nix
View File

@ -10,8 +10,6 @@ stdenv.mkDerivation {
sha256 = "02milzzlr4xk5aymg2fjz27f528d5pyscqvld3q0dm41zcpkz5ml"; sha256 = "02milzzlr4xk5aymg2fjz27f528d5pyscqvld3q0dm41zcpkz5ml";
}; };
unpackCmd = "tar xjf $src";
buildInputs = [ ocaml findlib ocamlbuild topkg ]; buildInputs = [ ocaml findlib ocamlbuild topkg ];
inherit (topkg) buildPhase installPhase; inherit (topkg) buildPhase installPhase;

2
pkgs/development/ocaml-modules/otfm/default.nix
View File

@ -21,8 +21,6 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ uutf result ]; propagatedBuildInputs = [ uutf result ];
unpackCmd = "tar xjf $src";
inherit (topkg) buildPhase installPhase; inherit (topkg) buildPhase installPhase;
meta = with stdenv.lib; { meta = with stdenv.lib; {

2
pkgs/development/ocaml-modules/ppx_blob/default.nix
View File

@ -9,8 +9,6 @@ buildDunePackage rec {
sha256 = "1xmslk1mwdzhy1bydgsjlcb7h544c39hvxa8lywp8w72gaggjl16"; sha256 = "1xmslk1mwdzhy1bydgsjlcb7h544c39hvxa8lywp8w72gaggjl16";
}; };
unpackCmd = "tar xjf $curSrc";
buildInputs = [ alcotest ocaml-migrate-parsetree ]; buildInputs = [ alcotest ocaml-migrate-parsetree ];
doCheck = true; doCheck = true;

2
pkgs/development/ocaml-modules/ppx_gen_rec/default.nix
View File

@ -11,8 +11,6 @@ buildDunePackage rec {
sha256 = "0qy0wa3rd5yh1612jijadi1yddfslpsmmmf69phi2dhr3vmkhza7"; sha256 = "0qy0wa3rd5yh1612jijadi1yddfslpsmmmf69phi2dhr3vmkhza7";
}; };
unpackCmd = "tar xjf $src";
buildInputs = [ ocaml-migrate-parsetree ]; buildInputs = [ ocaml-migrate-parsetree ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

2
pkgs/development/ocaml-modules/psq/default.nix
View File

@ -13,8 +13,6 @@ stdenv.mkDerivation rec {
sha256 = "08ghgdivbjrxnaqc3hsb69mr9s2ql5ds0fb97b7z6zimzqibz6lp"; sha256 = "08ghgdivbjrxnaqc3hsb69mr9s2ql5ds0fb97b7z6zimzqibz6lp";
}; };
unpackCmd = "tar -xjf $curSrc";
buildInputs = [ ocaml findlib ocamlbuild topkg ]; buildInputs = [ ocaml findlib ocamlbuild topkg ];
inherit (topkg) buildPhase installPhase; inherit (topkg) buildPhase installPhase;

2
pkgs/development/ocaml-modules/ptime/default.nix
View File

@ -9,8 +9,6 @@ stdenv.mkDerivation rec {
sha256 = "0z2snhda8bg136xkw2msw6k2dz84vb49p8bgzrxfs8mawdlk0kkg"; sha256 = "0z2snhda8bg136xkw2msw6k2dz84vb49p8bgzrxfs8mawdlk0kkg";
}; };
unpackCmd = "tar -xf $curSrc";
buildInputs = [ ocaml findlib ocamlbuild topkg js_of_ocaml ]; buildInputs = [ ocaml findlib ocamlbuild topkg js_of_ocaml ];
propagatedBuildInputs = [ result ]; propagatedBuildInputs = [ result ];

1
pkgs/development/ocaml-modules/react/default.nix
View File

@ -8,7 +8,6 @@ stdenv.mkDerivation {
sha256 = "1aj8w79gdd9xnrbz7s5p8glcb4pmimi8jp9f439dqnf6ih3mqb3v"; sha256 = "1aj8w79gdd9xnrbz7s5p8glcb4pmimi8jp9f439dqnf6ih3mqb3v";
}; };
unpackCmd = "tar xjf $src";
buildInputs = [ ocaml findlib topkg ocamlbuild ]; buildInputs = [ ocaml findlib topkg ocamlbuild ];
inherit (topkg) buildPhase installPhase; inherit (topkg) buildPhase installPhase;

1
pkgs/development/ocaml-modules/rope/default.nix
View File

@ -8,7 +8,6 @@ let param =
sha256 = "06pkbnkad2ck50jn59ggwv154yd9vb01abblihvam6p27m4za1pc"; sha256 = "06pkbnkad2ck50jn59ggwv154yd9vb01abblihvam6p27m4za1pc";
buildInputs = [ dune ]; buildInputs = [ dune ];
extra = { extra = {
unpackCmd = "tar -xjf $curSrc";
buildPhase = "dune build -p rope"; buildPhase = "dune build -p rope";
inherit (dune) installPhase; inherit (dune) installPhase;
}; };

2
pkgs/development/ocaml-modules/rresult/default.nix
View File

@ -8,8 +8,6 @@ stdenv.mkDerivation rec {
sha256 = "1k69a3gvrk7f2cshwjzvk7818f0bwxhacgd14wxy6d4gmrggci86"; sha256 = "1k69a3gvrk7f2cshwjzvk7818f0bwxhacgd14wxy6d4gmrggci86";
}; };
unpackCmd = "tar xjf $src";
buildInputs = [ ocaml findlib ocamlbuild topkg ]; buildInputs = [ ocaml findlib ocamlbuild topkg ];
inherit (topkg) buildPhase installPhase; inherit (topkg) buildPhase installPhase;

1
pkgs/development/ocaml-modules/topkg/default.nix
View File

@ -32,7 +32,6 @@ stdenv.mkDerivation rec {
buildInputs = [ ocaml findlib ocamlbuild ]; buildInputs = [ ocaml findlib ocamlbuild ];
propagatedBuildInputs = [ result ]; propagatedBuildInputs = [ result ];
unpackCmd = "tar xjf ${src}";
buildPhase = "${run} build"; buildPhase = "${run} build";
createFindlibDestdir = true; createFindlibDestdir = true;
installPhase = "${opaline}/bin/opaline -prefix $out -libdir $OCAMLFIND_DESTDIR"; installPhase = "${opaline}/bin/opaline -prefix $out -libdir $OCAMLFIND_DESTDIR";

2
pkgs/development/ocaml-modules/tsdl/default.nix
View File

@ -22,8 +22,6 @@ stdenv.mkDerivation {
buildInputs = [ ocaml findlib ocamlbuild topkg result ocb-stubblr ]; buildInputs = [ ocaml findlib ocamlbuild topkg result ocb-stubblr ];
propagatedBuildInputs = [ SDL2 ctypes ]; propagatedBuildInputs = [ SDL2 ctypes ];
unpackCmd = "tar xjf $src";
preConfigure = '' preConfigure = ''
# The following is done to avoid an additional dependency (ncurses) # The following is done to avoid an additional dependency (ncurses)
# due to linking in the custom bytecode runtime. Instead, just # due to linking in the custom bytecode runtime. Instead, just

1
pkgs/development/ocaml-modules/uchar/default.nix
View File

@ -8,7 +8,6 @@ stdenv.mkDerivation {
sha256 = "1w2saw7zanf9m9ffvz2lvcxvlm118pws2x1wym526xmydhqpyfa7"; sha256 = "1w2saw7zanf9m9ffvz2lvcxvlm118pws2x1wym526xmydhqpyfa7";
}; };
unpackCmd = "tar xjf $src";
buildInputs = [ ocaml ocamlbuild findlib opaline ]; buildInputs = [ ocaml ocamlbuild findlib opaline ];
buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true";
installPhase = "opaline -libdir $OCAMLFIND_DESTDIR"; installPhase = "opaline -libdir $OCAMLFIND_DESTDIR";

2
pkgs/development/ocaml-modules/uri/default.nix
View File

@ -11,8 +11,6 @@ buildDunePackage rec {
sha256 = "1m845rwd70wi4iijkrigyz939m1x84ba70hvv0d9sgk6971w4kz0"; sha256 = "1m845rwd70wi4iijkrigyz939m1x84ba70hvv0d9sgk6971w4kz0";
}; };
unpackCmd = "tar -xjf $curSrc";
buildInputs = [ ounit ]; buildInputs = [ ounit ];
propagatedBuildInputs = [ ppx_sexp_conv re sexplib stringext ]; propagatedBuildInputs = [ ppx_sexp_conv re sexplib stringext ];
doCheck = true; doCheck = true;

2
pkgs/development/ocaml-modules/uucd/default.nix
View File

@ -15,8 +15,6 @@ stdenv.mkDerivation rec {
buildInputs = [ ocaml findlib ocamlbuild topkg ]; buildInputs = [ ocaml findlib ocamlbuild topkg ];
unpackCmd = "tar xjf $src";
inherit (topkg) buildPhase installPhase; inherit (topkg) buildPhase installPhase;
propagatedBuildInputs = [ xmlm ]; propagatedBuildInputs = [ xmlm ];

2
pkgs/development/ocaml-modules/uucp/default.nix
View File

@ -21,8 +21,6 @@ stdenv.mkDerivation {
propagatedBuildInputs = [ uchar ]; propagatedBuildInputs = [ uchar ];
unpackCmd = "tar xjf $src";
buildPhase = "${topkg.buildPhase} --with-cmdliner false"; buildPhase = "${topkg.buildPhase} --with-cmdliner false";
inherit (topkg) installPhase; inherit (topkg) installPhase;

4
pkgs/development/ocaml-modules/uuidm/default.nix
View File

@ -2,14 +2,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.9.6"; version = "0.9.6";
name = "uuidm-${version}"; name = "uuidm-${version}";
src = fetchurl { src = fetchurl {
url = "http://erratique.ch/software/uuidm/releases/uuidm-${version}.tbz"; url = "http://erratique.ch/software/uuidm/releases/uuidm-${version}.tbz";
sha256 = "0hz4fdx0x16k0pw9995vkz5d1hmzz6b16wck9li399rcbfnv5jlc"; sha256 = "0hz4fdx0x16k0pw9995vkz5d1hmzz6b16wck9li399rcbfnv5jlc";
}; };
unpackCmd = "tar -xf $curSrc";
buildInputs = [ ocaml findlib ocamlbuild topkg cmdliner ]; buildInputs = [ ocaml findlib ocamlbuild topkg cmdliner ];
inherit (topkg) buildPhase installPhase; inherit (topkg) buildPhase installPhase;

2
pkgs/development/ocaml-modules/uunf/default.nix
View File

@ -19,8 +19,6 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ uchar ]; propagatedBuildInputs = [ uchar ];
unpackCmd = "tar xjf $src";
inherit (topkg) buildPhase installPhase; inherit (topkg) buildPhase installPhase;
meta = with stdenv.lib; { meta = with stdenv.lib; {

2
pkgs/development/ocaml-modules/uuseg/default.nix
View File

@ -18,8 +18,6 @@ stdenv.mkDerivation rec {
buildInputs = [ ocaml findlib ocamlbuild cmdliner topkg uutf ]; buildInputs = [ ocaml findlib ocamlbuild cmdliner topkg uutf ];
propagatedBuildInputs = [ uucp uchar ]; propagatedBuildInputs = [ uucp uchar ];
unpackCmd = "tar xjf $src";
inherit (topkg) buildPhase installPhase; inherit (topkg) buildPhase installPhase;
meta = with stdenv.lib; { meta = with stdenv.lib; {

2
pkgs/development/ocaml-modules/uutf/default.nix
View File

@ -16,8 +16,6 @@ stdenv.mkDerivation rec {
buildInputs = [ ocaml findlib ocamlbuild topkg cmdliner ]; buildInputs = [ ocaml findlib ocamlbuild topkg cmdliner ];
propagatedBuildInputs = [ uchar ]; propagatedBuildInputs = [ uchar ];
unpackCmd = "tar xjf $src";
inherit (topkg) buildPhase installPhase; inherit (topkg) buildPhase installPhase;
meta = with stdenv.lib; { meta = with stdenv.lib; {

2
pkgs/development/ocaml-modules/vg/default.nix
View File

@ -32,8 +32,6 @@ stdenv.mkDerivation rec {
++ optionals pdfBackend [ uutf otfm ] ++ optionals pdfBackend [ uutf otfm ]
++ optionals htmlcBackend [ js_of_ocaml js_of_ocaml-ocamlbuild js_of_ocaml-ppx ]; ++ optionals htmlcBackend [ js_of_ocaml js_of_ocaml-ocamlbuild js_of_ocaml-ppx ];
unpackCmd = "tar xjf $src";
buildPhase = topkg.buildPhase buildPhase = topkg.buildPhase
+ " --with-uutf ${boolToString pdfBackend}" + " --with-uutf ${boolToString pdfBackend}"
+ " --with-otfm ${boolToString pdfBackend}" + " --with-otfm ${boolToString pdfBackend}"

2
pkgs/development/ocaml-modules/wtf8/default.nix
View File

@ -11,8 +11,6 @@ buildDunePackage rec {
sha256 = "1msg3vycd3k8qqj61sc23qks541cxpb97vrnrvrhjnqxsqnh6ygq"; sha256 = "1msg3vycd3k8qqj61sc23qks541cxpb97vrnrvrhjnqxsqnh6ygq";
}; };
unpackCmd = "tar xjf $src";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/flowtype/ocaml-wtf8; homepage = https://github.com/flowtype/ocaml-wtf8;
description = "WTF-8 is a superset of UTF-8 that allows unpaired surrogates."; description = "WTF-8 is a superset of UTF-8 that allows unpaired surrogates.";

2
pkgs/development/ocaml-modules/x509/default.nix
View File

@ -12,8 +12,6 @@ stdenv.mkDerivation rec {
sha256 = "1c62mw9rnzq0rs3ihbhfs18nv4mdzwag7893hlqgji3wmaai70pk"; sha256 = "1c62mw9rnzq0rs3ihbhfs18nv4mdzwag7893hlqgji3wmaai70pk";
}; };
unpackCmd = "tar -xjf $curSrc";
buildInputs = [ ocaml findlib ocamlbuild topkg ppx_sexp_conv ounit cstruct-unix ]; buildInputs = [ ocaml findlib ocamlbuild topkg ppx_sexp_conv ounit cstruct-unix ];
propagatedBuildInputs = [ asn1-combinators astring nocrypto ]; propagatedBuildInputs = [ asn1-combinators astring nocrypto ];

2
pkgs/development/ocaml-modules/xmlm/default.nix
View File

@ -19,8 +19,6 @@ stdenv.mkDerivation rec {
buildInputs = [ ocaml findlib ocamlbuild topkg ]; buildInputs = [ ocaml findlib ocamlbuild topkg ];
unpackCmd = "tar xjf $src";
inherit (topkg) buildPhase installPhase; inherit (topkg) buildPhase installPhase;
meta = with stdenv.lib; { meta = with stdenv.lib; {