Merge pull request #291454 from imadnyc/numworks-epsilon

numworks-epsilon: 15.5.0 -> 22.2.0

pkgs/applications/science/math/numworks-epsilon/0001-ion-linux-makerules.patch

@@ -1,12 +0,0 @@
-diff --git a/ion/src/simulator/linux/Makefile b/ion/src/simulator/linux/Makefile
-index ca7da03fa..b05bba115 100644
---- a/ion/src/simulator/linux/Makefile
-+++ b/ion/src/simulator/linux/Makefile
-@@ -28,7 +28,6 @@ ion_src += $(addprefix ion/src/simulator/shared/, \
-   collect_registers.cpp \
-   haptics.cpp \
-   journal.cpp \
--  platform_action_modifier_ctrl.cpp \
-   state_file.cpp \
- )
- 

pkgs/applications/science/math/numworks-epsilon/default.nix

@@ -9,17 +9,18 @@
 , imagemagick
 , gcc-arm-embedded
 , pkg-config
+, python3Packages
 }:
 
 stdenv.mkDerivation rec {
   pname = "numworks-epsilon";
-  version = "15.5.0";
+  version = "22.2.0";
 
   src = fetchFromGitHub {
     owner = "numworks";
     repo = "epsilon";
     rev = version;
-    sha256 = "fPBO3FzZ4k5OxG+Ifc6R/au4Te974HNKAEdHz+aFdSg=";
+    hash = "sha256-E2WaXTn8+Ky9kdZxvQmEt63Ggo6Ns0fZ0Za+rQGIMSg=";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -31,18 +32,13 @@ stdenv.mkDerivation rec {
     python3
     imagemagick
     gcc-arm-embedded
+    python3Packages.lz4
   ];
 
   makeFlags = [
     "PLATFORM=simulator"
   ];
 
-  patches = [
-    # Remove make rule Introduced in cba596dde7
-    # which causes it to not build with nix
-    ./0001-ion-linux-makerules.patch
-  ];
-
   installPhase = ''
     runHook preInstall