From 77da7694cc7758e980037b67022d8bb25216355d Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 31 Dec 2024 01:29:25 +0900 Subject: [PATCH 1/2] python312Packages.zc-buildout: 3.0.1 -> 3.3 Diff: https://github.com/buildout/buildout/compare/3.0.1...3.3 --- pkgs/development/python-modules/buildout/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/buildout/default.nix b/pkgs/development/python-modules/buildout/default.nix index a653318ffe6f..b2197c501758 100644 --- a/pkgs/development/python-modules/buildout/default.nix +++ b/pkgs/development/python-modules/buildout/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "zc-buildout"; - version = "3.0.1"; + version = "3.3"; src = fetchFromGitHub { owner = "buildout"; repo = "buildout"; - rev = version; - sha256 = "J/ymUCFhl7EviHMEYSUCTky0ULRT8aL4gNCGxrbqJi0="; + tag = version; + hash = "sha256-o/iMCc8Jf+jNCHu3OnbCxD+oukoH/b7SUsdm6traO7k="; }; propagatedBuildInputs = [ From f632dcd105f70d91ecd7f49f5be7a46574415c8c Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 31 Dec 2024 01:36:12 +0900 Subject: [PATCH 2/2] python312Packages.zc-buildout: refactor --- .../{buildout => zc-buildout}/default.nix | 18 +++++++++--------- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) rename pkgs/development/python-modules/{buildout => zc-buildout}/default.nix (74%) diff --git a/pkgs/development/python-modules/buildout/default.nix b/pkgs/development/python-modules/zc-buildout/default.nix similarity index 74% rename from pkgs/development/python-modules/buildout/default.nix rename to pkgs/development/python-modules/zc-buildout/default.nix index b2197c501758..fa947a007b2a 100644 --- a/pkgs/development/python-modules/buildout/default.nix +++ b/pkgs/development/python-modules/zc-buildout/default.nix @@ -4,12 +4,12 @@ lib, pip, setuptools, - wheel, }: buildPythonPackage rec { pname = "zc-buildout"; version = "3.3"; + pyproject = true; src = fetchFromGitHub { owner = "buildout"; @@ -18,22 +18,22 @@ buildPythonPackage rec { hash = "sha256-o/iMCc8Jf+jNCHu3OnbCxD+oukoH/b7SUsdm6traO7k="; }; - propagatedBuildInputs = [ - setuptools - pip - wheel - ]; + build-system = [ setuptools ]; + + dependencies = [ pip ]; doCheck = false; # Missing package & BLOCKED on "zc.recipe.egg" pythonImportsCheck = [ "zc.buildout" ]; - meta = with lib; { + pythonNamespaces = [ "zc" ]; + + meta = { description = "Software build and configuration system"; mainProgram = "buildout"; downloadPage = "https://github.com/buildout/buildout"; homepage = "https://www.buildout.org"; - license = licenses.zpl21; - maintainers = with maintainers; [ gotcha ]; + license = lib.licenses.zpl21; + maintainers = with lib.maintainers; [ gotcha ]; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 67e850576181..3587848deb2f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18368,7 +18368,7 @@ self: super: with self; { zarr = callPackage ../development/python-modules/zarr { }; - zc-buildout = callPackage ../development/python-modules/buildout { }; + zc-buildout = callPackage ../development/python-modules/zc-buildout { }; zc-lockfile = callPackage ../development/python-modules/zc-lockfile { };