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/os-specific/linux/i7z | |
parent | 9253a95f6b3f65ecc701ebb10620acfb6d251f17 (diff) | |
parent | b35770818d70924b2b71ae41ead270fe0be8c826 (diff) | |
download | nixpkgs-2d326e5032fda2210ff84118a526195f0a68bd24.tar nixpkgs-2d326e5032fda2210ff84118a526195f0a68bd24.tar.gz nixpkgs-2d326e5032fda2210ff84118a526195f0a68bd24.tar.bz2 nixpkgs-2d326e5032fda2210ff84118a526195f0a68bd24.tar.lz nixpkgs-2d326e5032fda2210ff84118a526195f0a68bd24.tar.xz nixpkgs-2d326e5032fda2210ff84118a526195f0a68bd24.tar.zst nixpkgs-2d326e5032fda2210ff84118a526195f0a68bd24.zip |
Merge remote-tracking branch 'origin/master' into staging.
Conflicts: pkgs/desktops/e18/enlightenment.nix
Diffstat (limited to 'pkgs/os-specific/linux/i7z')
-rw-r--r-- | pkgs/os-specific/linux/i7z/default.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix index 80e43f17b3c..1fe1f48f4ef 100644 --- a/pkgs/os-specific/linux/i7z/default.nix +++ b/pkgs/os-specific/linux/i7z/default.nix @@ -29,8 +29,7 @@ stdenv.mkDerivation rec { description = "A better i7 (and now i3, i5) reporting tool for Linux"; homepage = http://code.google.com/p/i7z; repositories.git = https://github.com/ajaiantilal/i7z.git; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; }; } - |