Unverified Commit 15c6e717 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #102060 from addict3d/add-python-diagrams-from-github

parents 04224b7b 5e5a40b1

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -224,6 +224,12 @@ 
    githubId = 1773511;

    name = "Adrien Devresse";

  };

  addict3d = {

    email = "nickbathum@gmail.com";

    github = "addict3d";

    githubId = 49227;

    name = "Nick Bathum";

  };

  adisbladis = {

    email = "adisbladis@gmail.com";

    github = "adisbladis";

pkgs/applications/graphics/round/default.nix

0 → 100644
+27 −0
Original line number Diff line number Diff line 
{ lib

, buildGoModule

, fetchFromGitHub

}:



buildGoModule rec {

  pname = "round";

  version = "0.0.2";



  src = fetchFromGitHub {

    owner = "mingrammer";

    repo = pname;

    rev = "v${version}";

    sha256 = "09brjr3h4qnhlidxlki1by5anahxy16ai078zm4k7ryl579amzdw";

  };



  vendorSha256 = null;



  subPackages = [ "." ];



  meta = with lib; {

    description = "Round image corners from CLI";

    homepage    = "https://github.com/mingrammer/round";

    license     = licenses.mit;

    maintainers =  with maintainers; [ addict3d ];

  };

}

pkgs/development/python-modules/diagrams/build_poetry.patch

0 → 100644
+12 −0
Original line number Diff line number Diff line 
diff --git a/pyproject.toml b/pyproject.toml

index 2c93a39..6c800e2 100644

--- a/pyproject.toml

+++ b/pyproject.toml

@@ -24,3 +24,7 @@ isort = "^4.3"

 

 [tool.black]

 line-length = 120

+

+[build-system]

+requires = ["poetry_core>=1.0.0"]

+build-backend = "poetry.core.masonry.api"

pkgs/development/python-modules/diagrams/default.nix

0 → 100644
+49 −0
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, pythonOlder

, fetchFromGitHub

, black

, jinja2

, poetry-core

, round

, graphviz

, inkscape

, imagemagick

, pytestCheckHook

}:



buildPythonPackage rec {

  pname = "diagrams";

  version = "0.19.1";

  format = "pyproject";

  disabled = pythonOlder "3.6";



  src = fetchFromGitHub {

    owner = "mingrammer";

    repo = pname;

    rev = "v${version}";

    sha256 = "0qvk0cp3026n5jmwp9z7m70b6pws0h6a7slxr23glg18baxr44d4";

  };



  preConfigure = ''

    patchShebangs autogen.sh

    ./autogen.sh

  '';



  patches = [ ./build_poetry.patch ];



  checkInputs = [ pytestCheckHook ];



  # Despite living in 'tool.poetry.dependencies',

  # these are only used at build time to process the image resource files

  nativeBuildInputs = [ black inkscape imagemagick jinja2 poetry-core round ];



  propagatedBuildInputs = [ graphviz ];



  meta = with lib; {

    description = "Diagram as Code";

    homepage    = "https://diagrams.mingrammer.com/";

    license     = licenses.mit;

    maintainers =  with maintainers; [ addict3d ];

  };

}

pkgs/top-level/all-packages.nix

+2 −0
Original line number Diff line number Diff line
@@ -17155,6 +17155,8 @@ in 














  rote = callPackage ../development/libraries/rote { };



























  round = callPackage ../applications/graphics/round { };



























  ronn = callPackage ../development/tools/ronn { };





























  rshell = python3.pkgs.callPackage ../development/tools/rshell { };