treewide: remove redundant rec

2019-08-28 11:07:32 +00:00
parent 5061fe0c2c
commit 08f68313a4
1875 changed files with 2591 additions and 2596 deletions
@@ -1,6 +1,6 @@
 { buildDunePackage, bisect_ppx, ocamlbuild }:

-buildDunePackage rec {
+buildDunePackage {
  minimumOCamlVersion = "4.02";
  inherit (bisect_ppx) version src meta;
  pname = "bisect_ppx-ocamlbuild";
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, fetchpatch, ocaml, findlib, camlp4}:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "camomile";
  version = "0.8.5";

@@ -7,7 +7,7 @@ if !stdenv.lib.versionAtLeast cohttp-lwt.version "0.99"
 then cohttp-lwt
 else

-buildDunePackage rec {
+buildDunePackage {
 	pname = "cohttp-lwt-unix";
 	inherit (cohttp-lwt) version src meta;

@@ -4,7 +4,7 @@ if !stdenv.lib.versionAtLeast cohttp.version "0.99"
 then cohttp
 else

-buildDunePackage rec {
+buildDunePackage {
 	pname = "cohttp-lwt";
 	inherit (cohttp) version src meta;

@@ -6,7 +6,7 @@ if !stdenv.lib.versionAtLeast conduit-lwt.version "1.0"
 then conduit-lwt
 else

-buildDunePackage rec {
+buildDunePackage {
 	pname = "conduit-lwt-unix";
 	inherit (conduit-lwt) version src meta;

@@ -4,7 +4,7 @@ if !stdenv.lib.versionAtLeast conduit.version "1.0"
 then conduit
 else

-buildDunePackage rec {
+buildDunePackage {
 	pname = "conduit-lwt";
 	inherit (conduit) version src meta;

@@ -4,7 +4,7 @@ if stdenv.lib.versionAtLeast ocaml.version "4.06"
 then throw "cryptgps is not available for OCaml ${ocaml.version}"
 else

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "ocaml-cryptgps";
  version = "0.2.1";

@@ -17,7 +17,7 @@ let param =
  };
 in

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "cryptokit";
  inherit (param) version;

@@ -1,6 +1,6 @@
 { stdenv, buildOcaml, fetchzip, libffi, pkgconfig, ncurses, integers }:

-buildOcaml rec {
+buildOcaml {
  name = "ctypes";
  version = "0.13.1";

@@ -10,7 +10,7 @@ in

 assert versionAtLeast (getVersion ocaml) "4.01.0";

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {

  name = "ocaml-${pname}-${version}";

@@ -1,6 +1,6 @@
 { buildDunePackage, git, cohttp-lwt, alcotest, mtime, nocrypto }:

-buildDunePackage rec {
+buildDunePackage {
 	pname = "git-http";
 	inherit (git) version src;

@@ -1,6 +1,6 @@
 { buildDunePackage, git-http, cohttp-lwt-unix, tls, cmdliner, mtime }:

-buildDunePackage rec {
+buildDunePackage {
 	pname = "git-unix";
 	inherit (git-http) version src;

@@ -2,7 +2,7 @@
 bin_prot, core, ppx_custom_printf, fieldslib, herelib,
 pipebang, sexplib, async_rpc_kernel}:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "async_extra";
  hash = "1xdwab19fycr4cdm3dh9vmx42f8lvf9s4f9pjgdydxfrm7yzyrfh";
  propagatedBuildInputs = [ async_kernel async_unix core bin_prot ppx_custom_printf
@@ -2,7 +2,7 @@
 bin_prot, fieldslib,
 sexplib, herelib}:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "async_kernel";
  hash = "1n6ifbrq6q6hq8bxh6b9vhg11mv9r6jgp1b7vfw7mh5s2nrd4b60";
  propagatedBuildInputs = [ core_kernel bin_prot fieldslib herelib sexplib ];
@@ -2,7 +2,7 @@
 fieldslib, ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test,
 ppx_jane, sexplib, typerep, variantslib}:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "async_rpc_kernel";
  hash = "0pvys7giqix1nfidw1f4i3r94cf03ba1mvhadpm2zpdir3av91sw";
  propagatedBuildInputs = [ async_kernel bin_prot core_kernel fieldslib
@@ -2,7 +2,7 @@
 bin_prot, comparelib, core, fieldslib, herelib,
 pipebang, sexplib}:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "async_unix";
  hash = "03ng7f0s22wwzspakiqj442vs1a7yf834109jcj9r3g1awwfhcy7";
  propagatedBuildInputs = [ async_kernel core bin_prot comparelib
@@ -1,7 +1,7 @@
 {stdenv, buildOcamlJane, async_kernel,
 async_unix, async_extra}:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "async";
  version = "113.33.03";
  hash = "0wyspkp8k833fh03r3h016nbfn6kjfhvb2bg42cly6agcak59fmr";
@@ -2,7 +2,7 @@
 , openssl, fieldslib, herelib, pipebang, sexplib, ocaml_oasis
 }:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "async_ssl";
  version = "113.33.07";
  hash = "0bhzpnmlx6dy4fli3i7ipjwqbsdi7fq171jrila5dr3ciy3841xs";
@@ -1,6 +1,6 @@
 {stdenv, buildOcamlJane, type_conv}:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "bin_prot";
  version = "113.33.03";
  minimumSupportedOcamlVersion = "4.02";
@@ -4,7 +4,7 @@
 ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane,
 re2, textutils}:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "core_extended";
  hash = "1j4ipcn741j8w3h4gpv5sygjzg6b5g6gc2jcrr4n0jyn5dq8b0p5";
  propagatedBuildInputs =
@@ -3,7 +3,7 @@
 bin_prot, fieldslib, sexplib, typerep, variantslib,
 ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane}:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "core";
  hash = "0nz6d5glgymbpchvcpw77yis9jgi2bll32knzy9vx99wn83zdrmd";
  propagatedBuildInputs =
@@ -5,7 +5,7 @@
 , textutils
 }:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "core_bench";
  hash = "1d1ainpakgsf5rg8dvar12ksgilqcc4465jr8gf7fz5mmn0mlifj";
  propagatedBuildInputs =
@@ -2,7 +2,7 @@
 bin_prot, fieldslib, sexplib, typerep, variantslib,
 ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane}:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "core_kernel";
  hash = "13gamj056nlib04l7yh80lqpdx0pnswzlb52fkqa01awwp5nf3z6";
  propagatedBuildInputs =
@@ -1,6 +1,6 @@
 { stdenv, type_conv, buildOcamlJane }:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "fieldslib";
  version = "113.33.03";

@@ -1,7 +1,7 @@
 {stdenv, buildOcamlJane,
 ppx_compare, ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools, ppx_type_conv, sexplib}:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "ppx_assert";
  hash = "0n7fa1j79ykbkhp8xz0ksg5096asri5d0msshsaqhw5fz18chvz4";
  propagatedBuildInputs =
@@ -1,7 +1,7 @@
 {stdenv, buildOcamlJane,
 ppx_core, ppx_driver, ppx_inline_test, ppx_tools}:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "ppx_bench";
  minimumSupportedOcamlVersion = "4.02";
  hash = "1l5jlwy1d1fqz70wa2fkf7izngp6nx3g4s9bmnd6ca4dx1x5bksk";
@@ -1,7 +1,7 @@
 {stdenv, buildOcamlJane,
 ppx_core, ppx_tools, ppx_type_conv, bin_prot}:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "ppx_bin_prot";
  hash = "0kwmrrrybdkmphqczsr3lg3imsxcjb8iy41syvn44s3kcjfyyzbz";
  propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv bin_prot ];
@@ -1,7 +1,7 @@
 {stdenv, buildOcamlJane,
 ppx_core, ppx_driver, ppx_tools, ppx_type_conv}:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "ppx_compare";
  hash = "05cnwxfxm8201lpfmcqkcqfy6plh5c2151jbj4qsnxhlvvjli459";
  propagatedBuildInputs =
@@ -1,6 +1,6 @@
 {stdenv, buildOcamlJane, ppx_tools}:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "ppx_core";
  hash = "0df7vyai488lfkyh8szw2hvn22jsyrkfvq1b91j1s0g0y27nnfax";
  propagatedBuildInputs =
@@ -1,7 +1,7 @@
 {stdenv, buildOcamlJane,
 ppx_core, ppx_driver, ppx_sexp_conv, ppx_tools}:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "ppx_custom_printf";
  hash = "06y85m6ky376byja4w7gdwd339di5ag0xrf0czkylzjsnylhdr85";

@@ -1,7 +1,7 @@
 {stdenv, buildOcamlJane,
 ppx_core, ppx_optcomp}:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "ppx_driver";
  hash = "19cpfdn1n36vl5l9d6h7c61ffn0wmiipprn5by0354i5aywj8gpn";
  propagatedBuildInputs =
@@ -1,7 +1,7 @@
 {stdenv, buildOcamlJane,
 ppx_core, ppx_tools, ppx_type_conv}:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "ppx_enumerate";
  hash = "0m11921q2pjzkwckf21fynd2qfy83n9jjsgks23yagdai8a7ym16";
  propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv ];
@@ -3,7 +3,7 @@
 ppx_fields_conv, ppx_here, ppx_inline_test, ppx_sexp_conv, ppx_tools,
 ppx_variants_conv, re, sexplib, variantslib, fieldslib}:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "ppx_expect";
  hash = "0cwagb4cj3x1vsr19kyfa9pxlvaz9a5v863cahi5glinsh4mzgdx";
  propagatedBuildInputs =
@@ -1,7 +1,7 @@
 {stdenv, buildOcamlJane,
 ppx_core, ppx_driver, ppx_here, ppx_tools}:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "ppx_fail";
  hash = "1ms5axpc0zg469zj4799nz3wwxi6rmmyvqj52dy03crmpj71s18l";
  propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_tools ];
@@ -1,7 +1,7 @@
 {stdenv, buildOcamlJane,
 ppx_core, ppx_tools, ppx_type_conv}:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "ppx_fields_conv";
  hash = "11w9wfjgkv7yxv3rwlwi6m193zan6rhmi45q7n3ddi2s8ls3gra7";
  propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv ];
@@ -1,7 +1,7 @@
 {stdenv, buildOcamlJane,
 ppx_core, ppx_driver}:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "ppx_here";
  hash = "1mzdgn8k171zkwmbizf1a48l525ny0w3363c7gknpnifcinxniiw";
  propagatedBuildInputs = [ ppx_core ppx_driver ];
@@ -1,7 +1,7 @@
 {stdenv, buildOcamlJane,
 ppx_core, ppx_driver, ppx_tools}:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "ppx_inline_test";
  hash = "0ygapa54i0wwcj3jcqwiimrc6z0b7aafgjhbk37h6vvclnm5n7f6";
  propagatedBuildInputs = [ ppx_core ppx_driver ppx_tools ];
@@ -5,7 +5,7 @@
 ppx_inline_test, ppx_let, ppx_pipebang, ppx_sexp_conv, ppx_sexp_message,
 ppx_sexp_value, ppx_typerep_conv, ppx_variants_conv}:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "ppx_jane";
  hash  = "1la0rp8fhzfglwb15gqh1pl1ld8ls4cnidaw9mjc5q1hb0yj1qd9";
  propagatedBuildInputs =
@@ -1,7 +1,7 @@
 {stdenv, buildOcamlJane,
 ppx_core, ppx_driver}:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "ppx_let";
  hash = "0whnfq4rgkq4apfqnvc100wlk25pmqdyvy6s21dsn3fcm9hff467";
  propagatedBuildInputs = [ ppx_core ppx_driver ];
@@ -1,7 +1,7 @@
 {stdenv, buildOcamlJane,
 ppx_core, ppx_tools}:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "ppx_optcomp";
  hash = "09m2x2a5ics4bz1j29n5slhh1rlyhcwdfmf44v1jfxcby3f0riwd";
  propagatedBuildInputs =
@@ -1,7 +1,7 @@
 {stdenv, buildOcamlJane,
 ppx_core, ppx_driver, ppx_tools}:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "ppx_pipebang";
  hash = "0k25bhj9ziiw89xvs4svz7cgazbbmprba9wbic2llffg55fp7acc";
  propagatedBuildInputs = [ ppx_core ppx_driver ppx_tools ];
@@ -1,7 +1,7 @@
 {stdenv, buildOcamlJane,
 ppx_core, ppx_tools, ppx_type_conv, sexplib}:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "ppx_sexp_conv";
  hash = "1kgbmlc11w5jhbhmy5n0f734l44zwyry48342dm5qydi9sfzcgq2";
  propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv sexplib];
@@ -1,7 +1,7 @@
 {stdenv, buildOcamlJane,
 ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools}:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "ppx_sexp_message";
  hash = "0inbff25qii868p141jb1y8n3vjfyz66jpnsl9nma6nkkyjkp05j";
  propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_sexp_conv ppx_tools ];
@@ -1,7 +1,7 @@
 {stdenv, buildOcamlJane,
 ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools}:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "ppx_sexp_value";
  hash = "04602ppqfwx33ghjywam00hlqqzsz4d99r60k9q0v1mynk9pjhj0";
  propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_sexp_conv ppx_tools ];
