pyrox.dev
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
+9
-6
pkgs/applications/science/math/geogebra/default.nix
+9
-6
pkgs/applications/science/math/geogebra/default.nix
···
1
1
{ lib, stdenv, fetchurl, jre, makeDesktopItem, makeWrapper, unzip, language ? "en_US" }:
2
2
let
3
3
pname = "geogebra";
4
-
version = "5-0-609-0";
4
+
version = "5-0-620-0";
5
5
6
6
srcIcon = fetchurl {
7
7
url = "http://static.geogebra.org/images/geogebra-logo.svg";
···
27
27
calculus in one easy-to-use package.
28
28
'';
29
29
homepage = "https://www.geogebra.org/";
30
-
maintainers = with maintainers; [ ];
30
+
maintainers = with maintainers; [ sikmir ];
31
31
license = with licenses; [ gpl3 cc-by-nc-sa-30 geogebra ];
32
32
platforms = with platforms; linux ++ darwin;
33
33
hydraPlatforms = [];
···
41
41
src = fetchurl {
42
42
urls = [
43
43
"https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
44
-
"http://web.archive.org/web/20201022200454/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
44
+
"http://web.archive.org/web/20210101213140/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
45
45
];
46
-
sha256 = "0xbhg8hm3dqm3qkraj48pqwslrnjyxpq9mcgylr2m8i1gmqw7xwf";
46
+
sha256 = "0v4r76b91cj0pns78gh3d432g2jlq2pz37lslg3fnnpvlfh25s9j";
47
47
};
48
48
49
49
nativeBuildInputs = [ makeWrapper ];
···
70
70
preferLocalBuild = true;
71
71
72
72
src = fetchurl {
73
-
url = "https://download.geogebra.org/installers/5.0/GeoGebra-MacOS-Installer-withJava-${version}.zip";
74
-
sha256 = "16fgqwxz31cfmia0pyzpk05aqzrqr11sjbw37q9zb3xfh3p1r4gz";
73
+
urls = [
74
+
"https://download.geogebra.org/installers/5.0/GeoGebra-MacOS-Installer-withJava-${version}.zip"
75
+
"https://web.archive.org/web/20210101213641/https://download.geogebra.org/installers/5.0/GeoGebra-MacOS-Installer-withJava-${version}.zip"
76
+
];
77
+
sha256 = "02sbxrns9zvhcfrr68ygv766and6f6b2a3dfarljxszwsviv6ljf";
75
78
};
76
79
77
80
dontUnpack = true;
+11
-8
pkgs/applications/science/math/geogebra/geogebra6.nix
+11
-8
pkgs/applications/science/math/geogebra/geogebra6.nix
···
1
1
{ lib, stdenv, unzip, fetchurl, electron_6, makeWrapper, geogebra }:
2
2
let
3
3
pname = "geogebra";
4
-
version = "6-0-609-0";
4
+
version = "6-0-620-0";
5
5
6
6
srcIcon = geogebra.srcIcon;
7
7
desktopItem = geogebra.desktopItem;
8
8
9
9
meta = with lib; geogebra.meta // {
10
10
license = licenses.geogebra;
11
-
maintainers = with maintainers; [ voidless ];
11
+
maintainers = with maintainers; [ voidless sikmir ];
12
12
platforms = with platforms; linux ++ darwin;
13
13
};
14
14
···
17
17
18
18
src = fetchurl {
19
19
urls = [
20
-
"https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip"
21
-
"https://web.archive.org/web/20201022200156/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip"
22
-
];
23
-
sha256 = "0rzcbq587x8827g9v03awa9hz27vyfjc0cz45ymbchqp31lsx49b";
20
+
"https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip"
21
+
"https://web.archive.org/web/20210101214511/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip"
22
+
];
23
+
sha256 = "0xxzmphbfvmhnxnc1pkjgdhccjndyzmlvvaa8xfdrvswwwk7zh43";
24
24
};
25
25
26
26
dontConfigure = true;
···
51
51
inherit pname version meta;
52
52
53
53
src = fetchurl {
54
-
url = "https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip";
55
-
sha256 = "0275869zgwbl1qjj593q6629hnxbwk9c15rkm29a3lh10pinb099";
54
+
urls = [
55
+
"https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip"
56
+
"https://web.archive.org/web/20210101214236/https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip"
57
+
];
58
+
sha256 = "13g05d45j6dn9zwxpxnln83j7w1cvcd7l8jnir30pxlmdi7h8r78";
56
59
};
57
60
58
61
dontUnpack = true;