From 3a5bc4f034e6de586b644b8913ed36021e60ee17 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Thu, 19 May 2022 14:42:48 +0200
Subject: [PATCH] update nixos

---
 172622.patch | 62 ----------------------------------------------------
 flake.lock   |  6 ++---
 flake.nix    |  2 +-
 3 files changed, 4 insertions(+), 66 deletions(-)
 delete mode 100644 172622.patch

diff --git a/172622.patch b/172622.patch
deleted file mode 100644
index 775f99c..0000000
--- a/172622.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From b053f97b3d6284b0a945c09c9e45d1852c01fb85 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
-Date: Wed, 11 May 2022 22:52:27 +0000
-Subject: [PATCH] python3Packages.notify-py: fix tests
-
-Previously tests failed on Linux with
-
-    Cannot spawn a message bus without a machine-id
----
- .../python-modules/notify-py/default.nix      | 28 ++++++++++++++-----
- 1 file changed, 21 insertions(+), 7 deletions(-)
-
-diff --git a/pkgs/development/python-modules/notify-py/default.nix b/pkgs/development/python-modules/notify-py/default.nix
-index 497b20d3df8ff..6d255424812e5 100644
---- a/pkgs/development/python-modules/notify-py/default.nix
-+++ b/pkgs/development/python-modules/notify-py/default.nix
-@@ -9,7 +9,8 @@
- , which
- , jeepney
- , loguru
--, pytestCheckHook
-+, pytest
-+, dbus
- , coreutils
- }:
- 
-@@ -41,16 +42,29 @@ buildPythonPackage rec {
-     })
-   ];
- 
--  propagatedBuildInputs = [ loguru ]
--    ++ lib.optionals stdenv.isLinux [ jeepney ];
-+  propagatedBuildInputs = [
-+    loguru
-+  ] ++ lib.optionals stdenv.isLinux [
-+    jeepney
-+  ];
- 
--  checkInputs = [ pytestCheckHook ];
-+  checkInputs = [
-+    pytest
-+  ] ++ lib.optionals stdenv.isLinux [
-+    dbus
-+  ];
- 
--  # Tests search for "afplay" binary which is built in to MacOS and not available in nixpkgs
--  preCheck = lib.optionalString stdenv.isDarwin ''
-+  checkPhase = if stdenv.isDarwin then ''
-+    # Tests search for "afplay" binary which is built in to macOS and not available in nixpkgs
-     mkdir $TMP/bin
-     ln -s ${coreutils}/bin/true $TMP/bin/afplay
--    export PATH="$TMP/bin:$PATH"
-+    PATH="$TMP/bin:$PATH" pytest
-+  '' else if stdenv.isLinux then ''
-+    dbus-run-session \
-+      --config-file=${dbus.daemon}/share/dbus-1/session.conf \
-+      pytest
-+  '' else ''
-+    pytest
-   '';
- 
-   pythonImportsCheck = [ "notifypy" ];
diff --git a/flake.lock b/flake.lock
index 04ca417..288b5c2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -17,11 +17,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1652378906,
-        "narHash": "sha256-DeV2myAMArPvyqxp0M6z30kuXb2L9SO2QXjxbbsZQyY=",
+        "lastModified": 1652659998,
+        "narHash": "sha256-FqNrXC1EE6U2RACwXBlsAvg1lqQGLYpuYb6+W3DL9vA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d89d7af1ba23bd8a5341d00bdd862e8e9a808f56",
+        "rev": "1d7db1b9e4cf1ee075a9f52e5c36f7b9f4207502",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 4acbd3b..47a420b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,7 +15,7 @@
 
     channels.nixpkgs.input = nixpkgs;
 
-    channels.nixpkgs.patches = [ ./172622.patch ];
+    channels.nixpkgs.patches = [ ];
 
     nix.generateRegistryFromInputs = true;