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

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

Browse Source
This commit is contained in:
Sandro 2021-11-28 15:59:07 +01:00 committed by GitHub
commit ef65ac981a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 73 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/ocaml-modules/lwt_ssl/default.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchzip, buildDunePackage, ssl, lwt }:
{ lib, fetchFromGitHub, buildDunePackage, ssl, lwt }:
buildDunePackage rec {
pname = "lwt_ssl";
@ -7,9 +7,11 @@ buildDunePackage rec {
minimumOCamlVersion = "4.02";
useDune2 = true;
src = fetchzip {
url = "https://github.com/aantron/${pname}/archive/${version}.tar.gz";
sha256 = "0v417ch5zn0yknj156awa5mrq3mal08pbrvsyribbn63ix6f9y3p";
src = fetchFromGitHub {
owner = "aantron";
repo = "lwt_ssl";
rev = version;
sha256 = "sha256-d/jkTI/D2LVi9nrndRGgqg6ca1FcmRKknR7YXyA7gWw=";
};
propagatedBuildInputs = [ ssl lwt ];

10
pkgs/development/ocaml-modules/macaque/default.nix
View File

@ -1,12 +1,14 @@
{ lib, stdenv, fetchzip, ocaml, findlib, ocamlbuild, pgocaml, camlp4 }:
{ lib, stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, pgocaml, camlp4 }:
stdenv.mkDerivation rec {
pname = "ocaml-macaque";
version = "0.7.2";
src = fetchzip {
url = "https://github.com/ocsigen/macaque/archive/${version}.tar.gz";
sha256 = "14i0a8cndzndjmlkyhf31r451q99cnkndgxcj0id4qjqhdl4bmjv";
src = fetchFromGitHub {
owner = "ocsigen";
repo = "macaque";
rev = version;
sha256 = "sha256-W9ZFaINYYtIikKy/ZqdlKeFQSA7DQT9plc3+ZhlSIJI=";
};
buildInputs = [ ocaml findlib ocamlbuild camlp4 ];

10
pkgs/development/ocaml-modules/markup/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildDunePackage, fetchzip, ocaml, uchar, uutf, ounit2 }:
{ lib, buildDunePackage, fetchFromGitHub, ocaml, uchar, uutf, ounit2 }:
buildDunePackage rec {
pname = "markup";
@ -6,9 +6,11 @@ buildDunePackage rec {
useDune2 = true;
src = fetchzip {
url = "https://github.com/aantron/markup.ml/archive/${version}.tar.gz";
sha256 = "09hkrf9pw6hpb9j06p5bddklpnjwdjpqza3bx2179l970yl67an9";
src = fetchFromGitHub {
owner = "aantron";
repo = "markup.ml";
rev = version;
sha256 = "sha256-yapjqAcn0XSC6Guoj69sXNpLZ2urXANkWhcafpPLEyY=";
};
propagatedBuildInputs = [ uchar uutf ];

8
pkgs/development/ocaml-modules/ocplib-endian/default.nix
View File

@ -1,11 +1,13 @@
{ lib, buildDunePackage, fetchzip, cppo }:
{ lib, buildDunePackage, fetchFromGitHub, cppo }:
buildDunePackage rec {
version = "1.1";
pname = "ocplib-endian";
src = fetchzip {
url = "https://github.com/OCamlPro/ocplib-endian/archive/${version}.tar.gz";
src = fetchFromGitHub {
owner = "OCamlPro";
repo = "ocplib-endian";
rev = version;
sha256 = "sha256-zKsSkhlZBXSqPtw+/WN3pwo9plM9rDZfMbGVfosqb10=";
};

26
pkgs/development/ocaml-modules/ocsigen-deriving/default.nix
View File

@ -1,4 +1,12 @@
{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild, oasis, ocaml_optcomp, camlp4
{ stdenv
, lib
, fetchFromGitHub
, ocaml
, findlib
, ocamlbuild
, oasis
, ocaml_optcomp
, camlp4
, num
}:
@ -19,23 +27,27 @@ let inherit (param) version; in
stdenv.mkDerivation {
pname = "ocsigen-deriving";
inherit version;
src = fetchzip {
url = "https://github.com/ocsigen/deriving/archive/${version}.tar.gz";
src = fetchFromGitHub {
owner = "ocsigen";
repo = "deriving";
rev = version;
inherit (param) sha256;
};
buildInputs = [ ocaml findlib ocamlbuild oasis ocaml_optcomp camlp4 ]
++ (param.buildInputs or []);
++ (param.buildInputs or [ ]);
createFindlibDestdir = true;
meta = {
meta = {
homepage = "https://github.com/ocsigen/deriving";
description = "Extension to OCaml for deriving functions from type declarations";
license = lib.licenses.mit;
platforms = ocaml.meta.platforms or [];
platforms = ocaml.meta.platforms or [ ];
maintainers = with lib.maintainers; [
gal_bolle vbgl
gal_bolle
vbgl
];
};

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

@ -5,7 +5,7 @@
}:
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-ocsigen-start-${version}";
pname = "ocaml${ocaml.version}-ocsigen-start";
version = "4.3.0";
buildInputs = [ ocaml findlib ];

10
pkgs/development/ocaml-modules/optcomp/default.nix
View File

@ -1,12 +1,14 @@
{ stdenv, lib, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, camlp4 }:
{ stdenv, lib, fetchFromGitHub, fetchpatch, ocaml, findlib, ocamlbuild, camlp4 }:
stdenv.mkDerivation rec {
pname = "ocaml-optcomp";
version = "1.6";
src = fetchurl {
url = "https://github.com/diml/optcomp/archive/${version}.tar.gz";
sha256 = "0hhhb2gisah1h22zlg5iszbgqxdd7x85cwd57bd4mfkx9l7dh8jh";
src = fetchFromGitHub {
owner = "diml";
repo = "optcomp";
rev = version;
sha256 = "sha256-UCLYDk19ukraOqVxVlA/rXX81texPPqFgAEqHZ9YEEI=";
};
patches =

10
pkgs/development/ocaml-modules/pa_bench/default.nix
View File

@ -1,4 +1,4 @@
{lib, buildOcaml, fetchurl, type_conv, pa_ounit}:
{ lib, buildOcaml, fetchFromGitHub, type_conv, pa_ounit }:
buildOcaml rec {
pname = "pa_bench";
@ -6,9 +6,11 @@ buildOcaml rec {
minimumSupportedOcamlVersion = "4.00";
src = fetchurl {
url = "https://github.com/janestreet/pa_bench/archive/${version}.tar.gz";
sha256 = "1cd6291gdnk6h8ziclg6x3if8z5xy67nfz9gx8sx4k2cwv0j29k5";
src = fetchFromGitHub {
owner = "janestreet";
repo = "pa_bench";
rev = version;
sha256 = "sha256-WaXB3lgNPHy/z6D7uHxfD5W4HYuTZ+ieRbxxHlPao7c=";
};
buildInputs = [ pa_ounit ];

10
pkgs/development/ocaml-modules/pa_ounit/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildOcaml, ocaml, fetchurl, ounit }:
{ lib, buildOcaml, ocaml, fetchFromGitHub, ounit }:
if lib.versionAtLeast ocaml.version "4.06"
then throw "pa_ounit is not available for OCaml ${ocaml.version}"
@ -8,9 +8,11 @@ buildOcaml rec {
pname = "pa_ounit";
version = "113.00.00";
src = fetchurl {
url = "https://github.com/janestreet/pa_ounit/archive/${version}.tar.gz";
sha256 = "0vi0p2hxcrdsl0319c9s8mh9hmk2i4ir6c6vrj8axkc37zkgc437";
src = fetchFromGitHub {
owner = "janestreet";
repo = "pa_ounit";
rev = version;
sha256 = "sha256-zzXN+mSJtlnQ3e1QoEukCiyfDEoe8cBdkAQ3U1dkvEk=";
};
propagatedBuildInputs = [ ounit ];

10
pkgs/development/ocaml-modules/pipebang/default.nix
View File

@ -1,4 +1,4 @@
{lib, buildOcaml, fetchurl}:
{ lib, buildOcaml, fetchFromGitHub }:
buildOcaml rec {
pname = "pipebang";
@ -6,9 +6,11 @@ buildOcaml rec {
minimumSupportedOcamlVersion = "4.00";
src = fetchurl {
url = "https://github.com/janestreet/pipebang/archive/${version}.tar.gz";
sha256 = "0acm2y8wxvnapa248lkgm0vcc44hlwhrjxqkx1awjxzcmarnxhfk";
src = fetchFromGitHub {
owner = "janestreet";
repo = "pipebang";
rev = version;
sha256 = "sha256-9A3X/ciL5HtuKQ5awS+hDDBLL5ytOr12wHsmJLNRn+Q=";
};
meta = with lib; {

10
pkgs/development/ocaml-modules/reactivedata/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, react, opaline }:
{ lib, stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, react, opaline }:
if !lib.versionAtLeast ocaml.version "4.04"
then throw "reactiveData is not available for OCaml ${ocaml.version}"
@ -8,9 +8,11 @@ stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-reactiveData";
version = "0.2.2";
src = fetchurl {
url = "https://github.com/ocsigen/reactiveData/archive/${version}.tar.gz";
sha256 = "0jzagyp4zla28wykvcgqwd8df71ir0vb4s8akp02cfacd5v86sng";
src = fetchFromGitHub {
owner = "ocsigen";
repo = "reactiveData";
rev = version;
sha256 = "sha256-YLkacIbjxZQ/ThgSxjTqviBYih6eW2GX5H7iybQDv1A=";
};
buildInputs = [ ocaml findlib ocamlbuild opaline ];