diff --git a/lib/licenses.nix b/lib/licenses.nix index 6eeba6588be1..5839013c177f 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -969,11 +969,6 @@ in mkLicense lset) ({ fullName = "GNU Free Documentation License v1.3"; deprecated = true; }; - gpl1 = { - spdxId = "GPL-1.0"; - fullName = "GNU General Public License v1.0"; - deprecated = true; - }; gpl2 = { spdxId = "GPL-2.0"; fullName = "GNU General Public License v2.0"; diff --git a/pkgs/applications/audio/crip/default.nix b/pkgs/applications/audio/crip/default.nix index d635dce83f4e..d41ebed09606 100644 --- a/pkgs/applications/audio/crip/default.nix +++ b/pkgs/applications/audio/crip/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://bach.dynet.com/crip/"; description = "Terminal-based ripper/encoder/tagger tool for creating Ogg Vorbis/FLAC files"; - license = lib.licenses.gpl1; + license = lib.licenses.gpl1Only; platforms = lib.platforms.linux; maintainers = [ maintainers.endgame ]; }; diff --git a/pkgs/applications/audio/gbsplay/default.nix b/pkgs/applications/audio/gbsplay/default.nix index 59253af2ad68..1e6bbdb4dd71 100644 --- a/pkgs/applications/audio/gbsplay/default.nix +++ b/pkgs/applications/audio/gbsplay/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Gameboy sound player"; - license = licenses.gpl1; + license = licenses.gpl1Plus; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/applications/audio/pd-plugins/puremapping/default.nix b/pkgs/applications/audio/pd-plugins/puremapping/default.nix index 811b8c2ee9aa..5aef92ab61fb 100644 --- a/pkgs/applications/audio/pd-plugins/puremapping/default.nix +++ b/pkgs/applications/audio/pd-plugins/puremapping/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Set of externals to facilitate the use of sensors within Pure Data and to create complex relations between input and output of a dynamic system"; homepage = "http://www.chnry.net/ch/?090-Pure-Mapping&lang=en"; - license = lib.licenses.gpl1; + license = lib.licenses.gpl1Only; maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/applications/misc/grsync/default.nix b/pkgs/applications/misc/grsync/default.nix index c8068d682237..3a6a717b6e10 100644 --- a/pkgs/applications/misc/grsync/default.nix +++ b/pkgs/applications/misc/grsync/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Synchronize folders, files and make backups"; homepage = "http://www.opbyte.it/grsync/"; - license = licenses.gpl1; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = [ maintainers.kuznero ]; }; diff --git a/pkgs/applications/science/logic/prover9/default.nix b/pkgs/applications/science/logic/prover9/default.nix index aa01469bfbb8..5c476be06e4e 100644 --- a/pkgs/applications/science/logic/prover9/default.nix +++ b/pkgs/applications/science/logic/prover9/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://www.cs.unm.edu/~mccune/mace4/"; - license = licenses.gpl1; + license = licenses.gpl2Only; description = "Automated theorem prover for first-order and equational logic"; longDescription = '' Prover9 is a resolution/paramodulation automated theorem prover diff --git a/pkgs/development/libraries/libdvbcsa/default.nix b/pkgs/development/libraries/libdvbcsa/default.nix index 3eebaafe4509..7da80a75d6a7 100644 --- a/pkgs/development/libraries/libdvbcsa/default.nix +++ b/pkgs/development/libraries/libdvbcsa/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { description = "A free implementation of the DVB Common Scrambling Algorithm with encryption and decryption capabilities"; homepage = "http://www.videolan.org/developers/libdvbcsa.html"; platforms = lib.platforms.unix; - license = lib.licenses.gpl1; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ melias122 ]; }; diff --git a/pkgs/development/python-modules/geeknote/default.nix b/pkgs/development/python-modules/geeknote/default.nix index 6c4165481841..813adfb0dbf3 100644 --- a/pkgs/development/python-modules/geeknote/default.nix +++ b/pkgs/development/python-modules/geeknote/default.nix @@ -31,7 +31,7 @@ buildPythonPackage { meta = with lib; { description = "Work with Evernote from command line"; homepage = "http://www.geeknote.me"; - license = licenses.gpl1; + license = licenses.gpl1Only; maintainers = with maintainers; [ hbunke ]; }; diff --git a/pkgs/development/python-modules/hopcroftkarp/default.nix b/pkgs/development/python-modules/hopcroftkarp/default.nix index 995f10073c67..775ff1a50f5e 100644 --- a/pkgs/development/python-modules/hopcroftkarp/default.nix +++ b/pkgs/development/python-modules/hopcroftkarp/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Implementation of HopcroftKarp's algorithm"; homepage = "https://github.com/sofiat-olaosebikan/hopcroftkarp"; - license = licenses.gpl1; + license = licenses.gpl3Only; maintainers = [ maintainers.costrouc ]; }; } diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix index c12b16611e92..0d043e789df0 100644 --- a/pkgs/development/python-modules/mysqlclient/default.nix +++ b/pkgs/development/python-modules/mysqlclient/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface to MySQL"; homepage = "https://github.com/PyMySQL/mysqlclient-python"; - license = licenses.gpl1; + license = licenses.gpl2Only; maintainers = with maintainers; [ y0no ]; }; } diff --git a/pkgs/games/xbill/default.nix b/pkgs/games/xbill/default.nix index 765af44936a2..ac387a4a8c02 100644 --- a/pkgs/games/xbill/default.nix +++ b/pkgs/games/xbill/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv; { description = "Protect a computer network from getting infected"; homepage = "http://www.xbill.org/"; - license = lib.licenses.gpl1; + license = lib.licenses.gpl1Only; maintainers = with lib.maintainers; [ aw ]; longDescription = '' Ever get the feeling that nothing is going right? You're a sysadmin, diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index 4b79758ef892..0ab0f6bee31e 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/pkgs/misc/screensavers/electricsheep/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { homepage = "https://electricsheep.org/"; maintainers = with maintainers; [ ]; platforms = platforms.linux; - license = licenses.gpl1; + license = licenses.gpl2Only; }; } diff --git a/pkgs/tools/graphics/graph-easy/default.nix b/pkgs/tools/graphics/graph-easy/default.nix index 341d6dea90ac..b12a56c963e9 100644 --- a/pkgs/tools/graphics/graph-easy/default.nix +++ b/pkgs/tools/graphics/graph-easy/default.nix @@ -10,7 +10,7 @@ perlPackages.buildPerlPackage { meta = with lib; { description = "Render/convert graphs in/from various formats"; - license = licenses.gpl1; + license = licenses.gpl1Only; platforms = platforms.unix; maintainers = [ maintainers.jensbin ]; }; diff --git a/pkgs/tools/networking/pirate-get/default.nix b/pkgs/tools/networking/pirate-get/default.nix index 9b5846d6f76f..ec2c821f6e8c 100644 --- a/pkgs/tools/networking/pirate-get/default.nix +++ b/pkgs/tools/networking/pirate-get/default.nix @@ -16,7 +16,7 @@ buildPythonApplication rec { meta = with lib; { description = "A command line interface for The Pirate Bay"; homepage = "https://github.com/vikstrous/pirate-get"; - license = licenses.gpl1; + license = licenses.gpl3Plus; maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/security/bmrsa/11.nix b/pkgs/tools/security/bmrsa/11.nix index 71bdfae4e42e..932566c65060 100644 --- a/pkgs/tools/security/bmrsa/11.nix +++ b/pkgs/tools/security/bmrsa/11.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "RSA utility"; homepage = "http://bmrsa.sourceforge.net/"; - license = licenses.gpl1; + license = licenses.gpl2Only; platforms = platforms.linux; }; } diff --git a/pkgs/tools/text/untex/default.nix b/pkgs/tools/text/untex/default.nix index 55cf01d698f8..63108a923782 100644 --- a/pkgs/tools/text/untex/default.nix +++ b/pkgs/tools/text/untex/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A utility which removes LaTeX commands from input"; homepage = "https://www.ctan.org/pkg/untex"; - license = licenses.gpl1; + license = licenses.gpl1Only; maintainers = with maintainers; [ joachifm ]; platforms = platforms.all; };