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:55:37 +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
pkgs/development/libraries/globalplatform/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, zlib, openssl, pcsclite }:
{ stdenv, fetchurl, pkgconfig, zlib, openssl_1_0_2, pcsclite }:
stdenv.mkDerivation rec {
pname = "globalplatform";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ zlib openssl pcsclite ];
buildInputs = [ zlib openssl_1_0_2 pcsclite ];
meta = with stdenv.lib; {
homepage = https://sourceforge.net/p/globalplatform/wiki/Home/;
pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, globalplatform, openssl, pcsclite }:
{ stdenv, fetchurl, pkgconfig, globalplatform, openssl_1_0_2, pcsclite }:
stdenv.mkDerivation rec {
pname = "gppcscconnectionplugin";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ globalplatform openssl pcsclite ];
buildInputs = [ globalplatform openssl_1_0_2 pcsclite ];
meta = with stdenv.lib; {
homepage = https://sourceforge.net/p/globalplatform/wiki/Home/;