diff options
| author | Shea Levy <shea@shealevy.com> | 2018-03-20 08:38:28 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-03-20 08:38:28 -0400 |
| commit | 4250dd5de4a73c8aeca227adb31ca298b851b6fb (patch) | |
| tree | 28483308c24cda14731f05312532c01f2d84220d /pkgs/tools/security | |
| parent | 35ebf5bfd963a77c1276658bd7dee3d923039010 (diff) | |
| parent | 47bbd819c78b6966165b5a35050191e5700e8460 (diff) | |
| download | nixlib-4250dd5de4a73c8aeca227adb31ca298b851b6fb.tar nixlib-4250dd5de4a73c8aeca227adb31ca298b851b6fb.tar.gz nixlib-4250dd5de4a73c8aeca227adb31ca298b851b6fb.tar.bz2 nixlib-4250dd5de4a73c8aeca227adb31ca298b851b6fb.tar.lz nixlib-4250dd5de4a73c8aeca227adb31ca298b851b6fb.tar.xz nixlib-4250dd5de4a73c8aeca227adb31ca298b851b6fb.tar.zst nixlib-4250dd5de4a73c8aeca227adb31ca298b851b6fb.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/browserpass/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/security/browserpass/deps.nix | 9 | ||||
| -rw-r--r-- | pkgs/tools/security/hologram/default.nix | 14 |
3 files changed, 18 insertions, 9 deletions
diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/tools/security/browserpass/default.nix index af1bb14d02a1..c6d4a78e6b4b 100644 --- a/pkgs/tools/security/browserpass/default.nix +++ b/pkgs/tools/security/browserpass/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { name = "browserpass-${version}"; - version = "2.0.11"; + version = "2.0.13"; goPackagePath = "github.com/dannyvankooten/browserpass"; @@ -13,7 +13,7 @@ buildGoPackage rec { repo = "browserpass"; owner = "dannyvankooten"; rev = version; - sha256 = "0d6rpkka27a57nv69yiw71jj3m6axdj5hygsz36dznnn8w76vvyv"; + sha256 = "0pch0jddphgaaw208ddqjhnkiy5916n0kjxfza1cpc78fa8zw82l"; }; postInstall = '' diff --git a/pkgs/tools/security/browserpass/deps.nix b/pkgs/tools/security/browserpass/deps.nix index 763317aafc7b..631463a69d11 100644 --- a/pkgs/tools/security/browserpass/deps.nix +++ b/pkgs/tools/security/browserpass/deps.nix @@ -19,6 +19,15 @@ }; } { + goPackagePath = "github.com/sahilm/fuzzy"; + fetch = { + type = "git"; + url = "https://github.com/sahilm/fuzzy"; + rev = "a154b19bb758dcdd6ede58dc11ea53c2950527b2"; + sha256 = "0jkw6474d5ik2fq2zznqxj4y3p42z47r7mbg856ln5wyara2sg0l"; + }; + } + { goPackagePath = "rsc.io/qr"; fetch = { type = "git"; diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix index 911c1b12562a..5d873885b1fd 100644 --- a/pkgs/tools/security/hologram/default.nix +++ b/pkgs/tools/security/hologram/default.nix @@ -1,14 +1,14 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "hologram-${version}"; - version = "20170130-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "d20d1c30379e7010e8f9c428a5b9e82f54d390e1"; + name = "hologram-2018-03-19"; + rev = "a7bab58642b530edb75b9cf6c1d834c85822ceac"; - src = fetchgit { + src = fetchFromGitHub { + owner = "AdRoll"; + repo = "hologram"; inherit rev; - url = "https://github.com/AdRoll/hologram"; - sha256 = "0dg5kfs16kf2gzhpmzsg83qzi2pxgnc9g81lw5zpa6fmzpa9kgsn"; + sha256 = "00scryz8js6gbw8lp2y23qikbazz2dd992r97rqh0l1q4baa0ckn"; }; goPackagePath = "github.com/AdRoll/hologram"; |