diff options
Diffstat (limited to 'pkgs/applications/science/math')
7 files changed, 29 insertions, 20 deletions
diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/applications/science/math/fricas/default.nix index 9f0b87f011a10..43a00a5e1fbac 100644 --- a/pkgs/applications/science/math/fricas/default.nix +++ b/pkgs/applications/science/math/fricas/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fricas"; - version = "1.3.10"; + version = "1.3.11"; src = fetchFromGitHub { owner = "fricas"; repo = "fricas"; rev = version; - sha256 = "sha256-T1xDndDnHq/hmhTWWO3Eu0733u8+C8sJMCF6pbLU2GI="; + sha256 = "sha256-EX/boSs6rK4RrJ5W6Rd0TSHsbQsNiFI1evFuNPBMeu8="; }; buildInputs = [ sbcl libX11 libXpm libICE libSM libXt libXau libXdmcp ]; diff --git a/pkgs/applications/science/math/geogebra/geogebra6.nix b/pkgs/applications/science/math/geogebra/geogebra6.nix index 38b668804ad16..40169a72e4a6f 100644 --- a/pkgs/applications/science/math/geogebra/geogebra6.nix +++ b/pkgs/applications/science/math/geogebra/geogebra6.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, unzip, fetchurl, electron, makeWrapper, geogebra }: +{ + lib, + stdenv, + unzip, + fetchurl, + electron, + makeWrapper, + geogebra, +}: let pname = "geogebra"; version = "6-0-794-0"; @@ -14,14 +22,17 @@ let calculus in one easy-to-use package. ''; homepage = "https://www.geogebra.org/"; - maintainers = with maintainers; [ voidless sikmir ]; + maintainers = with maintainers; [ + voidless + sikmir + ]; license = licenses.geogebra; sourceProvenance = with sourceTypes; [ binaryBytecode - binaryNativeCode # some jars include native binaries + binaryNativeCode # some jars include native binaries ]; platforms = with platforms; linux ++ darwin; - hydraPlatforms = []; + hydraPlatforms = [ ]; }; linuxPkg = stdenv.mkDerivation { @@ -50,7 +61,9 @@ let installPhase = '' mkdir -p $out/libexec/geogebra/ $out/bin cp -r GeoGebra-linux-x64/{resources,locales} "$out/" - makeWrapper ${lib.getBin electron}/bin/electron $out/bin/geogebra --add-flags "$out/resources/app" + makeWrapper ${lib.getBin electron}/bin/electron $out/bin/geogebra \ + --add-flags "$out/resources/app" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" install -Dm644 "${desktopItem}/share/applications/"* \ -t $out/share/applications/ @@ -84,6 +97,4 @@ let }; }; in -if stdenv.isDarwin -then darwinPkg -else linuxPkg +if stdenv.isDarwin then darwinPkg else linuxPkg diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index 38caee5805b43..0edaa32babd70 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -5,7 +5,7 @@ , makeWrapper , libGLU , libGL -, freeglut +, libglut , mpfr , gmp , pkgsHostTarget @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]); buildInputs = [ - freeglut + libglut libGL libGLU mpfr diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index e4fc506516fdd..a27d7c1ffdb6f 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qalculate-gtk"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${finalAttrs.version}"; - hash = "sha256-yI+8TrNZJt4eJnDX5mk6RozBe2ZeP7sTyAjsgiYQPck="; + hash = "sha256-vH4GZaeQ6Ji9aWh8R5B6PE2fBBW7KTyCsFkpgHu6yg8="; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/science/math/qalculate-qt/default.nix b/pkgs/applications/science/math/qalculate-qt/default.nix index 3c4e19d56ebd7..ba47acb80e03f 100644 --- a/pkgs/applications/science/math/qalculate-qt/default.nix +++ b/pkgs/applications/science/math/qalculate-qt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qalculate-qt"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-qt"; rev = "v${finalAttrs.version}"; - hash = "sha256-gJfIC5HdA10gb/Dh/yhJbkCZfhUnN0zihqyfDjPv6ow="; + hash = "sha256-suJUPeWLX+da0lQdvsDgSBRCBYmog+s4+n/w0PnPijs="; }; nativeBuildInputs = [ qmake intltool pkg-config qttools wrapQtAppsHook ]; diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix index 1552de773d014..f54c6a92300c3 100644 --- a/pkgs/applications/science/math/sage/sagelib.nix +++ b/pkgs/applications/science/math/sage/sagelib.nix @@ -6,7 +6,6 @@ , perl , pkg-config , sage-setup -, pythonRelaxDepsHook , gd , iml , libpng @@ -103,7 +102,6 @@ buildPythonPackage rec { pip # needed to query installed packages pkg-config sage-setup - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index db2ff0c4a8444..2a6225eab7653 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -6,7 +6,7 @@ , gettext , maxima , wxGTK -, gnome +, adwaita-icon-theme , glib }: @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs:{ wxGTK maxima # So it won't embed svg files into headers. - gnome.adwaita-icon-theme + adwaita-icon-theme # So it won't crash under Sway. glib ]; |