From 61800c4281840be088b736f96b458cbcd347c6e6 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 26 Jun 2020 10:43:14 +0200 Subject: [PATCH 1/9] foo-yc20: fix licenses --- pkgs/applications/audio/foo-yc20/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/foo-yc20/default.nix b/pkgs/applications/audio/foo-yc20/default.nix index 643b648fa88d..4ec69c62b1ae 100644 --- a/pkgs/applications/audio/foo-yc20/default.nix +++ b/pkgs/applications/audio/foo-yc20/default.nix @@ -18,12 +18,12 @@ stdenv.mkDerivation { # remove lv2 until https://github.com/sampov2/foo-yc20/issues/6 is resolved postInstallFixup = "rm -rf $out/lib/lv2"; - meta = { + meta = with stdenv.lib; { broken = true; # see: https://github.com/sampov2/foo-yc20/issues/7 description = "A Faust implementation of a 1969 designed Yamaha combo organ, the YC-20"; homepage = "https://github.com/sampov2/foo-yc20"; - license = "BSD"; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = with licenses; [ bsd3 lgpl21 mpl11 ] ; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; }; } From 7f0fde082286e666b2370b1aec4ad09b470e327a Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 26 Jun 2020 10:49:33 +0200 Subject: [PATCH 2/9] wavesurfer: fix license --- pkgs/applications/misc/audio/wavesurfer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/audio/wavesurfer/default.nix b/pkgs/applications/misc/audio/wavesurfer/default.nix index 0ca01c8d2aed..45746a963b29 100644 --- a/pkgs/applications/misc/audio/wavesurfer/default.nix +++ b/pkgs/applications/misc/audio/wavesurfer/default.nix @@ -20,9 +20,9 @@ stdenv.mkDerivation { --prefix PATH : "${stdenv.lib.makeBinPath [ tcl tk ]}" ''; - meta = { + meta = { description = "Tool for recording, playing, editing, viewing and labeling of audio"; homepage = "http://www.speech.kth.se/wavesurfer/"; - license = "BSD"; + license = stdenv.lib.licenses.bsd0; }; } From 50377df233d5f5aa0c8d59433a9d8b1f2c53d051 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 26 Jun 2020 10:51:01 +0200 Subject: [PATCH 3/9] gmrun: fix license --- pkgs/applications/misc/gmrun/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/applications/misc/gmrun/default.nix index eaee8fb5fb37..8ca4c6061629 100644 --- a/pkgs/applications/misc/gmrun/default.nix +++ b/pkgs/applications/misc/gmrun/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ./gmrun-0.9.2-xdg.patch ]; - meta = { + meta = with stdenv.lib; { description = "Gnome Completion-Run Utility"; longDescription = '' A simple program which provides a "run program" window, featuring a bash-like TAB completion. @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { Running commands in a terminal with CTRL-Enter. URL handlers. ''; homepage = "https://sourceforge.net/projects/gmrun/"; - license = "GPL"; + license = licenses.gpl2; maintainers = []; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; } From f0b4511c81c261238a2525f126f82d98d37c8808 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 26 Jun 2020 10:53:23 +0200 Subject: [PATCH 4/9] mrxvt: fix license --- pkgs/applications/misc/mrxvt/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/mrxvt/default.nix b/pkgs/applications/misc/mrxvt/default.nix index 6717fc3c97f9..4dc70133ec47 100644 --- a/pkgs/applications/misc/mrxvt/default.nix +++ b/pkgs/applications/misc/mrxvt/default.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation { sha256 = "1mqhmnlz32lvld9rc6c1hyz7gjw4anwf39yhbsjkikcgj1das0zl"; }; - meta = { + meta = with stdenv.lib; { description = "Lightweight multitabbed feature-rich X11 terminal emulator"; longDescription = " - Multitabbed lightweight terminal emulator based on rxvt. + Multitabbed lightweight terminal emulator based on rxvt. Supports transparency, backgroundimages, freetype fonts, ... "; homepage = "https://sourceforge.net/projects/materm"; - license = "GPL"; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; }; } From ecc80518a63514f516d5abcd3bec57e1013ccb85 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 26 Jun 2020 11:00:19 +0200 Subject: [PATCH 5/9] sbagen: fix license --- pkgs/applications/misc/sbagen/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/sbagen/default.nix b/pkgs/applications/misc/sbagen/default.nix index 821fbe35ca1a..d7d7dd3ab707 100644 --- a/pkgs/applications/misc/sbagen/default.nix +++ b/pkgs/applications/misc/sbagen/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Binaural sound generator"; homepage = "http://uazu.net/sbagen"; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; platforms = [ "i686-linux" ]; }; } From ec38614621f762d525aba4ac64dd524bb78be714 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 26 Jun 2020 11:01:57 +0200 Subject: [PATCH 6/9] thinking-rock: fix license --- pkgs/applications/misc/thinking-rock/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/thinking-rock/default.nix b/pkgs/applications/misc/thinking-rock/default.nix index fd6065010fb6..2b5c9da4b17a 100644 --- a/pkgs/applications/misc/thinking-rock/default.nix +++ b/pkgs/applications/misc/thinking-rock/default.nix @@ -32,10 +32,10 @@ stdenv.mkDerivation { installPhase = ":"; - meta = { + meta = with stdenv.lib; { description = "Task management system"; homepage = "http://www.thinkingrock.com.au/"; - license = "CDDL"; # Common Development and Distribution License - platforms = stdenv.lib.platforms.unix; + license = licenses.cddl; + platforms = platforms.unix; }; } From ce37c5b0b41e03cb330a33ce44283965641a9462 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 26 Jun 2020 11:03:54 +0200 Subject: [PATCH 7/9] offrss: fix license --- pkgs/applications/networking/offrss/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/offrss/default.nix b/pkgs/applications/networking/offrss/default.nix index 679e966373b6..03159a61a404 100644 --- a/pkgs/applications/networking/offrss/default.nix +++ b/pkgs/applications/networking/offrss/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation { sha256 = "1akw1x84jj2m9z60cvlvmz21qwlaywmw18pl7lgp3bj5nw6250p6"; }; - meta = { + meta = with stdenv.lib; { homepage = "http://vicerveza.homeunix.net/~viric/cgi-bin/offrss"; description = "Offline RSS/Atom reader"; - license="AGPLv3+"; - maintainers = with stdenv.lib.maintainers; [viric]; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ viric ]; platforms = stdenv.lib.platforms.linux; }; } From 83dda5708229d17a7a1ad9aed425a4673943ab6b Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 26 Jun 2020 11:05:24 +0200 Subject: [PATCH 8/9] emboss: fix license --- pkgs/applications/science/biology/emboss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/emboss/default.nix b/pkgs/applications/science/biology/emboss/default.nix index e2374bcd1e2f..2eeb17520f20 100644 --- a/pkgs/applications/science/biology/emboss/default.nix +++ b/pkgs/applications/science/biology/emboss/default.nix @@ -21,8 +21,8 @@ stdenv.mkDerivation { specially developed for the needs of the molecular biology (e.g. EMBnet) user community, including libraries. The software automatically copes with data in a variety of formats and even allows transparent retrieval of - sequence data from the web.''; - license = "GPL2"; + sequence data from the web.''; + license = stdenv.lib.licenses.gpl2; homepage = "http://emboss.sourceforge.net/"; }; } From c317091b5af46a7117375b34908a01f19774cdb6 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 26 Jun 2020 11:06:35 +0200 Subject: [PATCH 9/9] mrbayes: fix license --- pkgs/applications/science/biology/mrbayes/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/biology/mrbayes/default.nix b/pkgs/applications/science/biology/mrbayes/default.nix index 8ee7bccf075f..0ebd14411216 100644 --- a/pkgs/applications/science/biology/mrbayes/default.nix +++ b/pkgs/applications/science/biology/mrbayes/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { builder = ./builder.sh; buildInputs = [readline]; - meta = { + meta = with stdenv.lib; { description = "Bayesian Inference of Phylogeny"; longDescription = '' Bayesian inference of phylogeny is based upon a @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { MrBayes uses a simulation technique called Markov chain Monte Carlo (or MCMC) to approximate the posterior probabilities of trees. ''; - license = "GPL2"; + license = licenses.gpl2; homepage = "http://mrbayes.csit.fsu.edu/"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; }