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

Merge staging-next-21.05 into staging-21.05

Browse Source
This commit is contained in:
github-actions[bot] 2021-09-14 18:02:49 +00:00 committed by GitHub
commit 84bab5e90c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/networking/browsers/firefox/common.nix
View File

@ -163,6 +163,23 @@ buildStdenv.mkDerivation ({
sha256 = "0qc62di5823r7ly2lxkclzj9rhg2z7ms81igz44nv0fzv3dszdab";
})
# These fix Firefox on sway and other non-Gnome wayland WMs. They should be
# removed whenever the following two patches make it onto a release:
# 1. https://hg.mozilla.org/mozilla-central/rev/51c13987d1b8
# 2. https://hg.mozilla.org/integration/autoland/rev/3b856ecc00e4
# This will probably happen in the next point release, but let's be careful
# and double check whether it's working on sway on the next v bump.
++ lib.optionals (lib.versionAtLeast ffversion "92") [
(fetchpatch {
url = "https://hg.mozilla.org/integration/autoland/raw-rev/3b856ecc00e4";
sha256 = "sha256-d8IRJD6ELC3ZgEs1ES/gy2kTNu/ivoUkUNGMEUoq8r8=";
})
(fetchpatch {
url = "https://hg.mozilla.org/mozilla-central/raw-rev/51c13987d1b8";
sha256 = "sha256-C2jcoWLuxW0Ic+Mbh3UpEzxTKZInljqVdcuA9WjspoA=";
})
]
++ patches;

4
pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "evolution-ews";
version = "3.40.1";
version = "3.40.3";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1kgxdacqqcq8yfkij6vyqlk5r4yqvw7gh7mxqii670hrn1mb2s50";
sha256 = "ZAIE5rpPOyZT3VSPYOR143bP8Na7Kv0NQRhQ+p2oxJY=";
};
nativeBuildInputs = [ cmake gettext intltool pkg-config ];

4
pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
View File

@ -42,11 +42,11 @@
stdenv.mkDerivation rec {
pname = "evolution";
version = "3.40.1";
version = "3.40.3";
src = fetchurl {
url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "07n4sbgsh0y9hrn52ymvy45ah65ll55gglgvqqi3h9nhkyy64y9g";
sha256 = "/SkjomENe/6212+FMLpAJkBOIf0nOrKKLFtQCJIeDVw=";
};
nativeBuildInputs = [

4
pkgs/desktops/gnome/core/evolution-data-server/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "evolution-data-server";
version = "3.40.2";
version = "3.40.4";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "7IKVFjnzKlzs6AqLC5qj9mt9MY4+4sHDUjTy4r3opBg=";
sha256 = "h8GF8Yw3Jw42EZgfGb2SIayXTIB0Ysjc6QvqCHEsWAA=";
};
patches = [