diff options
author | voidless <juliusjedermann@gmail.com> | 2021-11-10 00:08:24 +0100 |
---|---|---|
committer | voidless <juliusjedermann@gmail.com> | 2021-11-24 23:15:54 +0100 |
commit | a34736a38fb86a5b1ff1139c0885a629d232e419 (patch) | |
tree | c35ee94329072b66bf5d0e9dd220a1b9d53a2aae | |
parent | 164173d0fc914ec5f70b67cf1c8b2f03142cb7fc (diff) |
geogebra6 6-0-644-0 -> 6-0-676-0
-rw-r--r-- | pkgs/applications/science/math/geogebra/geogebra6.nix | 14 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/applications/science/math/geogebra/geogebra6.nix b/pkgs/applications/science/math/geogebra/geogebra6.nix index 8163fe5478fac..76d178b7e490d 100644 --- a/pkgs/applications/science/math/geogebra/geogebra6.nix +++ b/pkgs/applications/science/math/geogebra/geogebra6.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, unzip, fetchurl, electron_6, makeWrapper, geogebra }: +{ lib, stdenv, unzip, fetchurl, electron, makeWrapper, geogebra }: let pname = "geogebra"; - version = "6-0-644-0"; + version = "6-0-676-0"; srcIcon = geogebra.srcIcon; desktopItem = geogebra.desktopItem; @@ -18,9 +18,9 @@ let src = fetchurl { urls = [ "https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" - "https://web.archive.org/web/20210604132845/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" + "https://web.archive.org/web/20211123222708/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" ]; - sha256 = "bbe9e1a35abacfd560c0b7aa1ab975853e6adac08608bb70cd80261179e3f922"; + sha256 = "0wn90n2nd476rkf83gk9vvcpbjflkrvyri50pnmv52j76n023hmm"; }; dontConfigure = true; @@ -38,7 +38,7 @@ let installPhase = '' mkdir -p $out/libexec/geogebra/ $out/bin cp -r GeoGebra-linux-x64/{resources,locales} "$out/" - makeWrapper ${lib.getBin electron_6}/bin/electron $out/bin/geogebra --add-flags "$out/resources/app" + makeWrapper ${lib.getBin electron}/bin/electron $out/bin/geogebra --add-flags "$out/resources/app" install -Dm644 "${desktopItem}/share/applications/"* \ -t $out/share/applications/ @@ -53,9 +53,9 @@ let src = fetchurl { urls = [ "https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip" - "https://web.archive.org/web/20210406084052/https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip" + "https://web.archive.org/web/20211124143625/https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip" ]; - sha256 = "0fa680yyz4nry1xvb9v6qqh1mib6grff5d3p7d90nyjlv101p262"; + sha256 = "1dwv2f94a1c2y10lmy0i66cafynalp7dkqgnpk4f0mk6pir2fdgj"; }; dontUnpack = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f546e13c93af..64273b60f78ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31638,7 +31638,9 @@ with pkgs; gap-full = lowPrio (gap.override { packageSet = "full"; }); geogebra = callPackage ../applications/science/math/geogebra { }; - geogebra6 = callPackage ../applications/science/math/geogebra/geogebra6.nix { }; + geogebra6 = callPackage ../applications/science/math/geogebra/geogebra6.nix { + electron = electron_12; + }; maxima = callPackage ../applications/science/math/maxima { ecl = null; |