Merge pull request #193484 from wegank/gpl1-eol

Sandro 2678c1b0 146d1265

Changed files
+15 -20
lib
pkgs
applications
audio
crip
gbsplay
pd-plugins
puremapping
misc
grsync
science
logic
prover9
development
libraries
libdvbcsa
python-modules
geeknote
hopcroftkarp
mysqlclient
games
xbill
misc
screensavers
electricsheep
tools
graphics
graph-easy
networking
pirate-get
security
bmrsa
text
untex
-5
lib/licenses.nix
···
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";
+1 -1
pkgs/applications/audio/crip/default.nix
···
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 ];
};
+1 -1
pkgs/applications/audio/gbsplay/default.nix
···
meta = with lib; {
description = "Gameboy sound player";
-
license = licenses.gpl1;
+
license = licenses.gpl1Plus;
platforms = [ "i686-linux" "x86_64-linux" ];
maintainers = with maintainers; [ ];
};
+1 -1
pkgs/applications/audio/pd-plugins/puremapping/default.nix
···
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;
};
+1 -1
pkgs/applications/misc/grsync/default.nix
···
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 ];
};
+1 -1
pkgs/applications/science/logic/prover9/default.nix
···
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
+1 -1
pkgs/development/libraries/libdvbcsa/default.nix
···
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 ];
};
+1 -1
pkgs/development/python-modules/geeknote/default.nix
···
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 ];
};
+1 -1
pkgs/development/python-modules/hopcroftkarp/default.nix
···
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 ];
};
}
+1 -1
pkgs/development/python-modules/mysqlclient/default.nix
···
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 ];
};
}
+1 -1
pkgs/games/xbill/default.nix
···
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,
+1 -1
pkgs/misc/screensavers/electricsheep/default.nix
···
homepage = "https://electricsheep.org/";
maintainers = with maintainers; [ ];
platforms = platforms.linux;
-
license = licenses.gpl1;
+
license = licenses.gpl2Only;
};
}
+1 -1
pkgs/tools/graphics/graph-easy/default.nix
···
meta = with lib; {
description = "Render/convert graphs in/from various formats";
-
license = licenses.gpl1;
+
license = licenses.gpl1Only;
platforms = platforms.unix;
maintainers = [ maintainers.jensbin ];
};
+1 -1
pkgs/tools/networking/pirate-get/default.nix
···
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;
};
+1 -1
pkgs/tools/security/bmrsa/11.nix
···
meta = with lib; {
description = "RSA utility";
homepage = "http://bmrsa.sourceforge.net/";
-
license = licenses.gpl1;
+
license = licenses.gpl2Only;
platforms = platforms.linux;
};
}
+1 -1
pkgs/tools/text/untex/default.nix
···
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;
};