@@ -1,7 +1,7 @@
 {stdenv, buildOcamlJane,
 ppx_core, ppx_deriving, ppx_driver, ppx_tools}:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "ppx_type_conv";
  hash = "0gv0mqwn97dwrfm6rj442565y8dz7kiq8s8vadnhywrl7j4znqyq";
  propagatedBuildInputs =
@@ -1,7 +1,7 @@
 {stdenv, buildOcamlJane,
 ppx_core, ppx_tools, ppx_type_conv, typerep}:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "ppx_typerep_conv";
  hash = "0dldlx73r07j6w0i7h4hxly0v678naa79na5rafsk2974gs5ih9g";
  propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv typerep ];
@@ -1,7 +1,7 @@
 {stdenv, buildOcamlJane,
 ppx_core, ppx_tools, ppx_type_conv, sexplib, variantslib}:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "ppx_variants_conv";
  hash = "0kgal8b9yh7wrd75hllb9fyl6zbksfnr9k7pykpzdm3js98dirhn";
  propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv sexplib variantslib ];
@@ -3,7 +3,7 @@
 ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane,
 rsync}:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "re2";
  hash = "0fw5jscb1i17aw8v4l965zw20kyimhfnmf4w83wqaaxkqy3l6fqw";
  buildInputs = [ rsync ];
