From 1c3e617cc75c416610abc7a50e40c68a22401f89 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sun, 17 Oct 2021 11:43:26 +0200 Subject: [PATCH] Update dependencies --- flake.lock | 18 +++++++++--------- patches/141796.patch | 35 ----------------------------------- 2 files changed, 9 insertions(+), 44 deletions(-) delete mode 100644 patches/141796.patch diff --git a/flake.lock b/flake.lock index c39a8c4d..26e1f006 100644 --- a/flake.lock +++ b/flake.lock @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1631896269, - "narHash": "sha256-DAyCxJ8JacayOzGgGSfzrn7ghtsfL/EsCyk1NEUaAR8=", + "lastModified": 1634404028, + "narHash": "sha256-JyP2Y6JCCYvUcVz7CXX5pXUfTGTU4GX51Yza82BgMfk=", "owner": "ryantm", "repo": "agenix", - "rev": "daf1d773989ac5d949aeef03fce0fe27e583dbca", + "rev": "53aa91b4170da35a96fab1577c9a34bc0da44e27", "type": "github" }, "original": { @@ -42,11 +42,11 @@ }, "emacs-overlay": { "locked": { - "lastModified": 1634376134, - "narHash": "sha256-P/l6Nj89bolKiqePEpymRYbm3rHQ7pZC05T6H0sqcUQ=", + "lastModified": 1634434790, + "narHash": "sha256-vXGxQuuh+Kd7rmTyNyODXPZWI2/bq5oBQ6fVSxbJLCw=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "69f0a02671801fc02e61283091daef970a300ab3", + "rev": "76c0ca6786e5c7e12d1608f502641c1b5307330e", "type": "github" }, "original": { @@ -92,11 +92,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1634172192, - "narHash": "sha256-FBF4U/T+bMg4sEyT/zkgasvVquGzgdAf4y8uCosKMmo=", + "lastModified": 1634436779, + "narHash": "sha256-D/nrXTWpe1bPIjFy85sgiLHYqu+AeaC6v5/+KlA9PRg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2cf9db0e3d45b9d00f16f2836cb1297bcadc475e", + "rev": "9aeeb7574fb784eaf6395f4400705b5f619e6cc3", "type": "github" }, "original": { diff --git a/patches/141796.patch b/patches/141796.patch deleted file mode 100644 index ccbb88e7..00000000 --- a/patches/141796.patch +++ /dev/null @@ -1,35 +0,0 @@ -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 = [