BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ocamlPackages.netchannel: 2.0.0 → 2.1.1

Browse source 
ocamlPackages.mirage-xen: 6.0.0 → 7.2.0
This commit is contained in:
Vincent Laporte 2022-06-26 22:01:20 +01:00 committed by sternenseemann
parent 592b9dbcc8
commit eea01cd11d
5 changed files with 14 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/ocaml-modules/mirage-net-xen/default.nix
View file

@ -17,8 +17,6 @@ buildDunePackage {
inherit (netchannel)
src
version
useDune2
minimumOCamlVersion
meta
;

36
pkgs/development/ocaml-modules/mirage-xen/default.nix
View file

@ -1,7 +1,6 @@
{ lib
, buildDunePackage
, fetchurl
, pkg-config
, cstruct
, lwt
, shared-memory-ring-lwt
@ -11,7 +10,6 @@
, mirage-runtime
, logs
, fmt
, ocaml-freestanding
, bheap
, duration
, io-page
@ -19,32 +17,14 @@
buildDunePackage rec {
pname = "mirage-xen";
version = "6.0.0";
useDune2 = true;
version = "7.2.0";
src = fetchurl {
url = "https://github.com/mirage/mirage-xen/releases/download/v${version}/mirage-xen-v${version}.tbz";
sha256 = "f991e972059b27993c287ad010d9281fee061efaa1dd475d0955179f93710fbd";
url = "https://github.com/mirage/mirage-xen/releases/download/v${version}/mirage-xen-${version}.tbz";
sha256 = "sha256-5ZdzourQshHGtYPPdJtJLpH8P6ZLNbjQWy7TDxcY3OA=";
};
patches = [
./makefile-no-opam.patch
./pkg-config.patch
];
# can't handle OCAMLFIND_DESTDIR with substituteAll
postPatch = ''
substituteInPlace lib/bindings/mirage-xen.pc \
--replace "@out@" "$out" \
--replace "@OCAMLFIND_DESTDIR@" "$OCAMLFIND_DESTDIR"
'';
minimumOCamlVersion = "4.08";
nativeBuildInputs = [
pkg-config
];
minimalOCamlVersion = "4.08";
propagatedBuildInputs = [
cstruct
@ -59,16 +39,8 @@ buildDunePackage rec {
fmt
bheap
duration
(ocaml-freestanding.override { target = "xen"; })
];
# Move pkg-config files into their well-known location.
# This saves us an extra setup hook and causes no issues
# since we patch all relative paths out of the .pc file.
postInstall = ''
mv $OCAMLFIND_DESTDIR/pkgconfig $out/lib/pkgconfig
'';
meta = with lib; {
description = "Xen core platform libraries for MirageOS";
license = licenses.isc;

12
pkgs/development/ocaml-modules/mirage-xen/makefile-no-opam.patch
View file

@ -1,12 +0,0 @@
diff --git a/lib/bindings/Makefile b/lib/bindings/Makefile
index 4e413c0..67c7bdc 100644
--- a/lib/bindings/Makefile
+++ b/lib/bindings/Makefile
@@ -1,4 +1,6 @@
-PKG_CONFIG_PATH := $(shell opam config var prefix)/lib/pkgconfig
+ifneq (, $(shell command -v opam))
+ PKG_CONFIG_PATH ?= $(shell opam config var prefix)/lib/pkgconfig
+endif
CC ?= cc
FREESTANDING_CFLAGS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --cflags ocaml-freestanding)

13
pkgs/development/ocaml-modules/mirage-xen/pkg-config.patch
View file

@ -1,13 +0,0 @@
diff --git a/lib/bindings/mirage-xen.pc b/lib/bindings/mirage-xen.pc
index a03a217..8499aa4 100644
--- a/lib/bindings/mirage-xen.pc
+++ b/lib/bindings/mirage-xen.pc
@@ -1,6 +1,6 @@
-prefix=${pcfiledir}/../..
+prefix=@out@
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@OCAMLFIND_DESTDIR@
Name: mirage-xen
Version: 6.0.0

18
pkgs/development/ocaml-modules/netchannel/default.nix
View file

@ -12,20 +12,20 @@
, shared-memory-ring
, sexplib
, logs
, rresult
, macaddr
, lwt-dllist
, result
}:
buildDunePackage rec {
pname = "netchannel";
version = "2.0.0";
version = "2.1.1";
useDune2 = true;
minimumOCamlVersion = "4.08";
minimalOCamlVersion = "4.08";
src = fetchurl {
url = "https://github.com/mirage/mirage-net-xen/releases/download/v${version}/mirage-net-xen-v${version}.tbz";
sha256 = "ec3906ef1804ef6a9e36b91f4ae73ce4849e9e0d1d36a80fe66b5f905fab93ad";
url = "https://github.com/mirage/mirage-net-xen/releases/download/v${version}/mirage-net-xen-${version}.tbz";
sha256 = "sha256-kYsAf6ntwWKUp26dMcp5BScdUOaGpM46050jVZe6gfs=";
};
nativeBuildInputs = [
@ -43,7 +43,9 @@ buildDunePackage rec {
shared-memory-ring
sexplib
logs
rresult
macaddr
lwt-dllist
result
];
meta = with lib; {