From 0d2b66dff20609e9d8888558def28a173aa85099 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 2 May 2019 19:29:32 -0500 Subject: [PATCH] liburing: bump, fix version (1.0.0pre92_7b989f3) I accidentally got the number of commits wrong in the previous prerelease version string. This is now fixed. Generally, this would result in functions like builtins.compareVersions to give incorrect results, so 'nix-env -u' doesn't work. But I'm justifying it here, because: most people use it as a library, so the hash change is all that matters. Plus, I only authored this a week or so ago in upstream, so this change is fast enough that I think people will be fine with it and can work around, especially since it's unreleased in any stable channel. This also bumps the library to the newest version, which contains some bugfixes, and now installs the manpages into the $man output for us. Signed-off-by: Austin Seipp --- pkgs/development/libraries/liburing/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index 143919d148e..c90e0ee009e 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "liburing-${version}"; - version = "1.0.0pre821_${builtins.substring 0 7 src.rev}"; + version = "1.0.0pre92_${builtins.substring 0 7 src.rev}"; src = fetchgit { url = "http://git.kernel.dk/liburing"; - rev = "39e0ebd4fc66046bf733a47aaa899a556093ebc6"; - sha256 = "00c72fizxmwxd2jzmlzi4l82cw7h75lfpkkwzwcjpw9zdg9w0ci7"; + rev = "7b989f34191302011b5b49bf5b26b36862d54056"; + sha256 = "12kfqvwzxksmsm8667a1g4vxr6xsaq63cz9wrfhwq6hrsv3ynydc"; }; enableParallelBuilding = true; @@ -19,13 +19,12 @@ stdenv.mkDerivation rec { [ "prefix=$(out)" "includedir=$(dev)/include" "libdir=$(lib)/lib" + "mandir=$(man)/share/man" ]; - # Copy the examples into $out and man pages into $man. This should be handled - # by the build system in the future and submitted upstream. + # Copy the examples into $out. postInstall = '' - mkdir -p $out/bin $man/share/man/man2/ - cp -R ./man/* $man/share/man/man2 + mkdir -p $out/bin cp ./examples/io_uring-cp examples/io_uring-test $out/bin '';