Unverified Commit 65cbb455 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #297173 from Lurkki14/agpl3 

treewide: remove licenses.agpl3
parents 9ef9859c 82b45bf4

lib/licenses.nix

+0 −5
Original line number Diff line number Diff line
@@ -1266,11 +1266,6 @@ in mkLicense lset) ({ 
  };

} // {

  # TODO: remove legacy aliases

  agpl3 = {

    spdxId = "AGPL-3.0";

    fullName = "GNU Affero General Public License v3.0";

    deprecated = true;

  };

  gpl2 = {

    spdxId = "GPL-2.0";

    fullName = "GNU General Public License v2.0";

pkgs/applications/audio/cider/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ appimageTools.wrapType2 rec { 
  meta = with lib; {

    description = "A new look into listening and enjoying Apple Music in style and performance.";

    homepage = "https://github.com/ciderapp/Cider";

    license = licenses.agpl3;

    license = licenses.agpl3Only;

    maintainers = [ maintainers.cigrainger ];

    platforms = [ "x86_64-linux" ];

    mainProgram = "cider";

pkgs/applications/backup/urbackup-client/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec { 
    description = "An easy to setup Open Source client/server backup system";

    longDescription = "An easy to setup Open Source client/server backup system, that through a combination of image and file backups accomplishes both data safety and a fast restoration time";

    homepage = "https://www.urbackup.org/index.html";

    license = licenses.agpl3;

    license = licenses.agpl3Plus;

    platforms = platforms.linux;

    maintainers = [ maintainers.mgttlinger ];

  };

pkgs/applications/editors/standardnotes/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec { 
      end-to-end encryption, powerful extensions, and open-source applications.

    '';

    homepage = "https://standardnotes.org";

    license = licenses.agpl3;

    license = licenses.agpl3Only;

    maintainers = with maintainers; [ mgregoire chuangzhu squalus ];

    sourceProvenance = [ sourceTypes.binaryNativeCode ];

    platforms = builtins.attrNames srcjson.deb;

pkgs/applications/graphics/pikopixel/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ clangStdenv.mkDerivation rec { 
    mainProgram = "PikoPixel";

    homepage = "https://twilightedge.com/mac/pikopixel/";

    downloadPage = "https://twilightedge.com/mac/pikopixel/";

    license = licenses.agpl3;

    license = licenses.agpl3Plus;

    maintainers = with maintainers; [ fgaz ];

    platforms = platforms.all;

  };