Unverified Commit 2f83bdcf authored by Florian Brandes's avatar Florian Brandes
Browse files

datalad: move to python-modules 



This move is necessarry to next introduce python311 compat

Signed-off-by: default avatarFlorian Brandes <florian.brandes@posteo.de>
parent f056e15e

pkgs/by-name/da/datalad-gooey/package.nix

+0 −1
Original line number Diff line number Diff line 
{

  lib,

  datalad,

  git,

  python3,

  fetchFromGitHub,

pkgs/applications/version-management/datalad/default.nix→pkgs/development/python-modules/datalad/default.nix

+49 −10
Original line number Diff line number Diff line 
{

  buildPythonPackage,

  lib,

  setuptools,

  stdenv,

  fetchFromGitHub,

  installShellFiles,

  python3,

  git,

  coreutils,

  # core

  platformdirs,

  chardet,

  iso8601,

  humanize,

  fasteners,

  packaging,

  patool,

  tqdm,

  annexremote,

  looseversion,

  git-annex,

  # downloaders

  boto3,

  keyrings-alt,

  keyring,

  msgpack,

  requests,

  # publish

  python-gitlab,

  # misc

  argcomplete,

  pyperclip,

  python-dateutil,

  # duecredit

  duecredit,

  # python>=3.8

  distro,

  # win

  colorama,

  # python-version-dependent

  pythonOlder,

  importlib-resources,

  importlib-metadata,

  typing-extensions,

  # tests

  pytestCheckHook,

  p7zip,

  curl,

  coreutils,

  httpretty,

}:



python3.pkgs.buildPythonApplication rec {

buildPythonPackage rec {

  pname = "datalad";

  version = "1.1.1";
@@ -32,10 +70,9 @@ python3.pkgs.buildPythonApplication rec { 
    git

  ];



  build-system = [ python3.pkgs.setuptools ];

  build-system = [ setuptools ];



  dependencies =

    with python3.pkgs;

    [

      # core

      platformdirs
@@ -68,15 +105,17 @@ python3.pkgs.buildPythonApplication rec { 
      argcomplete

      pyperclip

      python-dateutil



      # duecredit

      duecredit



      # python>=3.8

      distro

    ]

    ++ lib.optionals stdenv.hostPlatform.isWindows [ colorama ]

    ++ lib.optionals (python3.pythonOlder "3.9") [ importlib-resources ]

    ++ lib.optionals (python3.pythonOlder "3.10") [ importlib-metadata ]

    ++ lib.optionals (python3.pythonOlder "3.11") [ typing_extensions ];

    ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]

    ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]

    ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ];



  postInstall = ''

    installShellCompletion --cmd datalad \
@@ -180,10 +219,10 @@ python3.pkgs.buildPythonApplication rec { 


  nativeCheckInputs = [

    p7zip

    python3.pkgs.pytestCheckHook

    pytestCheckHook

    git-annex

    curl

    python3.pkgs.httpretty

    httpretty

  ];



  pythonImportsCheck = [ "datalad" ];

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -2183,7 +2183,7 @@ with pkgs; 














  conform = callPackage ../applications/version-management/conform { };



























  datalad = callPackage ../applications/version-management/datalad { };













  datalad = with python3Packages; toPythonApplication datalad;





























  darcs-to-git = callPackage ../applications/version-management/darcs-to-git { };







































pkgs/top-level/python-packages.nix



+2
−0






























Original line number
Diff line number
Diff line








@@ -2835,6 +2835,8 @@ self: super: with self; {













    inherit (pkgs.darwin.apple_sdk.frameworks) Security SystemConfiguration;















  };



























  datalad = callPackage ../development/python-modules/datalad { };



























  datalad-next = callPackage ../development/python-modules/datalad-next { };





























  datamodeldict = callPackage ../development/python-modules/datamodeldict { };