diff --git a/pkgs/development/ocaml-modules/bitv/default.nix b/pkgs/development/ocaml-modules/bitv/default.nix index 23e8d145a308..2ac3a0ba3e76 100644 --- a/pkgs/development/ocaml-modules/bitv/default.nix +++ b/pkgs/development/ocaml-modules/bitv/default.nix @@ -1,16 +1,18 @@ -{ stdenv, lib, fetchzip, autoreconfHook, which, ocaml, findlib }: +{ stdenv, lib, fetchFromGitHub, autoreconfHook, which, ocaml, findlib }: if !lib.versionAtLeast ocaml.version "4.02" then throw "bitv is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-bitv-${version}"; + pname = "ocaml${ocaml.version}-bitv"; version = "1.3"; - src = fetchzip { - url = "https://github.com/backtracking/bitv/archive/${version}.tar.gz"; - sha256 = "0vkh1w9fpi5m1sgiqg6r38j3fqglhdajmbyiyr91113lrpljm75i"; + src = fetchFromGitHub { + owner = "backtracking"; + repo = "bitv"; + rev = version; + sha256 = "sha256-sZwq6c10hBBS9tGvKlWD9GE3JBrZPByfDrXE6xIPcG4="; }; buildInputs = [ autoreconfHook which ocaml findlib ]; diff --git a/pkgs/development/ocaml-modules/comparelib/default.nix b/pkgs/development/ocaml-modules/comparelib/default.nix index a1371e4f4d5e..1d7c314f005c 100644 --- a/pkgs/development/ocaml-modules/comparelib/default.nix +++ b/pkgs/development/ocaml-modules/comparelib/default.nix @@ -1,4 +1,4 @@ -{lib, buildOcaml, fetchurl, type_conv}: +{ lib, buildOcaml, fetchFromGitHub, type_conv }: buildOcaml rec { pname = "comparelib"; @@ -6,9 +6,11 @@ buildOcaml rec { minimumSupportedOcamlVersion = "4.00"; - src = fetchurl { - url = "https://github.com/janestreet/comparelib/archive/${version}.tar.gz"; - sha256 = "02l343drgi4200flfx73nzdk61zajwidsqjk9n80b2d37lvhazlf"; + src = fetchFromGitHub { + owner = "janestreet"; + repo = "comparelib"; + rev = version; + sha256 = "sha256-gtJvXAUxiIt/L9bCzS+8wHcCQ+QpBubwcjDcyN0K2MA="; }; propagatedBuildInputs = [ type_conv ]; diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index 6a50c73103b7..1b5a50b13b97 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -1,14 +1,16 @@ -{ lib, buildDunePackage, fetchurl, zlib, dune-configurator, zarith, ncurses }: +{ lib, buildDunePackage, fetchFromGitHub, zlib, dune-configurator, zarith, ncurses }: -buildDunePackage { +buildDunePackage rec { pname = "cryptokit"; version = "1.16.1"; useDune2 = true; - src = fetchurl { - url = "https://github.com/xavierleroy/cryptokit/archive/release1161.tar.gz"; - sha256 = "0kzqkk451m69nqi5qiwak0rd0rp5vzi613gcngsiig7dyxwka61c"; + src = fetchFromGitHub { + owner = "xavierleroy"; + repo = "cryptokit"; + rev = "release${lib.replaceStrings ["."] [""] version}"; + sha256 = "sha256-eDIzi16Al/mXCNos/lVqjZWCtdP9SllXnRfm4GBWMfA="; }; # dont do autotools configuration, but do trigger findlib's preConfigure hook diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix index f8ccffcf217f..8c20a68c2746 100644 --- a/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/pkgs/development/ocaml-modules/ctypes/default.nix @@ -1,28 +1,30 @@ -{ lib, stdenv, fetchzip, ocaml, findlib, libffi, pkg-config, ncurses, integers, bigarray-compat }: +{ lib, stdenv, fetchFromGitHub, ocaml, findlib, libffi, pkg-config, ncurses, integers, bigarray-compat }: if !lib.versionAtLeast ocaml.version "4.02" then throw "ctypes is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-ctypes-${version}"; + pname = "ocaml${ocaml.version}-ctypes"; version = "0.18.0"; - src = fetchzip { - url = "https://github.com/ocamllabs/ocaml-ctypes/archive/${version}.tar.gz"; - sha256 = "03zrbnl16m67ls0yfhq7a4k4238x6x6b3m456g4dw2yqwc153vks"; + src = fetchFromGitHub { + owner = "ocamllabs"; + repo = "ocaml-ctypes"; + rev = version; + sha256 = "sha256-eu5RAuPYC97IM4XUsUw3HQ1BJlEHQ+eBpsdUE6hd+Q8="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ocaml findlib ncurses ]; propagatedBuildInputs = [ integers libffi bigarray-compat ]; - buildPhase = '' - make XEN=false libffi.config ctypes-base ctypes-stubs - make XEN=false ctypes-foreign + buildPhase = '' + make XEN=false libffi.config ctypes-base ctypes-stubs + make XEN=false ctypes-foreign ''; - installPhase = '' + installPhase = '' mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs make install XEN=false ''; diff --git a/pkgs/development/ocaml-modules/dolog/default.nix b/pkgs/development/ocaml-modules/dolog/default.nix index 690823c5358a..64fb2b2c5a59 100644 --- a/pkgs/development/ocaml-modules/dolog/default.nix +++ b/pkgs/development/ocaml-modules/dolog/default.nix @@ -1,13 +1,14 @@ -{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }: +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }: -let version = "3.0"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "ocaml-dolog"; - inherit version; - src = fetchzip { - url = "https://github.com/UnixJunkie/dolog/archive/v${version}.tar.gz"; - sha256 = "0gx2s4509vkkkaikl2yp7k5x7bqv45s1y1vsy408d8rakd7yl1zb"; + version = "3.0"; + + src = fetchFromGitHub { + owner = "UnixJunkie"; + repo = "dolog"; + rev = "v${version}"; + sha256 = "sha256-6wfqT5sqo4YA8XoHH3QhG6/TyzzXCzqjmnPuBArRoj8="; }; buildInputs = [ ocaml findlib ocamlbuild ]; @@ -20,7 +21,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/UnixJunkie/dolog"; description = "Minimalistic lazy logger in OCaml"; - platforms = ocaml.meta.platforms or []; + platforms = ocaml.meta.platforms or [ ]; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/easy-format/default.nix b/pkgs/development/ocaml-modules/easy-format/default.nix index 161e263e129b..a6e78977846c 100644 --- a/pkgs/development/ocaml-modules/easy-format/default.nix +++ b/pkgs/development/ocaml-modules/easy-format/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchzip, ocaml, findlib }: -let +{ lib, stdenv, fetchFromGitHub, ocaml, findlib }: + +stdenv.mkDerivation rec { + pname = "easy-format"; version = "1.2.0"; -in -stdenv.mkDerivation { - name = "${pname}-${version}"; - - src = fetchzip { - url = "https://github.com/mjambon/${pname}/archive/v${version}.tar.gz"; - sha256 = "00ga7mrlycjc99gzp3bgx6iwhf7i6j8856f8xzrf1yas7zwzgzm9"; + src = fetchFromGitHub { + owner = "mjambon"; + repo = "easy-format"; + rev = "v${version}"; + sha256 = "sha256-qf73+T9a+eDy78iZgpA08TjIo+lvjftfSkwyT3M96gE="; }; nativeBuildInputs = [ ocaml findlib ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with lib; { description = "A high-level and functional interface to the Format module of the OCaml standard library"; - homepage = "https://github.com/ocaml-community/${pname}"; + homepage = "https://github.com/ocaml-community/easy-format"; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 4e2714fedd26..69ac628d2014 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,25 +1,40 @@ -{ stdenv, lib, fetchzip, which, ocsigen_server, ocaml, - lwt_react, - opaline, ppx_deriving, findlib -, js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, js_of_ocaml-ppx_deriving_json +{ stdenv +, lib +, fetchFromGitHub +, which +, ocsigen_server +, ocaml +, lwt_react +, opaline +, ppx_deriving +, findlib +, js_of_ocaml-ocamlbuild +, js_of_ocaml-ppx +, js_of_ocaml-ppx_deriving_json , js_of_ocaml-lwt , js_of_ocaml-tyxml , lwt_ppx , ocamlnet }: -stdenv.mkDerivation rec -{ +stdenv.mkDerivation rec { pname = "eliom"; version = "8.9.0"; - src = fetchzip { - url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz"; - sha256 = "sha256:1b1vb3ilb54ffzb98mqa6zggqchsnjspbni8qxi6j42pbajp7p2l"; + src = fetchFromGitHub { + owner = "ocsigen"; + repo = "eliom"; + rev = version; + sha256 = "sha256-VNxzpVpXEGlixyjadbW0GjL83jcKV5TWd46UReNYO6w="; }; - buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild - js_of_ocaml-ppx_deriving_json opaline + buildInputs = [ + ocaml + which + findlib + js_of_ocaml-ocamlbuild + js_of_ocaml-ppx_deriving_json + opaline ocamlnet ]; @@ -41,7 +56,7 @@ stdenv.mkDerivation rec homepage = "http://ocsigen.org/eliom/"; description = "OCaml Framework for programming Web sites and client/server Web applications"; - longDescription =''Eliom is a framework for programming Web sites + longDescription = ''Eliom is a framework for programming Web sites and client/server Web applications. It introduces new concepts to simplify programming common behaviours and uses advanced static typing features of OCaml to check many properties of the Web site diff --git a/pkgs/development/ocaml-modules/erm_xml/default.nix b/pkgs/development/ocaml-modules/erm_xml/default.nix index 56b5c9295708..fa072f8bd1c1 100644 --- a/pkgs/development/ocaml-modules/erm_xml/default.nix +++ b/pkgs/development/ocaml-modules/erm_xml/default.nix @@ -1,17 +1,18 @@ -{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }: +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }: if !lib.versionAtLeast ocaml.version "4.02" then throw "erm_xml is not available for OCaml ${ocaml.version}" else -let version = "0.3+20180112"; in +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-erm_xml"; + version = "0.3+20180112"; -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-erm_xml-${version}"; - - src = fetchzip { - url = "https://github.com/hannesm/xml/archive/bbabdade807d8281fc48806da054b70dfe482479.tar.gz"; - sha256 = "1gawpmg8plip0wia0xq60m024dn7l3ykwbjpbqx9f9bdmx74n1rr"; + src = fetchFromGitHub { + owner = "hannesm"; + repo = "xml"; + rev = "bbabdade807d8281fc48806da054b70dfe482479"; + sha256 = "sha256-OQdLTq9tJZc6XlcuPv2gxzYiQAUGd6AiBzfSi169XL0="; }; buildInputs = [ ocaml findlib ocamlbuild ]; @@ -21,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/hannesm/xml"; description = "XML Parser for discrete data"; - platforms = ocaml.meta.platforms or []; + platforms = ocaml.meta.platforms or [ ]; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/herelib/default.nix b/pkgs/development/ocaml-modules/herelib/default.nix index b6f05fc46af3..14c775d25fcd 100644 --- a/pkgs/development/ocaml-modules/herelib/default.nix +++ b/pkgs/development/ocaml-modules/herelib/default.nix @@ -1,4 +1,4 @@ -{lib, buildOcaml, fetchurl}: +{ lib, buildOcaml, fetchFromGitHub }: buildOcaml rec { version = "112.35.00"; @@ -6,9 +6,11 @@ buildOcaml rec { minimumSupportedOcamlVersion = "4.00"; - src = fetchurl { - url = "https://github.com/janestreet/herelib/archive/${version}.tar.gz"; - sha256 = "03rrlpjmnd8d1rzzmd112355m7a5bwn3vf90xkbc6gkxlad9cxbs"; + src = fetchFromGitHub { + owner = "janestreet"; + repo = "herelib"; + rev = version; + sha256 = "sha256-EuMhHu2na3lcpsJ1wMVOgBr6VKndlonq8jgAW01eelI="; }; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/iso8601/default.nix b/pkgs/development/ocaml-modules/iso8601/default.nix index d1b55609bc4a..add18281008c 100644 --- a/pkgs/development/ocaml-modules/iso8601/default.nix +++ b/pkgs/development/ocaml-modules/iso8601/default.nix @@ -1,13 +1,14 @@ -{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }: +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }: -let version = "0.2.4"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "ocaml-iso8601"; - inherit version; - src = fetchzip { - url = "https://github.com/sagotch/ISO8601.ml/archive/${version}.tar.gz"; - sha256 = "0ypdd1p04xdjxxx3b61wp7abswfrq3vcvwwaxvywxwqljw0dhydi"; + version = "0.2.4"; + + src = fetchFromGitHub { + owner = "sagotch"; + repo = "ISO8601.ml"; + rev = version; + sha256 = "sha256-sXnYAJcU88797orzzfbA2XG91Lk8mDV677J1Am5o7Xo="; }; buildInputs = [ ocaml findlib ocamlbuild ]; @@ -17,7 +18,7 @@ stdenv.mkDerivation { homepage = "https://ocaml-community.github.io/ISO8601.ml/"; description = "ISO 8601 and RFC 3999 date parsing for OCaml"; license = lib.licenses.mit; - platforms = ocaml.meta.platforms or []; + platforms = ocaml.meta.platforms or [ ]; maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix index 15678f89da3c..78b61de8d9c1 100644 --- a/pkgs/development/ocaml-modules/javalib/default.nix +++ b/pkgs/development/ocaml-modules/javalib/default.nix @@ -1,5 +1,11 @@ -{ lib, stdenv, fetchzip, which, ocaml, findlib -, camlzip, extlib +{ lib +, stdenv +, fetchFromGitHub +, which +, ocaml +, findlib +, camlzip +, extlib }: if !lib.versionAtLeast ocaml.version "4.04" @@ -7,12 +13,14 @@ then throw "javalib is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-javalib-${version}"; + pname = "ocaml${ocaml.version}-javalib"; version = "3.2.1"; - src = fetchzip { - url = "https://github.com/javalib-team/javalib/archive/v${version}.tar.gz"; - sha256 = "1fkdaiiza145yv0r1cm0n2hsrr0rbn6b27vs66njgv405zwn3vbn"; + src = fetchFromGitHub { + owner = "javalib-team"; + repo = "javalib"; + rev = "v${version}"; + sha256 = "sha256-du1h+S+A7CetMXofsYxdGeSsobCgspDB9oUE9WNUbbo="; }; buildInputs = [ which ocaml findlib ]; @@ -26,7 +34,7 @@ stdenv.mkDerivation rec { configureScript = "./configure.sh"; dontAddPrefix = "true"; dontAddStaticConfigureFlags = true; - configurePlatforms = []; + configurePlatforms = [ ]; propagatedBuildInputs = [ camlzip extlib ]; diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index be15d2b72a54..76e973a813e4 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchzip, pkg-config, ncurses, libev, buildDunePackage, ocaml +{ lib, fetchFromGitHub, pkg-config, ncurses, libev, buildDunePackage, ocaml , cppo, dune-configurator, ocplib-endian, result , mmap, seq , ocaml-syntax-shims @@ -12,9 +12,11 @@ buildDunePackage rec { useDune2 = true; - src = fetchzip { - url = "https://github.com/ocsigen/${pname}/archive/${version}.tar.gz"; - sha256 = "0cq2qy23sa1a5zk6nja3c652mp29i84yfrkcwks6i8sdqwli36jy"; + src = fetchFromGitHub { + owner = "ocsigen"; + repo = "lwt"; + rev = version; + sha256 = "sha256-XpoRKcdNo2j05Gxm5wmKSdwqimFDSWvmLyooPYTHAjM="; }; nativeBuildInputs = [ pkg-config cppo dune-configurator ];