public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Sandro 2021-01-29 02:19:06 +01:00 committed by GitHub
parent f6bb369bf7 c0575fe0ef
commit d17f76f05a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/science/math/geogebra/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, jre, makeDesktopItem, makeWrapper, unzip, language ? "en_US" }: { lib, stdenv, fetchurl, jre, makeDesktopItem, makeWrapper, unzip, language ? "en_US" }:
let let
pname = "geogebra"; pname = "geogebra";
version = "5-0-609-0"; version = "5-0-620-0";
srcIcon = fetchurl { srcIcon = fetchurl {
url = "http://static.geogebra.org/images/geogebra-logo.svg"; url = "http://static.geogebra.org/images/geogebra-logo.svg";
@ -27,7 +27,7 @@ let
calculus in one easy-to-use package. calculus in one easy-to-use package.
''; '';
homepage = "https://www.geogebra.org/"; homepage = "https://www.geogebra.org/";
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ sikmir ];
license = with licenses; [ gpl3 cc-by-nc-sa-30 geogebra ]; license = with licenses; [ gpl3 cc-by-nc-sa-30 geogebra ];
platforms = with platforms; linux ++ darwin; platforms = with platforms; linux ++ darwin;
hydraPlatforms = []; hydraPlatforms = [];
@ -41,9 +41,9 @@ let
src = fetchurl { src = fetchurl {
urls = [ urls = [
"https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" "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 ]; nativeBuildInputs = [ makeWrapper ];
@ -70,8 +70,11 @@ let
preferLocalBuild = true; preferLocalBuild = true;
src = fetchurl { src = fetchurl {
url = "https://download.geogebra.org/installers/5.0/GeoGebra-MacOS-Installer-withJava-${version}.zip"; urls = [
sha256 = "16fgqwxz31cfmia0pyzpk05aqzrqr11sjbw37q9zb3xfh3p1r4gz"; "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; dontUnpack = true;

19
pkgs/applications/science/math/geogebra/geogebra6.nix
View File

@ -1,14 +1,14 @@
{ 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-609-0"; version = "6-0-620-0";
srcIcon = geogebra.srcIcon; srcIcon = geogebra.srcIcon;
desktopItem = geogebra.desktopItem; desktopItem = geogebra.desktopItem;
meta = with lib; geogebra.meta // { meta = with lib; geogebra.meta // {
license = licenses.geogebra; license = licenses.geogebra;
maintainers = with maintainers; [ voidless ]; maintainers = with maintainers; [ voidless sikmir ];
platforms = with platforms; linux ++ darwin; platforms = with platforms; linux ++ darwin;
}; };
@ -17,10 +17,10 @@ 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/20201022200156/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 = "0rzcbq587x8827g9v03awa9hz27vyfjc0cz45ymbchqp31lsx49b"; sha256 = "0xxzmphbfvmhnxnc1pkjgdhccjndyzmlvvaa8xfdrvswwwk7zh43";
}; };
dontConfigure = true; dontConfigure = true;
@ -51,8 +51,11 @@ let
inherit pname version meta; inherit pname version meta;
src = fetchurl { src = fetchurl {
url = "https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip"; urls = [
sha256 = "0275869zgwbl1qjj593q6629hnxbwk9c15rkm29a3lh10pinb099"; "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; dontUnpack = true;