From f94580da695808d04626775d6aa3864a91b735b2 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 21 Dec 2014 00:00:35 +0100 Subject: Fix license attribute of many bsd-like licensed packages --- pkgs/applications/graphics/feh/default.nix | 2 +- pkgs/applications/networking/umurmur/default.nix | 4 ++-- pkgs/applications/office/ledger/default.nix | 2 +- pkgs/applications/science/logic/hol/default.nix | 2 +- pkgs/applications/science/logic/leo2/default.nix | 2 +- pkgs/applications/science/logic/spass/default.nix | 2 +- pkgs/applications/version-management/fossil/default.nix | 2 +- pkgs/applications/video/cc1394/default.nix | 2 +- pkgs/applications/virtualization/OVMF/default.nix | 2 +- pkgs/applications/window-managers/bspwm/default.nix | 2 +- pkgs/applications/window-managers/herbstluftwm/default.nix | 2 +- pkgs/applications/window-managers/sxhkd/default.nix | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) (limited to 'pkgs/applications') 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; }; } -- cgit 1.4.1