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: 29d14fecce65
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 23b45f50f223
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 25, 2021

  1. fixup! squash! folks: 0.14.0 → 0.15.2

    @jtojnar
    jtojnar committed Mar 25, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    rasendubi Oleksii Shmalko
    GPG key ID: DCEF7BCCEB3066C3
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0b0f3d7 View commit details

  2. fixup! gnome3.gnome-maps: 3.38.4 → 40.0

    @jtojnar
    jtojnar committed Mar 25, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    rasendubi Oleksii Shmalko
    GPG key ID: DCEF7BCCEB3066C3
    Verified
    Learn about vigilant mode
    Copy the full SHA
    23b45f5 View commit details
Showing with 16 additions and 6 deletions.
  1. +5 −0 pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
  2. +11 −6 pkgs/development/libraries/folks/default.nix
5 changes: 5 additions & 0 deletions pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
View file
Original file line number Diff line number Diff line change
@@ -82,6 +82,11 @@ stdenv.mkDerivation rec {
"Exec=$out/bin/gnome-maps"
'';

preCheck = ''
# “time.js” included by “timeTest” and “translationsTest” depends on “org.gnome.desktop.interface” schema.
export XDG_DATA_DIRS="${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:$XDG_DATA_DIRS"
'';

passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
17 changes: 11 additions & 6 deletions pkgs/development/libraries/folks/default.nix
View file
Original file line number Diff line number Diff line change
@@ -43,11 +43,6 @@ stdenv.mkDerivation rec {
sha256 = "08nirjax4m4g4ljr8ksq16wzmrvzq6myqh5rm0dw6pnijqk7nxzg";
};

mesonFlags = [
"-Ddocs=true"
"-Dtelepathy_backend=${lib.boolToString telepathySupport}"
];

nativeBuildInputs = [
gettext
gobject-introspection
@@ -92,7 +87,17 @@ stdenv.mkDerivation rec {
]))
];

doCheck = true;
mesonFlags = [
"-Ddocs=true"
"-Dtelepathy_backend=${lib.boolToString telepathySupport}"
# For some reason, the tests are getting stuck on 31/32,
# even though the one missing test finishes just fine on next run,
# when tests are permuted differently. And another test that
# previously passed will be stuck instead.
"-Dtests=false"
];

doCheck = false;

# Prevents e-d-s add-contacts-stress-test from timing out
checkPhase = ''