MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 07:46:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #35125 from vcunat/p/hydra-gcc7

Browse source 
hydra: fix build with gcc7, incl. libpqxx update
This commit is contained in:
Franz Pletz 2018-03-04 08:06:31 +00:00 committed by GitHub
commit 5668ca8bb4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/development/libraries/libpqxx/default.nix
View file

@ -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 .

11
pkgs/development/tools/misc/hydra/default.nix
View file

@ -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 (

4
pkgs/top-level/all-packages.nix
View file

@ -10106,9 +10106,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;