diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-07-15 02:02:46 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-07-15 02:02:46 -0700 |
| commit | 25e60feb725f1ce58590a097ffe088bbf14717e2 (patch) | |
| tree | 1cccfe708e755ca59aaa18135d8c1bc516688298 /pkgs/tools/security | |
| parent | 333f145d7604f07e3b2164b459b46e075fea81f4 (diff) | |
| parent | 369febb9569bdd3ddb76d8de2db6e27441d13e9f (diff) | |
| download | nixlib-25e60feb725f1ce58590a097ffe088bbf14717e2.tar nixlib-25e60feb725f1ce58590a097ffe088bbf14717e2.tar.gz nixlib-25e60feb725f1ce58590a097ffe088bbf14717e2.tar.bz2 nixlib-25e60feb725f1ce58590a097ffe088bbf14717e2.tar.lz nixlib-25e60feb725f1ce58590a097ffe088bbf14717e2.tar.xz nixlib-25e60feb725f1ce58590a097ffe088bbf14717e2.tar.zst nixlib-25e60feb725f1ce58590a097ffe088bbf14717e2.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/tpm-luks/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/security/tpm-luks/default.nix b/pkgs/tools/security/tpm-luks/default.nix index eda86a4a97ff..70dbc65040d4 100644 --- a/pkgs/tools/security/tpm-luks/default.nix +++ b/pkgs/tools/security/tpm-luks/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "tpm-luks-${version}"; - version = "0.9pre"; + version = "git-2015-07-11"; src = fetchgit { - url = "https://github.com/shpedoikal/tpm-luks/"; - rev = "3fa3ea4bbd34b5b02e9271e775a338fa49dc834f"; - sha256 = "37a56f05ad492d3128b07b3cb9dbf85ba8a0dd791329323fb398eb1026dfc89c"; + url = "https://github.com/momiji/tpm-luks"; + rev = "c9c5b7fdddbcdac1cd4d2ea6baddd0617cc88ffa"; + sha256 = "fdd451caddb4e51ede3f2406245e1ace57389596e85aa402c9f2606303707539"; }; buildInputs = [ autoreconfHook gawk trousers cryptsetup openssl ]; |