git.iko.soy/typeable/nixpkgs
on master help sign in
Revert "ocamlPackages.tcpip: 6.0.0 -> 6.1.0"

This reverts commit 988f5a5910bdba12f34b500e0dc3aa60042a75a6. The release process for many OCaml packages and in extension mirage related packages usually entails creating a release in the respective own repository so a release tarball becomes available and then opening a PR against ocaml/opam-repository to finalize the release. During this new issues can be discovered which push the release back. This happened for mirage-tcpip 6.1.0 several times: https://github.com/ocaml/opam-repository/pull/18357 Prompting in total 3 different 6.1.0 releases with different hashes respectively (the hash for ocamlPackages.tcpip.src shouldn't be reproducible anymore, but we probably have cached the tarball already). Ultimately the PR to opam-repository was closed to investigate some failures on opam-repository's CI and the release postponed: https://github.com/ocaml/opam-repository/pull/18357#issuecomment-808434285 I jumped the gun with the release and updated tcpip in nixpkgs before tcpip was “properly” released in opam. I usually watch the github repository of package I maintain for releases and can react pretty quickly to a release as a result. Most of the time I also check opam-repository's PRs nowadays for extra context or information, but when everything seems fine and tests succeed I deem the update alright to PR to nixpkgs. Being faster than opam was achievable in these cases and actually seems kind of tantalizing. In the light of this experience however, we should wait for the opam PR getting merged at least for some packages that exhibit this behavior of rereleasing the same version number multiple times to get the release just right (afaik the 6.1.0 tag pointed to three different revisions for tcpip). To me this is questionable upstream behavior we just have to deal with in some way.

commitb2eb2c8b4f422bee0f5f5a07cd705fadf1cbbc32 authorsternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> dateSat 27 Mar 2021, 00:57 (6 years ago) parent477812e
2 files changed+3−29
pkgs/development/ocaml-modules/tcpip/default.nix+3−8 pkgs/development/ocaml-modules/tcpip/no-opam-pkg-config-path.patch−21
pkgs/development/ocaml-modules/tcpip/default.nix+3−8
@@ -1,5 +1,5 @@
11{ lib, buildDunePackage, fetchurl
2−, bisect_ppx, ppx_cstruct, pkg-config
2+, bisect_ppx, ppx_cstruct
33, rresult, cstruct, cstruct-lwt, mirage-net, mirage-clock
44, mirage-random, mirage-stack, mirage-protocols, mirage-time
55, ipaddr, macaddr, macaddr-cstruct, mirage-profile, fmt
@@ -11,23 +11,18 @@
1111
1212buildDunePackage rec {
1313 pname = "tcpip";
14− version = "6.1.0";
14+ version = "6.0.0";
1515
1616 useDune2 = true;
1717
1818 src = fetchurl {
1919 url = "https://github.com/mirage/mirage-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
20− sha256 = "e81c98a6e80e05f9fa4e5fbee50e6c247f6011254c7b1d9a0e58bae318c1f0c8";
20+ sha256 = "0wbrs8jz1vw3zdrqmqcwawxh4yhc2gy30rw7gz4w116cblkvnb8s";
2121 };
2222
23− patches = [
24− ./no-opam-pkg-config-path.patch
25− ];
26−
2723 nativeBuildInputs = [
2824 bisect_ppx
2925 ppx_cstruct
30− pkg-config
3126 ];
3227
3328 propagatedBuildInputs = [
pkgs/development/ocaml-modules/tcpip/no-opam-pkg-config-path.patchdeleted−21
@@ -1,21 +0,0 @@
1−diff --git a/freestanding/Makefile b/freestanding/Makefile
2−index f22d220d..4bb3ac57 100644
3−--- a/freestanding/Makefile
4−+++ b/freestanding/Makefile
5−@@ -1,6 +1,4 @@
6−-PKG_CONFIG_PATH := $(shell opam config var prefix)/lib/pkgconfig
7−-
8−-EXISTS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --exists ocaml-freestanding; echo $$?)
9−+EXISTS := $(shell pkg-config --exists ocaml-freestanding; echo $$?)
10−
11− .PHONY: all clean
12− all: libtcpip_freestanding_stubs.a
13−@@ -10,7 +8,7 @@ libtcpip_freestanding_stubs.a:
14− touch $@
15− else
16− CC ?= cc
17−-FREESTANDING_CFLAGS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --cflags ocaml-freestanding)
18−+FREESTANDING_CFLAGS := $(shell pkg-config --cflags ocaml-freestanding)
19− CFLAGS := $(FREESTANDING_CFLAGS)
20−
21− OBJS=checksum_stubs.o