diff options
author | Austin Seipp <aseipp@pobox.com> | 2019-09-27 12:41:54 -0500 |
---|---|---|
committer | Austin Seipp <aseipp@pobox.com> | 2019-10-17 16:47:12 -0500 |
commit | 2332cb7dbc2c67955deba0c00fba5209d738e44b (patch) | |
tree | e87d23fa2fffd6e27ae93b4a93b6635e3feaa842 | |
parent | f57d39855f66fd9d4fa798e489dd4f6fdaf772a1 (diff) |
liburing: 0.1 -> 0.2pre246_08bd8151
Signed-off-by: Austin Seipp <aseipp@pobox.com>
-rw-r--r-- | pkgs/development/libraries/liburing/default.nix | 47 |
1 files changed, 4 insertions, 43 deletions
diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index 855c6ce280ecb..d2738bf72671f 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -4,54 +4,14 @@ stdenv.mkDerivation rec { pname = "liburing"; - version = "0.1"; + version = "0.2pre246_${builtins.substring 0 8 src.rev}"; src = fetchgit { url = "http://git.kernel.dk/liburing"; - rev = "refs/tags/liburing-${version}"; - sha256 = "038iqsbm9bdmlwvmb899bc6g1rw5dalr990azynbvgn8qs5adysh"; + rev = "08bd815170ab4352d71019f4d3e532cd3f6f0489"; + sha256 = "1wqraxj9mzph3wgfq4ld4bxa8ya2db65cwzyh9fmhvhhlsivi6wr"; }; - patches = [ - - # This patch re-introduces support for aarch64-linux, by adding the - # necessary memory barrier primitives for it to work. - # - # Already upstream: remove when moving to the next version - (fetchpatch { - url = "http://git.kernel.dk/cgit/liburing/patch/?id=0520db454c29f1d96cda6cf6cedeb93df65301e8"; - sha256 = "1i8133sb1imzxpplmhlhnaxkffgplhj40vanivc6clbibvhgwpq6"; - }) - - # This patch shuffles the name of the io_uring memory barrier primitives. - # They were using extremely common names by accident, which caused - # namespace conflicts with many other projects using the same names. Note: - # this does not change the user-visible API of liburing (liburing is - # designed exactly to hide the necessary memory barriers when using the - # io_uring syscall directly). It only changes the names of some internals. - # The only reason this caused problems at all is because memory barrier - # primitives are written as preprocessor defines, in a common header file, - # which get included unilaterally. - # - # Already upstream: remove when moving to the next version - (fetchpatch { - url = "http://git.kernel.dk/cgit/liburing/patch/?id=552c6a08d04c74d20eeaa86f535bfd553b352370"; - sha256 = "123d6jdqfy7b8aq9f6ax767n48hhbx6pln3nlrp623595i8zz3wf"; - }) - - # Finally, this patch fixes the aarch64-linux support introduced by the - # first patch, but which was _broken_ by the second patch, in a horrid - # twist of fate: it neglected to change the names of the aarch64 barriers - # appropriately. - # - # Already upstream: remove when moving to the next version - (fetchpatch { - url = "http://git.kernel.dk/cgit/liburing/patch/?id=6e9dd0c8c50b5988a0c77532c9c2bd6afd4790d2"; - sha256 = "11mqa1bp2pdfqh08gpcd98kg7lh3rrng41b4l1wvhxdbvg5rfw9c"; - }) - - ]; - separateDebugInfo = true; enableParallelBuilding = true; @@ -70,6 +30,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp ./examples/io_uring-cp examples/io_uring-test $out/bin cp ./examples/link-cp $out/bin/io_uring-link-cp + cp ./examples/ucontext-cp $out/bin/io_uring-ucontext-cp ''; meta = with stdenv.lib; { |