diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2020-12-28 12:24:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-28 12:24:08 +0000 |
| commit | d5506c4c59544130846f95cfc03bfc8c60343fe9 (patch) | |
| tree | ceba1917856eca49f8a7d632d58a15a56d90d328 /pkgs/tools | |
| parent | f3139e90caeeabd5953b4c97e1c04cb430e9e06f (diff) | |
| parent | f71e439688e4c4b231e0f419f81df6610fdaa231 (diff) | |
| download | nixpkgs-d5506c4c59544130846f95cfc03bfc8c60343fe9.tar nixpkgs-d5506c4c59544130846f95cfc03bfc8c60343fe9.tar.gz nixpkgs-d5506c4c59544130846f95cfc03bfc8c60343fe9.tar.bz2 nixpkgs-d5506c4c59544130846f95cfc03bfc8c60343fe9.tar.lz nixpkgs-d5506c4c59544130846f95cfc03bfc8c60343fe9.tar.xz nixpkgs-d5506c4c59544130846f95cfc03bfc8c60343fe9.tar.zst nixpkgs-d5506c4c59544130846f95cfc03bfc8c60343fe9.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/networking/cjdns/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index 28a418c27f2..8cc891cce19 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cjdns"; - version = "21"; + version = "21.1"; src = fetchFromGitHub { owner = "cjdelisle"; repo = "cjdns"; rev = "cjdns-v${version}"; - sha256 = "1s9d8yrdrj2gviig05jhr0fnzazb88lih0amxfk0av786rvh7ymj"; + sha256 = "NOmk+vMZ8i0E2MjrUzksk+tkJ9XVVNEXlE5OOTNa+Y0="; }; buildInputs = [ which python27 nodejs ] ++ @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://github.com/cjdelisle/cjdns"; description = "Encrypted networking for regular people"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ ehmry ]; platforms = platforms.linux; }; |