mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-20 11:05:14 +00:00
treewide: switch from opencascade-occt -> opencascade-occt_7_6
This commit is contained in:
parent
adc8a19f06
commit
ab2d6f7853
@ -34,7 +34,7 @@
|
||||
mesa,
|
||||
mpfr,
|
||||
nlopt,
|
||||
opencascade-occt,
|
||||
opencascade-occt_7_6,
|
||||
openvdb,
|
||||
pcre,
|
||||
qhull,
|
||||
@ -47,6 +47,7 @@
|
||||
withSystemd ? stdenv.isLinux,
|
||||
}:
|
||||
let
|
||||
opencascade-occt = opencascade-occt_7_6;
|
||||
wxGTK31' = wxGTK31.overrideAttrs (old: {
|
||||
configureFlags = old.configureFlags ++ [
|
||||
# Disable noisy debug dialogs
|
||||
|
@ -23,7 +23,7 @@
|
||||
, mpfr
|
||||
, nanosvg
|
||||
, nlopt
|
||||
, opencascade-occt
|
||||
, opencascade-occt_7_6
|
||||
, openvdb
|
||||
, pcre
|
||||
, qhull
|
||||
@ -37,6 +37,7 @@
|
||||
, wxGTK-override ? null
|
||||
}:
|
||||
let
|
||||
opencascade-occt = opencascade-occt_7_6;
|
||||
wxGTK-prusa = wxGTK32.overrideAttrs (old: rec {
|
||||
pname = "wxwidgets-prusa3d-patched";
|
||||
version = "3.2.0";
|
||||
|
@ -9,12 +9,14 @@
|
||||
, libgit2
|
||||
, librsvg
|
||||
, libuuid
|
||||
, opencascade-occt
|
||||
, opencascade-occt_7_6
|
||||
, pkg-config
|
||||
, podofo
|
||||
, sqlite
|
||||
}:
|
||||
|
||||
let
|
||||
opencascade-occt = opencascade-occt_7_6;
|
||||
in
|
||||
# This base is used in horizon-eda and python3Packages.horizon-eda
|
||||
rec {
|
||||
pname = "horizon-eda";
|
||||
|
@ -42,7 +42,7 @@
|
||||
, swig4
|
||||
, python
|
||||
, wxPython
|
||||
, opencascade-occt
|
||||
, opencascade-occt_7_6
|
||||
, libngspice
|
||||
, valgrind
|
||||
|
||||
@ -65,6 +65,7 @@ assert testing -> !stable
|
||||
-> throw "testing implies stable and cannot be used with stable = false";
|
||||
|
||||
let
|
||||
opencascade-occt = opencascade-occt_7_6;
|
||||
inherit (lib) optional optionals optionalString;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -1,5 +1,23 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, git, gfortran, mpi, blas, liblapack, pkg-config, libGL, libGLU, opencascade-occt, libsForQt5, tbb, vtkWithQt5 }:
|
||||
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, git
|
||||
, gfortran
|
||||
, mpi
|
||||
, blas
|
||||
, liblapack
|
||||
, pkg-config
|
||||
, libGL
|
||||
, libGLU
|
||||
, opencascade-occt_7_6
|
||||
, libsForQt5
|
||||
, tbb
|
||||
, vtkWithQt5
|
||||
}:
|
||||
let
|
||||
opencascade-occt = opencascade-occt_7_6;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elmerfem";
|
||||
version = "unstable-2023-09-18";
|
||||
@ -19,6 +37,7 @@ stdenv.mkDerivation rec {
|
||||
pkg-config
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
mpi
|
||||
blas
|
||||
|
@ -19,7 +19,7 @@
|
||||
, mpi
|
||||
, ninja
|
||||
, ode
|
||||
, opencascade-occt
|
||||
, opencascade-occt_7_6
|
||||
, pkg-config
|
||||
, python3Packages
|
||||
, runCommand # for passthru.tests
|
||||
@ -33,6 +33,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
opencascade-occt = opencascade-occt_7_6;
|
||||
boost = python3Packages.boost;
|
||||
inherit (libsForQt5)
|
||||
qtbase
|
||||
|
@ -7,11 +7,13 @@
|
||||
, icu
|
||||
, swig
|
||||
, pcre
|
||||
, opencascade-occt
|
||||
, opencascade-occt_7_6
|
||||
, opencollada
|
||||
, libxml2
|
||||
}:
|
||||
|
||||
let
|
||||
opencascade-occt = opencascade-occt_7_6;
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "ifcopenshell";
|
||||
version = "240306";
|
||||
|
Loading…
Reference in New Issue
Block a user