diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-06 10:16:39 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-06 10:16:39 +0100 |
| commit | 0518ccf5af90017df31c445f52badaff45b6b7cd (patch) | |
| tree | f60c912ecd598722d76947f6bd5230955210eb66 /pkgs/tools/compression | |
| parent | c96407720010658b44dcd2a8801b05879105b9ff (diff) | |
| parent | 782a12e450a58b815cd702c65da75855124d1572 (diff) | |
| download | nixpkgs-0518ccf5af90017df31c445f52badaff45b6b7cd.tar nixpkgs-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.gz nixpkgs-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.bz2 nixpkgs-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.lz nixpkgs-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.xz nixpkgs-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.zst nixpkgs-0518ccf5af90017df31c445f52badaff45b6b7cd.zip | |
Merge remote-tracking branch 'origin/master' into staging
Conflicts: pkgs/stdenv/generic/default.nix
Diffstat (limited to 'pkgs/tools/compression')
| -rw-r--r-- | pkgs/tools/compression/ncompress/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/compression/zsync/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/compression/ncompress/default.nix b/pkgs/tools/compression/ncompress/default.nix index 937cf987513..3d3ad80e25d 100644 --- a/pkgs/tools/compression/ncompress/default.nix +++ b/pkgs/tools/compression/ncompress/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://ncompress.sourceforge.net/; - license = "public domain"; + license = stdenv.lib.licenses.publicDomain; description = "A fast, simple LZW file compressor"; }; } diff --git a/pkgs/tools/compression/zsync/default.nix b/pkgs/tools/compression/zsync/default.nix index 3732e5b1756..4606d5bf79b 100644 --- a/pkgs/tools/compression/zsync/default.nix +++ b/pkgs/tools/compression/zsync/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://zsync.moria.org.uk/; description = "File distribution system using the rsync algorithm"; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; |