diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-01-29 02:19:06 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-29 02:19:06 +0100 |
commit | d17f76f05a6bab609e6a58f70dc9033f42a530e6 (patch) | |
tree | 333a44c779e066f4489118e20c473f33dd2729ef /pkgs/applications | |
parent | f6bb369bf74d7821730d31e9f388bd0e0b2c7207 (diff) | |
parent | c0575fe0ef7892dd58b70f84f449f631feff8cf1 (diff) |
Merge pull request #108172 from sikmir/geogebra
geogebra: 5-0-609-0 → 5-0-620-0, geogebra6: 6-0-609-0 → 6-0-620-0
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/science/math/geogebra/default.nix | 15 | ||||
-rw-r--r-- | pkgs/applications/science/math/geogebra/geogebra6.nix | 19 |
2 files changed, 20 insertions, 14 deletions
diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index a20b43c875e2..fa2724469b66 100644 --- a/pkgs/applications/science/math/geogebra/default.nix +++ b/pkgs/applications/science/math/geogebra/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, jre, makeDesktopItem, makeWrapper, unzip, language ? "en_US" }: let pname = "geogebra"; - version = "5-0-609-0"; + version = "5-0-620-0"; srcIcon = fetchurl { url = "http://static.geogebra.org/images/geogebra-logo.svg"; @@ -27,7 +27,7 @@ let calculus in one easy-to-use package. ''; homepage = "https://www.geogebra.org/"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ sikmir ]; license = with licenses; [ gpl3 cc-by-nc-sa-30 geogebra ]; platforms = with platforms; linux ++ darwin; hydraPlatforms = []; @@ -41,9 +41,9 @@ let src = fetchurl { urls = [ "https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" - "http://web.archive.org/web/20201022200454/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" + "http://web.archive.org/web/20210101213140/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" ]; - sha256 = "0xbhg8hm3dqm3qkraj48pqwslrnjyxpq9mcgylr2m8i1gmqw7xwf"; + sha256 = "0v4r76b91cj0pns78gh3d432g2jlq2pz37lslg3fnnpvlfh25s9j"; }; nativeBuildInputs = [ makeWrapper ]; @@ -70,8 +70,11 @@ let preferLocalBuild = true; src = fetchurl { - url = "https://download.geogebra.org/installers/5.0/GeoGebra-MacOS-Installer-withJava-${version}.zip"; - sha256 = "16fgqwxz31cfmia0pyzpk05aqzrqr11sjbw37q9zb3xfh3p1r4gz"; + urls = [ + "https://download.geogebra.org/installers/5.0/GeoGebra-MacOS-Installer-withJava-${version}.zip" + "https://web.archive.org/web/20210101213641/https://download.geogebra.org/installers/5.0/GeoGebra-MacOS-Installer-withJava-${version}.zip" + ]; + sha256 = "02sbxrns9zvhcfrr68ygv766and6f6b2a3dfarljxszwsviv6ljf"; }; dontUnpack = true; diff --git a/pkgs/applications/science/math/geogebra/geogebra6.nix b/pkgs/applications/science/math/geogebra/geogebra6.nix index 4ed66d969303..dc952dc23295 100644 --- a/pkgs/applications/science/math/geogebra/geogebra6.nix +++ b/pkgs/applications/science/math/geogebra/geogebra6.nix @@ -1,14 +1,14 @@ { lib, stdenv, unzip, fetchurl, electron_6, makeWrapper, geogebra }: let pname = "geogebra"; - version = "6-0-609-0"; + version = "6-0-620-0"; srcIcon = geogebra.srcIcon; desktopItem = geogebra.desktopItem; meta = with lib; geogebra.meta // { license = licenses.geogebra; - maintainers = with maintainers; [ voidless ]; + maintainers = with maintainers; [ voidless sikmir ]; platforms = with platforms; linux ++ darwin; }; @@ -17,10 +17,10 @@ let src = fetchurl { urls = [ - "https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" - "https://web.archive.org/web/20201022200156/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" - ]; - sha256 = "0rzcbq587x8827g9v03awa9hz27vyfjc0cz45ymbchqp31lsx49b"; + "https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" + "https://web.archive.org/web/20210101214511/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" + ]; + sha256 = "0xxzmphbfvmhnxnc1pkjgdhccjndyzmlvvaa8xfdrvswwwk7zh43"; }; dontConfigure = true; @@ -51,8 +51,11 @@ let inherit pname version meta; src = fetchurl { - url = "https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip"; - sha256 = "0275869zgwbl1qjj593q6629hnxbwk9c15rkm29a3lh10pinb099"; + urls = [ + "https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip" + "https://web.archive.org/web/20210101214236/https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip" + ]; + sha256 = "13g05d45j6dn9zwxpxnln83j7w1cvcd7l8jnir30pxlmdi7h8r78"; }; dontUnpack = true; |