Fix license attribute of many bsd-like licensed packages

+60 -60
+1 -1
pkgs/applications/graphics/feh/default.nix
··· 23 23 meta = { 24 24 description = "A light-weight image viewer"; 25 25 homepage = https://derf.homelinux.org/projects/feh/; 26 - license = "BSD"; 26 + license = stdenv.lib.licenses.mit; 27 27 maintainers = with stdenv.lib.maintainers; [viric]; 28 28 platforms = with stdenv.lib.platforms; linux; 29 29 };
+2 -2
pkgs/applications/networking/umurmur/default.nix
··· 12 12 13 13 configureFlags = "--with-ssl=openssl"; 14 14 15 - meta = { 15 + meta = with stdenv.lib; { 16 16 description = "Minimalistic Murmur (Mumble server)"; 17 - license = "BSD"; 17 + license = licenses.bsd3; 18 18 homepage = http://code.google.com/p/umurmur/; 19 19 }; 20 20 }
+1 -1
pkgs/applications/office/ledger/default.nix
··· 30 30 meta = { 31 31 homepage = "http://ledger-cli.org/"; 32 32 description = "A double-entry accounting system with a command-line reporting interface"; 33 - license = "BSD"; 33 + license = stdenv.lib.licenses.bsd3; 34 34 35 35 longDescription = '' 36 36 Ledger is a powerful, double-entry accounting system that is accessed
+1 -1
pkgs/applications/science/logic/hol/default.nix
··· 69 69 checking. 70 70 ''; 71 71 homepage = "http://hol.sourceforge.net/"; 72 - license = "BSD"; 72 + license = stdenv.lib.licenses.bsd3; 73 73 }; 74 74 }
+1 -1
pkgs/applications/science/logic/leo2/default.nix
··· 55 55 ]; 56 56 platforms = with a.lib.platforms; 57 57 linux; 58 - license = "BSD"; 58 + license = a.lib.licenses.bsd3; 59 59 inherit (sourceInfo) version; 60 60 homepage = "http://page.mi.fu-berlin.de/cbenzmueller/leo/"; 61 61 downloadPage = "http://page.mi.fu-berlin.de/cbenzmueller/leo/download.html";
+1 -1
pkgs/applications/science/logic/spass/default.nix
··· 38 38 ]; 39 39 platforms = with a.lib.platforms; 40 40 linux; 41 - license = "BSD"; 41 + license = a.lib.licenses.bsd2; 42 42 }; 43 43 passthru = { 44 44 updateInfo = {
+1 -1
pkgs/applications/version-management/fossil/default.nix
··· 40 40 from the others by being extremely simple to setup and operate. 41 41 ''; 42 42 homepage = http://www.fossil-scm.org/; 43 - license = "BSD"; 43 + license = stdenv.lib.licenses.bsd2; 44 44 platforms = with stdenv.lib.platforms; all; 45 45 maintainers = [ #Add your name here! 46 46 stdenv.lib.maintainers.z77z
+1 -1
pkgs/applications/video/cc1394/default.nix
··· 30 30 meta = { 31 31 homepage = http://www.alliedvisiontec.com/us/products/software/linux/avt-fire4linux.html; 32 32 description = "AVT Viewer application for AVT cameras"; 33 - license = "BSD"; 33 + license = stdenv.lib.licenses.bsd3; 34 34 maintainers = [ stdenv.lib.maintainers.viric ]; 35 35 platforms = stdenv.lib.platforms.linux; 36 36 hydraPlatforms = []; # because libdc1394avt is broken
+1 -1
pkgs/applications/virtualization/OVMF/default.nix
··· 26 26 meta = { 27 27 description = "Sample UEFI firmware for QEMU and KVM"; 28 28 homepage = http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=OVMF; 29 - license = "BSD"; 29 + license = stdenv.lib.licenses.bsd2; 30 30 maintainers = [ stdenv.lib.maintainers.shlevy ]; 31 31 platforms = ["x86_64-linux" "i686-linux"]; 32 32 };
+1 -1
pkgs/applications/window-managers/bspwm/default.nix
··· 23 23 description = "A tiling window manager based on binary space partitioning"; 24 24 homepage = http://github.com/baskerville/bspwm; 25 25 maintainers = [ stdenv.lib.maintainers.meisternu ]; 26 - license = "BSD"; 26 + license = stdenv.lib.licenses.bsd2; 27 27 platforms = stdenv.lib.platforms.linux; 28 28 }; 29 29 }
+1 -1
pkgs/applications/window-managers/herbstluftwm/default.nix
··· 19 19 meta = { 20 20 description = "A manual tiling window manager for X"; 21 21 homepage = "http://herbstluftwm.org/"; 22 - license = "BSD"; # Simplified BSD License 22 + license = stdenv.lib.licenses.bsd2; 23 23 platforms = stdenv.lib.platforms.linux; 24 24 }; 25 25 }
+1 -1
pkgs/applications/window-managers/sxhkd/default.nix
··· 21 21 meta = { 22 22 description = "Simple X hotkey daemon"; 23 23 homepage = "http://github.com/baskerville/sxhkd"; 24 - license = "BSD"; 24 + license = stdenv.lib.licenses.bsd2; 25 25 platforms = stdenv.lib.platforms.linux; 26 26 }; 27 27 }
+1 -1
pkgs/development/compilers/chicken/default.nix
··· 61 61 62 62 meta = { 63 63 homepage = http://www.call-cc.org/; 64 - license = "BSD"; 64 + license = stdenv.lib.licenses.bsd3; 65 65 maintainers = with stdenv.lib.maintainers; [ the-kenny ]; 66 66 platforms = with stdenv.lib.platforms; allBut darwin; 67 67 description = "A portable compiler for the Scheme programming language";
+2 -2
pkgs/development/compilers/edk2/default.nix
··· 33 33 34 34 meta = { 35 35 description = "Intel EFI development kit"; 36 - homepage = http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=EDK2; 37 - license = "BSD"; 36 + homepage = http://sourceforge.net/projects/edk2/; 37 + license = stdenv.lib.licenses.bsd2; 38 38 maintainers = [ stdenv.lib.maintainers.shlevy ]; 39 39 platforms = ["x86_64-linux" "i686-linux"]; 40 40 };
+3 -3
pkgs/development/compilers/yasm/default.nix
··· 8 8 sha256 = "0gv0slmm0qpq91za3v2v9glff3il594x5xsrbgab7xcmnh0ndkix"; 9 9 }; 10 10 11 - meta = { 11 + meta = with stdenv.lib; { 12 12 homepage = http://www.tortall.net/projects/yasm/; 13 13 description = "Complete rewrite of the NASM assembler"; 14 - license = "BSD"; 15 - platforms = stdenv.lib.platforms.unix; 14 + license = licenses.bsd2; 15 + platforms = platforms.unix; 16 16 }; 17 17 }
+2 -2
pkgs/development/interpreters/scsh/default.nix
··· 15 15 }; 16 16 17 17 meta = { 18 - description = "a Scheme shell"; 18 + description = "A Scheme shell"; 19 19 longDescription = '' 20 20 SCSH is an implementation of the Scheme shell. It is implemented as 21 21 a heap image which is interpreted by the Scheme 48 virtual machine. 22 22 ''; 23 23 homepage = http://www.scsh.net/; 24 - license = "BSD"; 24 + license = stdenv.lib.licenses.bsd3; 25 25 }; 26 26 }
+1 -1
pkgs/development/libraries/confuse/default.nix
··· 10 10 meta = { 11 11 homepage = http://www.nongnu.org/confuse/; 12 12 description = "Configuration file parser library"; 13 - license = "BSD"; 13 + license = stdenv.lib.licenses.isc; 14 14 }; 15 15 }
+1 -1
pkgs/development/libraries/enginepkcs11/default.nix
··· 15 15 16 16 meta = { 17 17 homepage = http://www.opensc-project.org/engine_pkcs11/; 18 - license = "BSD"; 18 + license = stdenv.lib.licenses.bsdOriginal; 19 19 description = "Engine for OpenSSL to use smart cards in PKCS#11 format"; 20 20 }; 21 21 }
+1 -1
pkgs/development/libraries/eventlog/default.nix
··· 19 19 combination of description and tag/value pairs. 20 20 ''; 21 21 homepage = "http://www.balabit.com/support/community/products/"; 22 - license = "BSD"; 22 + license = stdenv.lib.licenses.bsd3; 23 23 }; 24 24 }
+1 -1
pkgs/development/libraries/flann/default.nix
··· 12 12 13 13 meta = { 14 14 homepage = http://people.cs.ubc.ca/~mariusm/flann/; 15 - license = "BSD"; 15 + license = stdenv.lib.licenses.bsd3; 16 16 description = "Fast approximate nearest neighbor searches in high dimensional spaces"; 17 17 maintainers = with stdenv.lib.maintainers; [viric]; 18 18 platforms = with stdenv.lib.platforms; linux;
+1 -1
pkgs/development/libraries/glog/default.nix
··· 10 10 11 11 meta = { 12 12 homepage = http://code.google.com/p/google-glog/; 13 - license = "BSD"; 13 + license = stdenv.lib.licenses.bsd3; 14 14 description = "Library for application-level logging"; 15 15 }; 16 16 }
+1 -1
pkgs/development/libraries/itk/default.nix
··· 23 23 meta = { 24 24 description = "Insight Segmentation and Registration Toolkit"; 25 25 homepage = http://www.itk.org/; 26 - license = "BSD"; 26 + license = stdenv.lib.licenses.asl20; 27 27 maintainers = with stdenv.lib.maintainers; [viric]; 28 28 platforms = with stdenv.lib.platforms; linux; 29 29 };
+1 -1
pkgs/development/libraries/ldns/default.nix
··· 18 18 19 19 meta = { 20 20 description = "Library with the aim of simplifying DNS programming in C"; 21 - license = "BSD"; 21 + license = stdenv.lib.licenses.bsd3; 22 22 homepage = "http://www.nlnetlabs.nl/projects/ldns/"; 23 23 }; 24 24 }
+2 -2
pkgs/development/libraries/libcello/default.nix
··· 9 9 }; 10 10 11 11 meta = { 12 - homepage = "http://libcello.org/"; 12 + homepage = http://libcello.org/; 13 13 description = "Higher level programming in C"; 14 - license = "BSD"; 14 + license = stdenv.lib.licenses.bsd3; 15 15 }; 16 16 }
+1 -1
pkgs/development/libraries/libdnet/default.nix
··· 24 24 meta = { 25 25 description = "Provides a simplified, portable interface to several low-level networking routines"; 26 26 homepage = http://code.google.com/p/libdnet/; 27 - license = "BSD"; # New BSD license 27 + license = stdenv.lib.licenses.bsd3; 28 28 maintainers = [stdenv.lib.maintainers.marcweber]; 29 29 platforms = stdenv.lib.platforms.linux; 30 30 };
+1 -1
pkgs/development/libraries/libf2c/default.nix
··· 27 27 meta = { 28 28 description = "F2c converts Fortran 77 source code to C"; 29 29 homepage = http://www.netlib.org/f2c/; 30 - license = "BSD"; 30 + license = stdenv.lib.licenses.mit; 31 31 }; 32 32 }
+1 -1
pkgs/development/libraries/libmusclecard/default.nix
··· 15 15 meta = { 16 16 description = "Library for MUSCLE smartcard applications"; 17 17 homepage = http://pcsclite.alioth.debian.org/; 18 - license = "BSD"; 18 + license = stdenv.lib.licenses.lgpl21; 19 19 maintainers = with stdenv.lib.maintainers; [viric]; 20 20 platforms = with stdenv.lib.platforms; linux; 21 21 broken = true;
+1 -1
pkgs/development/libraries/libopus/default.nix
··· 18 18 19 19 meta = { 20 20 description = "Open, royalty-free, highly versatile audio codec"; 21 - license = "BSD"; 21 + license = stdenv.lib.licenses.bsd3; 22 22 homepage = http://www.opus-codec.org/; 23 23 }; 24 24 }
+1 -1
pkgs/development/libraries/opencv/2.1.nix
··· 27 27 meta = { 28 28 description = "Open Computer Vision Library with more than 500 algorithms"; 29 29 homepage = http://opencv.willowgarage.com/; 30 - license = "BSD"; 30 + license = stdenv.lib.licenses.bsd3; 31 31 maintainers = with stdenv.lib.maintainers; [viric]; 32 32 platforms = with stdenv.lib.platforms; linux; 33 33 broken = true;
+1 -1
pkgs/development/libraries/opencv/default.nix
··· 27 27 meta = { 28 28 description = "Open Computer Vision Library with more than 500 algorithms"; 29 29 homepage = http://opencv.org/; 30 - license = "BSD"; 30 + license = stdenv.lib.licenses.bsd3; 31 31 maintainers = with stdenv.lib.maintainers; [viric flosse]; 32 32 platforms = with stdenv.lib.platforms; linux; 33 33 };
+1 -1
pkgs/development/libraries/openjpeg/default.nix
··· 34 34 meta = { 35 35 homepage = http://www.openjpeg.org/; 36 36 description = "Open-source JPEG 2000 codec written in C language"; 37 - license = "BSD"; 37 + license = stdenv.lib.licenses.bsd2; 38 38 platforms = stdenv.lib.platforms.all; 39 39 }; 40 40 }
+1 -1
pkgs/development/libraries/pcl/default.nix
··· 15 15 meta = { 16 16 homepage = http://pointclouds.org/; 17 17 description = "Open project for 2D/3D image and point cloud processing"; 18 - license = "BSD"; 18 + license = stdenv.lib.licenses.bsd3; 19 19 maintainers = with stdenv.lib.maintainers; [viric]; 20 20 platforms = with stdenv.lib.platforms; linux; 21 21 broken = true;
+1 -1
pkgs/development/libraries/qimageblitz/default.nix
··· 19 19 20 20 meta = { 21 21 description = "Graphical effect and filter library for KDE4"; 22 - license = "BSD"; 22 + license = stdenv.lib.licenses.bsd2; 23 23 homepage = "http://${pn}.sourceforge.net"; 24 24 }; 25 25 }
+1 -1
pkgs/development/libraries/startup-notification/default.nix
··· 15 15 meta = { 16 16 homepage = http://www.freedesktop.org/software/startup-notification; 17 17 description = "Application startup notification and feedback library"; 18 - license = "BSD"; 18 + license = stdenv.lib.licenses.lgpl2; 19 19 }; 20 20 }
+1 -1
pkgs/development/libraries/tremor/default.nix
··· 20 20 meta = { 21 21 homepage = http://xiph.org/tremor/; 22 22 description = "Fixed-point version of the Ogg Vorbis decoder"; 23 - license = "BSD"; 23 + license = stdenv.lib.licenses.bsd3; 24 24 }; 25 25 }
+1 -1
pkgs/development/libraries/vtk/default.nix
··· 33 33 meta = { 34 34 description = "Open source libraries for 3D computer graphics, image processing and visualization"; 35 35 homepage = http://www.vtk.org/; 36 - license = "BSD"; 36 + license = stdenv.lib.licenses.bsd3; 37 37 maintainers = with stdenv.lib.maintainers; [ viric bbenoist ]; 38 38 platforms = with stdenv.lib.platforms; linux; 39 39 };
+3 -3
pkgs/misc/gxemul/default.nix
··· 1 - { composableDerivation, fetchurl }: 1 + { stdenv, composableDerivation, fetchurl }: 2 2 3 3 let edf = composableDerivation.edf; 4 4 name = "gxemul-0.4.6"; ··· 29 29 configurePhase = "./configure"; 30 30 31 31 meta = { 32 - license = "BSD"; 32 + license = stdenv.lib.licenses.bsd3; 33 33 description = "A Machine Emulator, mainly emulates MIPS, but supports other CPU types"; 34 - homepage = http://gavare.se/gxemul/; 34 + homepage = http://gxemul.sourceforge.net/; 35 35 }; 36 36 37 37 mergeAttrBy = { installPhase = a : b : "${a}\n${b}"; };
+1 -1
pkgs/os-specific/linux/iw/default.nix
··· 17 17 meta = { 18 18 description = "Tool to use nl80211"; 19 19 homepage = http://wireless.kernel.org/en/users/Documentation/iw; 20 - license = "BSD"; 20 + license = stdenv.lib.licenses.isc; 21 21 maintainers = with stdenv.lib.maintainers; [viric]; 22 22 platforms = with stdenv.lib.platforms; linux; 23 23 };
+1 -1
pkgs/os-specific/linux/v86d/default.nix
··· 25 25 meta = { 26 26 description = "A userspace helper that runs x86 code in an emulated environment"; 27 27 homepage = http://dev.gentoo.org/~spock/projects/uvesafb/; 28 - license = "BSD"; 28 + license = stdenv.lib.licenses.gpl2; 29 29 platforms = [ "i686-linux" "x86_64-linux" ]; 30 30 }; 31 31 }
+1 -1
pkgs/servers/http/lighttpd/default.nix
··· 29 29 meta = with stdenv.lib; { 30 30 description = "Lightweight high-performance web server"; 31 31 homepage = http://www.lighttpd.net/; 32 - license = "BSD"; 32 + license = stdenv.lib.licenses.bsd3; 33 33 platforms = platforms.linux; 34 34 maintainers = [ maintainers.bjornfor ]; 35 35 };
+1 -1
pkgs/servers/nosql/redis/default.nix
··· 15 15 meta = with stdenv.lib; { 16 16 homepage = http://redis.io; 17 17 description = "An open source, advanced key-value store"; 18 - license = "BSD"; 18 + license = stdenv.lib.licenses.bsd3; 19 19 platforms = platforms.unix; 20 20 maintainers = [ maintainers.berdario ]; 21 21 };
+1 -1
pkgs/servers/rpcbind/default.nix
··· 18 18 19 19 meta = { 20 20 description = "ONC RPC portmapper"; 21 - license = "BSD"; 21 + license = stdenv.lib.licenses.bsd3; 22 22 longDescription = '' 23 23 Universal addresses to RPC program number mapper. 24 24 '';
+1 -1
pkgs/shells/ipython/default.nix
··· 45 45 meta = { 46 46 homepage = http://ipython.scipy.org/; 47 47 description = "An interactive computing environment for Python"; 48 - license = "BSD"; 48 + license = stdenv.lib.licenses.bsd3; 49 49 longDescription = '' 50 50 The goal of IPython is to create a comprehensive environment 51 51 for interactive and exploratory computing. It consists of an
+1 -1
pkgs/tools/X11/xdotool/default.nix
··· 17 17 meta = { 18 18 homepage = http://www.semicomplete.com/projects/xdotool/; 19 19 description = "Fake keyboard/mouse input, window management, and more"; 20 - license = "BSD"; 20 + license = stdenv.lib.licenses.bsd3; 21 21 maintainers = with stdenv.lib.maintainers; [viric]; 22 22 platforms = with stdenv.lib.platforms; linux; 23 23 };
+2 -2
pkgs/tools/networking/dnstop/default.nix
··· 16 16 17 17 meta = { 18 18 description = "libpcap application that displays DNS traffic on your network"; 19 - homepage = "http://dns.measurement-factory.com/tools/dnstop"; 20 - license = "BSD"; 19 + homepage = http://dns.measurement-factory.com/tools/dnstop; 20 + license = stdenv.lib.licenses.bsd3; 21 21 }; 22 22 }
+2 -2
pkgs/tools/networking/oslrd/default.nix
··· 16 16 17 17 meta = { 18 18 description = "An adhoc wireless mesh routing daemon"; 19 - license = "BSD"; 20 - homepage = "http://olsr.org/"; 19 + license = stdenv.lib.licenses.bsd3; 20 + homepage = http://olsr.org/; 21 21 maintainers = with stdenv.lib.maintainers; [viric]; 22 22 platforms = with stdenv.lib.platforms; linux; 23 23 };
+1 -1
pkgs/tools/networking/slimrat/default.nix
··· 26 26 meta = { 27 27 homepage = http://code.google.com/p/slimrat/; 28 28 description = "Linux Rapidshare downloader"; 29 - license = "BSD"; 29 + license = stdenv.lib.licenses.mit; 30 30 }; 31 31 }
+1 -1
pkgs/tools/networking/trickle/default.nix
··· 24 24 25 25 meta = { 26 26 description = "Lightweight userspace bandwidth shaper"; 27 - license = "BSD"; 27 + license = stdenv.lib.licenses.bsd3; 28 28 homepage = http://monkey.org/~marius/pages/?page=trickle; 29 29 platforms = stdenv.lib.platforms.linux; 30 30 };
+2 -2
pkgs/tools/system/ipmitool/default.nix
··· 26 26 27 27 meta = { 28 28 description = ''Command-line interface to IPMI-enabled devices''; 29 - license = "BSD"; 30 - homepage = "http://ipmitool.sourceforge.net"; 29 + license = stdenv.lib.licenses.bsd3; 30 + homepage = http://ipmitool.sourceforge.net; 31 31 32 32 platforms = stdenv.lib.platforms.unix; 33 33 maintainers = [ stdenv.lib.maintainers.simons ];