diff options
-rwxr-xr-x | pkgs/build-support/upstream-updater/urls-from-page.sh | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/libev/default.nix | 26 | ||||
-rw-r--r-- | pkgs/development/libraries/libev/src-for-default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/libev/src-info-for-default.nix | 5 | ||||
-rw-r--r-- | pkgs/lib/platforms.nix | 7 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
6 files changed, 47 insertions, 4 deletions
diff --git a/pkgs/build-support/upstream-updater/urls-from-page.sh b/pkgs/build-support/upstream-updater/urls-from-page.sh index bfbcef8984492..d9f2d34e011af 100755 --- a/pkgs/build-support/upstream-updater/urls-from-page.sh +++ b/pkgs/build-support/upstream-updater/urls-from-page.sh @@ -8,5 +8,5 @@ relpath="${path#$server}" echo "URL: $url" >&2 -curl -k "$url" | sed -re 's/^/-/;s/[hH][rR][eE][fF]="([^"]*)"/\n+\1\n-/g' | \ +curl -L -k "$url" | sed -re 's/^/-/;s/[hH][rR][eE][fF]="([^"]*)"/\n+\1\n-/g' | \ sed -e '/^-/d; s/^[+]//; /^#/d;'"s/^\\//$protocol:\\/\\/$server\\//g" diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix new file mode 100644 index 0000000000000..b0c74c9e54c4e --- /dev/null +++ b/pkgs/development/libraries/libev/default.nix @@ -0,0 +1,26 @@ +a : +let + s = import ./src-for-default.nix; + buildInputs = with a; [ + + ]; +in +rec { + src = a.fetchUrlFromSrcInfo s; + + inherit (s) name; + inherit buildInputs; + configureFlags = []; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doConfigure" "doMakeInstall"]; + + meta = { + description = "An event loop library remotely similar to libevent"; + maintainers = [ + a.lib.maintainers.raskin + ]; + platforms = with a.lib.platforms; + linux ++ freebsd; + }; +} diff --git a/pkgs/development/libraries/libev/src-for-default.nix b/pkgs/development/libraries/libev/src-for-default.nix new file mode 100644 index 0000000000000..c7b37ce189129 --- /dev/null +++ b/pkgs/development/libraries/libev/src-for-default.nix @@ -0,0 +1,8 @@ +rec { + advertisedUrl="http://dist.schmorp.de/libev/Attic/libev-3.8.tar.gz"; + version = "3.8"; + url="http://dist.schmorp.de/libev/Attic/libev-3.8.tar.gz"; + hash = "1512n6c5q9ykqmk5zbwyb1na9qb9shd900kf4xhl5g07aypm7qr5"; + name = "libev-3.8"; + +} diff --git a/pkgs/development/libraries/libev/src-info-for-default.nix b/pkgs/development/libraries/libev/src-info-for-default.nix new file mode 100644 index 0000000000000..e14ca41955041 --- /dev/null +++ b/pkgs/development/libraries/libev/src-info-for-default.nix @@ -0,0 +1,5 @@ +{ + downloadPage = "http://dist.schmorp.de/libev/Attic/?M=D"; + sourceRegexp = "(^|/)libev-.*[.]tar[.]gz"; + baseName = "libev"; +} diff --git a/pkgs/lib/platforms.nix b/pkgs/lib/platforms.nix index acb35105d15b6..de75887cbcabd 100644 --- a/pkgs/lib/platforms.nix +++ b/pkgs/lib/platforms.nix @@ -2,9 +2,10 @@ let lists = import ./lists.nix; in rec { - linux = ["i686-linux" "x86_64-linux"]; - darwin = ["i686-darwin"]; + linux = ["i686-linux" "x86_64-linux" "powerpc-linux"]; + darwin = ["i686-darwin" "powerpc-darwin"]; + freebsd = ["i686-freebsd" "x86_64-freebsd" "powerpc-freebsd"]; cygwin = ["i686-cygwin"]; - all = linux ++ darwin ++ cygwin; + all = linux ++ darwin ++ cygwin ++ freebsd; allBut = platform: lists.filter (x: platform != x) all; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db930fdda0268..ce81238ee1342 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3494,6 +3494,9 @@ let inherit fetchurl stdenv ncurses; }; + libev = builderDefsPackage ../development/libraries/libev { + }; + libevent = import ../development/libraries/libevent { inherit fetchurl stdenv; }; |