From 934932998c3e0d91c077183f532f5933cede1ed6 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sat, 16 Oct 2021 08:36:22 +0200 Subject: [PATCH] Update dependencies --- flake.lock | 6 +++--- machines/kholinar/default.nix | 5 +---- patches/141796.patch | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 patches/141796.patch diff --git a/flake.lock b/flake.lock index ef397b18..e67b594e 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ }, "emacs-overlay": { "locked": { - "lastModified": 1634289381, - "narHash": "sha256-497CIfv2rayC5uafav42cGhkhtIMLWBsfXS6EtLGRcI=", + "lastModified": 1634349588, + "narHash": "sha256-XUWjr6REnzPnpPtdf+QsLHwBI5R+qhvCWRAzOVDmyto=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "de536fa76c469b25e377674028641f6fe03b602d", + "rev": "a7442f550bfedfccb1822fd8ceaf6e44955f43db", "type": "github" }, "original": { diff --git a/machines/kholinar/default.nix b/machines/kholinar/default.nix index 98072433..ff7c3975 100644 --- a/machines/kholinar/default.nix +++ b/machines/kholinar/default.nix @@ -30,10 +30,7 @@ enable = true; android.enable = true; }; - games = { - enable = true; - steam.enable = false; - }; + games.enable = true; graphical.enable = true; programs = { calibre.enable = false; diff --git a/patches/141796.patch b/patches/141796.patch new file mode 100644 index 00000000..ccbb88e7 --- /dev/null +++ b/patches/141796.patch @@ -0,0 +1,35 @@ +From f9c9ec120eb7bdd664bb9f29323a442637e81c7b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= +Date: Fri, 15 Oct 2021 14:34:17 -0500 +Subject: [PATCH] tracker: patch failing test due to float comparison + +--- + pkgs/development/libraries/tracker/default.nix | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix +index 39ac21b7ad6c..fc0ba54cbe7e 100644 +--- a/pkgs/development/libraries/tracker/default.nix ++++ b/pkgs/development/libraries/tracker/default.nix +@@ -1,6 +1,7 @@ + { stdenv + , lib + , fetchurl ++, fetchpatch + , gettext + , meson + , ninja +@@ -44,6 +45,13 @@ stdenv.mkDerivation rec { + src = ./fix-paths.patch; + inherit asciidoc; + }) ++ ] ++ lib.optionals (stdenv.hostPlatform.isi686) [ ++ # 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 = [