diff options
author | Théo Zimmermann <theo.zimmermann@univ-paris-diderot.fr> | 2018-11-11 18:04:27 +0100 |
---|---|---|
committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2018-11-12 17:25:18 +0000 |
commit | 208aedb9715f7c682d1617449298d73f3077222d (patch) | |
tree | e93607054814f933386e843b5c7b27cb0fd09f07 /pkgs/development/ocaml-modules | |
parent | 3ec657ab0c4bc271e685f9be025b2c17df83ba22 (diff) | |
download | nixpkgs-208aedb9715f7c682d1617449298d73f3077222d.tar nixpkgs-208aedb9715f7c682d1617449298d73f3077222d.tar.gz nixpkgs-208aedb9715f7c682d1617449298d73f3077222d.tar.bz2 nixpkgs-208aedb9715f7c682d1617449298d73f3077222d.tar.lz nixpkgs-208aedb9715f7c682d1617449298d73f3077222d.tar.xz nixpkgs-208aedb9715f7c682d1617449298d73f3077222d.tar.zst nixpkgs-208aedb9715f7c682d1617449298d73f3077222d.zip |
ocamlPackages.*: remove unnecessary unpackCmd
Diffstat (limited to 'pkgs/development/ocaml-modules')
47 files changed, 4 insertions, 89 deletions
diff --git a/pkgs/development/ocaml-modules/astring/default.nix b/pkgs/development/ocaml-modules/astring/default.nix index 827487be69b..f5dd92422cc 100644 --- a/pkgs/development/ocaml-modules/astring/default.nix +++ b/pkgs/development/ocaml-modules/astring/default.nix @@ -9,8 +9,6 @@ stdenv.mkDerivation rec { sha256 = "0ixjwc3plrljvj24za3l9gy0w30lsbggp8yh02lwrzw61ls4cri0"; }; - unpackCmd = "tar -xf $curSrc"; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/bos/default.nix b/pkgs/development/ocaml-modules/bos/default.nix index a1f4c6bc564..97434811665 100644 --- a/pkgs/development/ocaml-modules/bos/default.nix +++ b/pkgs/development/ocaml-modules/bos/default.nix @@ -10,8 +10,6 @@ stdenv.mkDerivation rec { sha256 = "1s10iqx8rgnxr5n93lf4blwirjf8nlm272yg5sipr7lsr35v49wc"; }; - unpackCmd = "tar xjf $src"; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; propagatedBuildInputs = [ astring fmt fpath logs rresult ]; diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix index 4b055a130fd..9ba48e6ebfd 100644 --- a/pkgs/development/ocaml-modules/cmdliner/default.nix +++ b/pkgs/development/ocaml-modules/cmdliner/default.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { sha256 = "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1"; }; - unpackCmd = "tar xjf $src"; - nativeBuildInputs = [ ocamlbuild topkg ]; buildInputs = [ ocaml findlib ]; propagatedBuildInputs = [ result ]; diff --git a/pkgs/development/ocaml-modules/cpuid/default.nix b/pkgs/development/ocaml-modules/cpuid/default.nix index 37400856f1a..0695da7ee37 100644 --- a/pkgs/development/ocaml-modules/cpuid/default.nix +++ b/pkgs/development/ocaml-modules/cpuid/default.nix @@ -8,8 +8,6 @@ stdenv.mkDerivation { sha256 = "08k2558a3dnxn8msgpz8c93sfn0y027ganfdi2yvql0fp1ixv97p"; }; - unpackCmd = "tar xjf $src"; - buildInputs = [ ocaml findlib ocamlbuild topkg ocb-stubblr ]; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix index c3941173bff..37c7f660ca6 100644 --- a/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/pkgs/development/ocaml-modules/cstruct/default.nix @@ -9,8 +9,6 @@ buildDunePackage rec { sha256 = "1x4jxsvd1lrfibnjdjrkfl7hqsc48rljnwbap6faanj9qhwwa6v2"; }; - unpackCmd = "tar -xjf $curSrc"; - propagatedBuildInputs = [ sexplib ocplib-endian ]; meta = { diff --git a/pkgs/development/ocaml-modules/cstruct/lwt.nix b/pkgs/development/ocaml-modules/cstruct/lwt.nix index 367a7fa2a44..fc621838966 100644 --- a/pkgs/development/ocaml-modules/cstruct/lwt.nix +++ b/pkgs/development/ocaml-modules/cstruct/lwt.nix @@ -2,7 +2,7 @@ buildDunePackage { pname = "cstruct-lwt"; - inherit (cstruct) version src unpackCmd meta; + inherit (cstruct) version src meta; minimumOCamlVersion = "4.02"; diff --git a/pkgs/development/ocaml-modules/cstruct/ppx.nix b/pkgs/development/ocaml-modules/cstruct/ppx.nix index 837bca370cf..5f4130dc23f 100644 --- a/pkgs/development/ocaml-modules/cstruct/ppx.nix +++ b/pkgs/development/ocaml-modules/cstruct/ppx.nix @@ -2,7 +2,7 @@ buildDunePackage { pname = "ppx_cstruct"; - inherit (cstruct) version src unpackCmd meta; + inherit (cstruct) version src meta; minimumOCamlVersion = "4.02"; diff --git a/pkgs/development/ocaml-modules/cstruct/unix.nix b/pkgs/development/ocaml-modules/cstruct/unix.nix index 6fb34ba7821..fb7612b5f05 100644 --- a/pkgs/development/ocaml-modules/cstruct/unix.nix +++ b/pkgs/development/ocaml-modules/cstruct/unix.nix @@ -2,7 +2,7 @@ buildDunePackage { pname = "cstruct-unix"; - inherit (cstruct) version src unpackCmd meta; + inherit (cstruct) version src meta; minimumOCamlVersion = "4.02"; diff --git a/pkgs/development/ocaml-modules/csv/default.nix b/pkgs/development/ocaml-modules/csv/default.nix index 8b67200f32f..e10b21286dd 100644 --- a/pkgs/development/ocaml-modules/csv/default.nix +++ b/pkgs/development/ocaml-modules/csv/default.nix @@ -9,8 +9,6 @@ buildDunePackage rec { sha256 = "0cgfb6cwhwy7ypc1i3jyfz6sdnykp75aqi6kk0g1a2d81yjwzbcg"; }; - unpackCmd = "tar -xjf $src"; - meta = { description = "A pure OCaml library to read and write CSV files"; license = stdenv.lib.licenses.lgpl21; diff --git a/pkgs/development/ocaml-modules/digestif/default.nix b/pkgs/development/ocaml-modules/digestif/default.nix index cf8b5335d59..d8089bb533f 100644 --- a/pkgs/development/ocaml-modules/digestif/default.nix +++ b/pkgs/development/ocaml-modules/digestif/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { sha256 = "0fsyfi5ps17j3wjav5176gf6z3a5xcw9aqhcr1gml9n9ayfbkhrd"; }; - unpackCmd = "tar -xjf $curSrc"; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/dtoa/default.nix b/pkgs/development/ocaml-modules/dtoa/default.nix index 0e776f8e0c7..a5164ab7fa9 100644 --- a/pkgs/development/ocaml-modules/dtoa/default.nix +++ b/pkgs/development/ocaml-modules/dtoa/default.nix @@ -11,8 +11,6 @@ buildDunePackage rec { sha256 = "0rzysj07z2q6gk0yhjxnjnba01vmdb9x32wwna10qk3rrb8r2pnn"; }; - unpackCmd = "tar xjf $src"; - hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow"; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/farfadet/default.nix b/pkgs/development/ocaml-modules/farfadet/default.nix index 080cc74998d..20b6f7d0909 100644 --- a/pkgs/development/ocaml-modules/farfadet/default.nix +++ b/pkgs/development/ocaml-modules/farfadet/default.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { sha256 = "06wvd57c8khpq0c2hvm15zng269zvabsw1lcaqphqdcckl67nsxr"; }; - unpackCmd = "tar -xjf $curSrc"; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; propagatedBuildInputs = [ faraday ]; @@ -31,4 +29,3 @@ stdenv.mkDerivation rec { inherit (ocaml.meta) platforms; }; } - diff --git a/pkgs/development/ocaml-modules/fmt/default.nix b/pkgs/development/ocaml-modules/fmt/default.nix index 2aa560e5349..922f85996e1 100644 --- a/pkgs/development/ocaml-modules/fmt/default.nix +++ b/pkgs/development/ocaml-modules/fmt/default.nix @@ -8,8 +8,6 @@ stdenv.mkDerivation { sha256 = "1zj9azcxcn6skmb69ykgmi9z8c50yskwg03wqgh87lypgjdcz060"; }; - unpackCmd = "tar xjf $src"; - buildInputs = [ ocaml findlib ocamlbuild topkg cmdliner ]; propagatedBuildInputs = [ result uchar ]; diff --git a/pkgs/development/ocaml-modules/fpath/default.nix b/pkgs/development/ocaml-modules/fpath/default.nix index f812ab1d48c..9317f50717e 100644 --- a/pkgs/development/ocaml-modules/fpath/default.nix +++ b/pkgs/development/ocaml-modules/fpath/default.nix @@ -7,8 +7,6 @@ stdenv.mkDerivation { sha256 = "1hr05d8bpqmqcfdavn4rjk9rxr7v2zl84866f5knjifrm60sxqic"; }; - unpackCmd = "tar xjf $src"; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; propagatedBuildInputs = [ astring ]; diff --git a/pkgs/development/ocaml-modules/functoria/default.nix b/pkgs/development/ocaml-modules/functoria/default.nix index 150d8db16a0..12b24a43956 100644 --- a/pkgs/development/ocaml-modules/functoria/default.nix +++ b/pkgs/development/ocaml-modules/functoria/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { sha256 = "019rl4rir4lwgjyqj2wq3ylw4daih1kxxgbc6ld6kzcq66mwr747"; }; - unpackCmd = "tar xjf $src"; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; propagatedBuildInputs = [ bos cmdliner ocamlgraph ]; diff --git a/pkgs/development/ocaml-modules/gg/default.nix b/pkgs/development/ocaml-modules/gg/default.nix index 0c80f39d9d7..e32611e0c05 100644 --- a/pkgs/development/ocaml-modules/gg/default.nix +++ b/pkgs/development/ocaml-modules/gg/default.nix @@ -23,8 +23,6 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; - unpackCmd = "tar xjf $src"; - buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; installPhase = "opaline -libdir $OCAMLFIND_DESTDIR"; diff --git a/pkgs/development/ocaml-modules/hex/default.nix b/pkgs/development/ocaml-modules/hex/default.nix index 0131b035970..172eecbe29d 100644 --- a/pkgs/development/ocaml-modules/hex/default.nix +++ b/pkgs/development/ocaml-modules/hex/default.nix @@ -11,8 +11,6 @@ buildDunePackage rec { sha256 = "17hqf7z5afp2z2c55fk5myxkm7cm74259rqm94hcxkqlpdaqhm8h"; }; - unpackCmd = "tar -xjf $curSrc"; - propagatedBuildInputs = [ cstruct ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/integers/default.nix b/pkgs/development/ocaml-modules/integers/default.nix index f7d22baf3e9..bf2d2dd1e8b 100644 --- a/pkgs/development/ocaml-modules/integers/default.nix +++ b/pkgs/development/ocaml-modules/integers/default.nix @@ -8,8 +8,6 @@ stdenv.mkDerivation { sha256 = "08b1ljw88ny3l0mdq6xmffjk8anfc77igryva5jz1p6f4f746ywk"; }; - unpackCmd = "tar xjf $src"; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/jsonm/default.nix b/pkgs/development/ocaml-modules/jsonm/default.nix index 0599a5f19fe..ca286ee36f8 100644 --- a/pkgs/development/ocaml-modules/jsonm/default.nix +++ b/pkgs/development/ocaml-modules/jsonm/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation { buildInputs = [ ocaml findlib ocamlbuild topkg ]; propagatedBuildInputs = [ uutf ]; - unpackCmd = "tar xjf $src"; - inherit (topkg) buildPhase installPhase; meta = { diff --git a/pkgs/development/ocaml-modules/logs/default.nix b/pkgs/development/ocaml-modules/logs/default.nix index aead4b4756f..4b67b23d97b 100644 --- a/pkgs/development/ocaml-modules/logs/default.nix +++ b/pkgs/development/ocaml-modules/logs/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { sha256 = "1khbn7jqpid83zn8rvyh1x1sirls7zc878zj4fz985m5xlsfy853"; }; - unpackCmd = "tar xjf $src"; - buildInputs = [ ocaml findlib ocamlbuild topkg fmt cmdliner lwt ]; propagatedBuildInputs = [ result ]; diff --git a/pkgs/development/ocaml-modules/lru/default.nix b/pkgs/development/ocaml-modules/lru/default.nix index 3e474c5653a..d6ff1721199 100644 --- a/pkgs/development/ocaml-modules/lru/default.nix +++ b/pkgs/development/ocaml-modules/lru/default.nix @@ -9,8 +9,6 @@ stdenv.mkDerivation rec { sha256 = "0bd7js9rrma1fjjjjc3fgr9l5fjbhgihx2nsaf96g2b35iiaimd0"; }; - unpackCmd = "tar -xjf $curSrc"; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; propagatedBuildInputs = [ psq ]; diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix index 69921537f5b..b067fd99ded 100644 --- a/pkgs/development/ocaml-modules/mtime/default.nix +++ b/pkgs/development/ocaml-modules/mtime/default.nix @@ -23,8 +23,6 @@ stdenv.mkDerivation { inherit (param) sha256; }; - unpackCmd = "tar xjf $src"; - buildInputs = [ ocaml findlib ocamlbuild topkg ] ++ stdenv.lib.optional jsooSupport js_of_ocaml; diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix index 67de1863e00..813b4d7f7a4 100644 --- a/pkgs/development/ocaml-modules/nocrypto/default.nix +++ b/pkgs/development/ocaml-modules/nocrypto/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { sha256 = "0zshi9hlhcz61n5z1k6fx6rsi0pl4xgahsyl2jp0crqkaf3hqwlg"; }; - unpackCmd = "tar xjf $curSrc"; - patches = [ (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"; diff --git a/pkgs/development/ocaml-modules/notty/default.nix b/pkgs/development/ocaml-modules/notty/default.nix index 2dffb472f3e..f273f28a71e 100644 --- a/pkgs/development/ocaml-modules/notty/default.nix +++ b/pkgs/development/ocaml-modules/notty/default.nix @@ -19,8 +19,6 @@ stdenv.mkDerivation rec { sha256 = "0wdfmgx1mz77s7m451vy8r9i4iqwn7s7b39kpbpckf3w9417riq0"; }; - unpackCmd = "tar -xjf $curSrc"; - buildInputs = [ ocaml findlib ocamlbuild topkg ocb-stubblr ]; propagatedBuildInputs = [ result uucp uuseg uutf ] ++ optional withLwt lwt; diff --git a/pkgs/development/ocaml-modules/octavius/default.nix b/pkgs/development/ocaml-modules/octavius/default.nix index 57e3c9bfa74..6c2ee821c0d 100644 --- a/pkgs/development/ocaml-modules/octavius/default.nix +++ b/pkgs/development/ocaml-modules/octavius/default.nix @@ -10,8 +10,6 @@ stdenv.mkDerivation { sha256 = "02milzzlr4xk5aymg2fjz27f528d5pyscqvld3q0dm41zcpkz5ml"; }; - unpackCmd = "tar xjf $src"; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/otfm/default.nix b/pkgs/development/ocaml-modules/otfm/default.nix index 05c25c81d5a..081876f7075 100644 --- a/pkgs/development/ocaml-modules/otfm/default.nix +++ b/pkgs/development/ocaml-modules/otfm/default.nix @@ -21,8 +21,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ uutf result ]; - unpackCmd = "tar xjf $src"; - inherit (topkg) buildPhase installPhase; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/ppx_blob/default.nix b/pkgs/development/ocaml-modules/ppx_blob/default.nix index b36eaed500f..3b72853e782 100644 --- a/pkgs/development/ocaml-modules/ppx_blob/default.nix +++ b/pkgs/development/ocaml-modules/ppx_blob/default.nix @@ -9,8 +9,6 @@ buildDunePackage rec { sha256 = "1xmslk1mwdzhy1bydgsjlcb7h544c39hvxa8lywp8w72gaggjl16"; }; - unpackCmd = "tar xjf $curSrc"; - buildInputs = [ alcotest ocaml-migrate-parsetree ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix b/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix index 270afae754b..5d45ee90c2e 100644 --- a/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix +++ b/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix @@ -11,8 +11,6 @@ buildDunePackage rec { sha256 = "0qy0wa3rd5yh1612jijadi1yddfslpsmmmf69phi2dhr3vmkhza7"; }; - unpackCmd = "tar xjf $src"; - buildInputs = [ ocaml-migrate-parsetree ]; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/psq/default.nix b/pkgs/development/ocaml-modules/psq/default.nix index fc3fa81a02a..08b9c10d982 100644 --- a/pkgs/development/ocaml-modules/psq/default.nix +++ b/pkgs/development/ocaml-modules/psq/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { sha256 = "08ghgdivbjrxnaqc3hsb69mr9s2ql5ds0fb97b7z6zimzqibz6lp"; }; - unpackCmd = "tar -xjf $curSrc"; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/ptime/default.nix b/pkgs/development/ocaml-modules/ptime/default.nix index b0067d44911..4ac473fef00 100644 --- a/pkgs/development/ocaml-modules/ptime/default.nix +++ b/pkgs/development/ocaml-modules/ptime/default.nix @@ -9,8 +9,6 @@ stdenv.mkDerivation rec { sha256 = "0z2snhda8bg136xkw2msw6k2dz84vb49p8bgzrxfs8mawdlk0kkg"; }; - unpackCmd = "tar -xf $curSrc"; - buildInputs = [ ocaml findlib ocamlbuild topkg js_of_ocaml ]; propagatedBuildInputs = [ result ]; diff --git a/pkgs/development/ocaml-modules/react/default.nix b/pkgs/development/ocaml-modules/react/default.nix index 920ee05244a..9d070b962b4 100644 --- a/pkgs/development/ocaml-modules/react/default.nix +++ b/pkgs/development/ocaml-modules/react/default.nix @@ -8,7 +8,6 @@ stdenv.mkDerivation { sha256 = "1aj8w79gdd9xnrbz7s5p8glcb4pmimi8jp9f439dqnf6ih3mqb3v"; }; - unpackCmd = "tar xjf $src"; buildInputs = [ ocaml findlib topkg ocamlbuild ]; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/rope/default.nix b/pkgs/development/ocaml-modules/rope/default.nix index 9e9ebea6b6a..4353c606d61 100644 --- a/pkgs/development/ocaml-modules/rope/default.nix +++ b/pkgs/development/ocaml-modules/rope/default.nix @@ -8,7 +8,6 @@ let param = sha256 = "06pkbnkad2ck50jn59ggwv154yd9vb01abblihvam6p27m4za1pc"; buildInputs = [ dune ]; extra = { - unpackCmd = "tar -xjf $curSrc"; buildPhase = "dune build -p rope"; inherit (dune) installPhase; }; diff --git a/pkgs/development/ocaml-modules/rresult/default.nix b/pkgs/development/ocaml-modules/rresult/default.nix index 2cb602973f5..270432b86e9 100644 --- a/pkgs/development/ocaml-modules/rresult/default.nix +++ b/pkgs/development/ocaml-modules/rresult/default.nix @@ -8,8 +8,6 @@ stdenv.mkDerivation rec { sha256 = "1k69a3gvrk7f2cshwjzvk7818f0bwxhacgd14wxy6d4gmrggci86"; }; - unpackCmd = "tar xjf $src"; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/topkg/default.nix b/pkgs/development/ocaml-modules/topkg/default.nix index 3ff641ff93e..3e6b78a7171 100644 --- a/pkgs/development/ocaml-modules/topkg/default.nix +++ b/pkgs/development/ocaml-modules/topkg/default.nix @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ result ]; - unpackCmd = "tar xjf ${src}"; buildPhase = "${run} build"; createFindlibDestdir = true; installPhase = "${opaline}/bin/opaline -prefix $out -libdir $OCAMLFIND_DESTDIR"; diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix index 4230d098e0d..230aab2617f 100644 --- a/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/pkgs/development/ocaml-modules/tsdl/default.nix @@ -22,8 +22,6 @@ stdenv.mkDerivation { buildInputs = [ ocaml findlib ocamlbuild topkg result ocb-stubblr ]; propagatedBuildInputs = [ SDL2 ctypes ]; - unpackCmd = "tar xjf $src"; - preConfigure = '' # The following is done to avoid an additional dependency (ncurses) # due to linking in the custom bytecode runtime. Instead, just diff --git a/pkgs/development/ocaml-modules/uchar/default.nix b/pkgs/development/ocaml-modules/uchar/default.nix index 8fddf883da5..c943d3ce35a 100644 --- a/pkgs/development/ocaml-modules/uchar/default.nix +++ b/pkgs/development/ocaml-modules/uchar/default.nix @@ -8,7 +8,6 @@ stdenv.mkDerivation { sha256 = "1w2saw7zanf9m9ffvz2lvcxvlm118pws2x1wym526xmydhqpyfa7"; }; - unpackCmd = "tar xjf $src"; buildInputs = [ ocaml ocamlbuild findlib opaline ]; buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; installPhase = "opaline -libdir $OCAMLFIND_DESTDIR"; diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix index a8b664b0720..6073411a24d 100644 --- a/pkgs/development/ocaml-modules/uri/default.nix +++ b/pkgs/development/ocaml-modules/uri/default.nix @@ -11,8 +11,6 @@ buildDunePackage rec { sha256 = "1m845rwd70wi4iijkrigyz939m1x84ba70hvv0d9sgk6971w4kz0"; }; - unpackCmd = "tar -xjf $curSrc"; - buildInputs = [ ounit ]; propagatedBuildInputs = [ ppx_sexp_conv re sexplib stringext ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/uucd/default.nix b/pkgs/development/ocaml-modules/uucd/default.nix index 60429ca4b40..683ace8cbc5 100644 --- a/pkgs/development/ocaml-modules/uucd/default.nix +++ b/pkgs/development/ocaml-modules/uucd/default.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ocamlbuild topkg ]; - unpackCmd = "tar xjf $src"; - inherit (topkg) buildPhase installPhase; propagatedBuildInputs = [ xmlm ]; diff --git a/pkgs/development/ocaml-modules/uucp/default.nix b/pkgs/development/ocaml-modules/uucp/default.nix index 6e61d39fe8e..1d3e9f283ce 100644 --- a/pkgs/development/ocaml-modules/uucp/default.nix +++ b/pkgs/development/ocaml-modules/uucp/default.nix @@ -21,8 +21,6 @@ stdenv.mkDerivation { propagatedBuildInputs = [ uchar ]; - unpackCmd = "tar xjf $src"; - buildPhase = "${topkg.buildPhase} --with-cmdliner false"; inherit (topkg) installPhase; diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix index b295143c0bc..0c45e6c8af1 100644 --- a/pkgs/development/ocaml-modules/uuidm/default.nix +++ b/pkgs/development/ocaml-modules/uuidm/default.nix @@ -2,14 +2,12 @@ stdenv.mkDerivation rec { version = "0.9.6"; - name = "uuidm-${version}"; + name = "uuidm-${version}"; src = fetchurl { url = "http://erratique.ch/software/uuidm/releases/uuidm-${version}.tbz"; sha256 = "0hz4fdx0x16k0pw9995vkz5d1hmzz6b16wck9li399rcbfnv5jlc"; }; - unpackCmd = "tar -xf $curSrc"; - buildInputs = [ ocaml findlib ocamlbuild topkg cmdliner ]; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix index 4b0ce9e899c..e6ecec3145e 100644 --- a/pkgs/development/ocaml-modules/uunf/default.nix +++ b/pkgs/development/ocaml-modules/uunf/default.nix @@ -19,8 +19,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ uchar ]; - unpackCmd = "tar xjf $src"; - inherit (topkg) buildPhase installPhase; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/uuseg/default.nix b/pkgs/development/ocaml-modules/uuseg/default.nix index a0ed74f7cda..df56e904ab6 100644 --- a/pkgs/development/ocaml-modules/uuseg/default.nix +++ b/pkgs/development/ocaml-modules/uuseg/default.nix @@ -18,8 +18,6 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ocamlbuild cmdliner topkg uutf ]; propagatedBuildInputs = [ uucp uchar ]; - unpackCmd = "tar xjf $src"; - inherit (topkg) buildPhase installPhase; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/uutf/default.nix b/pkgs/development/ocaml-modules/uutf/default.nix index 95ec93d8584..9b6c1868ad3 100644 --- a/pkgs/development/ocaml-modules/uutf/default.nix +++ b/pkgs/development/ocaml-modules/uutf/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ocamlbuild topkg cmdliner ]; propagatedBuildInputs = [ uchar ]; - unpackCmd = "tar xjf $src"; - inherit (topkg) buildPhase installPhase; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix index 582b2dc8a2c..5e0d715b0be 100644 --- a/pkgs/development/ocaml-modules/vg/default.nix +++ b/pkgs/development/ocaml-modules/vg/default.nix @@ -32,8 +32,6 @@ stdenv.mkDerivation rec { ++ optionals pdfBackend [ uutf otfm ] ++ optionals htmlcBackend [ js_of_ocaml js_of_ocaml-ocamlbuild js_of_ocaml-ppx ]; - unpackCmd = "tar xjf $src"; - buildPhase = topkg.buildPhase + " --with-uutf ${boolToString pdfBackend}" + " --with-otfm ${boolToString pdfBackend}" diff --git a/pkgs/development/ocaml-modules/wtf8/default.nix b/pkgs/development/ocaml-modules/wtf8/default.nix index 1c105fbc025..7f3686abb51 100644 --- a/pkgs/development/ocaml-modules/wtf8/default.nix +++ b/pkgs/development/ocaml-modules/wtf8/default.nix @@ -11,8 +11,6 @@ buildDunePackage rec { sha256 = "1msg3vycd3k8qqj61sc23qks541cxpb97vrnrvrhjnqxsqnh6ygq"; }; - unpackCmd = "tar xjf $src"; - meta = with stdenv.lib; { homepage = https://github.com/flowtype/ocaml-wtf8; description = "WTF-8 is a superset of UTF-8 that allows unpaired surrogates."; diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix index 44a25865c1a..8d4bd4c82b3 100644 --- a/pkgs/development/ocaml-modules/x509/default.nix +++ b/pkgs/development/ocaml-modules/x509/default.nix @@ -12,8 +12,6 @@ stdenv.mkDerivation rec { sha256 = "1c62mw9rnzq0rs3ihbhfs18nv4mdzwag7893hlqgji3wmaai70pk"; }; - unpackCmd = "tar -xjf $curSrc"; - buildInputs = [ ocaml findlib ocamlbuild topkg ppx_sexp_conv ounit cstruct-unix ]; propagatedBuildInputs = [ asn1-combinators astring nocrypto ]; diff --git a/pkgs/development/ocaml-modules/xmlm/default.nix b/pkgs/development/ocaml-modules/xmlm/default.nix index a1765296d57..d3166d4cd73 100644 --- a/pkgs/development/ocaml-modules/xmlm/default.nix +++ b/pkgs/development/ocaml-modules/xmlm/default.nix @@ -19,8 +19,6 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ocamlbuild topkg ]; - unpackCmd = "tar xjf $src"; - inherit (topkg) buildPhase installPhase; meta = with stdenv.lib; { |