Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f57d39855f66
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2332cb7dbc2c
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 17, 2019

  1. liburing: 0.1 -> 0.2pre246_08bd8151 

    Signed-off-by: Austin Seipp <aseipp@pobox.com>
    @thoughtpolice
    thoughtpolice committed Oct 17, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    shuding Shu Ding
    GPG key ID: 899520937F032E83
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2332cb7 View commit details
Showing with 4 additions and 43 deletions.
  1. +4 −43 pkgs/development/libraries/liburing/default.nix
47 changes: 4 additions & 43 deletions pkgs/development/libraries/liburing/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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; {