From be7ef555f26ae8d1fc45898f02a7d26b478c9c3c Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 24 Mar 2015 19:44:00 +0100
Subject: [PATCH 1/3] libev: port to mkDerivation

---
 pkgs/development/libraries/libev/default.nix  | 28 +++++++------------
 .../libraries/libev/src-for-default.nix       |  9 ------
 .../libraries/libev/src-info-for-default.nix  |  5 ----
 pkgs/top-level/all-packages.nix               |  2 +-
 4 files changed, 11 insertions(+), 33 deletions(-)
 delete mode 100644 pkgs/development/libraries/libev/src-for-default.nix
 delete mode 100644 pkgs/development/libraries/libev/src-info-for-default.nix

diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix
index 6b070c170c7d..e96c69f21384 100644
--- a/pkgs/development/libraries/libev/default.nix
+++ b/pkgs/development/libraries/libev/default.nix
@@ -1,25 +1,17 @@
-a :  
-let 
-  s = import ./src-for-default.nix;
-  buildInputs = with a; [
-    
-  ];
-in
-rec {
-  src = a.fetchUrlFromSrcInfo s;
+{ stdenv, fetchurl }:
 
-  inherit (s) name;
-  inherit buildInputs;
-  configureFlags = [];
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-      
+stdenv.mkDerivation rec {
+  name = "libev-${version}";
+  version="4.15";
+  src = fetchurl {
+    url = "http://dist.schmorp.de/libev/Attic/${name}.tar.gz";
+    sha256 = "1svgc1hq4i5zsw4i02sf7xb4pk2d8kpvc1gdrd856vsmffh47pdj";
+  };
   meta = {
     description = "An event loop library remotely similar to libevent";
     maintainers = [
-      a.lib.maintainers.raskin
+      stdenv.lib.maintainers.raskin
     ];
-    platforms = a.lib.platforms.all;
+    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/libev/src-for-default.nix b/pkgs/development/libraries/libev/src-for-default.nix
deleted file mode 100644
index 3e4f58a5ce0f..000000000000
--- a/pkgs/development/libraries/libev/src-for-default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-rec {
-   version="4.15";
-   name="libev-4.15";
-   hash="1svgc1hq4i5zsw4i02sf7xb4pk2d8kpvc1gdrd856vsmffh47pdj";
-   url="http://dist.schmorp.de/libev/Attic/libev-${version}.tar.gz";
-   advertisedUrl="http://dist.schmorp.de/libev/Attic/libev-4.15.tar.gz";
-  
-  
-}
diff --git a/pkgs/development/libraries/libev/src-info-for-default.nix b/pkgs/development/libraries/libev/src-info-for-default.nix
deleted file mode 100644
index e14ca4195504..000000000000
--- a/pkgs/development/libraries/libev/src-info-for-default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  downloadPage = "http://dist.schmorp.de/libev/Attic/?M=D";
-  sourceRegexp = "(^|/)libev-.*[.]tar[.]gz";
-  baseName = "libev";
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2efc9ea27ad9..00c7e4863fcc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6193,7 +6193,7 @@ let
 
   libechonest = callPackage ../development/libraries/libechonest { };
 
-  libev = builderDefsPackage ../development/libraries/libev { };
+  libev = callPackage ../development/libraries/libev { };
 
   libevent14 = callPackage ../development/libraries/libevent/1.4.nix { };
   libevent = callPackage ../development/libraries/libevent { };

From 2284a1ab8ea2bb6b1eddf4189e1da955dfc81b63 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 24 Mar 2015 23:45:49 +0100
Subject: [PATCH 2/3] libev: set license and description

Use upstream's description
---
 pkgs/development/libraries/libev/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix
index e96c69f21384..57e6f98fe72e 100644
--- a/pkgs/development/libraries/libev/default.nix
+++ b/pkgs/development/libraries/libev/default.nix
@@ -8,10 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "1svgc1hq4i5zsw4i02sf7xb4pk2d8kpvc1gdrd856vsmffh47pdj";
   };
   meta = {
-    description = "An event loop library remotely similar to libevent";
-    maintainers = [
-      stdenv.lib.maintainers.raskin
-    ];
+    description = "A high-performance event loop/event model with lots of features";
+    maintainers = [ stdenv.lib.maintainers.raskin ];
     platforms = stdenv.lib.platforms.all;
+    license = stdenv.lib.licenses.bsd2; # or GPL2+
   };
 }

From b71865b1bb4a16b86651f7c19010b74247d14b13 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 25 Mar 2015 00:07:22 +0100
Subject: [PATCH 3/3] libev: bump to 4.19

---
 pkgs/development/libraries/libev/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix
index 57e6f98fe72e..90cab2cc6871 100644
--- a/pkgs/development/libraries/libev/default.nix
+++ b/pkgs/development/libraries/libev/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "libev-${version}";
-  version="4.15";
+  version="4.19";
   src = fetchurl {
-    url = "http://dist.schmorp.de/libev/Attic/${name}.tar.gz";
-    sha256 = "1svgc1hq4i5zsw4i02sf7xb4pk2d8kpvc1gdrd856vsmffh47pdj";
+    url = "http://dist.schmorp.de/libev/${name}.tar.gz";
+    sha256 = "1jyw7qbl0spxqa0dccj9x1jsw7cj7szff43cq4acmklnra4mzz48";
   };
   meta = {
     description = "A high-performance event loop/event model with lots of features";