From dc5888be97094f6f0aa0422ea411803c9bf290c6 Mon Sep 17 00:00:00 2001 From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com> Date: Mon, 26 Jun 2023 22:09:19 +0100 Subject: [PATCH 1/5] python3Packages.speg: init at 0.3 --- .../python-modules/speg/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/speg/default.nix diff --git a/pkgs/development/python-modules/speg/default.nix b/pkgs/development/python-modules/speg/default.nix new file mode 100644 index 000000000000..83bdc1e5b046 --- /dev/null +++ b/pkgs/development/python-modules/speg/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, speg +}: + +buildPythonPackage rec { + pname = "speg"; + version = "0.3"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-EMvvR+Fo38YvFNtXXPHEKAN6K4gc7mw8/O2gQ5wkPnE="; + extension = "zip"; + }; + + pythonImportChecks = [ "speg" ]; + + # checks fail for seemingly spurious reasons + doCheck = false; + + meta = with lib; { + description = "A PEG-based parser interpreter with memoization (in time)"; + homepage = "https://github.com/avakar/speg"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ xworld21 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6df7c8b16581..7c0a592e1a0e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11500,6 +11500,8 @@ self: super: with self; { speedtest-cli = callPackage ../development/python-modules/speedtest-cli { }; + speg = callPackage ../development/python-modules/speg { }; + spglib = callPackage ../development/python-modules/spglib { }; sphfile = callPackage ../development/python-modules/sphfile { }; From c44ab108b2fc705f516fef6b4b4de42b29715f11 Mon Sep 17 00:00:00 2001 From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com> Date: Mon, 26 Jun 2023 22:09:19 +0100 Subject: [PATCH 2/5] python3Packages.cson: init at 0.8 --- .../python-modules/cson/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/cson/default.nix diff --git a/pkgs/development/python-modules/cson/default.nix b/pkgs/development/python-modules/cson/default.nix new file mode 100644 index 000000000000..c05ad78240c0 --- /dev/null +++ b/pkgs/development/python-modules/cson/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, speg +}: + +buildPythonPackage rec { + pname = "cson"; + version = "0.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-7owBZvzR9ReJiHGX4+g1Sse++jlvwpcGvOta8l7cngE="; + }; + + propagatedBuildInputs = [ speg ]; + + pythonImportChecks = [ "cson" ]; + + meta = with lib; { + description = "A python parser for the Coffeescript Object Notation (CSON)"; + homepage = "https://github.com/avakar/pycson"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ xworld21 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7c0a592e1a0e..70338846d2aa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2199,6 +2199,8 @@ self: super: with self; { crytic-compile = callPackage ../development/python-modules/crytic-compile { }; + cson = callPackage ../development/python-modules/cson { }; + csrmesh = callPackage ../development/python-modules/csrmesh { }; csscompressor = callPackage ../development/python-modules/csscompressor { }; From 640d4e204d62b55fe37883cbabf2ccc6f4b86c0e Mon Sep 17 00:00:00 2001 From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com> Date: Mon, 26 Jun 2023 22:09:19 +0100 Subject: [PATCH 3/5] asymptote: make the python modules imported by xasy available at runtime --- pkgs/tools/graphics/asymptote/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 9950d3c56f99..38edd3050e83 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -2,7 +2,7 @@ , autoreconfHook, bison, glm, flex , freeglut, ghostscriptX, imagemagick, fftw , boehmgc, libGLU, libGL, mesa, ncurses, readline, gsl, libsigsegv -, python3Packages +, python3 , zlib, perl, curl , texLive, texinfo , darwin @@ -32,10 +32,8 @@ stdenv.mkDerivation rec { boehmgc ncurses readline gsl libsigsegv zlib perl curl texLive - ] ++ (with python3Packages; [ - python - pyqt5 - ]); + (python3.withPackages (ps: with ps; [ cson numpy pyqt5 ])) + ]; propagatedBuildInputs = [ glm From ba1db967e7f554d2600fb1a0ceef05b992af9723 Mon Sep 17 00:00:00 2001 From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com> Date: Mon, 26 Jun 2023 22:09:19 +0100 Subject: [PATCH 4/5] asymptote: add Qt5 libraries and wrapper for xasy --- pkgs/tools/graphics/asymptote/default.nix | 12 +++++++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 38edd3050e83..c3dfe639f95c 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, fetchurl, fetchpatch -, autoreconfHook, bison, glm, flex +, autoreconfHook, bison, glm, flex, wrapQtAppsHook , freeglut, ghostscriptX, imagemagick, fftw , boehmgc, libGLU, libGL, mesa, ncurses, readline, gsl, libsigsegv -, python3 +, python3, qtbase, qtsvg , zlib, perl, curl , texLive, texinfo , darwin @@ -25,12 +25,13 @@ stdenv.mkDerivation rec { flex bison texinfo + wrapQtAppsHook ]; buildInputs = [ ghostscriptX imagemagick fftw boehmgc ncurses readline gsl libsigsegv - zlib perl curl + zlib perl curl qtbase qtsvg texLive (python3.withPackages (ps: with ps; [ cson numpy pyqt5 ])) ]; @@ -43,6 +44,8 @@ stdenv.mkDerivation rec { OpenGL GLUT Cocoa ]); + dontWrapQtApps = true; + preConfigure = '' HOME=$TMP ''; @@ -55,6 +58,9 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-I${boehmgc.dev}/include/gc"; postInstall = '' + rm "$out"/bin/xasy + makeQtWrapper "$out"/share/asymptote/GUI/xasy.py "$out"/bin/xasy --prefix PATH : "$out"/bin + mv $out/share/info/asymptote/*.info $out/share/info/ sed -i -e 's|(asymptote/asymptote)|(asymptote)|' $out/share/info/asymptote.info rmdir $out/share/info/asymptote diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 29600cc58489..cc7a87414182 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3014,7 +3014,7 @@ with pkgs; astc-encoder = callPackage ../tools/graphics/astc-encoder { }; - asymptote = callPackage ../tools/graphics/asymptote { + asymptote = libsForQt5.callPackage ../tools/graphics/asymptote { texLive = texlive.combine { inherit (texlive) scheme-small epsf cm-super texinfo media9 ocgx2 collection-latexextra; }; }; From 3493e8525854bc2f87bc4c7f7dc5a22f3d931fad Mon Sep 17 00:00:00 2001 From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com> Date: Mon, 26 Jun 2023 22:09:19 +0100 Subject: [PATCH 5/5] asymptote: enable lsp --- pkgs/tools/graphics/asymptote/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index c3dfe639f95c..795378d370c2 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, fetchurl, fetchpatch -, autoreconfHook, bison, glm, flex, wrapQtAppsHook +, autoreconfHook, bison, glm, flex, wrapQtAppsHook, cmake , freeglut, ghostscriptX, imagemagick, fftw , boehmgc, libGLU, libGL, mesa, ncurses, readline, gsl, libsigsegv -, python3, qtbase, qtsvg +, python3, qtbase, qtsvg, boost , zlib, perl, curl , texLive, texinfo , darwin @@ -26,12 +26,13 @@ stdenv.mkDerivation rec { bison texinfo wrapQtAppsHook + cmake ]; buildInputs = [ ghostscriptX imagemagick fftw boehmgc ncurses readline gsl libsigsegv - zlib perl curl qtbase qtsvg + zlib perl curl qtbase qtsvg boost texLive (python3.withPackages (ps: with ps; [ cson numpy pyqt5 ])) ]; @@ -70,6 +71,8 @@ stdenv.mkDerivation rec { install -Dt $out/share/emacs/site-lisp/${pname} $out/share/asymptote/*.el ''; + dontUseCmakeConfigure = true; + enableParallelBuilding = true; # Missing install depends: # ...-coreutils-9.1/bin/install: cannot stat 'asy-keywords.el': No such file or directory