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: 3abf03857041
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9b7dfeb871f5
Choose a head ref
  • 2 commits
  • 5 files changed
  • 2 contributors

Commits on Apr 13, 2021

  1. pythonPackages.tappy: init at 3.0

    @SFrijters @jtojnar
    SFrijters authored and jtojnar committed Apr 13, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    bwoodsend Brénainn Woodsend
    GPG key ID: 52B5C9300BEF567E
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1716b6f View commit details

  2. !squash tracker: 3.0.3 → 3.1.1 

    Also reverts #118823

Co-Authored-By: Bastian Köcher <info@kchr.de>
Co-Authored-By: Stefan Frijters <sfrijters@gmail.com>
    @bkchr @SFrijters @jtojnar
    2 people authored and jtojnar committed Apr 13, 2021
    Copy the full SHA
    9b7dfeb View commit details
24 changes: 14 additions & 10 deletions pkgs/development/libraries/tracker/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ lib, stdenv
, fetchurl
, fetchpatch
, gettext
, meson
, ninja
@@ -27,7 +28,7 @@
, substituteAll
}:

stdenv.mkDerivation (rec {
stdenv.mkDerivation rec {
pname = "tracker";
version = "3.1.1";

@@ -43,6 +44,14 @@ stdenv.mkDerivation (rec {
src = ./fix-paths.patch;
inherit asciidoc;
})

# Add missing build target dependencies to fix parallel building of docs.
# TODO: Upstream this.
./fix-docs.patch

# Fix 32bit datetime issue, use this upstream patch until 3.1.2 lands
# https://gitlab.gnome.org/GNOME/tracker/-/merge_requests/401
./fix-datetime.patch
];

nativeBuildInputs = [
@@ -74,16 +83,16 @@ stdenv.mkDerivation (rec {
libstemmer
];

checkInputs = [
python3.pkgs.pygobject3
checkInputs = with python3.pkgs; [
pygobject3
tappy
];

mesonFlags = [
"-Ddocs=true"
];

# https://gitlab.gnome.org/GNOME/tracker/-/issues/292#note_1075369
doCheck = !stdenv.isi686;
doCheck = true;

postPatch = ''
patchShebangs utils/g-ir-merge/g-ir-merge
@@ -135,8 +144,3 @@ stdenv.mkDerivation (rec {
platforms = platforms.linux;
};
}
// lib.optionalAttrs stdenv.isi686 {
# TMP: fatal error: libtracker-sparql/tracker-sparql-enum-types.h: No such file or directory
enableParallelBuilding = false;
}
)
Loading