From 5bc7030a25c753b080ba77cf860b5e994b2fc49a Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 18 Oct 2020 14:08:28 +0200 Subject: [PATCH 1/4] freecad: add missing python module for addon manager --- pkgs/applications/graphics/freecad/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index f9322add5c09..563b3a5486fa 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -32,6 +32,7 @@ in mkDerivation rec { libGLU libXmu qtbase qttools qtwebengine qtxmlpatterns ] ++ (with pythonPackages; [ matplotlib pycollada shiboken2 pyside2 pyside2-tools pivy python boost + GitPython # for addon manager ]); cmakeFlags = [ From 351f24fa03a2ef7cd12800c67b87cc61b5c09f4b Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 18 Oct 2020 14:09:26 +0200 Subject: [PATCH 2/4] freecad: 2020-09-25 -> 2020-10-17 --- pkgs/applications/graphics/freecad/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 563b3a5486fa..3a5d36dfac19 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -9,13 +9,13 @@ let pythonPackages = python3Packages; in mkDerivation rec { pname = "freecad-unstable"; - version = "2020-09-25"; + version = "2020-10-17"; src = fetchFromGitHub { owner = "FreeCAD"; repo = "FreeCAD"; - rev = "7616153b3c31ace006169cdc2fdafab484498858"; - sha256 = "1vffvzv3gkndfj2k8ik0afyk9rgngnr4aai5py66qd63qd7kmxch"; + rev = "f3bdaaa55a6c03b297924c40819d23e4603fa55b"; + sha256 = "1q1iy4i9k65v8z7h8a6r4bf5ycn124jp26xwp0xwbar4gnkx2jiq"; }; nativeBuildInputs = [ From 1665d59ac3300f74f1eaa8d136d6f9cf64d11c93 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 18 Oct 2020 15:12:12 +0200 Subject: [PATCH 3/4] freecadStable: remove It depends on the insecure qtwebkit package. --- pkgs/applications/graphics/freecad/stable.nix | 85 ------------------- pkgs/top-level/all-packages.nix | 5 -- 2 files changed, 90 deletions(-) delete mode 100644 pkgs/applications/graphics/freecad/stable.nix diff --git a/pkgs/applications/graphics/freecad/stable.nix b/pkgs/applications/graphics/freecad/stable.nix deleted file mode 100644 index 657caeca8b3d..000000000000 --- a/pkgs/applications/graphics/freecad/stable.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d, -xercesc, ode, eigen, qtbase, qttools, qtwebkit, wrapQtAppsHook, -opencascade-occt, gts, hdf5, vtk, medfile, zlib, python3Packages, swig, -gfortran, libXmu, soqt, libf2c, libGLU, makeWrapper, pkgconfig, mpi ? null }: - -assert mpi != null; - -let - pythonPackages = python3Packages; -in mkDerivation rec { - pname = "freecad"; - version = "0.18.4"; - - src = fetchFromGitHub { - owner = "FreeCAD"; - repo = "FreeCAD"; - rev = version; - sha256 = "1phs9a0px5fnzpyx930cz39p5dis0f0yajxzii3c3sazgkzrd55s"; - }; - - nativeBuildInputs = [ - cmake - ninja - pkgconfig - pythonPackages.pyside2-tools - wrapQtAppsHook - ]; - - buildInputs = [ - cmake coin3d xercesc ode eigen opencascade-occt gts - zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile - libGLU libXmu qtbase qttools qtwebkit - ] ++ (with pythonPackages; [ - matplotlib pycollada shiboken2 pyside2 pyside2-tools pivy python boost - ]); - - # Fix missing app icon on Wayland. Has been upstreamed and should be safe to - # remove in versions >= 0.19 - patches = [ - (fetchpatch { - url = "https://github.com/FreeCAD/FreeCAD/commit/c4d2a358ca125d51d059dfd72dcbfba326196dfc.patch"; - sha256 = "0yqc9zrxgi2c2xcidm8wh7a9yznkphqvjqm9742qm5fl20p8gl4h"; - }) - ]; - - cmakeFlags = [ - "-DBUILD_QT5=ON" - "-DSHIBOKEN_INCLUDE_DIR=${pythonPackages.shiboken2}/include" - "-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken" - ("-DPYSIDE_INCLUDE_DIR=${pythonPackages.pyside2}/include" - + ";${pythonPackages.pyside2}/include/PySide2/QtCore" - + ";${pythonPackages.pyside2}/include/PySide2/QtWidgets" - + ";${pythonPackages.pyside2}/include/PySide2/QtGui" - ) - "-DPYSIDE_LIBRARY=PySide2::pyside2" - ]; - - # This should work on both x86_64, and i686 linux - preBuild = '' - export NIX_LDFLAGS="-L${gfortran.cc}/lib64 -L${gfortran.cc}/lib $NIX_LDFLAGS"; - ''; - - # Their main() removes PYTHONPATH=, and we rely on it. - preConfigure = '' - sed '/putenv("PYTHONPATH/d' -i src/Main/MainGui.cpp - - qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH") - ''; - - qtWrapperArgs = [ - "--set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1" - ]; - - postFixup = '' - mv $out/share/doc $out - ''; - - meta = with stdenv.lib; { - description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler"; - homepage = "https://www.freecadweb.org/"; - license = licenses.lgpl2Plus; - maintainers = with maintainers; [ viric gebner ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 850c4243b0d4..fa45539595b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20846,11 +20846,6 @@ in freecad = libsForQt5.callPackage ../applications/graphics/freecad { mpi = openmpi; }; - freecadStable = libsForQt5.callPackage ../applications/graphics/freecad/stable.nix { - mpi = openmpi; - opencascade-occt = opencascade-occt730; - python3Packages = python37Packages; - }; freemind = callPackage ../applications/misc/freemind { jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 From 27bf7cb663f56009e3cae5632034e63efaf41d4a Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 18 Oct 2020 15:13:25 +0200 Subject: [PATCH 4/4] opencascade-occt730: remove --- .../libraries/opencascade-occt/7.3.nix | 29 ------------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 30 deletions(-) delete mode 100644 pkgs/development/libraries/opencascade-occt/7.3.nix diff --git a/pkgs/development/libraries/opencascade-occt/7.3.nix b/pkgs/development/libraries/opencascade-occt/7.3.nix deleted file mode 100644 index 5f8302aff3c1..000000000000 --- a/pkgs/development/libraries/opencascade-occt/7.3.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, cmake, ninja, tcl, tk, - libGL, libGLU, libXext, libXmu, libXi, darwin }: - -stdenv.mkDerivation rec { - pname = "opencascade-occt"; - version = "7.3.0p3"; - commit = "V${builtins.replaceStrings ["."] ["_"] version}"; - - src = fetchurl { - name = "occt-${commit}.tar.gz"; - url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=${commit};sf=tgz"; - sha256 = "0k9c3ypcnjcilq1dhsf6xxbd52gyq4h5rchvp30k3c8ph4ris5pz"; - }; - - nativeBuildInputs = [ cmake ninja ]; - buildInputs = [ tcl tk libGL libGLU libXext libXmu libXi ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; - - meta = with stdenv.lib; { - description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation"; - homepage = "https://www.opencascade.org/"; - license = licenses.lgpl21; # essentially... - # The special exception defined in the file OCCT_LGPL_EXCEPTION.txt - # are basically about making the license a little less share-alike. - maintainers = with maintainers; [ amiloradovsky ]; - platforms = platforms.all; - }; - -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa45539595b4..8d33489e0a95 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14707,7 +14707,6 @@ in inherit (darwin.apple_sdk.frameworks) OpenCL Cocoa; }; opencascade-occt = callPackage ../development/libraries/opencascade-occt { }; - opencascade-occt730 = callPackage ../development/libraries/opencascade-occt/7.3.nix { }; opencl-headers = callPackage ../development/libraries/opencl-headers { };