update nixos

169414.patch

@@ -1,73 +0,0 @@
-From aa305e509322a6cefa4660402689b45bbc292f30 Mon Sep 17 00:00:00 2001
-From: Florian Brandes <florian.brandes@posteo.de>
-Date: Wed, 20 Apr 2022 10:04:50 +0200
-Subject: [PATCH 1/2] python3Packages.sentry-sdk: disable tests
-
-disable tests in the wake of Flask and Werkzeug update
-
-Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
----
- .../python-modules/sentry-sdk/default.nix          | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix
-index 3272c4b612f63..8a450023d1f3f 100644
---- a/pkgs/development/python-modules/sentry-sdk/default.nix
-+++ b/pkgs/development/python-modules/sentry-sdk/default.nix
-@@ -112,6 +112,8 @@ buildPythonPackage rec {
-     "test_auto_session_tracking_with_aggregates"
-     # Network requests to public web
-     "test_crumb_capture"
-+    # TypeError: cannot unpack non-iterable TestResponse object
-+    "test_rpc_error_page"
-   ];
- 
-   disabledTestPaths = [
-@@ -128,7 +130,17 @@ buildPythonPackage rec {
-     "tests/integrations/rq/"
-     # broken since pytest 7.0.1; AssertionError: previous item was not torn down properly
-     "tests/utils/test_contextvars.py"
--  ];
-+    # broken since Flask and Werkzeug update to 2.1.0 (different error messages)
-+    "tests/integrations/flask/test_flask.py"
-+    "tests/integrations/bottle/test_bottle.py"
-+    "tests/integrations/django/test_basic.py"
-+    "tests/integrations/pyramid/test_pyramid.py"
-+  ]
-+  # test crashes on aarch64
-+  ++ (if stdenv.buildPlatform != "x86_64-linux" then [
-+    "tests/test_transport.py"
-+    "tests/integrations/threading/test_threading.py"
-+  ] else [ ]);
- 
-   pythonImportsCheck = [
-     "sentry_sdk"
-
-From 9277e0002ae9e99d2cd4ae1452ce4ed3f4e97e92 Mon Sep 17 00:00:00 2001
-From: Florian <florian.brandes@posteo.de>
-Date: Fri, 22 Apr 2022 09:03:26 +0200
-Subject: [PATCH 2/2] Update
- pkgs/development/python-modules/sentry-sdk/default.nix
-
-Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
----
- pkgs/development/python-modules/sentry-sdk/default.nix | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix
-index 8a450023d1f3f..513e0a0acc4f1 100644
---- a/pkgs/development/python-modules/sentry-sdk/default.nix
-+++ b/pkgs/development/python-modules/sentry-sdk/default.nix
-@@ -137,10 +137,10 @@ buildPythonPackage rec {
-     "tests/integrations/pyramid/test_pyramid.py"
-   ]
-   # test crashes on aarch64
--  ++ (if stdenv.buildPlatform != "x86_64-linux" then [
-+  ++ lib.optionals (stdenv.buildPlatform != "x86_64-linux") [
-     "tests/test_transport.py"
-     "tests/integrations/threading/test_threading.py"
--  ] else [ ]);
-+  ];
- 
-   pythonImportsCheck = [
-     "sentry_sdk"

flake.lock

@@ -17,11 +17,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1650701402,
-        "narHash": "sha256-XKfstdtqDg+O+gNBx1yGVKWIhLgfEDg/e2lvJSsp9vU=",
+        "lastModified": 1650831523,
+        "narHash": "sha256-6pDZ08SAXsUx5rOP391x+TG39ENP/XA8VMa1tQvgEjc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "bc41b01dd7a9fdffd32d9b03806798797532a5fe",
+        "rev": "87d34a6b8982e901b8e50096b8e79ebc0e66cda0",
         "type": "github"
       },
       "original": {

flake.nix

@@ -15,7 +15,7 @@
 
     channels.nixpkgs.input = nixpkgs;
 
-    channels.nixpkgs.patches = [ ./170238.patch ./170241.patch ./170244.patch ./169414.patch ];
+    channels.nixpkgs.patches = [ ./170238.patch ./170241.patch ./170244.patch ];
 
     nix.generateRegistryFromInputs = true;