Merge pull request #214572 from bcdarwin/update-csxcad

csxcad: unstable-2020-02-08 -> unstable-2022-05-18

4 files changed, 17 insertions, 17 deletions

diff --git a/pkgs/applications/science/electronics/appcsxcad/default.nix b/pkgs/applications/science/electronics/appcsxcad/default.nix
index b02082e5b6cd..2e882aff361d 100644
--- a/pkgs/applications/science/electronics/appcsxcad/default.nix
+++ b/pkgs/applications/science/electronics/appcsxcad/default.nix
@@ -5,7 +5,7 @@
 , csxcad
 , qcsxcad
 , hdf5
-, vtk_8_withQt5
+, vtkWithQt5
 , qtbase
 , fparser
 , tinyxml
@@ -15,13 +15,13 @@
 
 mkDerivation {
   pname = "appcsxcad";
-  version = "unstable-2020-01-04";
+  version = "unstable-2023-01-06";
 
   src = fetchFromGitHub {
     owner = "thliebig";
     repo = "AppCSXCAD";
-    rev = "de8c271ec8b57e80233cb2a432e3d7fd54d30876";
-    sha256 = "0shnfa0if3w588a68gr82qi6k7ldg1j2921fnzji90mmay21birp";
+    rev = "379ede4b8e00c11e8d0fb724c35547991b30c423";
+    hash = "sha256-L0ZEyovnfMzM7JuITBuhb4tJ2Aqgw52IiKEfEGq7Yo0=";
   };
 
   nativeBuildInputs = [
@@ -32,7 +32,7 @@ mkDerivation {
     csxcad
     qcsxcad
     hdf5
-    vtk_8_withQt5
+    vtkWithQt5
     qtbase
     fparser
     tinyxml
diff --git a/pkgs/applications/science/electronics/csxcad/default.nix b/pkgs/applications/science/electronics/csxcad/default.nix
index 10bae3c0fdf4..f6b0ff93fff5 100644
--- a/pkgs/applications/science/electronics/csxcad/default.nix
+++ b/pkgs/applications/science/electronics/csxcad/default.nix
@@ -5,7 +5,7 @@
 , tinyxml
 , hdf5
 , cgal_5
-, vtk_8
+, vtk
 , boost
 , gmp
 , mpfr
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "csxcad";
-  version = "unstable-2020-02-08";
+  version = "unstable-2022-05-18";
 
   src = fetchFromGitHub {
     owner = "thliebig";
     repo = "CSXCAD";
-    rev = "ef6e40931dbd80e0959f37c8e9614c437bf7e518";
-    sha256 = "072s765jyzpdq8qqysdy0dld17m6sr9zfcs0ip2zk8c4imxaysnb";
+    rev = "cd9decb4d9cebe3c8bf115e2c0ee73f730f22da1";
+    sha256 = "1604amhvp7dm8ych7gwzxwawqvb9hpjglk5ffd4qm0y3k6r89arn";
   };
 
   patches = [./searchPath.patch ];
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     boost
     gmp
     mpfr
-    vtk_8
+    vtk
     fparser
     tinyxml
     hdf5
diff --git a/pkgs/applications/science/electronics/openems/default.nix b/pkgs/applications/science/electronics/openems/default.nix
index 53768588c3fa..083f01a42881 100644
--- a/pkgs/applications/science/electronics/openems/default.nix
+++ b/pkgs/applications/science/electronics/openems/default.nix
@@ -5,7 +5,7 @@
 , fparser
 , tinyxml
 , hdf5
-, vtk_8
+, vtk
 , boost
 , zlib
 , cmake
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
     fparser
     tinyxml
     hdf5
-    vtk_8
+    vtk
     boost
     zlib
     csxcad
diff --git a/pkgs/development/libraries/science/electronics/qcsxcad/default.nix b/pkgs/development/libraries/science/electronics/qcsxcad/default.nix
index 0fcf4a6c04e6..6ac453aec2c0 100644
--- a/pkgs/development/libraries/science/electronics/qcsxcad/default.nix
+++ b/pkgs/development/libraries/science/electronics/qcsxcad/default.nix
@@ -4,19 +4,19 @@
 , cmake
 , csxcad
 , tinyxml
-, vtk_8_withQt5
+, vtkWithQt5
 , qtbase
 }:
 
 mkDerivation {
   pname = "qcsxcad";
-  version = "unstable-2020-01-04";
+  version = "unstable-2023-01-06";
 
   src = fetchFromGitHub {
     owner = "thliebig";
     repo = "QCSXCAD";
-    rev = "0dabbaf2bc1190adec300871cf309791af842c8e";
-    sha256 = "11kbh0mxbdfh7s5azqin3i2alic5ihmdfj0jwgnrhlpjk4cbf9rn";
+    rev = "1cde9d560a5000f4c24c249d2dd5ccda12de38b6";
+    hash = "sha256-kc9Vnx6jGiQC2K88ZH00b61D/DbWxAIZZwYCsINqtrY=";
   };
 
   outputs = [ "out" "dev" ];
@@ -33,7 +33,7 @@ mkDerivation {
   buildInputs = [
     csxcad
     tinyxml
-    vtk_8_withQt5
+    vtkWithQt5
     qtbase
   ];