From 9b883bc36715b278b3e01b737099bcf112b3bf5c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Nov 2024 04:23:48 +0000 Subject: [PATCH 1/4] python312Packages.datalad: 1.1.3 -> 1.1.4 (cherry picked from commit 415b0ea85b2cb2dbd5f6ffaf769fa66dfe9b5630) --- pkgs/development/python-modules/datalad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datalad/default.nix b/pkgs/development/python-modules/datalad/default.nix index c61c0566c163f..5021b2e1c3028 100644 --- a/pkgs/development/python-modules/datalad/default.nix +++ b/pkgs/development/python-modules/datalad/default.nix @@ -52,13 +52,13 @@ buildPythonPackage rec { pname = "datalad"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "datalad"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Y7P9vRfFUJ5ZhVRTAYeImI9cv1LtWVAeBoBl6wANnrc="; + hash = "sha256-l3II9xebSq09He5e4GGGiGtfe6ERtIQD00eHKGx46WA="; }; postPatch = '' From c59a435e3b59f364a30a5684bb88207094df25ff Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 22 Nov 2024 09:24:45 +0900 Subject: [PATCH 2/4] python312Packages.datalad: refactor (cherry picked from commit 53b61e7a0ea65e009f2135d6d3474dcadf8209db) --- .../python-modules/datalad/default.nix | 72 +++++++++---------- 1 file changed, 34 insertions(+), 38 deletions(-) diff --git a/pkgs/development/python-modules/datalad/default.nix b/pkgs/development/python-modules/datalad/default.nix index 5021b2e1c3028..1df8ee11bf655 100644 --- a/pkgs/development/python-modules/datalad/default.nix +++ b/pkgs/development/python-modules/datalad/default.nix @@ -34,16 +34,15 @@ python-dateutil, # duecredit duecredit, - # python>=3.8 distro, # win colorama, # python-version-dependent pythonOlder, - importlib-resources, importlib-metadata, typing-extensions, # tests + pytest-xdist, pytestCheckHook, p7zip, curl, @@ -53,10 +52,11 @@ buildPythonPackage rec { pname = "datalad"; version = "1.1.4"; + pyproject = true; src = fetchFromGitHub { owner = "datalad"; - repo = pname; + repo = "datalad"; rev = "refs/tags/${version}"; hash = "sha256-l3II9xebSq09He5e4GGGiGtfe6ERtIQD00eHKGx46WA="; }; @@ -79,49 +79,44 @@ buildPythonPackage rec { ]; dependencies = - [ - # core - platformdirs - chardet - iso8601 - humanize - fasteners - packaging - patool - tqdm - annexremote - looseversion - setuptools - git-annex - - # downloaders-extra - # requests-ftp # not in nixpkgs yet - - # downloaders + optional-dependencies.core ++ optional-dependencies.downloaders ++ optional-dependencies.publish; + + optional-dependencies = { + core = + [ + platformdirs + chardet + distro + iso8601 + humanize + fasteners + packaging + patool + tqdm + annexremote + looseversion + ] + ++ lib.optionals stdenv.hostPlatform.isWindows [ colorama ] + ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ] + ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]; + downloaders = [ boto3 keyrings-alt keyring msgpack requests - - # publish - python-gitlab - - # misc + ]; + downloaders-extra = [ + # requests-ftp # not in nixpkgs yet + ]; + publish = [ python-gitlab ]; + misc = [ argcomplete pyperclip python-dateutil - - # duecredit - duecredit - - # python>=3.8 - distro - ] - ++ lib.optionals stdenv.hostPlatform.isWindows [ colorama ] - ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ] - ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ] - ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]; + ]; + duecredit = [ duecredit ]; + }; postInstall = '' installShellCompletion --cmd datalad \ @@ -228,6 +223,7 @@ buildPythonPackage rec { nativeCheckInputs = [ p7zip + pytest-xdist pytestCheckHook git-annex curl From 6a7343c9750db0d32abe8004df41cdc6b9e6193f Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Tue, 10 Dec 2024 20:51:16 +0100 Subject: [PATCH 3/4] datalad: fix changed hash from upstream Signed-off-by: Florian Brandes (cherry picked from commit 07a190e7a44fb98349272e274a818f9e9fddd1f2) --- pkgs/development/python-modules/datalad/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/datalad/default.nix b/pkgs/development/python-modules/datalad/default.nix index 1df8ee11bf655..f97007d13e52f 100644 --- a/pkgs/development/python-modules/datalad/default.nix +++ b/pkgs/development/python-modules/datalad/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { owner = "datalad"; repo = "datalad"; rev = "refs/tags/${version}"; - hash = "sha256-l3II9xebSq09He5e4GGGiGtfe6ERtIQD00eHKGx46WA="; + hash = "sha256-sIWHBaqTJuKQHvh+L10PUehsmjRFl/holXzp0SMqr+k="; }; postPatch = '' From 79f9ac9f5674c78cd57022da54281ed1b2c56f6c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Dec 2024 02:06:12 +0000 Subject: [PATCH 4/4] python312Packages.datalad: 1.1.4 -> 1.1.5 (cherry picked from commit 67605d59a035c573863b64184853ecd1a6bdea25) --- pkgs/development/python-modules/datalad/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/datalad/default.nix b/pkgs/development/python-modules/datalad/default.nix index f97007d13e52f..7cba7a25e33f8 100644 --- a/pkgs/development/python-modules/datalad/default.nix +++ b/pkgs/development/python-modules/datalad/default.nix @@ -51,14 +51,14 @@ buildPythonPackage rec { pname = "datalad"; - version = "1.1.4"; + version = "1.1.5"; pyproject = true; src = fetchFromGitHub { owner = "datalad"; repo = "datalad"; - rev = "refs/tags/${version}"; - hash = "sha256-sIWHBaqTJuKQHvh+L10PUehsmjRFl/holXzp0SMqr+k="; + tag = version; + hash = "sha256-XwzYlSP2MbEb0U3tuVOq3NNqLTS08UzSfSFBidHbpAY="; }; postPatch = ''