From 3100e48e86cb68b291e47306819208c0ab48bb1e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 5 Oct 2021 20:07:02 +0200 Subject: [PATCH 1/2] mautrix-telegram: fix eval --- pkgs/servers/mautrix-telegram/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index b2dd5f4a97c..ebf87d95b67 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -60,7 +60,7 @@ in with python.pkgs; buildPythonPackage rec { pillow lxml setuptools - prometheus-client + prometheus_client ] ++ lib.optionals withE2BE [ asyncpg python-olm From a73053ed88e512dbc844e9f6fc57274cfd5b4dc0 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 27 Sep 2021 18:27:04 +0000 Subject: [PATCH 2/2] firefox-bin: fix license The Mozilla Trademark Policy is not a license, and applies equally to our own source builds of Firefox, so it doesn't make sense to mark the package as unfree because of that. Quoting : > Binaries of this product have been made available to you by the > Mozilla Project under the Mozilla Public License 2.0 (MPL). Since all this does is download a large binary and wrap it, there's still no point in it ending up in cache.nixos.org, so disable it on Hydra now that Hydra would otherwise try to build it. (cherry picked from commit 6a71c7eb1acc70e5cc023dc7e1c9d1a144b9ca82) --- .../networking/browsers/firefox-bin/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index fc702993338..30a4cb6766c 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -198,11 +198,9 @@ stdenv.mkDerivation { meta = with lib; { description = "Mozilla Firefox, free web browser (binary package)"; homepage = "http://www.mozilla.org/firefox/"; - license = { - free = false; - url = "http://www.mozilla.org/en-US/foundation/trademarks/policy/"; - }; + license = licenses.mpl20; platforms = builtins.attrNames mozillaPlatforms; + hydraPlatforms = []; maintainers = with maintainers; [ taku0 lovesegfault ]; }; }