diff options
| author | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2021-07-24 14:26:34 +0200 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2021-07-25 16:51:51 +0200 |
| commit | e731250332709eed4384c1176cc176eb217fc55f (patch) | |
| tree | 7cf4d7357224cdc059f8dae1a28f6d7283fea518 | |
| parent | 4cf4f3c454ed5f6c54afdfdf0cad23f8badabd0d (diff) | |
| download | nixpkgs-e731250332709eed4384c1176cc176eb217fc55f.tar nixpkgs-e731250332709eed4384c1176cc176eb217fc55f.tar.gz nixpkgs-e731250332709eed4384c1176cc176eb217fc55f.tar.bz2 nixpkgs-e731250332709eed4384c1176cc176eb217fc55f.tar.lz nixpkgs-e731250332709eed4384c1176cc176eb217fc55f.tar.xz nixpkgs-e731250332709eed4384c1176cc176eb217fc55f.tar.zst nixpkgs-e731250332709eed4384c1176cc176eb217fc55f.zip | |
ocamlPackages.tcpip: 6.1.0 -> 6.2.0
https://github.com/mirage/mirage-tcpip/releases/tag/v6.2.0
| -rw-r--r-- | pkgs/development/ocaml-modules/tcpip/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/tcpip/makefile-no-opam.patch | 12 |
2 files changed, 2 insertions, 26 deletions
diff --git a/pkgs/development/ocaml-modules/tcpip/default.nix b/pkgs/development/ocaml-modules/tcpip/default.nix index 53656f00572..635e9aea117 100644 --- a/pkgs/development/ocaml-modules/tcpip/default.nix +++ b/pkgs/development/ocaml-modules/tcpip/default.nix @@ -13,27 +13,15 @@ buildDunePackage rec { pname = "tcpip"; - version = "6.1.0"; + version = "6.2.0"; useDune2 = true; src = fetchurl { url = "https://github.com/mirage/mirage-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "7b3ed2e1ca835c1cc65ac911bcb0de12ebc2b580dd195006bdea2cb387510474"; + sha256 = "d0f6e643ce04da808d5f977c5ab2422cdb4f67e7abdc46dd6776ceada7151e1b"; }; - patches = [ - ./makefile-no-opam.patch - ]; - - # Make tests compatible with alcotest 1.4.0 - postPatch = '' - for p in common.ml test_tcp_options.ml - do - substituteInPlace test/$p --replace 'Fmt.kstrf Alcotest.fail' 'Fmt.kstrf (fun s -> Alcotest.fail s)' - done - ''; - nativeBuildInputs = [ bisect_ppx ppx_cstruct diff --git a/pkgs/development/ocaml-modules/tcpip/makefile-no-opam.patch b/pkgs/development/ocaml-modules/tcpip/makefile-no-opam.patch deleted file mode 100644 index 1603a1278b0..00000000000 --- a/pkgs/development/ocaml-modules/tcpip/makefile-no-opam.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/freestanding/Makefile b/freestanding/Makefile -index f22d220d..3e97b4c5 100644 ---- a/freestanding/Makefile -+++ b/freestanding/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 - - EXISTS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --exists ocaml-freestanding; echo $$?) - |