Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 36148f6a47eb
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 047282ba91e4
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 25, 2021

  1. fixup! gnome3.geary: 3.38.2 → 40.alpha

    @jtojnar
    jtojnar committed Mar 25, 2021
    Copy the full SHA
    ba649f2 View commit details

  2. fixup! fixup! epiphany: 3.38.2 → 40.0

    @jtojnar
    jtojnar committed Mar 25, 2021
    Copy the full SHA
    047282b View commit details
Showing with 10 additions and 7 deletions.
  1. +6 −6 pkgs/desktops/gnome-3/core/epiphany/default.nix
  2. +4 −1 pkgs/desktops/gnome-3/misc/geary/default.nix
12 changes: 6 additions & 6 deletions pkgs/desktops/gnome-3/core/epiphany/default.nix
View file
Original file line number Diff line number Diff line change
@@ -44,11 +44,6 @@ stdenv.mkDerivation rec {
sha256 = "0i58mfmdkzgamb08p6sp6q9imrqn25a3gcw6fq9v06xdcq7iry6m";
};

# Tests need an X display
mesonFlags = [
"-Dunit_tests=disabled"
];

nativeBuildInputs = [
desktop-file-utils
gettext
@@ -94,6 +89,11 @@ stdenv.mkDerivation rec {
webkitgtk
];

# Tests need an X display
mesonFlags = [
"-Dunit_tests=disabled"
];

postPatch = ''
chmod +x post_install.py # patchShebangs requires executable file
patchShebangs post_install.py
@@ -109,7 +109,7 @@ stdenv.mkDerivation rec {
homepage = "https://wiki.gnome.org/Apps/Epiphany";
description = "WebKit based web browser for GNOME";
maintainers = teams.gnome.members;
license = licenses.gpl2;
license = licenses.gpl3Plus;
platforms = platforms.linux;
};
}
5 changes: 4 additions & 1 deletion pkgs/desktops/gnome-3/misc/geary/default.nix
View file
Original file line number Diff line number Diff line change
@@ -37,6 +37,7 @@
, gobject-introspection
, gspell
, appstream-glib
, libstemmer
, libytnef
, libhandy
, gsound
@@ -90,6 +91,7 @@ stdenv.mkDerivation rec {
libpeas
libsecret
libunwind
libstemmer
libytnef
sqlite
webkitgtk
@@ -104,7 +106,8 @@ stdenv.mkDerivation rec {
];

mesonFlags = [
"-Dcontractor=true" # install the contractor file (Pantheon specific)
"-Dprofile=release"
"-Dcontractor=enabled" # install the contractor file (Pantheon specific)
];

# NOTE: Remove `build-auxyaml_to_json.py` when no longer needed, see: