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/applications/audio/praat | |
parent | 9253a95f6b3f65ecc701ebb10620acfb6d251f17 (diff) | |
parent | b35770818d70924b2b71ae41ead270fe0be8c826 (diff) | |
download | nixlib-2d326e5032fda2210ff84118a526195f0a68bd24.tar nixlib-2d326e5032fda2210ff84118a526195f0a68bd24.tar.gz nixlib-2d326e5032fda2210ff84118a526195f0a68bd24.tar.bz2 nixlib-2d326e5032fda2210ff84118a526195f0a68bd24.tar.lz nixlib-2d326e5032fda2210ff84118a526195f0a68bd24.tar.xz nixlib-2d326e5032fda2210ff84118a526195f0a68bd24.tar.zst nixlib-2d326e5032fda2210ff84118a526195f0a68bd24.zip |
Merge remote-tracking branch 'origin/master' into staging.
Conflicts: pkgs/desktops/e18/enlightenment.nix
Diffstat (limited to 'pkgs/applications/audio/praat')
-rw-r--r-- | pkgs/applications/audio/praat/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index c7a40bf85a7c..86c68d087b77 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "Doing phonetics by computer"; homepage = http://www.fon.hum.uva.nl/praat/; - license = "GPLv2+"; # Has some 3rd-party code in it though + license = stdenv.lib.licenses.gpl2Plus; # Has some 3rd-party code in it though platforms = stdenv.lib.platforms.linux; }; } |