From 27db642c6508320584d8b69d5e8141cb6b844018 Mon Sep 17 00:00:00 2001 From: Tristan Gosselin-Hane Date: Thu, 29 Jul 2021 20:14:53 -0400 Subject: [PATCH 1/2] multimc: change license to asl20 (cherry picked from commit 9a8f5b712fa5beb86659dd1f2d0a830c16f4cfc9) --- pkgs/games/multimc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index aa32efaa940..7ccafd2b860 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -43,7 +43,7 @@ in mkDerivation rec { Allows you to have multiple, separate instances of Minecraft (each with their own mods, texture packs, saves, etc) and helps you manage them and their associated options with a simple interface. ''; platforms = platforms.linux; - license = licenses.lgpl21Plus; + license = licenses.asl20; maintainers = with maintainers; [ cleverca22 starcraft66 ]; }; } From 28188b0b4278babff90a8fdc2480d377fd099bda Mon Sep 17 00:00:00 2001 From: Tristan Gosselin-Hane Date: Thu, 29 Jul 2021 20:18:05 -0400 Subject: [PATCH 2/2] multimc: don't re-distribute package Fixes NixOS#131983 (cherry picked from commit 8dfddb341ebaf718904722692dbbcd1d5d9d5e12) --- pkgs/games/multimc/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index 7ccafd2b860..8e72b958856 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -44,6 +44,9 @@ in mkDerivation rec { ''; platforms = platforms.linux; license = licenses.asl20; + # upstream don't want us to re-distribute this application: + # https://github.com/NixOS/nixpkgs/issues/131983 + hydraPlatforms = []; maintainers = with maintainers; [ cleverca22 starcraft66 ]; }; }