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

Commits on Nov 12, 2017

  1. opencryptoki: 3.2 -> 3.8.1

    @c0bw3b
    c0bw3b authored Nov 12, 2017
    Copy the full SHA
    f1ec44e View commit details

  2. pkcs11-helper: 1.21 -> 1.22 

    plus homepage refresh
    @c0bw3b
    c0bw3b authored Nov 12, 2017
    Copy the full SHA
    39c219c View commit details

  3. simple-tpm-pk11: 2016-07-12 -> 0.06

    @c0bw3b
    c0bw3b authored Nov 12, 2017
    Copy the full SHA
    ac060f5 View commit details

Commits on Nov 20, 2017

  1. Merge pull request #31573 from c0bw3b/pkg/pkcs11 

     opencryptoki, pkcs11-helper, simple-tpm-pk11
    @c0bw3b
    c0bw3b authored Nov 20, 2017
    Copy the full SHA
    1d6f3ea View commit details
Showing with 42 additions and 35 deletions.
  1. +5 −3 pkgs/development/libraries/pkcs11helper/default.nix
  2. +23 −20 pkgs/tools/security/opencryptoki/default.nix
  3. +14 −12 pkgs/tools/security/simple-tpm-pk11/default.nix
8 changes: 5 additions & 3 deletions pkgs/development/libraries/pkcs11helper/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,20 +2,22 @@

stdenv.mkDerivation rec {
name = "pkcs11-helper-${version}";
version = "1.21";
version = "1.22";

src = fetchFromGitHub {
owner = "OpenSC";
repo = "pkcs11-helper";
rev = "${name}";
sha256 = "17a2cssycl7fh44xikmhszigx57vvn0h2sjsnmsy3772kfj796b1";
sha256 = "01v3zv6sr5phqhr2f21fl2rmcnmkp9518dkq82g1v2y9ysjksg7q";
};

nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ openssl ];

enableParallelBuilding = true;

meta = with stdenv.lib; {
homepage = https://www.opensc-project.org/opensc/wiki/pkcs11-helper;
homepage = https://github.com/OpenSC/pkcs11-helper;
license = with licenses; [ bsd3 gpl2 ];
description = "Library that simplifies the interaction with PKCS#11 providers";
platforms = platforms.unix;
43 changes: 23 additions & 20 deletions pkgs/tools/security/opencryptoki/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,38 +1,41 @@
{ stdenv, fetchurl, openssl, trousers, automake, autoconf, libtool, bison, flex }:
{ stdenv, fetchFromGitHub, openssl, trousers, autoreconfHook, libtool, bison, flex }:

stdenv.mkDerivation rec {
version = "3.2";
name = "opencryptoki-${version}";
version = "3.8.1";

src = fetchurl {
url = "mirror://sourceforge/opencryptoki/opencryptoki/v${version}/opencryptoki-v${version}.tgz";
sha256 = "06r6zp299vxdspl6k65myzgjv0bihg7kc500v7s4jd3mcrkngd6h";
src = fetchFromGitHub {
owner = "opencryptoki";
repo = "opencryptoki";
rev = "v${version}";
sha256 = "1m618pjfzw18irmh6i4pfq1gvcxgyfh9ikjn33nrdj55v2l27g31";
};

buildInputs = [ automake autoconf libtool openssl trousers bison flex ];
nativeBuildInputs = [ autoreconfHook libtool bison flex ];
buildInputs = [ openssl trousers ];

preConfigure = ''
substituteInPlace configure.in --replace "chown" "true"
substituteInPlace configure.in --replace "chgrp" "true"
sh bootstrap.sh --prefix=$out
postPatch = ''
substituteInPlace configure.ac \
--replace "usermod" "true" \
--replace "groupadd" "true" \
--replace "chmod" "true" \
--replace "chgrp" "true"
substituteInPlace usr/lib/Makefile.am --replace "DESTDIR" "out"
'';

configureFlags = [ "--disable-ccatok" "--disable-icatok" ];
configureFlags = [
"--prefix=$(out)"
"--disable-ccatok"
"--disable-icatok"
];

makeFlags = "DESTDIR=$(out)";

# work around the build script of opencryptoki
postInstall = ''
cp -r $out/$out/* $out
rm -r $out/nix
'';
enableParallelBuilding = true;

meta = with stdenv.lib; {
description = "PKCS#11 implementation for Linux";
homepage = http://opencryptoki.sourceforge.net/;
homepage = https://github.com/opencryptoki/opencryptoki;
license = licenses.cpl10;
maintainers = [ maintainers.tstrobel ];
platforms = platforms.unix;
};
}

26 changes: 14 additions & 12 deletions pkgs/tools/security/simple-tpm-pk11/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,29 @@
{ stdenv, fetchgit, trousers, openssl, opencryptoki, automake, autoconf, libtool }:
{ stdenv, fetchFromGitHub, trousers, openssl, opencryptoki, autoreconfHook, libtool }:

stdenv.mkDerivation rec {
name = "simple-tpm-pk11-2016-07-12";
name = "simple-tpm-pk11-${version}";
version = "0.06";

src = fetchgit {
url = "https://github.com/ThomasHabets/simple-tpm-pk11";
rev = "6f1f7a6b96ac82965e977cfecb88d930f1d70243";
sha256 = "06vf3djp29slh7hrh4hlh3npyl277fy7d77jv9mxa1sk1idjklxc";
src = fetchFromGitHub {
owner = "ThomasHabets";
repo = "simple-tpm-pk11";
rev = version;
sha256 = "0vpbaklr4r1a2am0pqcm6m41ph22mkcrq33y8ab5h8qkhkvhd6a6";
};

buildInputs = [ trousers openssl opencryptoki automake autoconf libtool ];
nativeBuildInputs = [ autoreconfHook libtool ];
buildInputs = [ trousers openssl opencryptoki ];

preConfigure = "sh bootstrap.sh";
enableParallelBuilding = true;

meta = with stdenv.lib; {
description = "Simple PKCS11 provider for TPM chips";
longDescription = ''
A simple library for using the TPM chip to secure SSH keys.
'';
'';
homepage = https://github.com/ThomasHabets/simple-tpm-pk11;
license = stdenv.lib.licenses.asl20;
maintainers = with stdenv.lib; [ maintainers.tstrobel ];
license = licenses.asl20;
maintainers = with maintainers; [ tstrobel ];
platforms = platforms.unix;
};
}