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

Merge branch 'master' into static-fixes

Browse Source
This commit is contained in:
Matthew Bauer
2019-12-02 13:34:24 -05:00
committed by GitHub
parent 7263951cc8 9fe1b95c3d
commit 0505c5125c
2387 changed files with 35006 additions and 69414 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/ocaml-modules/bap/default.nix
+3 -3
View File
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
createFindlibDestdir = true;
setupHook = writeText "setupHook.sh" ''
export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}/"
export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}-llvm-plugins/"
export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}/"
export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}-llvm-plugins/"
'';
nativeBuildInputs = [ which makeWrapper ];
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
installPhase = ''
export OCAMLPATH=$OCAMLPATH:$OCAMLFIND_DESTDIR;
export PATH=$PATH:$out/bin
export CAML_LD_LIBRARY_PATH=$CAML_LD_LIBRARY_PATH:$OCAMLFIND_DESTDIR/bap-plugin-llvm/:$OCAMLFIND_DESTDIR/bap/
export CAML_LD_LIBRARY_PATH=''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}$OCAMLFIND_DESTDIR/bap-plugin-llvm/:$OCAMLFIND_DESTDIR/bap/
mkdir -p $out/lib/bap
make install
rm $out/bin/baptop
pkgs/development/ocaml-modules/cpuid/default.nix
+8 -11
View File
@@ -1,23 +1,20 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg, ocb-stubblr, buildDunePackage }:
{ lib, fetchurl, buildDunePackage }:
buildDunePackage rec {
pname = "cpuid";
version = "0.1.2";
src = fetchFromGitHub {
owner = "pqwy";
repo = pname;
rev = "v${version}";
sha256 = "04zqlvy608kj9pn48q5zybz62rlwzyfmadpwjhcxwcx28km528r4";
};
minimumOCamlVersion = "4.03";
#buildInputs = [ ocb-stubblr ];
src = fetchurl {
url = "https://github.com/pqwy/cpuid/releases/download/v${version}/cpuid-v${version}.tbz";
sha256 = "08ng4mva6qblb5ipkrxbr0my7ndkc4qwcbswkqgbgir864s74m93";
};
meta = {
homepage = https://github.com/pqwy/cpuid;
description = "Detect CPU features from OCaml";
license = stdenv.lib.licenses.isc;
maintainers = [ stdenv.lib.maintainers.vbgl ];
inherit (ocaml.meta) platforms;
license = lib.licenses.isc;
maintainers = [ lib.maintainers.vbgl ];
};
}
pkgs/development/ocaml-modules/easy-format/default.nix
+1 -1
View File
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "A high-level and functional interface to the Format module of the OCaml standard library";
homepage = "http://mjambon.com/${pname}.html";
homepage = "https://github.com/ocaml-community/${pname}";
license = licenses.bsd3;
maintainers = [ maintainers.vbgl ];
};
pkgs/development/ocaml-modules/eigen/default.nix
+25
View File
@@ -0,0 +1,25 @@
{ stdenv, buildDunePackage, fetchFromGitHub, ctypes }:
buildDunePackage rec {
pname = "eigen";
version = "0.1.5";
src = fetchFromGitHub {
owner = "owlbarn";
repo = pname;
rev = version;
sha256 = "0pbqd87i9h7qpx84hr8k4iw0rhmjgma4s3wihxh992jjvsrgdyfi";
};
minimumOCamlVersion = "4.04";
propagatedBuildInputs = [ ctypes ];
meta = with stdenv.lib; {
inherit (src.meta) homepage;
description = "Minimal/incomplete Ocaml interface to Eigen3, mostly for Owl";
platforms = platforms.x86_64;
maintainers = [ maintainers.bcdarwin ];
license = licenses.mit;
};
}
pkgs/development/ocaml-modules/facile/default.nix
+8 -27
View File
@@ -1,38 +1,19 @@
{ stdenv, fetchurl, ocaml, findlib }:
{ lib, fetchurl, buildDunePackage }:
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-facile-${version}";
version = "1.1.3";
buildDunePackage rec {
pname = "facile";
version = "1.1.4";
src = fetchurl {
url = "http://opti.recherche.enac.fr/facile/distrib/facile-${version}.tar.gz";
sha256 = "1v4apqcw4gm36ph5xwf1wxaaza0ggvihvgsdslnf33fa1pdkvdjw";
url = "https://github.com/Emmanuel-PLF/facile/releases/download/${version}/facile-${version}.tbz";
sha256 = "0jqrwmn6fr2vj2rrbllwxq4cmxykv7zh0y4vnngx29f5084a04jp";
};
dontAddPrefix = 1;
buildInputs = [ ocaml findlib ];
createFindlibDestdir = true;
installFlags = [ "FACILEDIR=$(OCAMLFIND_DESTDIR)/facile" ];
postInstall = ''
cat > $OCAMLFIND_DESTDIR/facile/META <<EOF
version = "${version}"
name = "facile"
description = "A Functional Constraint Library"
requires = ""
archive(byte) = "facile.cma"
archive(native) = "facile.cmxa"
EOF
'';
doCheck = true;
meta = {
homepage = "http://opti.recherche.enac.fr/facile/";
license = stdenv.lib.licenses.lgpl21Plus;
license = lib.licenses.lgpl21Plus;
description = "A Functional Constraint Library";
platforms = stdenv.lib.platforms.unix;
};
}
pkgs/development/ocaml-modules/iso8601/default.nix
+1 -1
View File
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
createFindlibDestdir = true;
meta = {
homepage = http://sagotch.github.io/ISO8601.ml/;
homepage = https://ocaml-community.github.io/ISO8601.ml/;
description = "ISO 8601 and RFC 3999 date parsing for OCaml";
license = stdenv.lib.licenses.mit;
platforms = ocaml.meta.platforms or [];
pkgs/development/ocaml-modules/kafka/default.nix
+26
View File
@@ -0,0 +1,26 @@
{ stdenv, fetchFromGitHub, buildDunePackage, base, cmdliner, ocaml_lwt,
rdkafka, zlib }:
buildDunePackage rec {
pname = "kafka";
version = "0.4";
src = fetchFromGitHub {
owner = "didier-wenzek";
repo = "ocaml-kafka";
rev = version;
sha256 = "0lb8x0wh7sf8v9mjwhq32azjz54kw49fsjfb7m76z4nhxfkjw5hy";
};
buildInputs = [ base cmdliner ocaml_lwt zlib ];
propagatedBuildInputs = [ rdkafka zlib ];
meta = with stdenv.lib; {
homepage = https://github.com/didier-wenzek/ocaml-kafka;
description = "OCaml bindings for Kafka";
license = licenses.mit;
maintainers = [ maintainers.rixed ];
};
}
pkgs/development/ocaml-modules/lablgl/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, ocaml, lablgtk, findlib, libGLU_combined, freeglut, camlp4 } :
{stdenv, fetchurl, ocaml, lablgtk, findlib, libGLU, libGL, freeglut, camlp4 } :
let
pname = "lablgl";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ocaml findlib lablgtk freeglut camlp4];
propagatedBuildInputs = [ libGLU_combined ];
propagatedBuildInputs = [ libGLU libGL ];
patches = [ ./Makefile.config.patch ./META.patch ];
pkgs/development/ocaml-modules/lwt/4.x.nix
+5 -10
View File
@@ -1,5 +1,5 @@
{ lib, fetchzip, pkgconfig, ncurses, libev, buildDunePackage, ocaml
, cppo, ocaml-migrate-parsetree, ppx_tools_versioned, result
, cppo, ocaml-migrate-parsetree, ocplib-endian, result
, mmap, seq
}:
@@ -7,22 +7,17 @@ let inherit (lib) optional versionAtLeast; in
buildDunePackage rec {
pname = "lwt";
version = "4.2.1";
version = "4.4.0";
src = fetchzip {
url = "https://github.com/ocsigen/${pname}/archive/${version}.tar.gz";
sha256 = "1hz24fyhpm7d6603v399pgxvdl236srwagqja41ljvjx83y10ysr";
sha256 = "1l97zdcql7y13fhaq0m9n9xvxf712jg0w70r72fvv6j49xm4nlhi";
};
postPatch = ''
substituteInPlace lwt.opam \
--replace 'version: "dev"' 'version: "${version}"'
'';
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cppo ocaml-migrate-parsetree ppx_tools_versioned ]
buildInputs = [ cppo ocaml-migrate-parsetree ]
++ optional (!versionAtLeast ocaml.version "4.07") ncurses;
propagatedBuildInputs = [ libev mmap seq result ];
propagatedBuildInputs = [ libev mmap ocplib-endian seq result ];
meta = {
homepage = "https://ocsigen.org/lwt/";
pkgs/development/ocaml-modules/lwt/ppx.nix
+1 -2
View File
@@ -5,8 +5,7 @@ buildDunePackage {
inherit (lwt) src version;
buildInputs = [ ppx_tools_versioned ];
propagatedBuildInputs = [ lwt ];
propagatedBuildInputs = [ lwt ppx_tools_versioned ];
meta = {
description = "Ppx syntax extension for Lwt";
pkgs/development/ocaml-modules/ocsigen-server/default.nix
+1 -1
View File
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
''
rm -rf $out/var/run
wrapProgram $out/bin/ocsigenserver \
--prefix CAML_LD_LIBRARY_PATH : "$CAML_LD_LIBRARY_PATH:${mkpath ssl "ssl"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath ocaml_sqlite3 "sqlite3"}"
--suffix CAML_LD_LIBRARY_PATH : "${mkpath ssl "ssl"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath ocaml_sqlite3 "sqlite3"}"
'';
dontPatchShebangs = true;
pkgs/development/ocaml-modules/owl-base/default.nix
+25
View File
@@ -0,0 +1,25 @@
{ stdenv, buildDunePackage, fetchFromGitHub, integers, stdlib-shims }:
buildDunePackage rec {
pname = "owl-base";
version = "0.7.1";
src = fetchFromGitHub {
owner = "owlbarn";
repo = "owl";
rev = version;
sha256 = "1v4jfn3w18zq188f9gskx9ffja3xx59j2mgrw6azp8lsbqixg5xk";
};
propagatedBuildInputs = [ stdlib-shims ];
minimumOCamlVersion = "4.06";
meta = with stdenv.lib; {
description = "Numerical computing library for Ocaml";
homepage = "https://ocaml.xyz";
platforms = platforms.x86_64;
maintainers = [ maintainers.bcdarwin ];
license = licenses.mit;
};
}
pkgs/development/ocaml-modules/owl/default.nix
+15
View File
@@ -0,0 +1,15 @@
{ stdenv, buildDunePackage, fetchFromGitHub, alcotest
, eigen, stdio, stdlib-shims, openblasCompat, owl-base
}:
buildDunePackage rec {
pname = "owl";
inherit (owl-base) version src meta;
buildInputs = [ eigen ];
checkInputs = [ alcotest ];
propagatedBuildInputs = [ stdio stdlib-shims openblasCompat owl-base ];
# tests not enabled for now due to owlbarn/owl/issues/460
}
pkgs/development/ocaml-modules/sodium/default.nix
+27
View File
@@ -0,0 +1,27 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, ctypes, libsodium }:
stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-sodium";
version = "0.6.0";
src = fetchFromGitHub {
owner = "dsheets";
repo = "ocaml-sodium";
rev = version;
sha256 = "124gpi1jhac46x05gp5viykyrafnlp03v1cmkl13c6pgcs8w04pv";
};
buildInputs = [ ocaml findlib ocamlbuild ];
propagatedBuildInputs = [ ctypes libsodium ];
createFindlibDestdir = true;
hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow";
meta = with stdenv.lib; {
homepage = https://github.com/dsheets/ocaml-sodium;
description = "Binding to libsodium 1.0.9+";
platforms = ocaml.meta.platforms or [];
maintainers = [ maintainers.rixed ];
};
}
pkgs/development/ocaml-modules/yojson/default.nix
+1 -1
View File
@@ -36,7 +36,7 @@ stdenv.mkDerivation ({
meta = with stdenv.lib; {
description = "An optimized parsing and printing library for the JSON format";
homepage = "http://mjambon.com/${pname}.html";
homepage = "https://github.com/ocaml-community/${pname}";
license = licenses.bsd3;
maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms or [];