From 206cde956fc1d6e68a2a096911db3a523ce7c825 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 12 Apr 2023 13:22:42 -0400 Subject: [PATCH] datalad: 0.16.5 -> 0.18.3; unbreak Added missing `looseversion` and undeclared `setuptools` dependencies. Added git-annex. Correctly wrapped `datalad` program so that `datalad create` works. --- .../version-management/datalad/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/datalad/default.nix b/pkgs/applications/version-management/datalad/default.nix index dfbb4e7db9e0..f5920d198af6 100644 --- a/pkgs/applications/version-management/datalad/default.nix +++ b/pkgs/applications/version-management/datalad/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, installShellFiles, python3, git }: +{ lib, stdenv, fetchFromGitHub, installShellFiles, python3, git, git-annex }: python3.pkgs.buildPythonApplication rec { pname = "datalad"; - version = "0.16.5"; + version = "0.18.3"; src = fetchFromGitHub { owner = "datalad"; repo = pname; rev = version; - hash = "sha256-F5UFW0/XqntrHclpj3TqoAwuHJbiiv5a7/4MnFoJ1dE="; + hash = "sha256-vqO37o5NxQk+gHfvhM1I2ea9/q9ZaLWkDEyPYJKEPcs"; }; nativeBuildInputs = [ installShellFiles git ]; @@ -24,6 +24,9 @@ python3.pkgs.buildPythonApplication rec { patool tqdm annexremote + looseversion + setuptools + git-annex # downloaders-extra # requests-ftp # not in nixpkgs yet @@ -66,11 +69,14 @@ python3.pkgs.buildPythonApplication rec { installShellCompletion --cmd datalad \ --bash <($out/bin/datalad shell-completion) \ --zsh <($out/bin/datalad shell-completion) + wrapProgram $out/bin/datalad --prefix PYTHONPATH : "$PYTHONPATH" ''; # no tests doCheck = false; + pythonImportsCheck = [ "datalad" ]; + meta = with lib; { description = "Keep code, data, containers under control with git and git-annex"; homepage = "https://www.datalad.org";