diff options
| author | Peder Bergebakken Sundt <pbsds@hotmail.com> | 2024-06-08 02:11:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-08 02:11:00 +0200 |
| commit | b227056d293ebd8c8c567bb4f77b04f294d7ded0 (patch) | |
| tree | 753bd9ad0e0692dcf50769820081d804629e313d /pkgs/applications/science | |
| parent | 89844b58a89d540fa56027436b605883b7006f89 (diff) | |
| parent | 07509a06adfc66f871c15fd9a1060b5813fa6850 (diff) | |
| download | nixlib-b227056d293ebd8c8c567bb4f77b04f294d7ded0.tar nixlib-b227056d293ebd8c8c567bb4f77b04f294d7ded0.tar.gz nixlib-b227056d293ebd8c8c567bb4f77b04f294d7ded0.tar.bz2 nixlib-b227056d293ebd8c8c567bb4f77b04f294d7ded0.tar.lz nixlib-b227056d293ebd8c8c567bb4f77b04f294d7ded0.tar.xz nixlib-b227056d293ebd8c8c567bb4f77b04f294d7ded0.tar.zst nixlib-b227056d293ebd8c8c567bb4f77b04f294d7ded0.zip | |
Merge pull request #291454 from imadnyc/numworks-epsilon
numworks-epsilon: 15.5.0 -> 22.2.0
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/math/numworks-epsilon/0001-ion-linux-makerules.patch | 12 | ||||
| -rw-r--r-- | pkgs/applications/science/math/numworks-epsilon/default.nix | 12 |
2 files changed, 4 insertions, 20 deletions
diff --git a/pkgs/applications/science/math/numworks-epsilon/0001-ion-linux-makerules.patch b/pkgs/applications/science/math/numworks-epsilon/0001-ion-linux-makerules.patch deleted file mode 100644 index 0bc29b9aab5f..000000000000 --- a/pkgs/applications/science/math/numworks-epsilon/0001-ion-linux-makerules.patch +++ /dev/null @@ -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 \ - ) - diff --git a/pkgs/applications/science/math/numworks-epsilon/default.nix b/pkgs/applications/science/math/numworks-epsilon/default.nix index a90ebc67b65b..98d5d0d4560a 100644 --- a/pkgs/applications/science/math/numworks-epsilon/default.nix +++ b/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 |