conan: modernize

1 files changed, 19 insertions, 8 deletions

diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix
index 63f53dbf3be..471d27e5042 100644
--- a/pkgs/development/tools/build-managers/conan/default.nix
+++ b/pkgs/development/tools/build-managers/conan/default.nix
@@ -1,4 +1,10 @@
-{ lib, stdenv, python3, fetchFromGitHub, git, pkg-config }:
+{ lib
+, stdenv
+, python3
+, fetchFromGitHub
+, git
+, pkg-config
+}:
 
 # Note:
 # Conan has specific dependency demands; check
@@ -32,16 +38,21 @@ let newPython = python3.override {
 };
 
 in newPython.pkgs.buildPythonApplication rec {
-  version = "1.53.0";
   pname = "conan";
+  version = "1.53.0";
 
   src = fetchFromGitHub {
     owner = "conan-io";
     repo = "conan";
-    rev = version;
+    rev = "refs/tags/${version}";
     hash = "sha256-2DNDNdZO1D30egOiYa3qw8F2xsUTBOm/CHv07v5OrC8=";
   };
 
+  postPatch = ''
+    substituteInPlace conans/requirements.txt \
+      --replace 'PyYAML>=3.11, <6.0' 'PyYAML>=3.11'
+  '';
+
   propagatedBuildInputs = with newPython.pkgs; [
     bottle
     colorama
@@ -62,7 +73,11 @@ in newPython.pkgs.buildPythonApplication rec {
     six
     tqdm
     urllib3
-  ] ++ lib.optionals stdenv.isDarwin [ idna cryptography pyopenssl ];
+  ] ++ lib.optionals stdenv.isDarwin [
+    idna
+    cryptography
+    pyopenssl
+  ];
 
   nativeCheckInputs = [
     pkg-config
@@ -79,10 +94,6 @@ in newPython.pkgs.buildPythonApplication rec {
   # Not enabled right now due to time constraints/failing tests that I didn't have time to track down
   doCheck = false;
 
-  postPatch = ''
-    substituteInPlace conans/requirements.txt --replace 'PyYAML>=3.11, <6.0' 'PyYAML>=3.11'
-  '';
-
   meta = with lib; {
     description = "Decentralized and portable C/C++ package manager";
     homepage = "https://conan.io";