diff options
49 files changed, 60 insertions, 60 deletions
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index d23f42fdbf99..e40a5fd0630e 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "A light-weight image viewer"; homepage = https://derf.homelinux.org/projects/feh/; - license = "BSD"; + license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/applications/networking/umurmur/default.nix index 1f08b9873d44..2e196cdf8cf3 100644 --- a/pkgs/applications/networking/umurmur/default.nix +++ b/pkgs/applications/networking/umurmur/default.nix @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { configureFlags = "--with-ssl=openssl"; - meta = { + meta = with stdenv.lib; { description = "Minimalistic Murmur (Mumble server)"; - license = "BSD"; + license = licenses.bsd3; homepage = http://code.google.com/p/umurmur/; }; } diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index 34aa7c769d01..350bb4d713cf 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { homepage = "http://ledger-cli.org/"; description = "A double-entry accounting system with a command-line reporting interface"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; longDescription = '' Ledger is a powerful, double-entry accounting system that is accessed diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix index dc8e975ce1d1..a7cdf7f3097d 100644 --- a/pkgs/applications/science/logic/hol/default.nix +++ b/pkgs/applications/science/logic/hol/default.nix @@ -69,6 +69,6 @@ stdenv.mkDerivation { checking. ''; homepage = "http://hol.sourceforge.net/"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/applications/science/logic/leo2/default.nix b/pkgs/applications/science/logic/leo2/default.nix index 8f673eb0f15a..95012f90a944 100644 --- a/pkgs/applications/science/logic/leo2/default.nix +++ b/pkgs/applications/science/logic/leo2/default.nix @@ -55,7 +55,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "BSD"; + license = a.lib.licenses.bsd3; inherit (sourceInfo) version; homepage = "http://page.mi.fu-berlin.de/cbenzmueller/leo/"; downloadPage = "http://page.mi.fu-berlin.de/cbenzmueller/leo/download.html"; diff --git a/pkgs/applications/science/logic/spass/default.nix b/pkgs/applications/science/logic/spass/default.nix index 2c6144baf0e8..5327ed6a42aa 100644 --- a/pkgs/applications/science/logic/spass/default.nix +++ b/pkgs/applications/science/logic/spass/default.nix @@ -38,7 +38,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "BSD"; + license = a.lib.licenses.bsd2; }; passthru = { updateInfo = { diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index c2793190e892..8cc8920d4a1a 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { from the others by being extremely simple to setup and operate. ''; homepage = http://www.fossil-scm.org/; - license = "BSD"; + license = stdenv.lib.licenses.bsd2; platforms = with stdenv.lib.platforms; all; maintainers = [ #Add your name here! stdenv.lib.maintainers.z77z diff --git a/pkgs/applications/video/cc1394/default.nix b/pkgs/applications/video/cc1394/default.nix index d555e1b7885a..1040f8e009a3 100644 --- a/pkgs/applications/video/cc1394/default.nix +++ b/pkgs/applications/video/cc1394/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.alliedvisiontec.com/us/products/software/linux/avt-fire4linux.html; description = "AVT Viewer application for AVT cameras"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; # because libdc1394avt is broken diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index c42a8d0481dd..388248c5aa86 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" { meta = { description = "Sample UEFI firmware for QEMU and KVM"; homepage = http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=OVMF; - license = "BSD"; + license = stdenv.lib.licenses.bsd2; maintainers = [ stdenv.lib.maintainers.shlevy ]; platforms = ["x86_64-linux" "i686-linux"]; }; diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix index 0b36d922df4c..c17107ae97b8 100644 --- a/pkgs/applications/window-managers/bspwm/default.nix +++ b/pkgs/applications/window-managers/bspwm/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "A tiling window manager based on binary space partitioning"; homepage = http://github.com/baskerville/bspwm; maintainers = [ stdenv.lib.maintainers.meisternu ]; - license = "BSD"; + license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index 7c4cb4934c9f..c4b265f4b41a 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "A manual tiling window manager for X"; homepage = "http://herbstluftwm.org/"; - license = "BSD"; # Simplified BSD License + license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/window-managers/sxhkd/default.nix b/pkgs/applications/window-managers/sxhkd/default.nix index 03563a4f8121..af368d0a0425 100644 --- a/pkgs/applications/window-managers/sxhkd/default.nix +++ b/pkgs/applications/window-managers/sxhkd/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple X hotkey daemon"; homepage = "http://github.com/baskerville/sxhkd"; - license = "BSD"; + license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/chicken/default.nix b/pkgs/development/compilers/chicken/default.nix index 0e210343a72f..1ddda71c2d3e 100644 --- a/pkgs/development/compilers/chicken/default.nix +++ b/pkgs/development/compilers/chicken/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.call-cc.org/; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; platforms = with stdenv.lib.platforms; allBut darwin; description = "A portable compiler for the Scheme programming language"; diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index acb2dea191a0..02e22e820290 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -33,8 +33,8 @@ edk2 = stdenv.mkDerivation { meta = { description = "Intel EFI development kit"; - homepage = http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=EDK2; - license = "BSD"; + homepage = http://sourceforge.net/projects/edk2/; + license = stdenv.lib.licenses.bsd2; maintainers = [ stdenv.lib.maintainers.shlevy ]; platforms = ["x86_64-linux" "i686-linux"]; }; diff --git a/pkgs/development/compilers/yasm/default.nix b/pkgs/development/compilers/yasm/default.nix index f752ad35a6d4..738b63fe1ad7 100644 --- a/pkgs/development/compilers/yasm/default.nix +++ b/pkgs/development/compilers/yasm/default.nix @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { sha256 = "0gv0slmm0qpq91za3v2v9glff3il594x5xsrbgab7xcmnh0ndkix"; }; - meta = { + meta = with stdenv.lib; { homepage = http://www.tortall.net/projects/yasm/; description = "Complete rewrite of the NASM assembler"; - license = "BSD"; - platforms = stdenv.lib.platforms.unix; + license = licenses.bsd2; + platforms = platforms.unix; }; } diff --git a/pkgs/development/interpreters/scsh/default.nix b/pkgs/development/interpreters/scsh/default.nix index 010d7c504d3a..98b4f55f79b8 100644 --- a/pkgs/development/interpreters/scsh/default.nix +++ b/pkgs/development/interpreters/scsh/default.nix @@ -15,12 +15,12 @@ stdenv.mkDerivation { }; meta = { - description = "a Scheme shell"; + description = "A Scheme shell"; longDescription = '' SCSH is an implementation of the Scheme shell. It is implemented as a heap image which is interpreted by the Scheme 48 virtual machine. ''; homepage = http://www.scsh.net/; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/development/libraries/confuse/default.nix b/pkgs/development/libraries/confuse/default.nix index 67fe669a0374..e11e0ae0a1c8 100644 --- a/pkgs/development/libraries/confuse/default.nix +++ b/pkgs/development/libraries/confuse/default.nix @@ -10,6 +10,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.nongnu.org/confuse/; description = "Configuration file parser library"; - license = "BSD"; + license = stdenv.lib.licenses.isc; }; } diff --git a/pkgs/development/libraries/enginepkcs11/default.nix b/pkgs/development/libraries/enginepkcs11/default.nix index 8c570c5421d6..ff40a110a33e 100644 --- a/pkgs/development/libraries/enginepkcs11/default.nix +++ b/pkgs/development/libraries/enginepkcs11/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.opensc-project.org/engine_pkcs11/; - license = "BSD"; + license = stdenv.lib.licenses.bsdOriginal; description = "Engine for OpenSSL to use smart cards in PKCS#11 format"; }; } diff --git a/pkgs/development/libraries/eventlog/default.nix b/pkgs/development/libraries/eventlog/default.nix index 7a8ab8e464b4..12da7e896038 100644 --- a/pkgs/development/libraries/eventlog/default.nix +++ b/pkgs/development/libraries/eventlog/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { combination of description and tag/value pairs. ''; homepage = "http://www.balabit.com/support/community/products/"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/development/libraries/flann/default.nix index 4e4391a50f75..bffb124dc68f 100644 --- a/pkgs/development/libraries/flann/default.nix +++ b/pkgs/development/libraries/flann/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { meta = { homepage = http://people.cs.ubc.ca/~mariusm/flann/; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; description = "Fast approximate nearest neighbor searches in high dimensional spaces"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix index d3f74f4043a9..9e26d8ecf052 100644 --- a/pkgs/development/libraries/glog/default.nix +++ b/pkgs/development/libraries/glog/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://code.google.com/p/google-glog/; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; description = "Library for application-level logging"; }; } diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index 29e15e08f696..7b4e3834af76 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Insight Segmentation and Registration Toolkit"; homepage = http://www.itk.org/; - license = "BSD"; + license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index 21c95066b336..01aeeecc6f6e 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Library with the aim of simplifying DNS programming in C"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; homepage = "http://www.nlnetlabs.nl/projects/ldns/"; }; } diff --git a/pkgs/development/libraries/libcello/default.nix b/pkgs/development/libraries/libcello/default.nix index 4a7bc56568e2..f45fb378374e 100644 --- a/pkgs/development/libraries/libcello/default.nix +++ b/pkgs/development/libraries/libcello/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { }; meta = { - homepage = "http://libcello.org/"; + homepage = http://libcello.org/; description = "Higher level programming in C"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/development/libraries/libdnet/default.nix b/pkgs/development/libraries/libdnet/default.nix index acd930ddd015..2bdeffb204d8 100644 --- a/pkgs/development/libraries/libdnet/default.nix +++ b/pkgs/development/libraries/libdnet/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "Provides a simplified, portable interface to several low-level networking routines"; homepage = http://code.google.com/p/libdnet/; - license = "BSD"; # New BSD license + license = stdenv.lib.licenses.bsd3; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libf2c/default.nix b/pkgs/development/libraries/libf2c/default.nix index 3f800c2086e0..3123bb33d45b 100644 --- a/pkgs/development/libraries/libf2c/default.nix +++ b/pkgs/development/libraries/libf2c/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { meta = { description = "F2c converts Fortran 77 source code to C"; homepage = http://www.netlib.org/f2c/; - license = "BSD"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/libmusclecard/default.nix b/pkgs/development/libraries/libmusclecard/default.nix index af235b833826..fa8b41a17724 100644 --- a/pkgs/development/libraries/libmusclecard/default.nix +++ b/pkgs/development/libraries/libmusclecard/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "Library for MUSCLE smartcard applications"; homepage = http://pcsclite.alioth.debian.org/; - license = "BSD"; + license = stdenv.lib.licenses.lgpl21; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; broken = true; diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 78b264506f01..557e448e2d49 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Open, royalty-free, highly versatile audio codec"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; homepage = http://www.opus-codec.org/; }; } diff --git a/pkgs/development/libraries/opencv/2.1.nix b/pkgs/development/libraries/opencv/2.1.nix index 4b0ccc0903ff..302ac10d4ab0 100644 --- a/pkgs/development/libraries/opencv/2.1.nix +++ b/pkgs/development/libraries/opencv/2.1.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Open Computer Vision Library with more than 500 algorithms"; homepage = http://opencv.willowgarage.com/; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; broken = true; diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 775f7de9d612..fe4aaecbfe38 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Open Computer Vision Library with more than 500 algorithms"; homepage = http://opencv.org/; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [viric flosse]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix index 979812184781..7f23929efb08 100644 --- a/pkgs/development/libraries/openjpeg/default.nix +++ b/pkgs/development/libraries/openjpeg/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.openjpeg.org/; description = "Open-source JPEG 2000 codec written in C language"; - license = "BSD"; + license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index b9943b443318..a71709b554b4 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { homepage = http://pointclouds.org/; description = "Open project for 2D/3D image and point cloud processing"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; broken = true; diff --git a/pkgs/development/libraries/qimageblitz/default.nix b/pkgs/development/libraries/qimageblitz/default.nix index 1f820b33e811..dcf453fd8e1d 100644 --- a/pkgs/development/libraries/qimageblitz/default.nix +++ b/pkgs/development/libraries/qimageblitz/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Graphical effect and filter library for KDE4"; - license = "BSD"; + license = stdenv.lib.licenses.bsd2; homepage = "http://${pn}.sourceforge.net"; }; } diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix index 2683a01a2902..b4b29b54881e 100644 --- a/pkgs/development/libraries/startup-notification/default.nix +++ b/pkgs/development/libraries/startup-notification/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.freedesktop.org/software/startup-notification; description = "Application startup notification and feedback library"; - license = "BSD"; + license = stdenv.lib.licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/tremor/default.nix b/pkgs/development/libraries/tremor/default.nix index d55ea6166e8b..c8eb6e3bdab9 100644 --- a/pkgs/development/libraries/tremor/default.nix +++ b/pkgs/development/libraries/tremor/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://xiph.org/tremor/; description = "Fixed-point version of the Ogg Vorbis decoder"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index 9d16edb0f2e7..62fce3c1d2d3 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Open source libraries for 3D computer graphics, image processing and visualization"; homepage = http://www.vtk.org/; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ viric bbenoist ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/misc/gxemul/default.nix b/pkgs/misc/gxemul/default.nix index 5cad3c964e45..8538932339c0 100644 --- a/pkgs/misc/gxemul/default.nix +++ b/pkgs/misc/gxemul/default.nix @@ -1,4 +1,4 @@ -{ composableDerivation, fetchurl }: +{ stdenv, composableDerivation, fetchurl }: let edf = composableDerivation.edf; name = "gxemul-0.4.6"; @@ -29,9 +29,9 @@ composableDerivation.composableDerivation {} { configurePhase = "./configure"; meta = { - license = "BSD"; + license = stdenv.lib.licenses.bsd3; description = "A Machine Emulator, mainly emulates MIPS, but supports other CPU types"; - homepage = http://gavare.se/gxemul/; + homepage = http://gxemul.sourceforge.net/; }; mergeAttrBy = { installPhase = a : b : "${a}\n${b}"; }; diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix index a3b2f23c8c78..262b673822b3 100644 --- a/pkgs/os-specific/linux/iw/default.nix +++ b/pkgs/os-specific/linux/iw/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Tool to use nl80211"; homepage = http://wireless.kernel.org/en/users/Documentation/iw; - license = "BSD"; + license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/os-specific/linux/v86d/default.nix b/pkgs/os-specific/linux/v86d/default.nix index 2ad3087d6a17..f7e0c5ca5e22 100644 --- a/pkgs/os-specific/linux/v86d/default.nix +++ b/pkgs/os-specific/linux/v86d/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "A userspace helper that runs x86 code in an emulated environment"; homepage = http://dev.gentoo.org/~spock/projects/uvesafb/; - license = "BSD"; + license = stdenv.lib.licenses.gpl2; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 899914b6446d..8803b8134f7a 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lightweight high-performance web server"; homepage = http://www.lighttpd.net/; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index e733ef3d009e..b9c2e83d5828 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://redis.io; description = "An open source, advanced key-value store"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; platforms = platforms.unix; maintainers = [ maintainers.berdario ]; }; diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix index 8d8a677647c2..31be5eef7c8c 100644 --- a/pkgs/servers/rpcbind/default.nix +++ b/pkgs/servers/rpcbind/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "ONC RPC portmapper"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; longDescription = '' Universal addresses to RPC program number mapper. ''; diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix index b101e25f5744..e85d258a6320 100644 --- a/pkgs/shells/ipython/default.nix +++ b/pkgs/shells/ipython/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = { homepage = http://ipython.scipy.org/; description = "An interactive computing environment for Python"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; longDescription = '' The goal of IPython is to create a comprehensive environment for interactive and exploratory computing. It consists of an diff --git a/pkgs/tools/X11/xdotool/default.nix b/pkgs/tools/X11/xdotool/default.nix index 9224c3b2d9cd..2eeb61dfaf4c 100644 --- a/pkgs/tools/X11/xdotool/default.nix +++ b/pkgs/tools/X11/xdotool/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.semicomplete.com/projects/xdotool/; description = "Fake keyboard/mouse input, window management, and more"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/networking/dnstop/default.nix b/pkgs/tools/networking/dnstop/default.nix index 00984a4ee70a..c1a41d98f4bd 100644 --- a/pkgs/tools/networking/dnstop/default.nix +++ b/pkgs/tools/networking/dnstop/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "libpcap application that displays DNS traffic on your network"; - homepage = "http://dns.measurement-factory.com/tools/dnstop"; - license = "BSD"; + homepage = http://dns.measurement-factory.com/tools/dnstop; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/tools/networking/oslrd/default.nix b/pkgs/tools/networking/oslrd/default.nix index 44f32e93474c..90f686f77ea6 100644 --- a/pkgs/tools/networking/oslrd/default.nix +++ b/pkgs/tools/networking/oslrd/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { meta = { description = "An adhoc wireless mesh routing daemon"; - license = "BSD"; - homepage = "http://olsr.org/"; + license = stdenv.lib.licenses.bsd3; + homepage = http://olsr.org/; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/networking/slimrat/default.nix b/pkgs/tools/networking/slimrat/default.nix index 9006fadfcdb9..f73a1bc5bcc8 100644 --- a/pkgs/tools/networking/slimrat/default.nix +++ b/pkgs/tools/networking/slimrat/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { meta = { homepage = http://code.google.com/p/slimrat/; description = "Linux Rapidshare downloader"; - license = "BSD"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/tools/networking/trickle/default.nix b/pkgs/tools/networking/trickle/default.nix index 254dc168ec8c..d10e645dc874 100644 --- a/pkgs/tools/networking/trickle/default.nix +++ b/pkgs/tools/networking/trickle/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight userspace bandwidth shaper"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; homepage = http://monkey.org/~marius/pages/?page=trickle; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix index 027017247b74..eedca8bd7fd5 100644 --- a/pkgs/tools/system/ipmitool/default.nix +++ b/pkgs/tools/system/ipmitool/default.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation { meta = { description = ''Command-line interface to IPMI-enabled devices''; - license = "BSD"; - homepage = "http://ipmitool.sourceforge.net"; + license = stdenv.lib.licenses.bsd3; + homepage = http://ipmitool.sourceforge.net; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.simons ]; |