diff options
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/aws-mturk-clt/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/fasd/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/figlet/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/flashrom/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/i3minator/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/jdiskreport/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/mysql2pgsql/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/pk2cmd/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/pv/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/w3c-css-validator/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/xdaliclock/default.nix | 10 |
11 files changed, 19 insertions, 19 deletions
diff --git a/pkgs/tools/misc/aws-mturk-clt/default.nix b/pkgs/tools/misc/aws-mturk-clt/default.nix index d2d29aae785d..4db4f3b1672b 100644 --- a/pkgs/tools/misc/aws-mturk-clt/default.nix +++ b/pkgs/tools/misc/aws-mturk-clt/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "aws-mturk-clt-1.3.0"; - + src = fetchurl { url = "http://mturk.s3.amazonaws.com/CLTSource/${name}.tar.gz"; sha256 = "06p0cbb5afmqjjlibbw9gb08jp270c7j57lhnf9ld50sm1z021ln"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://requester.mturk.com/developer; description = "Command line tools for interacting with the Amazon Mechanical Turk"; - license = "unfree-redistributable"; # Amazon http://aws.amazon.com/asl/ + license = stdenv.lib.licenses.amazonsl; longDescription = '' diff --git a/pkgs/tools/misc/fasd/default.nix b/pkgs/tools/misc/fasd/default.nix index 1cbbb9720c9a..54edaaa033a4 100644 --- a/pkgs/tools/misc/fasd/default.nix +++ b/pkgs/tools/misc/fasd/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/clvv/fasd"; description = "quick command-line access to files and directories for POSIX shells"; - license = "free"; # https://github.com/clvv/fasd/blob/master/LICENSE + license = stdenv.lib.licenses.free; # https://github.com/clvv/fasd/blob/master/LICENSE longDescription = '' Fasd is a command-line productivity booster. diff --git a/pkgs/tools/misc/figlet/default.nix b/pkgs/tools/misc/figlet/default.nix index 7f22a35e8de1..99c7a056051d 100644 --- a/pkgs/tools/misc/figlet/default.nix +++ b/pkgs/tools/misc/figlet/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation { makeFlags="DESTDIR=$out/bin MANDIR=$out/man/man6 DEFAULTFONTDIR=$out/share/figlet" ''; - meta = { + meta = { description = "Program for making large letters out of ordinary text"; homepage = http://www.figlet.org/; - license = "AFL-2.1"; + license = stdenv.lib.licenses.afl21; }; } diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index c4e74359b15b..2d22bdcd3026 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.flashrom.org"; description = "Utility for reading, writing, erasing and verifying flash ROM chips"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.funfunctor ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix index 08e012128c24..02b804936549 100644 --- a/pkgs/tools/misc/i3minator/default.nix +++ b/pkgs/tools/misc/i3minator/default.nix @@ -32,7 +32,7 @@ in buildPythonPackage rec { project is inspired by tmuxinator and uses i3-py. ''; homepage = https://github.com/carlesso/i3minator; - license = "WTFPL"; # http://sam.zoy.org/wtfpl/ + license = stdenv.lib.licenses.wtfpl; maintainers = with maintainers; [ iElectric ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix index 2fa712239314..08fbba873e5b 100644 --- a/pkgs/tools/misc/jdiskreport/default.nix +++ b/pkgs/tools/misc/jdiskreport/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.jgoodies.com/freeware/jdiskreport/; description = "A graphical utility to visualize disk usage"; - license = "unfree-redistributable"; #TODO freedist, libs under BSD-3 + license = stdenv.lib.licenses.unfreeRedistributable; #TODO freedist, libs under BSD-3 }; } diff --git a/pkgs/tools/misc/mysql2pgsql/default.nix b/pkgs/tools/misc/mysql2pgsql/default.nix index 0dad6c2d33f3..ce4f8728a808 100644 --- a/pkgs/tools/misc/mysql2pgsql/default.nix +++ b/pkgs/tools/misc/mysql2pgsql/default.nix @@ -20,9 +20,9 @@ stdenv.mkDerivation { mv {,$out/bin/}mysql2psql ''; - meta = { + meta = { description = "converts mysql dump files to psql loadable files "; homepage = http://pgfoundry.org/projects/mysql2pgsql/; - license = "BSD-Original"; + license = stdenv.lib.licenses.bsdOriginal; }; } diff --git a/pkgs/tools/misc/pk2cmd/default.nix b/pkgs/tools/misc/pk2cmd/default.nix index 909ed0856bb9..3501090c63c8 100644 --- a/pkgs/tools/misc/pk2cmd/default.nix +++ b/pkgs/tools/misc/pk2cmd/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.microchip.com/pickit2; - license = "nonfree"; #MicroChip-PK2 + license = stdenv.lib.licenses.unfree; #MicroChip-PK2 description = "Microchip PIC programming software for the PICKit2 programmer"; }; } diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix index 0af7143a320a..a94cdea1339f 100644 --- a/pkgs/tools/misc/pv/default.nix +++ b/pkgs/tools/misc/pv/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.ivarch.com/programs/pv; description = "Tool for monitoring the progress of data through a pipeline"; - license = "Artistic-2"; + license = stdenv.lib.licenses.artistic2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/tools/misc/w3c-css-validator/default.nix b/pkgs/tools/misc/w3c-css-validator/default.nix index f08fe87202f0..3c7aa5261a24 100644 --- a/pkgs/tools/misc/w3c-css-validator/default.nix +++ b/pkgs/tools/misc/w3c-css-validator/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, sourceFromHead, apacheAnt, tomcat, jre }: -let +let sources = [ (fetchurl { @@ -69,7 +69,7 @@ stdenv.mkDerivation { homepage = http://dev.w3.org/cvsweb/2002/css-validator/; # dependencies ship their own license files # I think all .java files are covered by this license (?) - license = "w3c"; # http://www.w3.org/Consortium/Legal/ + license = stdenv.lib.licenses.w3c; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; broken = true; diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix index df1a7eedeffd..7d731650288c 100644 --- a/pkgs/tools/misc/xdaliclock/default.nix +++ b/pkgs/tools/misc/xdaliclock/default.nix @@ -3,9 +3,9 @@ x@{builderDefsPackage , libSM, libXext , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -35,7 +35,7 @@ rec { '' ["minInit" "defEnsureDir"]; goSrcDir = "cd X11"; - + meta = { description = "A clock application that morphs digits when they are changed"; maintainers = with a.lib.maintainers; @@ -44,7 +44,7 @@ rec { ]; platforms = with a.lib.platforms; linux ++ freebsd; - license = "free"; #TODO BSD on Gentoo, looks like MIT + license = a.lib.licenses.free; #TODO BSD on Gentoo, looks like MIT downloadPage = "http://www.jwz.org/xdaliclock/"; inherit version; updateWalker = true; |