diff options
| author | Peter Simons <simons@cryp.to> | 2014-08-04 16:51:47 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2014-08-04 16:51:47 +0200 |
| commit | 2d326e5032fda2210ff84118a526195f0a68bd24 (patch) | |
| tree | d3af676b9948c865f1e942e1db51862da5e19ad5 /pkgs/os-specific/linux/google-authenticator | |
| parent | 9253a95f6b3f65ecc701ebb10620acfb6d251f17 (diff) | |
| parent | b35770818d70924b2b71ae41ead270fe0be8c826 (diff) | |
| download | nixpkgs-2d326e5032fda2210ff84118a526195f0a68bd24.tar nixpkgs-2d326e5032fda2210ff84118a526195f0a68bd24.tar.gz nixpkgs-2d326e5032fda2210ff84118a526195f0a68bd24.tar.bz2 nixpkgs-2d326e5032fda2210ff84118a526195f0a68bd24.tar.lz nixpkgs-2d326e5032fda2210ff84118a526195f0a68bd24.tar.xz nixpkgs-2d326e5032fda2210ff84118a526195f0a68bd24.tar.zst nixpkgs-2d326e5032fda2210ff84118a526195f0a68bd24.zip | |
Merge remote-tracking branch 'origin/master' into staging.
Conflicts: pkgs/desktops/e18/enlightenment.nix
Diffstat (limited to 'pkgs/os-specific/linux/google-authenticator')
| -rw-r--r-- | pkgs/os-specific/linux/google-authenticator/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix index 7667b330f23..0e38d94e1ed 100644 --- a/pkgs/os-specific/linux/google-authenticator/default.nix +++ b/pkgs/os-specific/linux/google-authenticator/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { meta = { homepage = https://code.google.com/p/google-authenticator/; description = "Two-step verification, with pam module"; - license = "ASL2.0"; + license = stdenv.lib.licenses.asl20; }; } |