Unverified Commit fe8aa990 authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

python3Packages.klayout: 0.30.4.post1 -> 0.30.5 (#482632)

parents 7c2089c7 ecbac368

pkgs/by-name/li/libngspice/package.nix

+18 −0
Original line number Diff line number Diff line
@@ -21,6 +21,24 @@ stdenv.mkDerivation (finalAttrs: { 
    hash = "sha256-8arYq6woKKe3HaZkEd6OQGUk518wZuRnVUOcSQRC1zQ=";

  };



  patches = [

    (builtins.toFile "fix-cppduals.patch" ''

      --- a/src/include/cppduals/duals/dual

      +++ b/src/include/cppduals/duals/dual

      @@ -485,10 +485,6 @@ struct is_arithmetic<duals::dual<T>> : is_arithmetic<T> {};



       #endif // CPPDUALS_ENABLE_IS_ARITHMETIC



      -/// Duals are compound types.

      -template <class T>

      -struct is_compound<duals::dual<T>> : true_type {};

      -

       // Modification of std::numeric_limits<> per

       // C++03 17.4.3.1/1, and C++11 18.3.2.3/1.

       template <class T>

    '')

  ];



  nativeBuildInputs = [

    flex

    bison

pkgs/by-name/xc/xcircuit/declare-missing-prototype.patch

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
From 323c4c437b0eb027ac5acbd2d0c5b6d62a38befb Mon Sep 17 00:00:00 2001

From: Florian Weimer <fweimer@redhat.com>

Date: Tue, 11 Apr 2023 09:03:09 +0200

Subject: [PATCH] Declare UDrawXAt in prototypes.h



This avoids an implicit function declaration in functions.c for

HAVE_CAIRO.  Future compilers will not accept such implicit function

declarations by default, leading to a build failure.

---

 prototypes.h | 1 +

 1 file changed, 1 insertion(+)



diff --git a/prototypes.h b/prototypes.h

index d577c854c48eddf1b9d086294930c714d69b7af5..5ec4b272722fd658253b70a3fe211c65881075a5 100644

--- a/prototypes.h

+++ b/prototypes.h

@@ -431,6 +431,7 @@ extern void UDrawSimpleLine(XPoint *, XPoint *);

 extern void UDrawLine(XPoint *, XPoint *);

 extern void UDrawCircle(XPoint *, u_char);

 extern void UDrawX(labelptr);

+extern void UDrawXAt(XPoint *);

 extern void UDrawXDown(labelptr);

 extern int  toplevelwidth(objinstptr, short *);

 extern int  toplevelheight(objinstptr, short *);

pkgs/by-name/xc/xcircuit/package.nix

+3 −8
Original line number Diff line number Diff line
@@ -19,14 +19,14 @@ 
}:



stdenv.mkDerivation {

  version = "3.10.37";

  version = "3.10.42";

  pname = "xcircuit";



  src = fetchFromGitHub {

    owner = "RTimothyEdwards";

    repo = "XCircuit";

    rev = "0056213308c92bec909e8469a0fa1515b72fc3d2";

    sha256 = "sha256-LXU5VEkLF1aKYz9ynI1qQjJUwt/zKFMPYj153OgJOOI=";

    rev = "8a0429250abbd2b70c4d3fbfe2e2c20b4c43be81";

    sha256 = "sha256-ijJYppWuEYcb2RLVsvGHu+7YRp027MNDDcqxSKLHORU=";

  };



  nativeBuildInputs = [
@@ -42,11 +42,6 @@ stdenv.mkDerivation { 
    "--with-ngspice=${lib.getBin ngspice}/bin/ngspice"

  ];



  patches = [

    # fix compilation with GCC 14

    ./declare-missing-prototype.patch

  ];



  buildInputs = [

    cairo

    ghostscript

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

+43 −18
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  buildPythonPackage,

  fetchPypi,

  curl,

  cython,

  expat,

  fixDarwinDylibNames,

  fetchFromGitHub,

  libpng,

  qt6,

  setuptools,

  stdenv,

  fixDarwinDylibNames,

  tomli,

  which,

  zlib,

}:



buildPythonPackage rec {

buildPythonPackage (finalAttrs: {

  pname = "klayout";

  version = "0.30.4.post1";

  version = "0.30.5";

  pyproject = true;



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-jQLVD3IsekQfO0P80miKOtyTyGldc2Vn/mJFfvvgMFo=";

  src = fetchFromGitHub {

    owner = "KLayout";

    repo = "klayout";

    tag = "v${finalAttrs.version}";

    hash = "sha256-WigRictn6CxOPId2YitlEm43vEw+dSRWdoareD9HtMc=";

  };



  build-system = [

    cython

    setuptools

    tomli

  ];



  nativeBuildInputs = [

    qt6.wrapQtAppsHook

    which

  ]

  ++

    # libpng-config is needed for the build on Darwin

    lib.optionals stdenv.hostPlatform.isDarwin [

      (lib.getDev libpng)

      fixDarwinDylibNames

    ];



  buildInputs = [

    qt6.qtbase

    qt6.qtsvg

    qt6.qtmultimedia

    libpng

    curl

    expat

    libpng

    zlib

  ];



  # libpng-config is needed for the build on Darwin

  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [

    libpng.dev

    fixDarwinDylibNames

  ];

  env = {

    KLAYOUT_QT_VERSION = "6";

    HAVE_QT6 = "1";

    HAVE_PNG = "1";

    HAVE_CURL = "1";

    HAVE_EXPAT = "1";

    HAVE_ZLIB = "1";



    # Ensure that there is enough space for the `fixDarwinDylibNames` hook to

    # update the install names of the output dylibs.

  env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-headerpad_max_install_names";

    NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-headerpad_max_install_names";

  };



  pythonImportsCheck = [ "klayout" ];
@@ -51,4 +76,4 @@ buildPythonPackage rec { 
    maintainers = with lib.maintainers; [ fbeffa ];

    platforms = lib.platforms.linux ++ lib.platforms.darwin;

  };

}
 
})