@@ -1,6 +1,6 @@
 {stdenv, buildOcamlJane, type_conv}:

-buildOcamlJane rec {
+buildOcamlJane {
  minimumSupportedOcamlVersion = "4.02";
  name = "sexplib";
  version = "113.33.03";
@@ -2,7 +2,7 @@
 bin_prot, core, fieldslib, sexplib, typerep, variantslib,
 ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane}:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "textutils";
  hash = "0mkjm9b3k7db7zzrq4403v8qbkgqgkjlz120vcbqh6z7d7ql65vb";
  propagatedBuildInputs =
@@ -1,6 +1,6 @@
 {stdenv, buildOcamlJane, type_conv}:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "typerep";
  version = "113.33.03";

@@ -1,6 +1,6 @@
 {stdenv, buildOcamlJane, type_conv}:

-buildOcamlJane rec {
+buildOcamlJane {
  name = "variantslib";
  version = "113.33.03";

@@ -13,7 +13,7 @@ let param =
  } else throw "lablgtk is not available for OCaml ${ocaml.version}";
 in

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "lablgtk";
  inherit (param) version;

@@ -1,6 +1,6 @@
 { buildDunePackage, gtkspell3, lablgtk3 }:

-buildDunePackage rec {
+buildDunePackage {
  pname = "lablgtk3-gtkspell3";
  buildInputs = [ gtkspell3 ] ++ lablgtk3.buildInputs;
  propagatedBuildInputs = [ lablgtk3 ];
@@ -1,6 +1,6 @@
 { buildDunePackage, gtksourceview, lablgtk3 }:

-buildDunePackage rec {
+buildDunePackage {
  pname = "lablgtk3-sourceview3";
  buildInputs = lablgtk3.buildInputs ++ [ gtksourceview ];
  propagatedBuildInputs = [ lablgtk3 ];
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, libev, ocaml, findlib, ocamlbuild, lwt, react, zed, camlp4 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  version = "1.6";
  pname = "lambda-term";

@@ -18,7 +18,7 @@ let sha256 = {

 let optionals = stdenv.lib.optionals (!stdenv.lib.versionAtLeast version "3"); in

-buildOcaml rec {
+buildOcaml {
  name = "lwt";
  inherit version;

@@ -13,7 +13,7 @@
 , alcotest
 }:

-buildDunePackage rec {
+buildDunePackage {
 	pname = "opium";
 	inherit (opium_kernel) version src meta minimumOCamlVersion;

@@ -8,7 +8,7 @@ in

 assert stdenv.lib.versionAtLeast ocaml.version "4.01.0";

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {

  name = "ocaml-${pname}-${version}";

@@ -7,7 +7,7 @@ let
  version = "1.5.6";
  webpage = "http://sawja.inria.fr/";
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {

  name = "ocaml${ocaml.version}-${pname}-${version}";

@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, buildDunePackage, base, stdio, configurator, secp256k1 }:

-buildDunePackage rec {
+buildDunePackage {
  pname = "secp256k1";
  version = "0.4.0";

@@ -19,7 +19,7 @@ if !versionAtLeast ocaml.version "4.03"
 then throw "vg is not available for OCaml ${ocaml.version}"
 else

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {

  name = "ocaml${ocaml.version}-${pname}-${version}";

@@ -1,6 +1,6 @@
 { buildDunePackage, zmq, ocaml_lwt }:

-buildDunePackage rec {
+buildDunePackage {
  pname = "zmq-lwt";
  inherit (zmq) version src meta;