Unverified Commit 1feb3d81 authored by Aaron Andersen's avatar Aaron Andersen Committed by GitHub
Browse files

Merge pull request #324275 from Lurkki14/gpl2-pkgs-games 

pkgs/games: remove licenses.gpl2
parents 7f29cc77 e1f68ae7

pkgs/games/0ad/game.nix

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ stdenv.mkDerivation rec { 
    description = "Free, open-source game of ancient warfare";

    homepage = "https://play0ad.com/";

    license = with licenses; [

      gpl2 lgpl21 mit cc-by-sa-30

      gpl2Plus lgpl21 mit cc-by-sa-30

      licenses.zlib # otherwise masked by pkgs.zlib

    ];

    maintainers = with maintainers; [ chvp ];

pkgs/games/airstrike/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec { 
    description = "2d dogfighting game";

    mainProgram = "airstrike";

    homepage = "https://icculus.org/airstrike/";

    license = licenses.gpl2;

    license = licenses.gpl2Only;

    maintainers = with maintainers; [ pSub ];

    platforms = platforms.linux;

  };

pkgs/games/amoeba/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec { 
  meta = with lib; {

    description = "Fast-paced, polished OpenGL demonstration by Excess";

    homepage = "https://packages.qa.debian.org/a/amoeba.html";

    license = licenses.gpl2; # Engine is GPLv2, data files in amoeba-data nonfree

    license = licenses.gpl2Only; # Engine is GPLv2, data files in amoeba-data nonfree

    maintainers = [ maintainers.dezgeg ];

    platforms = platforms.linux;

  };

pkgs/games/angband/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { 
    description = "Single-player roguelike dungeon exploration game";

    mainProgram = "angband";

    maintainers = [ maintainers.kenran ];

    license = licenses.gpl2;

    license = licenses.gpl2Only;

    platforms = platforms.unix;

  };

})

pkgs/games/atanks/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec { 
    homepage = "http://atanks.sourceforge.net/";

    maintainers = [ maintainers.raskin ];

    platforms = platforms.linux;

    license = licenses.gpl2;

    license = licenses.gpl2Plus;

  };

}