diff options
| author | Domen Kozar <domen@dev.si> | 2014-03-12 21:20:01 +0100 |
|---|---|---|
| committer | Domen Kozar <domen@dev.si> | 2014-03-12 21:20:43 +0100 |
| commit | 059e8e179bb03e7a315ddd6400c59d36163eaca7 (patch) | |
| tree | 3ba02da89c5c994460ee81a9a3f947b826a7962e /pkgs/tools | |
| parent | b13a5d4ccae1b38a1ba1c1a846d7528ba1227ec2 (diff) | |
| download | nixlib-059e8e179bb03e7a315ddd6400c59d36163eaca7.tar nixlib-059e8e179bb03e7a315ddd6400c59d36163eaca7.tar.gz nixlib-059e8e179bb03e7a315ddd6400c59d36163eaca7.tar.bz2 nixlib-059e8e179bb03e7a315ddd6400c59d36163eaca7.tar.lz nixlib-059e8e179bb03e7a315ddd6400c59d36163eaca7.tar.xz nixlib-059e8e179bb03e7a315ddd6400c59d36163eaca7.tar.zst nixlib-059e8e179bb03e7a315ddd6400c59d36163eaca7.zip | |
set all licenses to be attributes (and wait for Nix 1.7)
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/networking/haproxy/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/networking/p2p/tahoe-lafs/default.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index e4a32e14260c..42760da5d4ae 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -29,9 +29,9 @@ stdenv.mkDerivation rec { homepage = http://haproxy.1wt.eu; maintainers = [ stdenv.lib.maintainers.garbas ]; platforms = stdenv.lib.platforms.linux; - license = [ + /* TODO license = [ stdenv.lib.licenses.gpl2 stdenv.lib.licenses.lgpl21 - ]; + ];*/ }; } diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index 8796dbd076e7..76a4a0eae62d 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -67,7 +67,7 @@ buildPythonPackage { homepage = http://allmydata.org/; - license = [ lib.licenses.gpl2Plus /* or */ "TGPPLv1+" ]; + # TODO license = [ lib.licenses.gpl2Plus /* or */ "TGPPLv1+" ]; maintainers = [ lib.maintainers.simons ]; platforms = lib.platforms.gnu; # arbitrary choice |