From ffdb0c7eb933b52e623028b54c99dbc4994f2d6a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Feb 2023 09:21:27 +0100 Subject: [PATCH 1/3] python310Packages.ossfs: add changelog to meta --- pkgs/development/python-modules/ossfs/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ossfs/default.nix b/pkgs/development/python-modules/ossfs/default.nix index e6d8bf28a652..2e885552a9e7 100644 --- a/pkgs/development/python-modules/ossfs/default.nix +++ b/pkgs/development/python-modules/ossfs/default.nix @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fsspec"; repo = pname; - rev = version; - hash = "sha256-bORiE3sIDNESjEizdzsJYZTSMbcqpbjostXo+0NQDfA="; + rev = "refs/tags/${version}"; + hash = "sha256-5mz1OC+6kDpiLNsMwOp+bdqY2eozMpAekS6h34QiOdo="; }; propagatedBuildInputs = [ @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Filesystem for Alibaba Cloud (Aliyun) Object Storage System (OSS)"; homepage = "https://github.com/fsspec/ossfs"; + changelog = "https://github.com/fsspec/ossfs/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From 5dc04588f0d974366cb2fb73f1498c963e335091 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Feb 2023 09:27:38 +0100 Subject: [PATCH 2/3] python310Packages.ossfs: missing input - relax constraints --- .../development/python-modules/ossfs/default.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ossfs/default.nix b/pkgs/development/python-modules/ossfs/default.nix index 2e885552a9e7..ac5fd7276e68 100644 --- a/pkgs/development/python-modules/ossfs/default.nix +++ b/pkgs/development/python-modules/ossfs/default.nix @@ -4,6 +4,8 @@ , fsspec , oss2 , pythonOlder +, setuptools-scm +, pythonRelaxDepsHook }: buildPythonPackage rec { @@ -11,7 +13,7 @@ buildPythonPackage rec { version = "2021.8.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fsspec"; @@ -20,6 +22,18 @@ buildPythonPackage rec { hash = "sha256-5mz1OC+6kDpiLNsMwOp+bdqY2eozMpAekS6h34QiOdo="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + pythonRelaxDeps = [ + "fsspec" + "oss2" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + setuptools-scm + ]; + propagatedBuildInputs = [ fsspec oss2 From 160a3278d8d1b39fa6f8b16997ee5da5eec81ce9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Feb 2023 09:33:30 +0100 Subject: [PATCH 3/3] python311Packages.ossfs: 2021.8.0 -> 2023.1.0 Changelog: https://github.com/fsspec/ossfs/releases/tag/2023.1.0 --- pkgs/development/python-modules/ossfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ossfs/default.nix b/pkgs/development/python-modules/ossfs/default.nix index ac5fd7276e68..f78ed6dd5adf 100644 --- a/pkgs/development/python-modules/ossfs/default.nix +++ b/pkgs/development/python-modules/ossfs/default.nix @@ -10,8 +10,8 @@ buildPythonPackage rec { pname = "ossfs"; - version = "2021.8.0"; - format = "setuptools"; + version = "2023.1.0"; + format = "pyproject"; disabled = pythonOlder "3.8";