ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

ocamlPackages.stdint: 0.5.0 -> 0.5.1

Browse Source
This commit is contained in:
Cedric Cellier 2019-03-26 11:04:59 +01:00 committed by Vincent Laporte
parent 5f47ad0f8a
commit 1777055209
3 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/ocaml-modules/stdint/default.nix
View File

@ -1,19 +1,20 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }: { stdenv, fetchFromGitHub, ocaml, findlib, dune }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-stdint-${version}"; pname = "stdint";
version = "0.5.0"; name = "ocaml${ocaml.version}-${pname}-${version}";
version = "0.5.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "andrenth"; owner = "andrenth";
repo = "ocaml-stdint"; repo = "ocaml-stdint";
rev = version; rev = version;
sha256 = "1xjzqq13m7cqrfwa6vcwxirm17w8bx025dgnjqjgd3k2lxfgd1j7"; sha256 = "0z2z77m3clna9m9k0f8fd1400cdlglvy1kr893qs3907b3v0c057";
}; };
buildInputs = [ ocaml findlib ocamlbuild ]; buildInputs = [ ocaml findlib dune ];
configurePhase = "ocaml setup.ml -configure --prefix $out";
createFindlibDestdir = true; buildPhase = "dune build -p ${pname}";
inherit (dune) installPhase;
meta = { meta = {
description = "Various signed and unsigned integers for OCaml"; description = "Various signed and unsigned integers for OCaml";

4
pkgs/development/ocaml-modules/zmq/default.nix
View File

@ -11,10 +11,6 @@ buildDunePackage rec {
sha256 = "1f5l4bw78y4drabhyvmpj3z8k30bill33ca7bzhr02m55yf6gqpf"; sha256 = "1f5l4bw78y4drabhyvmpj3z8k30bill33ca7bzhr02m55yf6gqpf";
}; };
patches = [
./ocaml-zmq-issue43.patch
];
buildInputs = [ czmq ]; buildInputs = [ czmq ];
propagatedBuildInputs = [ stdint ]; propagatedBuildInputs = [ stdint ];

11
pkgs/development/ocaml-modules/zmq/ocaml-zmq-issue43.patch
View File

@ -1,11 +0,0 @@
--- source/zmq/src/caml_zmq_stubs.c 1970-01-01 01:00:01.000000000 +0100
+++ source/zmq/src/caml_zmq_stubs.c 1970-01-01 01:00:01.000000000 +0100
@@ -35,7 +35,7 @@
#include "socket.h"
#include "msg.h"
-#include <uint64.h>
+#include <ocaml_stdint/uint64.h>
/**
* Version