diff options
author | William A. Kennington III <william@wkennington.com> | 2015-07-31 17:26:20 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-07-31 17:26:20 -0700 |
commit | 09b4a7cc1bdb0392c385a630168b3c8430e475c5 (patch) | |
tree | 8e1e72e845fc6a39e154e2666ac04fee98430f45 /pkgs/tools/security | |
parent | cb7c053383ff76a454484992b3a6d6a2f1530c15 (diff) | |
parent | 85e2c8ff23feb5f6344acde44d8b51d46c4ba89a (diff) | |
download | nixlib-09b4a7cc1bdb0392c385a630168b3c8430e475c5.tar nixlib-09b4a7cc1bdb0392c385a630168b3c8430e475c5.tar.gz nixlib-09b4a7cc1bdb0392c385a630168b3c8430e475c5.tar.bz2 nixlib-09b4a7cc1bdb0392c385a630168b3c8430e475c5.tar.lz nixlib-09b4a7cc1bdb0392c385a630168b3c8430e475c5.tar.xz nixlib-09b4a7cc1bdb0392c385a630168b3c8430e475c5.tar.zst nixlib-09b4a7cc1bdb0392c385a630168b3c8430e475c5.zip |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/tools/security')
-rw-r--r-- | pkgs/tools/security/eid-mw/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/security/eid-viewer/default.nix | 15 | ||||
-rw-r--r-- | pkgs/tools/security/prey/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/security/sudo/default.nix | 4 |
4 files changed, 16 insertions, 10 deletions
diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index e14bc6b9cc4b..c039c41314db 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -2,7 +2,7 @@ , pkgconfig }: let version = "4.1.4"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "eid-mw-${version}"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/eid-viewer/default.nix b/pkgs/tools/security/eid-viewer/default.nix index f2dfd58a7fb1..ad33975a7d92 100644 --- a/pkgs/tools/security/eid-viewer/default.nix +++ b/pkgs/tools/security/eid-viewer/default.nix @@ -1,14 +1,16 @@ { stdenv, fetchurl, jre, makeWrapper, pcsclite }: -stdenv.mkDerivation rec { +let # TODO: find out what the version components actually mean, if anything: - package = "eid-viewer-4.0.7-195"; - build = "tcm406-258907"; - name = "${package}-${build}"; + major = "4.1.4-v4.1.4"; + minor = "tcm406-270732"; + version = "${major}-${minor}"; +in stdenv.mkDerivation rec { + name = "eid-viewer-${version}"; src = fetchurl { - url = "http://eid.belgium.be/en/binaries/${package}.src.tar_${build}.gz"; - sha256 = "e263e6751ef7c185e278a607fdc46c207306d9a56c6ddb2ce6f58fb4464a2893"; + url = "http://eid.belgium.be/en/binaries/eid-viewer-${major}.src.tar_${minor}.gz"; + sha256 = "06kda45y7c3wvvqby153zcasgz4jibjypv8gvfwvrwvn4ag2z934"; }; buildInputs = [ jre pcsclite ]; @@ -31,6 +33,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { + inherit version; description = "Belgian electronic identity card (eID) viewer"; homepage = http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/; license = licenses.lgpl3; diff --git a/pkgs/tools/security/prey/default.nix b/pkgs/tools/security/prey/default.nix index d04f48c0f313..b36c11cf9345 100644 --- a/pkgs/tools/security/prey/default.nix +++ b/pkgs/tools/security/prey/default.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchurl, fetchgit, curl, scrot, imagemagick, xawtv, inetutils -, makeWrapper, coreutils, cacert +{ stdenv, fetchurl, fetchgit, curl, scrot, imagemagick, xawtv, inetutils, makeWrapper, coreutils , apiKey ? "" , deviceKey ? "" }: @@ -36,7 +35,7 @@ in stdenv.mkDerivation rec { cp -R ${modulesSrc}/* $out/modules/ wrapProgram "$out/prey.sh" \ --prefix PATH ":" "${xawtv}/bin:${imagemagick}/bin:${curl}/bin:${scrot}/bin:${inetutils}/bin:${coreutils}/bin" \ - --set CURL_CA_BUNDLE "${cacert}/etc/ssl/certs/ca-bundle.crt" + --set CURL_CA_BUNDLE "/etc/ssl/certs/ca-certificates.crt" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 8c9d35333466..34e1731778f5 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, coreutils, pam, groff , sendmailPath ? "/var/setuid-wrappers/sendmail" +, withInsults ? false }: stdenv.mkDerivation rec { @@ -20,6 +21,9 @@ stdenv.mkDerivation rec { "--with-vardir=/var/db/sudo" "--with-logpath=/var/log/sudo.log" "--with-sendmail=${sendmailPath}" + ] ++ stdenv.lib.optional withInsults [ + "--with-insults" + "--with-all-insults" ]; configureFlagsArray = [ |