about summary refs log tree commit diff
path: root/pkgs/development/tools
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-05-05 18:24:02 +0000
committerGitHub <noreply@github.com>2021-05-05 18:24:02 +0000
commit202eb5ddf582725c3daad9cf0c2f1d0eee013867 (patch)
treedbc86f55ab15cc10bbb7b6463d5c1a3981b3a8d6 /pkgs/development/tools
parentaf9d9374faae669a32c3f27b79f7d03fdfead783 (diff)
parent87b4a04f06332de2852765c98ebd9e58cbe2eff3 (diff)
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r--pkgs/development/tools/build-managers/conan/default.nix8
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix
index 0ec9d3ea93e64..bf780985bc4fd 100644
--- a/pkgs/development/tools/build-managers/conan/default.nix
+++ b/pkgs/development/tools/build-managers/conan/default.nix
@@ -28,6 +28,14 @@ let newPython = python3.override {
         sha256 = "18hpzh1am1dqx81fypn57r2wk565fi4g14292qrc5jm1h9dalzld";
       };
     });
+    # 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";
+      };
+    });
   };
 };