Merge pull request #118652 from voidIess/u/geogebra_6_0_631_0

geogebra6: 6_0_620_0 -> 6_0_631_0
This commit is contained in:
Sandro 2021-04-06 16:16:54 +02:00 committed by GitHub
commit dcc25d2372
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,7 +1,7 @@
{ lib, stdenv, unzip, fetchurl, electron_6, makeWrapper, geogebra }: { lib, stdenv, unzip, fetchurl, electron_6, makeWrapper, geogebra }:
let let
pname = "geogebra"; pname = "geogebra";
version = "6-0-620-0"; version = "6-0-631-0";
srcIcon = geogebra.srcIcon; srcIcon = geogebra.srcIcon;
desktopItem = geogebra.desktopItem; desktopItem = geogebra.desktopItem;
@ -18,9 +18,9 @@ let
src = fetchurl { src = fetchurl {
urls = [ urls = [
"https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" "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" "https://web.archive.org/web/20210406083122/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip"
]; ];
sha256 = "0xxzmphbfvmhnxnc1pkjgdhccjndyzmlvvaa8xfdrvswwwk7zh43"; sha256 = "1k4jxcvxxjxfrdghs4a29zpp4yid2vh1mfgp8xxr3qlzxnqv92ha";
}; };
dontConfigure = true; dontConfigure = true;
@ -53,9 +53,9 @@ let
src = fetchurl { src = fetchurl {
urls = [ urls = [
"https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip" "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" "https://web.archive.org/web/20210406084052/https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip"
]; ];
sha256 = "13g05d45j6dn9zwxpxnln83j7w1cvcd7l8jnir30pxlmdi7h8r78"; sha256 = "0fa680yyz4nry1xvb9v6qqh1mib6grff5d3p7d90nyjlv101p262";
}; };
dontUnpack = true; dontUnpack = true;