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

Merge branch 'master' into staging-next

Browse Source 
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
This commit is contained in:
Vladimír Čunát
2019-08-24 08:19:05 +02:00
parent 84a91208a9 8943fb5f24
commit 2e6bf42a22
865 changed files with 29587 additions and 14316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/libraries/opensaml-cpp/default.nix
View File

@@ -1,17 +1,21 @@
{ stdenv, fetchgit, autoreconfHook, boost, openssl, log4shib, xercesc, xml-security-c, xml-tooling-c, zlib }:
{ stdenv, fetchgit, autoreconfHook, pkgconfig
, boost, openssl, log4shib, xercesc, xml-security-c, xml-tooling-c, zlib
}:
stdenv.mkDerivation rec {
pname = "opensaml-cpp";
version = "2.6.1";
version = "3.0.1";
src = fetchgit {
url = "https://git.shibboleth.net/git/cpp-opensaml.git";
rev = version;
sha256 = "0wjb6jyvh4hwpy1pvhh63i821746nqijysrd4vasbirkf4h6z7nx";
sha256 = "0ms3sqmwqkrqb92d7jy2hqwnz5yd7cbrz73n321jik0jilrwl5w8";
};
buildInputs = [ boost openssl log4shib xercesc xml-security-c xml-tooling-c zlib ];
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [
boost openssl log4shib xercesc xml-security-c xml-tooling-c zlib
];
nativeBuildInputs = [ autoreconfHook pkgconfig ];
configureFlags = [ "--with-xmltooling=${xml-tooling-c}" ];