Unverified Commit e6a970aa authored by Mario Rodas's avatar Mario Rodas Committed by GitHub
Browse files

Merge pull request #238994 from kilianar/geogebra 

geogebra: 5-0-745-0 -> 5-0-783-0, geogebra6: 6-0-745-0 -> 6-0-783-0
parents 1fe1484b 46f3360e

pkgs/applications/science/math/geogebra/default.nix

+6 −6
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, jre, makeDesktopItem, makeWrapper, unzip, language ? "en_US" }:

let

  pname = "geogebra";

  version = "5-0-745-0";

  version = "5-0-785-0";



  srcIcon = fetchurl {

    url = "http://static.geogebra.org/images/geogebra-logo.svg";
@@ -45,9 +45,9 @@ let 
    src = fetchurl {

      urls = [

        "https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"

        "https://web.archive.org/web/20221126102702/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"

        "https://web.archive.org/web/20230627211902/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"

      ];

      hash = "sha256-DhZ9inK/6Cc/vunYNHhyP4tI/9/toUOgV4lZWmFIj3c=";

      hash = "sha256-cL4ERKZpE9Y6IdOjvYiX3nIIW3E2qoqkpMyTszvFseM=";

    };



    nativeBuildInputs = [ makeWrapper ];
@@ -75,10 +75,10 @@ let 


    src = fetchurl {

      urls = [

        "https://download.geogebra.org/installers/5.0/GeoGebra-MacOS-Installer-withJava-${version}.zip"

        "https://web.archive.org/web/20221126102602/https://download.geogebra.org/installers/5.0/GeoGebra-MacOS-Installer-withJava-${version}.zip"

        "https://download.geogebra.org/installers/5.0/GeoGebra-MacOS-Installer-withJava-${version}-x64.zip"

        "https://web.archive.org/web/20230627211427/https://download.geogebra.org/installers/5.0/GeoGebra-MacOS-Installer-withJava-${version}-x64.zip"

      ];

      hash = "sha256-La7NzEoao4ExUw3mBGstvSHm94/JM5LHlhOE9ewJePY=";

      hash = "sha256-KHjNH8c3/aMJ5CcwCwW9z0QRxJwqYU5I610zpMMruBQ=";

    };



    dontUnpack = true;

pkgs/applications/science/math/geogebra/geogebra6.nix

+5 −5
Original line number Diff line number Diff line 
{ lib, stdenv, unzip, fetchurl, electron, makeWrapper, geogebra }:

let

  pname = "geogebra";

  version = "6-0-745-0";

  version = "6-0-785-0";



  srcIcon = geogebra.srcIcon;

  desktopItem = geogebra.desktopItem;
@@ -30,9 +30,9 @@ let 
    src = fetchurl {

      urls = [

        "https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip"

        "https://web.archive.org/web/20221126110648/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip"

        "https://web.archive.org/web/20230627211859/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip"

      ];

      hash = "sha256-UksHZt7bEs/aRzFiJrT1Quz/SFSvA88sdhoi1IEVdBc=";

      hash = "sha256-Yv8pTCKkyM7XMUNV2Pcn/YxWo1MbOTNMQBFuJFhB/uE=";

    };



    dontConfigure = true;
@@ -65,9 +65,9 @@ let 
    src = fetchurl {

      urls = [

        "https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip"

        "https://web.archive.org/web/20221126111123/https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip"

        "https://web.archive.org/web/20230627214413/https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip"

      ];

      hash = "sha256-Qn2MD3W5icX45Tfs19oRV8J3lYmL8T+hp7A+crRb9tQ=";

      hash = "sha256-HtIhhq8E1Q5B6xZ7q6Ok95Rt53VWLoGf8PbY+UEOSKg=";

    };



    dontUnpack = true;

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -38942,9 +38942,7 @@ with pkgs; 
  gap-full = lowPrio (gap.override { packageSet = "full"; });















  geogebra = callPackage ../applications/science/math/geogebra { };













  geogebra6 = callPackage ../applications/science/math/geogebra/geogebra6.nix {













    electron = electron_14;













   };













  geogebra6 = callPackage ../applications/science/math/geogebra/geogebra6.nix { };





























  maxima = callPackage ../applications/science/math/maxima {















    lisp-compiler = sbcl;