public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge release-21.05 into staging-next-21.05

Browse Source
This commit is contained in:
github-actions[bot] 2021-10-06 00:02:54 +00:00 committed by GitHub
commit 511690c873
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/browsers/firefox-bin/default.nix
View File

@ -198,11 +198,9 @@ stdenv.mkDerivation {
meta = with lib; { meta = with lib; {
description = "Mozilla Firefox, free web browser (binary package)"; description = "Mozilla Firefox, free web browser (binary package)";
homepage = "http://www.mozilla.org/firefox/"; homepage = "http://www.mozilla.org/firefox/";
license = { license = licenses.mpl20;
free = false;
url = "http://www.mozilla.org/en-US/foundation/trademarks/policy/";
};
platforms = builtins.attrNames mozillaPlatforms; platforms = builtins.attrNames mozillaPlatforms;
hydraPlatforms = [];
maintainers = with maintainers; [ taku0 lovesegfault ]; maintainers = with maintainers; [ taku0 lovesegfault ];
}; };
} }

2
pkgs/servers/mautrix-telegram/default.nix
View File

@ -60,7 +60,7 @@ in with python.pkgs; buildPythonPackage rec {
pillow pillow
lxml lxml
setuptools setuptools
prometheus-client prometheus_client
] ++ lib.optionals withE2BE [ ] ++ lib.optionals withE2BE [
asyncpg asyncpg
python-olm python-olm