nixpkgs/pkgs/development/libraries/zeromq/4.x.nix
Vladimír Čunát 89023c38fc
Recover the complicated situation after my bad merge
I made a mistake merge.  Reverting it in c778945806 undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.

I reconstructed the "desired" state of staging-next tree by:
 - checking out the last commit of the problematic range: 4effe769e2
 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
   merge commit and its revert from that range (while keeping
   reapplication from 4effe769e2)
 - merging the last unaffected staging-next commit (803ca85c20)
 - fortunately no other commits have been pushed to staging-next yet
 - applying a diff on staging-next to get it into that state
2020-10-26 09:01:04 +01:00

33 lines
824 B
Nix

{ stdenv, fetchFromGitHub, cmake, asciidoc, pkg-config, libsodium
, enableDrafts ? false }:
stdenv.mkDerivation rec {
pname = "zeromq";
version = "4.3.3";
src = fetchFromGitHub {
owner = "zeromq";
repo = "libzmq";
rev = "v${version}";
sha256 = "155kb0ih0xj4jvd39bq8d04bgvhy9143r3632ks1m04455z4qdzd";
};
nativeBuildInputs = [ cmake asciidoc pkg-config ];
buildInputs = [ libsodium ];
enableParallelBuilding = true;
doCheck = false; # fails all the tests (ctest)
cmakeFlags = stdenv.lib.optional enableDrafts "-DENABLE_DRAFTS=ON";
meta = with stdenv.lib; {
branch = "4";
homepage = "http://www.zeromq.org";
description = "The Intelligent Transport Layer";
license = licenses.gpl3;
platforms = platforms.all;
maintainers = with maintainers; [ fpletz ];
};
}