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/tools/networking/udptunnel | |
| parent | 9253a95f6b3f65ecc701ebb10620acfb6d251f17 (diff) | |
| parent | b35770818d70924b2b71ae41ead270fe0be8c826 (diff) | |
Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
pkgs/desktops/e18/enlightenment.nix
Diffstat (limited to 'pkgs/tools/networking/udptunnel')
| -rw-r--r-- | pkgs/tools/networking/udptunnel/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/tools/networking/udptunnel/default.nix b/pkgs/tools/networking/udptunnel/default.nix index 0cb777b01af3..b12ce573d1c4 100644 --- a/pkgs/tools/networking/udptunnel/default.nix +++ b/pkgs/tools/networking/udptunnel/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = http://code.google.com/p/udptunnel/; description = "Tunnels TCP over UDP packets"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; |