ef65ac9 · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

Merge pull request #143870 from Stunkymonkey/development-github-3

commitef65ac981aac0faf9f532398897c6c0b9c1b08e4 authorSandro <sandro.jaeckel@gmail.com> dateSun 28 Nov 2021, 15:59 (5 years ago) parent89bb06e 5a76214

11 files changed+73−43

compare with master

unifiedsplit

pkgs/development/ocaml-modules/lwt_ssl/default.nix+6−4

@@ -1,4 +1,4 @@

1−{ lib, fetchzip, buildDunePackage, ssl, lwt }:

1+{ lib, fetchFromGitHub, buildDunePackage, ssl, lwt }:

33buildDunePackage rec {

44 pname = "lwt_ssl";

@@ -7,9 +7,11 @@ buildDunePackage rec {

77 minimumOCamlVersion = "4.02";

88 useDune2 = true;

10− src = fetchzip {

11− url = "https://github.com/aantron/${pname}/archive/${version}.tar.gz";

12− sha256 = "0v417ch5zn0yknj156awa5mrq3mal08pbrvsyribbn63ix6f9y3p";

10+ src = fetchFromGitHub {

11+ owner = "aantron";

12+ repo = "lwt_ssl";

13+ rev = version;

14+ sha256 = "sha256-d/jkTI/D2LVi9nrndRGgqg6ca1FcmRKknR7YXyA7gWw=";

1315 };

1416

1517 propagatedBuildInputs = [ ssl lwt ];

pkgs/development/ocaml-modules/macaque/default.nix+6−4

@@ -1,12 +1,14 @@

1−{ lib, stdenv, fetchzip, ocaml, findlib, ocamlbuild, pgocaml, camlp4 }:

1+{ lib, stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, pgocaml, camlp4 }:

33stdenv.mkDerivation rec {

44 pname = "ocaml-macaque";

55 version = "0.7.2";

7− src = fetchzip {

8− url = "https://github.com/ocsigen/macaque/archive/${version}.tar.gz";

9− sha256 = "14i0a8cndzndjmlkyhf31r451q99cnkndgxcj0id4qjqhdl4bmjv";

7+ src = fetchFromGitHub {

8+ owner = "ocsigen";

9+ repo = "macaque";

10+ rev = version;

11+ sha256 = "sha256-W9ZFaINYYtIikKy/ZqdlKeFQSA7DQT9plc3+ZhlSIJI=";

1012 };

1113

1214 buildInputs = [ ocaml findlib ocamlbuild camlp4 ];

pkgs/development/ocaml-modules/markup/default.nix+6−4

@@ -1,4 +1,4 @@

1−{ lib, buildDunePackage, fetchzip, ocaml, uchar, uutf, ounit2 }:

1+{ lib, buildDunePackage, fetchFromGitHub, ocaml, uchar, uutf, ounit2 }:

33buildDunePackage rec {

44 pname = "markup";

@@ -6,9 +6,11 @@ buildDunePackage rec {

77 useDune2 = true;

9− src = fetchzip {

10− url = "https://github.com/aantron/markup.ml/archive/${version}.tar.gz";

11− sha256 = "09hkrf9pw6hpb9j06p5bddklpnjwdjpqza3bx2179l970yl67an9";

9+ src = fetchFromGitHub {

10+ owner = "aantron";

11+ repo = "markup.ml";

12+ rev = version;

13+ sha256 = "sha256-yapjqAcn0XSC6Guoj69sXNpLZ2urXANkWhcafpPLEyY=";

1214 };

1315

1416 propagatedBuildInputs = [ uchar uutf ];

pkgs/development/ocaml-modules/ocplib-endian/default.nix+5−3

@@ -1,11 +1,13 @@

1−{ lib, buildDunePackage, fetchzip, cppo }:

1+{ lib, buildDunePackage, fetchFromGitHub, cppo }:

33buildDunePackage rec {

44 version = "1.1";

55 pname = "ocplib-endian";

7− src = fetchzip {

8− url = "https://github.com/OCamlPro/ocplib-endian/archive/${version}.tar.gz";

7+ src = fetchFromGitHub {

8+ owner = "OCamlPro";

9+ repo = "ocplib-endian";

10+ rev = version;

911 sha256 = "sha256-zKsSkhlZBXSqPtw+/WN3pwo9plM9rDZfMbGVfosqb10=";

1012 };

1113

pkgs/development/ocaml-modules/ocsigen-deriving/default.nix+19−7

@@ -1,4 +1,12 @@

1−{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild, oasis, ocaml_optcomp, camlp4

1+{ stdenv

2+, lib

3+, fetchFromGitHub

4+, ocaml

5+, findlib

6+, ocamlbuild

7+, oasis

8+, ocaml_optcomp

9+, camlp4

210, num

311}:

412

@@ -19,23 +27,27 @@ let inherit (param) version; in

1927stdenv.mkDerivation {

2028 pname = "ocsigen-deriving";

2129 inherit version;

22− src = fetchzip {

23− url = "https://github.com/ocsigen/deriving/archive/${version}.tar.gz";

30+

31+ src = fetchFromGitHub {

32+ owner = "ocsigen";

33+ repo = "deriving";

34+ rev = version;

2435 inherit (param) sha256;

2536 };

2637

2738 buildInputs = [ ocaml findlib ocamlbuild oasis ocaml_optcomp camlp4 ]

28− ++ (param.buildInputs or []);

39+ ++ (param.buildInputs or [ ]);

2940

3041 createFindlibDestdir = true;

3142

32− meta = {

43+ meta = {

3344 homepage = "https://github.com/ocsigen/deriving";

3445 description = "Extension to OCaml for deriving functions from type declarations";

3546 license = lib.licenses.mit;

36− platforms = ocaml.meta.platforms or [];

47+ platforms = ocaml.meta.platforms or [ ];

3748 maintainers = with lib.maintainers; [

38− gal_bolle vbgl

49+ gal_bolle

50+ vbgl

3951 ];

4052 };

4153

pkgs/development/ocaml-modules/ocsigen-start/default.nix+1−1

@@ -5,7 +5,7 @@

55}:

77stdenv.mkDerivation rec {

8− name = "ocaml${ocaml.version}-ocsigen-start-${version}";

8+ pname = "ocaml${ocaml.version}-ocsigen-start";

99 version = "4.3.0";

1010

1111 buildInputs = [ ocaml findlib ];

pkgs/development/ocaml-modules/optcomp/default.nix+6−4

@@ -1,12 +1,14 @@

1−{ stdenv, lib, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, camlp4 }:

1+{ stdenv, lib, fetchFromGitHub, fetchpatch, ocaml, findlib, ocamlbuild, camlp4 }:

33stdenv.mkDerivation rec {

44 pname = "ocaml-optcomp";

55 version = "1.6";

7− src = fetchurl {

8− url = "https://github.com/diml/optcomp/archive/${version}.tar.gz";

9− sha256 = "0hhhb2gisah1h22zlg5iszbgqxdd7x85cwd57bd4mfkx9l7dh8jh";

7+ src = fetchFromGitHub {

8+ owner = "diml";

9+ repo = "optcomp";

10+ rev = version;

11+ sha256 = "sha256-UCLYDk19ukraOqVxVlA/rXX81texPPqFgAEqHZ9YEEI=";

1012 };

1113

1214 patches =

pkgs/development/ocaml-modules/pa_bench/default.nix+6−4

@@ -1,4 +1,4 @@

1−{lib, buildOcaml, fetchurl, type_conv, pa_ounit}:

1+{ lib, buildOcaml, fetchFromGitHub, type_conv, pa_ounit }:

33buildOcaml rec {

44 pname = "pa_bench";

@@ -6,9 +6,11 @@ buildOcaml rec {

77 minimumSupportedOcamlVersion = "4.00";

9− src = fetchurl {

10− url = "https://github.com/janestreet/pa_bench/archive/${version}.tar.gz";

11− sha256 = "1cd6291gdnk6h8ziclg6x3if8z5xy67nfz9gx8sx4k2cwv0j29k5";

9+ src = fetchFromGitHub {

10+ owner = "janestreet";

11+ repo = "pa_bench";

12+ rev = version;

13+ sha256 = "sha256-WaXB3lgNPHy/z6D7uHxfD5W4HYuTZ+ieRbxxHlPao7c=";

1214 };

1315

1416 buildInputs = [ pa_ounit ];

pkgs/development/ocaml-modules/pa_ounit/default.nix+6−4

@@ -1,4 +1,4 @@

1−{ lib, buildOcaml, ocaml, fetchurl, ounit }:

1+{ lib, buildOcaml, ocaml, fetchFromGitHub, ounit }:

33if lib.versionAtLeast ocaml.version "4.06"

44then throw "pa_ounit is not available for OCaml ${ocaml.version}"

@@ -8,9 +8,11 @@ buildOcaml rec {

88 pname = "pa_ounit";

99 version = "113.00.00";

1010

11− src = fetchurl {

12− url = "https://github.com/janestreet/pa_ounit/archive/${version}.tar.gz";

13− sha256 = "0vi0p2hxcrdsl0319c9s8mh9hmk2i4ir6c6vrj8axkc37zkgc437";

11+ src = fetchFromGitHub {

12+ owner = "janestreet";

13+ repo = "pa_ounit";

14+ rev = version;

15+ sha256 = "sha256-zzXN+mSJtlnQ3e1QoEukCiyfDEoe8cBdkAQ3U1dkvEk=";

1416 };

1517

1618 propagatedBuildInputs = [ ounit ];

pkgs/development/ocaml-modules/pipebang/default.nix+6−4

@@ -1,4 +1,4 @@

1−{lib, buildOcaml, fetchurl}:

1+{ lib, buildOcaml, fetchFromGitHub }:

33buildOcaml rec {

44 pname = "pipebang";

@@ -6,9 +6,11 @@ buildOcaml rec {

77 minimumSupportedOcamlVersion = "4.00";

9− src = fetchurl {

10− url = "https://github.com/janestreet/pipebang/archive/${version}.tar.gz";

11− sha256 = "0acm2y8wxvnapa248lkgm0vcc44hlwhrjxqkx1awjxzcmarnxhfk";

9+ src = fetchFromGitHub {

10+ owner = "janestreet";

11+ repo = "pipebang";

12+ rev = version;

13+ sha256 = "sha256-9A3X/ciL5HtuKQ5awS+hDDBLL5ytOr12wHsmJLNRn+Q=";

1214 };

1315

1416 meta = with lib; {

pkgs/development/ocaml-modules/reactivedata/default.nix+6−4

@@ -1,4 +1,4 @@

1−{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, react, opaline }:

1+{ lib, stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, react, opaline }:

33if !lib.versionAtLeast ocaml.version "4.04"

44then throw "reactiveData is not available for OCaml ${ocaml.version}"

@@ -8,9 +8,11 @@ stdenv.mkDerivation rec {

88 pname = "ocaml${ocaml.version}-reactiveData";

99 version = "0.2.2";

1010

11− src = fetchurl {

12− url = "https://github.com/ocsigen/reactiveData/archive/${version}.tar.gz";

13− sha256 = "0jzagyp4zla28wykvcgqwd8df71ir0vb4s8akp02cfacd5v86sng";

11+ src = fetchFromGitHub {

12+ owner = "ocsigen";

13+ repo = "reactiveData";

14+ rev = version;

15+ sha256 = "sha256-YLkacIbjxZQ/ThgSxjTqviBYih6eW2GX5H7iybQDv1A=";

1416 };

1517

1618 buildInputs = [ ocaml findlib ocamlbuild opaline ];