diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-10-05 11:05:56 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-10-05 11:06:26 -0700 |
| commit | a3e7a84d36e52e37f1aeeee6f561c4a3992a76fa (patch) | |
| tree | cda0f85328637a85cd72620ca34443aa961f5bc8 /pkgs/development/libraries/libev | |
| parent | d9813ed4acfbc0f5adf532551a06177181d435c3 (diff) | |
| download | nixpkgs-a3e7a84d36e52e37f1aeeee6f561c4a3992a76fa.tar nixpkgs-a3e7a84d36e52e37f1aeeee6f561c4a3992a76fa.tar.gz nixpkgs-a3e7a84d36e52e37f1aeeee6f561c4a3992a76fa.tar.bz2 nixpkgs-a3e7a84d36e52e37f1aeeee6f561c4a3992a76fa.tar.lz nixpkgs-a3e7a84d36e52e37f1aeeee6f561c4a3992a76fa.tar.xz nixpkgs-a3e7a84d36e52e37f1aeeee6f561c4a3992a76fa.tar.zst nixpkgs-a3e7a84d36e52e37f1aeeee6f561c4a3992a76fa.zip | |
libev: 4.19 -> 4.20
Tested using stdenv and clangStdenv
Diffstat (limited to 'pkgs/development/libraries/libev')
| -rw-r--r-- | pkgs/development/libraries/libev/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/libraries/libev/noreturn.patch | 13 |
2 files changed, 3 insertions, 21 deletions
diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix index d27df16eb94..0472aeef694 100644 --- a/pkgs/development/libraries/libev/default.nix +++ b/pkgs/development/libraries/libev/default.nix @@ -2,18 +2,13 @@ stdenv.mkDerivation rec { name = "libev-${version}"; - version="4.19"; + version="4.20"; + src = fetchurl { url = "http://dist.schmorp.de/libev/Attic/${name}.tar.gz"; - sha256 = "1jyw7qbl0spxqa0dccj9x1jsw7cj7szff43cq4acmklnra4mzz48"; + sha256 = "17j47pbkr65a18mfvy2861p5k7w4pxmdgiw723ryfqd9gx636w7q"; }; - patches = [ ./noreturn.patch ]; - - # Version 4.19 is not valid C11 (which Clang default to) - # Check if this is still necessary on upgrade - NIX_CFLAGS_COMPILE = if stdenv.cc.isClang then "-std=c99" else null; - meta = { description = "A high-performance event loop/event model with lots of features"; maintainers = [ stdenv.lib.maintainers.raskin ]; diff --git a/pkgs/development/libraries/libev/noreturn.patch b/pkgs/development/libraries/libev/noreturn.patch deleted file mode 100644 index 85e2eaee6b4..00000000000 --- a/pkgs/development/libraries/libev/noreturn.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/ev.c b/ev.c -index 6f36c6d..b8a1c5f 100644 ---- a/ev.c -+++ b/ev.c -@@ -1026,7 +1026,7 @@ ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << ( - #define ecb_unreachable() __builtin_unreachable () - #else - /* this seems to work fine, but gcc always emits a warning for it :/ */ -- ecb_inline void ecb_unreachable (void) ecb_noreturn; -+ ecb_inline ecb_noreturn void ecb_unreachable (void); - ecb_inline void ecb_unreachable (void) { } - #endif - |