Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9f187a691978
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a74c43aa8df5
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on May 24, 2017

  1. ccid: 1.4.26 -> 1.4.27

    @fpletz
    fpletz committed May 24, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    bfa438e View commit details

  2. pcsclite: 1.8.20 -> 1.8.21

    @fpletz
    fpletz committed May 24, 2017
    Copy the full SHA
    a74c43a View commit details
Showing with 7 additions and 7 deletions.
  1. +3 −3 pkgs/tools/security/ccid/default.nix
  2. +4 −4 pkgs/tools/security/pcsclite/default.nix
6 changes: 3 additions & 3 deletions pkgs/tools/security/ccid/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }:

stdenv.mkDerivation rec {
version = "1.4.26";
version = "1.4.27";
name = "ccid-${version}";

src = fetchurl {
url = "https://alioth.debian.org/frs/download.php/file/4205/ccid-1.4.26.tar.bz2";
sha256 = "0bxy835c133ajalpj4gx60nqkjvpf9y1n97n04pw105pi9qbyrrj";
url = "https://alioth.debian.org/frs/download.php/file/4218/ccid-1.4.27.tar.bz2";
sha256 = "0dyikpmhsph36ndgd61bs4yx437v5y0bmm8ahjacp1k9c1ly4q56";
};

patchPhase = ''
8 changes: 4 additions & 4 deletions pkgs/tools/security/pcsclite/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@

stdenv.mkDerivation rec {
name = "pcsclite-${version}";
version = "1.8.20";
version = "1.8.21";

src = fetchurl {
# This URL changes in unpredictable ways, so it is not sensicle
# This URL changes in unpredictable ways, so it is not sensible
# to put a version variable in there.
url = "https://alioth.debian.org/frs/download.php/file/4203/pcsc-lite-1.8.20.tar.bz2";
sha256 = "1ckb0jf4n585a4j26va3jm2nrv3c1y38974514f8qy3c04a02zgc";
url = "https://alioth.debian.org/frs/download.php/file/4216/pcsc-lite-1.8.21.tar.bz2";
sha256 = "1b8kwl81f6s3y7qh68ahr8sp8a0w6m464v9b3s4zxq2cgpmnaczy";
};

patches = [ ./no-dropdir-literals.patch ];