From 8b567c6689001f2a68ad5617d9b76742d1a9ea2d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 May 2024 15:53:49 +0200 Subject: [PATCH 1/3] python312Packages.language-data: refactor --- .../python-modules/language-data/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/language-data/default.nix b/pkgs/development/python-modules/language-data/default.nix index ff04b036dc05..674ddbca331c 100644 --- a/pkgs/development/python-modules/language-data/default.nix +++ b/pkgs/development/python-modules/language-data/default.nix @@ -10,23 +10,23 @@ buildPythonPackage rec { pname = "language-data"; version = "1.0.1"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "rspeer"; repo = "language_data"; - rev = "v${version}"; - sha256 = "51TUVHXPHG6ofbnxI6+o5lrtr+QCIpGKu+OjDK3l7Mc="; + rev = "refs/tags/v${version}"; + hash = "sha256-51TUVHXPHG6ofbnxI6+o5lrtr+QCIpGKu+OjDK3l7Mc="; }; - nativeBuildInputs = [ + build-system = [ poetry-core setuptools ]; - propagatedBuildInputs = [ + dependencies = [ marisa-trie ]; @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Supplement module for langcodes"; homepage = "https://github.com/rspeer/language_data"; + changelog = "https://github.com/rspeer/language_data/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From 0313582186c63dd525743d1dd75c1bf3f4eec99b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 May 2024 15:54:13 +0200 Subject: [PATCH 2/3] python312Packages.language-data: format with nixfmt --- .../python-modules/language-data/default.nix | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/language-data/default.nix b/pkgs/development/python-modules/language-data/default.nix index 674ddbca331c..3a051afba1d8 100644 --- a/pkgs/development/python-modules/language-data/default.nix +++ b/pkgs/development/python-modules/language-data/default.nix @@ -1,10 +1,11 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, marisa-trie -, poetry-core -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + fetchFromGitHub, + marisa-trie, + poetry-core, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -26,16 +27,12 @@ buildPythonPackage rec { setuptools ]; - dependencies = [ - marisa-trie - ]; + dependencies = [ marisa-trie ]; # Module has no tests doCheck = false; - pythonImportsCheck = [ - "language_data" - ]; + pythonImportsCheck = [ "language_data" ]; meta = with lib; { description = "Supplement module for langcodes"; From aa01c7a453c00a3647a0bb72e2f5365556dbbf0f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 May 2024 16:09:35 +0200 Subject: [PATCH 3/3] python312Packages.language-data: 1.0.1 -> 1.2.0 Diff: https://github.com/georgkrause/language_data/compare/refs/tags/v1.0.1...v1.2.0 Changelog: https://github.com/georgkrause/language_data/releases/tag/v1.2.0 --- .../python-modules/language-data/default.nix | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/language-data/default.nix b/pkgs/development/python-modules/language-data/default.nix index 3a051afba1d8..da1a35456152 100644 --- a/pkgs/development/python-modules/language-data/default.nix +++ b/pkgs/development/python-modules/language-data/default.nix @@ -3,41 +3,37 @@ buildPythonPackage, fetchFromGitHub, marisa-trie, - poetry-core, pythonOlder, - setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "language-data"; - version = "1.0.1"; + version = "1.2.0"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = "rspeer"; + owner = "georgkrause"; repo = "language_data"; rev = "refs/tags/v${version}"; - hash = "sha256-51TUVHXPHG6ofbnxI6+o5lrtr+QCIpGKu+OjDK3l7Mc="; + hash = "sha256-TVWyDEDI6NBioc8DqhXzpLS22EFKsZ/nan2vfgFsieQ="; }; - build-system = [ - poetry-core - setuptools - ]; + build-system = [ setuptools-scm ]; dependencies = [ marisa-trie ]; - # Module has no tests - doCheck = false; - pythonImportsCheck = [ "language_data" ]; + # No unittests + doCheck = false; + meta = with lib; { description = "Supplement module for langcodes"; - homepage = "https://github.com/rspeer/language_data"; - changelog = "https://github.com/rspeer/language_data/releases/tag/v${version}"; + homepage = "https://github.com/georgkrause/language_data"; + changelog = "https://github.com/georgkrause/language_data/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; };