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: f5e013347ff4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3ef530a9ba3b
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jun 9, 2019

  1. p11-kit: 0.23.15 -> 0.23.16.1

    @dtzWill @FRidh
    dtzWill authored and FRidh committed Jun 9, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    alyssais Alyssa Ross
    GPG key ID: C4844408C0657052
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3ef530a View commit details
Showing with 2 additions and 15 deletions.
  1. +2 −15 pkgs/development/libraries/p11-kit/default.nix
17 changes: 2 additions & 15 deletions pkgs/development/libraries/p11-kit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,28 +4,15 @@

stdenv.mkDerivation rec {
pname = "p11-kit";
version = "0.23.15";
version = "0.23.16.1";

src = fetchFromGitHub {
owner = "p11-glue";
repo = pname;
rev = version;
sha256 = "0kf7zz2cvd6j09qkff3rl3wfisva82ia1z9h8bmy4ifwkv4yl9fv";
sha256 = "0jr62qkbqxp3iawgksk1qc3gp8p6x09sg5v7xac80ghyfxil15wy";
};

patches = [
(fetchpatch {
# https://github.com/p11-glue/p11-kit/issues/212
url = "https://github.com/p11-glue/p11-kit/commit/2a474e1fe8f4bd8b4ed7622e5cf3b2718a202562.patch";
sha256 = "13wi32hpzilvzxn57crn79h88q38jm2fzd5zxj4wnhv9dhwqr6lg";
})
(fetchpatch {
# https://github.com/p11-glue/p11-kit/issues/220
url = "https://github.com/p11-glue/p11-kit/commit/e2170b295992cb7fdf115227a78028ac3780619f.patch";
sha256 = "0433d8drfxaabsxwkkl4kr0jx8jr2l3a9ar11szipd9jwvrqnyr7";
})
];

outputs = [ "out" "dev"];
outputBin = "dev";