From be7ef555f26ae8d1fc45898f02a7d26b478c9c3c Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 24 Mar 2015 19:44:00 +0100 Subject: [PATCH] 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 { };