diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-03-31 21:32:15 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-03-31 21:32:15 +0200 |
| commit | 3e0f4e202f4221d5a05a9664fd46e492de711fa2 (patch) | |
| tree | 5f62c67bff9ccc643621e80b04cf43e3959d723d /pkgs/tools/security | |
| parent | a803f716bdf756edaedbdd99d66cf04f27496682 (diff) | |
| parent | a8811cb82bab25aa835a09dc48a2d9450448d6d5 (diff) | |
| download | nixlib-3e0f4e202f4221d5a05a9664fd46e492de711fa2.tar nixlib-3e0f4e202f4221d5a05a9664fd46e492de711fa2.tar.gz nixlib-3e0f4e202f4221d5a05a9664fd46e492de711fa2.tar.bz2 nixlib-3e0f4e202f4221d5a05a9664fd46e492de711fa2.tar.lz nixlib-3e0f4e202f4221d5a05a9664fd46e492de711fa2.tar.xz nixlib-3e0f4e202f4221d5a05a9664fd46e492de711fa2.tar.zst nixlib-3e0f4e202f4221d5a05a9664fd46e492de711fa2.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/nwipe/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/security/ripasso/cursive.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/security/sequoia/default.nix | 5 |
3 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/tools/security/nwipe/default.nix b/pkgs/tools/security/nwipe/default.nix index b2ead19a2011..c72ada867614 100644 --- a/pkgs/tools/security/nwipe/default.nix +++ b/pkgs/tools/security/nwipe/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, ncurses, parted, automake, autoconf, pkgconfig }: stdenv.mkDerivation rec { - version = "0.27"; + version = "0.28"; pname = "nwipe"; src = fetchFromGitHub { owner = "martijnvanbrummelen"; repo = "nwipe"; rev = "v${version}"; - sha256 = "1rfqv5nxb20g7rfcmqaxwkbz5v294ak0kfsndncx3m4m1791fw04"; + sha256 = "1aw905lmn1vm6klqn3q7445dwmwbjhcmwnkygpq9rddacgig1gdx"; }; nativeBuildInputs = [ automake autoconf pkgconfig ]; buildInputs = [ ncurses parted ]; diff --git a/pkgs/tools/security/ripasso/cursive.nix b/pkgs/tools/security/ripasso/cursive.nix index 70c4ee864b64..c8a55d3f397f 100644 --- a/pkgs/tools/security/ripasso/cursive.nix +++ b/pkgs/tools/security/ripasso/cursive.nix @@ -16,9 +16,9 @@ buildRustPackage rec { cargoBuildFlags = [ "-p ripasso-cursive -p ripasso-man" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig gpgme python3 ]; buildInputs = [ - ncurses python3 openssl libgpgerror gpgme xorg.libxcb + ncurses openssl libgpgerror gpgme xorg.libxcb ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ]; preFixup = '' diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix index fe0b13bbb973..d1a24f49d802 100644 --- a/pkgs/tools/security/sequoia/default.nix +++ b/pkgs/tools/security/sequoia/default.nix @@ -28,6 +28,7 @@ rustPlatform.buildRustPackage rec { llvmPackages.libclang llvmPackages.clang ensureNewerSourcesForZipFilesHook + capnproto ] ++ lib.optionals pythonSupport [ pythonPackages.setuptools ] ; @@ -41,9 +42,7 @@ rustPlatform.buildRustPackage rec { openssl sqlite nettle - capnproto - ] - ++ lib.optionals pythonSupport [ pythonPackages.python pythonPackages.cffi ] + ] ++ lib.optionals pythonSupport [ pythonPackages.python pythonPackages.cffi ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ] ; |