Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tracker: patch failing test due to float comparison #141796

Merged
merged 1 commit into from
Oct 16, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions pkgs/development/libraries/tracker/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchurl
, fetchpatch
, gettext
, meson
, ninja
Expand Down Expand Up @@ -44,6 +45,13 @@ stdenv.mkDerivation rec {
src = ./fix-paths.patch;
inherit asciidoc;
})
] ++ lib.optionals (stdenv.hostPlatform.isi686) [
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

First of all the () are optional and should be removed. Second no one ever tests packages on i686 when updating which means the patch will bit rot almost immediately. Why is this not applied unconditional?

Copy link
Member

@jtojnar jtojnar Oct 16, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Steam depends on i686 and applying it unconditionally would cause a mass rebuild.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think it will bit-rot, it won't apply on the next upstream tracker release and many nix contributors/maintainers depend on i686 build of tracker trough transitive dependencies like steam.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Though, also @jtojnar is one of the two persons on the GNOME maintainers team and has been putting a lot of work into updates. Regardless I will be on the lookout for the next version bump.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If steam depends on it, it should be fine.

# Upstream: https://gitlab.gnome.org/GNOME/tracker/-/issues/332
(fetchpatch {
name = "i686-test.patch";
url = "https://gitlab.gnome.org/GNOME/tracker/-/commit/af707181a2c492a794daec7ce3f3062d67ffd9dc.patch";
sha256 = "sha256-KOdkTy79w3oiQILrPG00UVrv+VBjAk4Y868I8jtifqk=";
})
];

nativeBuildInputs = [
Expand Down