about summary refs log tree commit diff
path: root/pkgs/applications/misc
diff options
context:
space:
mode:
authorFlorian Brandes <florian.brandes@posteo.de>2022-04-16 07:59:17 +0200
committerFlorian Brandes <florian.brandes@posteo.de>2022-04-29 08:00:18 +0200
commit51436260b0f28c658456c2abcdd4bceb8044ea86 (patch)
tree17abf78020b858bee3502e4773a2f19850b2caeb /pkgs/applications/misc
parentcab2909b9af1f69c6aa1f12bc4c2e0e91570e2ca (diff)
octoprint: 1.8.0rc2 -> 1.8.0rc5
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r--pkgs/applications/misc/octoprint/default.nix77
1 files changed, 4 insertions, 73 deletions
diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix
index 1d5fe7c3e9faa..c964ba8fda92c 100644
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/pkgs/applications/misc/octoprint/default.nix
@@ -14,75 +14,6 @@ let
     self = py;
     packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) (
       [
-         (
-           self: super: {
-             sentry-sdk = super.sentry-sdk.overrideAttrs (oldAttrs: rec {
-               disabledTests = oldAttrs.disabledTests ++ lib.optionals (stdenv.buildPlatform != "x86_64-linux") [
-                 "test_leaks"
-               ];
-               disabledTestPaths = [
-                 # Don't test integrations
-                 "tests/integrations"
-                 # test crashes on aarch64
-                 "tests/test_transport.py"
-               ];
-             });
-           }
-         )
-
-        # All test fail on aarch64
-        (
-          self: super: {
-            azure-core = super.azure-core.overridePythonAttrs (oldAttrs: rec {
-              doCheck = stdenv.buildPlatform == "x86_64-linux";
-            });
-          }
-        )
-
-        # needs network
-        (
-          self: super: {
-            falcon = super.falcon.overridePythonAttrs (oldAttrs: rec {
-              #pytestFlagsArray = [ "-W ignore::DeprecationWarning" ];
-              disabledTestPaths = oldAttrs.disabledTestPaths or [] ++ [
-                "tests/asgi/test_asgi_servers.py"
-              ];
-            });
-          }
-        )
-
-        # update broke some tests
-        (
-          self: super: {
-            sanic = super.sanic.overridePythonAttrs (oldAttrs: rec {
-              disabledTestPaths = oldAttrs.disabledTestPaths or [] ++ [
-                "test_cli.py"
-                "test_cookies.py"
-                # requires network
-                "test_worker.py"
-              ];
-            });
-          }
-        )
-
-         (
-          self: super: {
-            flask-restful = super.flask-restful.overridePythonAttrs (oldAttrs: rec {
-              # remove werkzeug patch
-              patches = [];
-            });
-          }
-        )
-
-        (
-          self: super: {
-            trytond = super.trytond.overridePythonAttrs (oldAttrs: rec {
-              # remove werkzeug patch
-              patches = [];
-            });
-          }
-        )
-
         # Built-in dependency
         (
           self: super: {
@@ -123,14 +54,14 @@ let
           self: super: {
             octoprint-pisupport = self.buildPythonPackage rec {
               pname = "OctoPrint-PiSupport";
-              version = "2022.3.1";
+              version = "2022.3.28";
               format = "setuptools";
 
               src = fetchFromGitHub {
                 owner = "OctoPrint";
                 repo = "OctoPrint-PiSupport";
                 rev = version;
-                sha256 = "fuDIvmz9u4f1Kptm6pd9TfQd9DVKiak4THUd66QpRO4=";
+                sha256 = "yzE/jz604nX/CHcW3aa7goH1ey8qZ7rLw31SMfNKJZM=";
               };
 
               # requires octoprint itself during tests
@@ -143,13 +74,13 @@ let
           self: super: {
             octoprint = self.buildPythonPackage rec {
               pname = "OctoPrint";
-              version = "1.8.0rc2";
+              version = "1.8.0rc5";
 
               src = fetchFromGitHub {
                 owner = "OctoPrint";
                 repo = "OctoPrint";
                 rev = version;
-                sha256 = "sha256-0DX9xQ/yhrVPQD14DhGlIS7ikMJAF4p+uJaQ3MUcaKs=";
+                sha256 = "sha256-FeT45w6VXaFV4BsuOMk58nxxiu9jhCNnA2F7Uh/3sB0=";
               };
 
               propagatedBuildInputs = with super; [