diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-08-25 14:57:11 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-08-25 14:57:11 +0200 |
commit | 985d1ac425735963d396e1c09dd49ad111813649 (patch) | |
tree | 38a90f65d3bf5906ef020ef2c9482565325e850e /pkgs/development/libraries/libcacard | |
parent | bc238b8df55bad9d8a436e120615cc5cfbbb78dc (diff) | |
parent | f188bad6eaf26ebee19d02df03b1c6ae56c4d7f6 (diff) | |
download | nixpkgs-985d1ac425735963d396e1c09dd49ad111813649.tar nixpkgs-985d1ac425735963d396e1c09dd49ad111813649.tar.gz nixpkgs-985d1ac425735963d396e1c09dd49ad111813649.tar.bz2 nixpkgs-985d1ac425735963d396e1c09dd49ad111813649.tar.lz nixpkgs-985d1ac425735963d396e1c09dd49ad111813649.tar.xz nixpkgs-985d1ac425735963d396e1c09dd49ad111813649.tar.zst nixpkgs-985d1ac425735963d396e1c09dd49ad111813649.zip |
Merge branch 'master' into staging-next
There were several more conflicts from name -> pname+version; all auto-solved by kdiff3, hopefully OK. Hydra nixpkgs: ?compare=1538611
Diffstat (limited to 'pkgs/development/libraries/libcacard')
-rw-r--r-- | pkgs/development/libraries/libcacard/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libcacard/default.nix b/pkgs/development/libraries/libcacard/default.nix index 48402b9ad45..2e134c5bb63 100644 --- a/pkgs/development/libraries/libcacard/default.nix +++ b/pkgs/development/libraries/libcacard/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libcacard"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { url = "https://www.spice-space.org/download/libcacard/${pname}-${version}.tar.xz"; - sha256 = "1w6y0kiakhg7dgyf8yqpm4jj6jiv17zhy9lp3d7z32q1pniccxk2"; + sha256 = "0vyvkk4b6xjwq1ccggql13c1x7g4y90clpkqw28257azgn2a1c8n"; }; nativeBuildInputs = [ pkgconfig ]; |