b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #193484 from wegank/gpl1-eol

Browse source
This commit is contained in:
Sandro 2022-10-12 21:04:31 +02:00 committed by GitHub
parent 146d1265f4 870d6f4a98
commit 2678c1b034
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/licenses.nix
View file

@ -984,11 +984,6 @@ in mkLicense lset) ({
fullName = "GNU Free Documentation License v1.3"; fullName = "GNU Free Documentation License v1.3";
deprecated = true; deprecated = true;
}; };
gpl1 = {
spdxId = "GPL-1.0";
fullName = "GNU General Public License v1.0";
deprecated = true;
};
gpl2 = { gpl2 = {
spdxId = "GPL-2.0"; spdxId = "GPL-2.0";
fullName = "GNU General Public License v2.0"; fullName = "GNU General Public License v2.0";

2
pkgs/applications/audio/crip/default.nix
View file

@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = "http://bach.dynet.com/crip/"; homepage = "http://bach.dynet.com/crip/";
description = "Terminal-based ripper/encoder/tagger tool for creating Ogg Vorbis/FLAC files"; 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; platforms = lib.platforms.linux;
maintainers = [ maintainers.endgame ]; maintainers = [ maintainers.endgame ];
}; };

2
pkgs/applications/audio/gbsplay/default.nix
View file

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Gameboy sound player"; description = "Gameboy sound player";
license = licenses.gpl1; license = licenses.gpl1Plus;
platforms = [ "i686-linux" "x86_64-linux" ]; platforms = [ "i686-linux" "x86_64-linux" ];
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ ];
}; };

2
pkgs/applications/audio/pd-plugins/puremapping/default.nix
View file

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
meta = { 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"; 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"; homepage = "http://www.chnry.net/ch/?090-Pure-Mapping&lang=en";
license = lib.licenses.gpl1; license = lib.licenses.gpl1Only;
maintainers = [ lib.maintainers.magnetophon ]; maintainers = [ lib.maintainers.magnetophon ];
platforms = lib.platforms.linux; platforms = lib.platforms.linux;
}; };

2
pkgs/applications/misc/grsync/default.nix
View file

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Synchronize folders, files and make backups"; description = "Synchronize folders, files and make backups";
homepage = "http://www.opbyte.it/grsync/"; homepage = "http://www.opbyte.it/grsync/";
license = licenses.gpl1; license = licenses.gpl2Only;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.kuznero ]; maintainers = [ maintainers.kuznero ];
}; };

2
pkgs/applications/science/logic/prover9/default.nix
View file

@ -33,7 +33,7 @@ stdenv.mkDerivation {
meta = with lib; { meta = with lib; {
homepage = "https://www.cs.unm.edu/~mccune/mace4/"; homepage = "https://www.cs.unm.edu/~mccune/mace4/";
license = licenses.gpl1; license = licenses.gpl2Only;
description = "Automated theorem prover for first-order and equational logic"; description = "Automated theorem prover for first-order and equational logic";
longDescription = '' longDescription = ''
Prover9 is a resolution/paramodulation automated theorem prover Prover9 is a resolution/paramodulation automated theorem prover

2
pkgs/development/libraries/libdvbcsa/default.nix
View file

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
description = "A free implementation of the DVB Common Scrambling Algorithm with encryption and decryption capabilities"; description = "A free implementation of the DVB Common Scrambling Algorithm with encryption and decryption capabilities";
homepage = "http://www.videolan.org/developers/libdvbcsa.html"; homepage = "http://www.videolan.org/developers/libdvbcsa.html";
platforms = lib.platforms.unix; platforms = lib.platforms.unix;
license = lib.licenses.gpl1; license = lib.licenses.gpl2Only;
maintainers = with lib.maintainers; [ melias122 ]; maintainers = with lib.maintainers; [ melias122 ];
}; };

2
pkgs/development/python-modules/geeknote/default.nix
View file

@ -31,7 +31,7 @@ buildPythonPackage {
meta = with lib; { meta = with lib; {
description = "Work with Evernote from command line"; description = "Work with Evernote from command line";
homepage = "http://www.geeknote.me"; homepage = "http://www.geeknote.me";
license = licenses.gpl1; license = licenses.gpl1Only;
maintainers = with maintainers; [ hbunke ]; maintainers = with maintainers; [ hbunke ];
}; };

2
pkgs/development/python-modules/hopcroftkarp/default.nix
View file

@ -18,7 +18,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Implementation of HopcroftKarp's algorithm"; description = "Implementation of HopcroftKarp's algorithm";
homepage = "https://github.com/sofiat-olaosebikan/hopcroftkarp"; homepage = "https://github.com/sofiat-olaosebikan/hopcroftkarp";
license = licenses.gpl1; license = licenses.gpl3Only;
maintainers = [ maintainers.costrouc ]; maintainers = [ maintainers.costrouc ];
}; };
} }

