Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

freecad: add missing python package #100972

Merged
merged 4 commits into from
Oct 18, 2020
Merged

freecad: add missing python package #100972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5bc7030
freecad: add missing python module for addon manager
gebner Oct 18, 2020
351f24f
freecad: 2020-09-25 -> 2020-10-17
gebner Oct 18, 2020
1665d59
freecadStable: remove
gebner Oct 18, 2020
27bf7cb
opencascade-occt730: remove
gebner Oct 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions pkgs/applications/graphics/freecad/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand All @@ -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 = [
Expand Down
85 changes: 0 additions & 85 deletions pkgs/applications/graphics/freecad/stable.nix
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions pkgs/development/libraries/opencascade-occt/7.3.nix
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 { };

Expand Down Expand Up @@ -20846,11 +20845,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
Expand Down