public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor to use autoreconfHook where possible

Browse Source 
Close #12446.
This commit is contained in:
Robin Gloster
2016-01-17 23:04:40 +00:00
committed by Vladimír Čunát
parent 620c147cce
commit 53b389327e
50 changed files with 188 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/servers/nosql/hyperdex/busybee.nix
View File

@@ -1,5 +1,4 @@
{ stdenv, fetchurl, unzip, autoconf, automake, libtool,
libpo6, libe, pkgconfig }:
{ stdenv, fetchurl, unzip, autoreconfHook, libpo6, libe, pkgconfig }:
stdenv.mkDerivation rec {
name = "busybee-${version}";
@@ -9,16 +8,14 @@ stdenv.mkDerivation rec {
url = "https://github.com/rescrv/busybee/archive/releases/${version}.zip";
sha256 = "0b51h1kmkf0s3d9y7wjqgp1pk1rk9i7n8bcgyj01kflzdgafbl0b";
};
buildInputs = [
autoconf
automake
autoreconfHook
libe
libpo6
libtool
pkgconfig
unzip
];
preConfigure = "autoreconf -i";
meta = with stdenv.lib; {
description = "A high-performance messaging layer";

11
pkgs/servers/nosql/hyperdex/default.nix
View File

@@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeWrapper, unzip, autoconf, automake, libtool,
python, libsodium, pkgconfig, popt, glog, xz, json_c, gperf, yacc,
flex, pandoc, help2man, autoconf-archive, callPackage }:
{ stdenv, fetchurl, makeWrapper, unzip, autoreconfHook, autoconf-archive
, python, libsodium, pkgconfig, popt, glog, xz, json_c, gperf, yacc
, flex, pandoc, help2man, callPackage }:
assert stdenv.isLinux;
@@ -25,9 +25,8 @@ stdenv.mkDerivation rec {
};
buildInputs = [
autoconf
autoreconfHook
autoconf-archive
automake
busybee
glog
hyperleveldb
@@ -35,7 +34,6 @@ stdenv.mkDerivation rec {
libe
libmacaroons
libpo6
libtool
pkgconfig
popt
python
@@ -47,7 +45,6 @@ stdenv.mkDerivation rec {
help2man
pandoc
];
preConfigure = "autoreconf -fi";
meta = with stdenv.lib; {
description = "A scalable, searchable key-value store";

6
pkgs/servers/nosql/hyperdex/hyperleveldb.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, unzip, autoconf, automake, libtool }:
{ stdenv, fetchurl, unzip, autoreconfHook }:
stdenv.mkDerivation rec {
name = "hyperleveldb-${version}";
@@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
url = "https://github.com/rescrv/HyperLevelDB/archive/releases/${version}.zip";
sha256 = "0m5fwl9sc7c6m2zm3zjlxxg7f602gnaryikxgflahhdccdvvr56y";
};
buildInputs = [ unzip autoconf automake libtool ];
preConfigure = "autoreconf -i";
buildInputs = [ unzip autoreconfHook ];
meta = with stdenv.lib; {
description = ''A fork of LevelDB intended to meet the needs of

6
pkgs/servers/nosql/hyperdex/libe.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, unzip, autoconf, automake, libtool, libpo6, pkgconfig }:
{ stdenv, fetchurl, unzip, autoreconfHook, libpo6, pkgconfig }:
stdenv.mkDerivation rec {
name = "libe-${version}";
@@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
url = "https://github.com/rescrv/e/archive/releases/${version}.zip";
sha256 = "18xm0hcnqdf0ipfn19jrgzqsxij5xjbbnihhzc57n4v7yfdca1w3";
};
buildInputs = [ unzip autoconf automake libtool libpo6 pkgconfig ];
preConfigure = "autoreconf -i";
buildInputs = [ unzip autoreconfHook libpo6 pkgconfig ];
meta = with stdenv.lib; {
description = "Library containing high-performance datastructures and utilities for C++";

10
pkgs/servers/nosql/hyperdex/libmacaroons.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, unzip, autoconf, automake, libtool,
pkgconfig, libsodium, python }:
{ stdenv, fetchurl, unzip, autoreconfHook, pkgconfig, libsodium, python }:
stdenv.mkDerivation rec {
name = "libmacaroons-${version}";
version = "0.3.0";
@@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
url = "https://github.com/rescrv/libmacaroons/archive/releases/${version}.zip";
sha256 = "18c44424jri0p5la6jgrnlz5p937hk7ws2mldhzjwisqyf5qld43";
};
buildInputs = [ unzip autoconf automake libtool python libsodium pkgconfig ];
preConfigure = "autoreconf -i";
buildInputs = [ unzip autoreconfHook python libsodium pkgconfig ];
meta = with stdenv.lib; {
description = ''Macaroons are flexible authorization credentials that
support decentralized delegation, attenuation, and verification.'';

6
pkgs/servers/nosql/hyperdex/libpo6.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, unzip, autoconf, automake, libtool }:
{ stdenv, fetchurl, unzip, autoreconfHook }:
stdenv.mkDerivation rec {
name = "libpo6-${version}";
@@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
url = "https://github.com/rescrv/po6/archive/releases/${version}.zip";
sha256 = "17grzkh6aw1f68qvkhivbb6vwbm6jd41ysbfn88pypf5lczxrxly";
};
buildInputs = [ unzip autoconf automake libtool ];
preConfigure = "autoreconf -i";
buildInputs = [ unzip autoreconfHook ];
meta = with stdenv.lib; {
description = "POSIX wrappers for C++";

10
pkgs/servers/nosql/hyperdex/replicant.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, unzip, autoconf, automake, libtool, glog,
{ stdenv, fetchurl, unzip, autoreconfHook, glog,
hyperleveldb, libe, pkgconfig, popt, libpo6, busybee }:
stdenv.mkDerivation rec {
@@ -9,21 +9,19 @@ stdenv.mkDerivation rec {
url = "https://github.com/rescrv/Replicant/archive/releases/${version}.zip";
sha256 = "1q3pdq2ndpj70yd1578bn4grlrp77gl8hv2fz34jpx34qmlalda4";
};
buildInputs = [
autoconf
automake
autoreconfHook
busybee
glog
hyperleveldb
libe
libpo6
libtool
pkgconfig
popt
unzip
];
preConfigure = "autoreconf -i";
meta = with stdenv.lib; {
description = "A system for maintaining replicated state machines";
homepage = https://github.com/rescrv/Replicant;

5
pkgs/servers/shellinabox/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pam, openssl, openssh, shadow, makeWrapper }:
{ stdenv, fetchFromGitHub, autoreconfHook, pam, openssl, openssh, shadow, makeWrapper }:
stdenv.mkDerivation rec {
version = "2.19";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
patches = [ ./shellinabox-minus.patch ];
buildInputs = [ autoconf automake libtool pam openssl openssh makeWrapper];
buildInputs = [ autoreconfHook pam openssl openssh makeWrapper ];
# Disable GSSAPIAuthentication errors. Also, paths in certain source files are
# hardcoded. Replace the hardcoded paths with correct paths.
@@ -23,7 +23,6 @@ stdenv.mkDerivation rec {
substituteInPlace ./shellinabox/service.c --replace "/bin/login" "${shadow}/bin/login"
substituteInPlace ./shellinabox/launcher.c --replace "/bin/login" "${shadow}/bin/login"
substituteInPlace ./libhttp/ssl.c --replace "/usr/bin" "${openssl}/bin"
autoreconf -vfi
'';
postInstall = ''