diff options
| -rw-r--r-- | pkgs/development/libraries/libpqxx/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/hydra/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 11 insertions, 20 deletions
diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix index 51cb1c48e54..f51171ade68 100644 --- a/pkgs/development/libraries/libpqxx/default.nix +++ b/pkgs/development/libraries/libpqxx/default.nix @@ -1,14 +1,18 @@ -{ lib, stdenv, fetchurl, postgresql, python2, gnused }: +{ lib, stdenv, fetchFromGitHub, postgresql, python2, gnused }: stdenv.mkDerivation rec { - name = "libpqxx-4.0.1"; + name = "libpqxx-${version}"; + version = "6.1.0"; - src = fetchurl { - url = "http://pqxx.org/download/software/libpqxx/${name}.tar.gz"; - sha256 = "0f6wxspp6rx12fkasanb0z2g2gc8dhcfwnxagx8wwqbpg6ifsz09"; + src = fetchFromGitHub { + owner = "jtv"; + repo = "libpqxx"; + rev = version; + sha256 = "1dv96h10njg115216n2zm6fsvi4kb502hmhhn8cjhlfbxr9vc84q"; }; - buildInputs = [ postgresql python2 gnused ]; + nativeBuildInputs = [ gnused python2 ]; + buildInputs = [ postgresql ]; preConfigure = '' patchShebangs . diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 613a4fec853..cf9057d35e2 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -79,17 +79,6 @@ in releaseTools.nixBuild rec { guile # optional, for Guile + Guix support perlDeps perl nixUnstable postgresql # for running the tests - (lib.overrideDerivation (aws-sdk-cpp.override { - apis = ["s3"]; - customMemoryManagement = false; - }) (attrs: { - src = fetchFromGitHub { - owner = "edolstra"; - repo = "aws-sdk-cpp"; - rev = "local"; - sha256 = "1vhgsxkhpai9a7dk38q4r239l6dsz2jvl8hii24c194lsga3g84h"; - }; - })) ]; hydraPath = lib.makeBinPath ( diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d24de9f0f6d..6603e35f1c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10049,9 +10049,7 @@ with pkgs; libpfm = callPackage ../development/libraries/libpfm { }; - libpqxx = callPackage ../development/libraries/libpqxx { - gnused = gnused_422; - }; + libpqxx = callPackage ../development/libraries/libpqxx { }; libproxy = callPackage ../development/libraries/libproxy { inherit (darwin.apple_sdk.frameworks) SystemConfiguration CoreFoundation JavaScriptCore; |