Unverified Commit 2f457890 authored by Leona Maroni's avatar Leona Maroni Committed by GitHub
Browse files

gaphor: 2.8.2 -> 2.26.0 (#335627)

parents 557398e2 29014765

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -1044,6 +1044,12 @@ 
    github = "Alexnortung";

    githubId = 1552267;

  };

  alex-nt = {

    email = "nix@azuremyst.org";

    github = "alex-nt";

    githubId = 12470950;

    name = "AN";

  };

  alexoundos = {

    email = "alexoundos@gmail.com";

    github = "AleXoundOS";

pkgs/development/python-modules/better-exceptions/default.nix

0 → 100644
+33 −0
Original line number Diff line number Diff line 
{

  lib,

  buildPythonPackage,

  fetchPypi,

  setuptools,

}:



buildPythonPackage rec {

  pname = "better-exceptions";

  version = "0.3.3";

  pyproject = true;



  src = fetchPypi {

    pname = "better_exceptions";

    inherit version;

    hash = "sha256-5Oa8GERNXwTm6JSxA4Hl6SHT1UQkBBgWLH21fp6zRTs=";

  };



  build-system = [ setuptools ];



  pythonImportsCheck = [ "better_exceptions" ];



  # As noted by @WolfangAukang, some check files need to be disabled because of various errors, same with some tests.

  # After disabling and running the build, no tests are collected.

  doCheck = false;



  meta = {

    description = "Pretty and more helpful exceptions in Python, automatically";

    homepage = "https://github.com/qix-/better-exceptions";

    license = lib.licenses.mit;

    maintainers = [ lib.maintainers.alex-nt ];

  };

}

pkgs/tools/misc/gaphor/default.nix

+33 −17
Original line number Diff line number Diff line
@@ -4,16 +4,23 @@ 
, copyDesktopItems

, gobject-introspection

, poetry-core

, wrapGAppsHook3

, gtksourceview4

, wrapGAppsHook4

, gtksourceview5

, libadwaita

, pango

, gaphas

, generic

, jedi

, pycairo

, pillow

, dulwich

, pydot

, defusedxml

, better-exceptions

, babel

, pygobject3

, tinycss2

, gtk3

, gtk4

, librsvg

, makeDesktopItem

, python
@@ -21,34 +28,43 @@ 


buildPythonApplication rec {

  pname = "gaphor";

  version = "2.8.2";



  format = "pyproject";

  version = "2.26.0";

  pyproject = true;



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-+qqsSLjdY2I19fxdfkOEQ9DhTTHccUDll4O5yqtLiz0=";

    hash = "sha256-e0K5bfgPqlJh8qrAz40c/w3ANzkfa/6txuqzQDJYXfE=";

  };



  pythonRelaxDeps = [ "defusedxml" ];



  nativeBuildInputs = [

    copyDesktopItems

    gobject-introspection

    poetry-core

    wrapGAppsHook3

    wrapGAppsHook4

  ];



  buildInputs = [

    gtksourceview4

    gtksourceview5

    pango

    libadwaita

  ];



  propagatedBuildInputs = [

    gaphas

    generic

    jedi

  build-system = [ poetry-core ];



  dependencies = [

    pycairo

    pygobject3

    gaphas

    generic

    tinycss2

    babel

    jedi

    better-exceptions

    pydot

    pillow

    defusedxml

    dulwich

  ];



  desktopItems = [
@@ -61,7 +77,7 @@ buildPythonApplication rec { 
    })

  ];



  # Disable automatic wrapGAppsHook3 to prevent double wrapping

  # Disable automatic wrapGAppsHook4 to prevent double wrapping

  dontWrapGApps = true;



  postInstall = ''
@@ -71,7 +87,7 @@ buildPythonApplication rec { 
  preFixup = ''

    makeWrapperArgs+=(

      "''${gappsWrapperArgs[@]}" \

      --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \

      --prefix XDG_DATA_DIRS : "${gtk4}/share/gsettings-schemas/${gtk4.name}/" \

      --set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"

    )

  '';
@@ -81,6 +97,6 @@ buildPythonApplication rec { 
    maintainers = [ ];

    homepage = "https://github.com/gaphor/gaphor";

    license = licenses.asl20;

    platforms = [ "x86_64-linux" ];

    platforms = lib.platforms.linux;

  };

}

pkgs/top-level/python-packages.nix

+2 −0
Original line number Diff line number Diff line
@@ -1591,6 +1591,8 @@ self: super: with self; { 














  betamax-serializers = callPackage ../development/python-modules/betamax-serializers { };



























  better-exceptions = callPackage ../development/python-modules/better-exceptions { };



























  betterproto = callPackage ../development/python-modules/betterproto { };





























  beziers = callPackage ../development/python-modules/beziers { };