about summary refs log tree commit diff
path: root/pkgs/development/tools/build-managers/conan
diff options
context:
space:
mode:
authorRobert Schütz <nix@dotlambda.de>2022-06-13 01:00:55 +0000
committerRobert Schütz <github@dotlambda.de>2022-06-13 17:57:32 +0000
commitfe8a3f1ff8d3a5f378aa2e5134647e7193d5d692 (patch)
tree14dbc9418a7fee6cb42f11ffab4c0a5550af045f /pkgs/development/tools/build-managers/conan
parent153ddcc04c7176b63356814dbbf50040609b0954 (diff)
conan: 1.47.0 -> 1.49.0
Diffstat (limited to 'pkgs/development/tools/build-managers/conan')
-rw-r--r--pkgs/development/tools/build-managers/conan/default.nix15
1 files changed, 2 insertions, 13 deletions
diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix
index 78e54028cc9cd..a72106ace3c4d 100644
--- a/pkgs/development/tools/build-managers/conan/default.nix
+++ b/pkgs/development/tools/build-managers/conan/default.nix
@@ -21,17 +21,6 @@ let newPython = python3.override {
         sha256 = "1dv6mjsm67l1razcgmq66riqmsb36wns17mnipqr610v0z0zf5j0";
       };
     });
-    # https://github.com/conan-io/conan/issues/8876
-    pyjwt = super.pyjwt.overridePythonAttrs (oldAttrs: rec {
-      version = "1.7.1";
-      src = oldAttrs.src.override {
-        inherit version;
-        sha256 = "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96";
-      };
-      disabledTests = [
-        "test_ec_verify_should_return_false_if_signature_invalid"
-      ];
-    });
     distro = super.distro.overridePythonAttrs (oldAttrs: rec {
       version = "1.5.0";
       src = oldAttrs.src.override {
@@ -43,14 +32,14 @@ let newPython = python3.override {
 };
 
 in newPython.pkgs.buildPythonApplication rec {
-  version = "1.47.0";
+  version = "1.49.0";
   pname = "conan";
 
   src = fetchFromGitHub {
     owner = "conan-io";
     repo = "conan";
     rev = version;
-    sha256 = "1zs2xb22rsy5fsc0fd7c95vrx1mfz7vasyg1lqkzyfimvn5zah6n";
+    hash = "sha256-BJGstNAnAZtpwagsCY+4quTd0/79zL+v4ifKikS3vaw=";
   };
 
   propagatedBuildInputs = with newPython.pkgs; [