2
pkgs/development/python-modules/mysqlclient/default.nix
View file

@ -23,7 +23,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Python interface to MySQL"; description = "Python interface to MySQL";
homepage = "https://github.com/PyMySQL/mysqlclient-python"; homepage = "https://github.com/PyMySQL/mysqlclient-python";
license = licenses.gpl1; license = licenses.gpl2Only;
maintainers = with maintainers; [ y0no ]; maintainers = with maintainers; [ y0no ];
}; };
} }

2
pkgs/games/xbill/default.nix
View file

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
meta = with stdenv; { meta = with stdenv; {
description = "Protect a computer network from getting infected"; description = "Protect a computer network from getting infected";
homepage = "http://www.xbill.org/"; homepage = "http://www.xbill.org/";
license = lib.licenses.gpl1; license = lib.licenses.gpl1Only;
maintainers = with lib.maintainers; [ aw ]; maintainers = with lib.maintainers; [ aw ];
longDescription = '' longDescription = ''
Ever get the feeling that nothing is going right? You're a sysadmin, Ever get the feeling that nothing is going right? You're a sysadmin,

2
pkgs/misc/screensavers/electricsheep/default.nix
View file

@ -42,6 +42,6 @@ stdenv.mkDerivation rec {
homepage = "https://electricsheep.org/"; homepage = "https://electricsheep.org/";
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ ];
platforms = platforms.linux; platforms = platforms.linux;
license = licenses.gpl1; license = licenses.gpl2Only;
}; };
} }

2
pkgs/tools/graphics/graph-easy/default.nix
View file

@ -10,7 +10,7 @@ perlPackages.buildPerlPackage {
meta = with lib; { meta = with lib; {
description = "Render/convert graphs in/from various formats"; description = "Render/convert graphs in/from various formats";
license = licenses.gpl1; license = licenses.gpl1Only;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.jensbin ]; maintainers = [ maintainers.jensbin ];
}; };

2
pkgs/tools/networking/pirate-get/default.nix
View file

@ -16,7 +16,7 @@ buildPythonApplication rec {
meta = with lib; { meta = with lib; {
description = "A command line interface for The Pirate Bay"; description = "A command line interface for The Pirate Bay";
homepage = "https://github.com/vikstrous/pirate-get"; homepage = "https://github.com/vikstrous/pirate-get";
license = licenses.gpl1; license = licenses.gpl3Plus;
maintainers = with maintainers; [ rnhmjoj ]; maintainers = with maintainers; [ rnhmjoj ];
platforms = platforms.unix; platforms = platforms.unix;
}; };

2
pkgs/tools/security/bmrsa/11.nix
View file

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "RSA utility"; description = "RSA utility";
homepage = "http://bmrsa.sourceforge.net/"; homepage = "http://bmrsa.sourceforge.net/";
license = licenses.gpl1; license = licenses.gpl2Only;
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

2
pkgs/tools/text/untex/default.nix
View file

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "A utility which removes LaTeX commands from input"; description = "A utility which removes LaTeX commands from input";
homepage = "https://www.ctan.org/pkg/untex"; homepage = "https://www.ctan.org/pkg/untex";
license = licenses.gpl1; license = licenses.gpl1Only;
maintainers = with maintainers; [ joachifm ]; maintainers = with maintainers; [ joachifm ];
platforms = platforms.all; platforms = platforms.all;
}; };