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

ocamlPackages.tcpip: 6.0.0 -> 6.1.0 

https://github.com/mirage/mirage-tcpip/releases/tag/v6.1.0
This commit is contained in:
sternenseemann 2021-03-17 23:41:08 +01:00 committed by Vincent Laporte
parent 8463b9959d
commit 988f5a5910
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/ocaml-modules/tcpip/default.nix
View File

@ -1,5 +1,5 @@
{ lib, buildDunePackage, fetchurl { lib, buildDunePackage, fetchurl
, bisect_ppx, ppx_cstruct , bisect_ppx, ppx_cstruct, pkg-config
, rresult, cstruct, cstruct-lwt, mirage-net, mirage-clock , rresult, cstruct, cstruct-lwt, mirage-net, mirage-clock
, mirage-random, mirage-stack, mirage-protocols, mirage-time , mirage-random, mirage-stack, mirage-protocols, mirage-time
, ipaddr, macaddr, macaddr-cstruct, mirage-profile, fmt , ipaddr, macaddr, macaddr-cstruct, mirage-profile, fmt
@ -11,18 +11,23 @@
buildDunePackage rec { buildDunePackage rec {
pname = "tcpip"; pname = "tcpip";
version = "6.0.0"; version = "6.1.0";
useDune2 = true; useDune2 = true;
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/mirage-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; url = "https://github.com/mirage/mirage-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
sha256 = "0wbrs8jz1vw3zdrqmqcwawxh4yhc2gy30rw7gz4w116cblkvnb8s"; sha256 = "e81c98a6e80e05f9fa4e5fbee50e6c247f6011254c7b1d9a0e58bae318c1f0c8";
}; };
patches = [
./no-opam-pkg-config-path.patch
];
nativeBuildInputs = [ nativeBuildInputs = [
bisect_ppx bisect_ppx
ppx_cstruct ppx_cstruct
pkg-config
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [

21
pkgs/development/ocaml-modules/tcpip/no-opam-pkg-config-path.patch Normal file
View File

@ -0,0 +1,21 @@
diff --git a/freestanding/Makefile b/freestanding/Makefile
index f22d220d..4bb3ac57 100644
--- a/freestanding/Makefile
+++ b/freestanding/Makefile
@@ -1,6 +1,4 @@
-PKG_CONFIG_PATH := $(shell opam config var prefix)/lib/pkgconfig
-
-EXISTS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --exists ocaml-freestanding; echo $$?)
+EXISTS := $(shell pkg-config --exists ocaml-freestanding; echo $$?)
.PHONY: all clean
all: libtcpip_freestanding_stubs.a
@@ -10,7 +8,7 @@ libtcpip_freestanding_stubs.a:
touch $@
else
CC ?= cc
-FREESTANDING_CFLAGS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --cflags ocaml-freestanding)
+FREESTANDING_CFLAGS := $(shell pkg-config --cflags ocaml-freestanding)
CFLAGS := $(FREESTANDING_CFLAGS)
OBJS=checksum_stubs.o