diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-04 15:25:54 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-04 15:25:54 +0200 |
commit | 08900c0554657442c60c86e54081325c0f4cedce (patch) | |
tree | 4e7a2e330991ee3eb08cf6b51d3f44ae47ae03f3 /pkgs/applications/science | |
parent | 458b2cb7d67561c796c6f0660a97eea9b685fc65 (diff) | |
parent | 3327b9a385f5ec2e219bf93b48896772b3f66afc (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/science')
6 files changed, 28 insertions, 115 deletions
diff --git a/pkgs/applications/science/logic/cadical/default.nix b/pkgs/applications/science/logic/cadical/default.nix index 5e6c0d55b7dd6..6a90f50b5aa3a 100644 --- a/pkgs/applications/science/logic/cadical/default.nix +++ b/pkgs/applications/science/logic/cadical/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "arminbiere"; repo = "cadical"; rev = "rel-${version}"; - hash = "sha256:1a66xkw42ad330fvw8i0sawrmg913m8wrq5c85lw5qandkwvxdi6"; + sha256 = "1a66xkw42ad330fvw8i0sawrmg913m8wrq5c85lw5qandkwvxdi6"; }; dontAddPrefix = true; diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix index 031ca55a04803..a2c26de7a2dcf 100644 --- a/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -25,7 +25,7 @@ let owner = pname + "-toolbox"; repo = pname; rev = pname + "_" + version; - sha256 = "38aULxK50wQ2+/ERosSpRyBmssmYSGv5aaWfWSlrSRc="; + sha256 = "05s9dclmk7x5d7wnnj4qr6r6c827m72a44gizcv09lxr28pr9inz"; fetchSubmodules = true; }; # we need the packed archive diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/applications/science/math/gap/default.nix index 87f4fa1203875..04a49becc973b 100644 --- a/pkgs/applications/science/math/gap/default.nix +++ b/pkgs/applications/science/math/gap/default.nix @@ -3,7 +3,7 @@ , fetchurl , fetchpatch , makeWrapper -, m4 +, readline , gmp # one of # - "minimal" (~400M): @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { version = "4.10.2"; src = fetchurl { - url = "https://www.gap-system.org/pub/gap/gap-${lib.versions.major version}.${lib.versions.minor version}/tar.bz2/gap-${version}.tar.bz2"; + url = "https://files.gap-system.org/gap-${lib.versions.major version}.${lib.versions.minor version}/tar.bz2/gap-${version}.tar.bz2"; sha256 = "0cp6ddk0469zzv1m1vair6gm27ic6c5m77ri8rn0znq3gaps6x94"; }; @@ -73,10 +73,8 @@ stdenv.mkDerivation rec { patchShebangs . ''; - configureFlags = [ "--with-gmp=system" ]; - buildInputs = [ - m4 + readline gmp ]; @@ -91,14 +89,31 @@ stdenv.mkDerivation rec { url = "https://github.com/gap-system/gap/commit/3361c172e6c5ff3bb3f01ba9d6f1dd4ad42cea80.patch"; sha256 = "1kwp9qnfvmlbpf1c3rs6j5m2jz22rj7a4hb5x1gj9vkpiyn5pdyj"; }) + + # Fix for locale specific tests causing issues. Already upstream. + # Backport of https://github.com/gap-system/gap/pull/4022 + # WHEN REMOVING: also remove the`rm tst/testinstall/strings.tst` line in + # `postPatch` below. That line is necessary since the patch is not intended + # for gap 4.10. + (fetchpatch { + name = "remove-locale-specific-tests.patch"; + url = "https://github.com/gap-system/gap/commit/c18b0c4215b5212a2cc4f305e2d5b94ba716bee8.patch"; + excludes = ["tst/testinstall/stringobj.tst"]; + sha256 = "1mz5b4mbw2jdd1ypp5s0dy6pp0jsvwsxr2dm4kbkls20r1r192sc"; + }) ]; + postPatch = '' + # File not covered by the remove-locale-specific-tests.patch patch above. + rm tst/testinstall/strings.tst + ''; + # "teststandard" is a superset of testinstall. It takes ~1h instead of ~1min. # tests are run twice, once with all packages loaded and once without # checkTarget = "teststandard"; doInstallCheck = true; - installCheckTarget = "testinstall"; + installCheckTarget = "check"; preInstallCheck = '' # gap tests check that the home directory exists @@ -119,16 +134,6 @@ stdenv.mkDerivation rec { ) ''; - postCheck = '' - # The testsuite doesn't exit with a non-zero exit code on failure. - # It leaves its logs in dev/log however. - - # grep for error messages - if grep ^##### dev/log/*; then - exit 1 - fi - ''; - postBuild = '' pushd pkg bash ../bin/BuildPackages.sh @@ -170,11 +175,11 @@ stdenv.mkDerivation rec { ]; platforms = platforms.all; broken = stdenv.isDarwin; - # keeping all packages increases the package size considerably, wchich - # is why a local build is preferable in that situation. The timeframe - # is reasonable and that way the binary cache doesn't get overloaded. + # keeping all packages increases the package size considerably, which is + # why a local build is preferable in that situation. The timeframe is + # reasonable and that way the binary cache doesn't get overloaded. hydraPlatforms = lib.optionals (!keepAllPackages) meta.platforms; license = licenses.gpl2; - homepage = "http://gap-system.org/"; + homepage = "https://www.gap-system.org"; }; } diff --git a/pkgs/applications/science/robotics/gazebo/6.nix b/pkgs/applications/science/robotics/gazebo/6.nix deleted file mode 100644 index 80c52b49e47f2..0000000000000 --- a/pkgs/applications/science/robotics/gazebo/6.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ stdenv, fetchurl, callPackage, ignition, gazeboSimulator, ... } @ args: - -callPackage ./default.nix (args // { - version = "6.5.1"; - src-sha256 = "96260aa23f1a1f24bc116f8e359d31f3bc65011033977cb7fb2c64d574321908"; - sdformat = gazeboSimulator.sdformat3; -}) - diff --git a/pkgs/applications/science/robotics/gazebo/default.nix b/pkgs/applications/science/robotics/gazebo/default.nix deleted file mode 100644 index 86572e73c7563..0000000000000 --- a/pkgs/applications/science/robotics/gazebo/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ stdenv, fetchurl, cmake, pkgconfig, boost, protobuf, freeimage - , boost-build, boost_process - , xorg_sys_opengl, tbb, ogre, tinyxml-2 - , libtar, glxinfo, libusb-compat-0_1, libxslt, ignition - , pythonPackages, utillinux - - # these deps are hidden; cmake doesn't catch them - , gazeboSimulator, sdformat ? gazeboSimulator.sdformat, curl, tinyxml, qt4 - , xlibsWrapper - , withIgnitionTransport ? true - , libav, withLibAvSupport ? true - , openal, withAudioSupport ? false - , withQuickBuild ? false, withHeadless ? false, withLowMemorySupport ? false - , doxygen, withDocs ? true - , bullet, withBulletEngineSupport ? false - , graphviz, withModelEditorSchematicView ? true # graphviz needed for this view - , gdal, withDigitalElevationTerrainsSupport ? true - , gts, withConstructiveSolidGeometrySupport ? true - , hdf5, withHdf5Support ? true - , version ? "7.0.0" - , src-sha256 ? "127q2g93kvmak2b6vhl13xzg56h09v14s4pki8wv7aqjv0c3whbl" - , ... -}: with stdenv.lib; - -stdenv.mkDerivation rec { - inherit version; - pname = "gazebo"; - - src = fetchurl { - url = "https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${pname}-${version}.tar.bz2"; - sha256 = src-sha256; - }; - - enableParallelBuilding = true; # gazebo needs this so bad - cmakeFlags = [ - "-DCMAKE_INSTALL_LIBDIR:PATH=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" ] - ++ optional withQuickBuild [ "-DENABLE_TESTS_COMPILATION=False" ] - ++ optional withLowMemorySupport [ "-DUSE_LOW_MEMORY_TESTS=True" ] - ++ optional withHeadless [ "-DENABLE_SCREEN_TESTS=False" ]; - - nativeBuildInputs = [ cmake pkgconfig ]; - - propagatedNativeBuildInputs = [ boost boost-build boost_process protobuf ]; - - buildInputs = [ - #cmake boost protobuf - freeimage - xorg_sys_opengl - tbb - ogre - tinyxml-2 - libtar - glxinfo - libusb-compat-0_1 - libxslt - ignition.math2 - sdformat - pythonPackages.pyopengl - - # TODO: add these hidden deps to cmake configuration & submit upstream - curl - tinyxml - xlibsWrapper - qt4 - ] ++ optional stdenv.isLinux utillinux # on Linux needs uuid/uuid.h - ++ optional withDocs doxygen - ++ optional withLibAvSupport libav #TODO: package rubygem-ronn and put it here - ++ optional withAudioSupport openal - ++ optional withBulletEngineSupport bullet - ++ optional withIgnitionTransport ignition.transport - ++ optional withModelEditorSchematicView graphviz - ++ optional withDigitalElevationTerrainsSupport gdal - ++ optional withConstructiveSolidGeometrySupport gts - ++ optional withHdf5Support hdf5; - - meta = with stdenv.lib; { - homepage = "http://gazebosim.org/"; - description = "Multi-robot simulator for outdoor environments"; - license = licenses.asl20; - maintainers = with maintainers; [ pxc ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index c17ffb001182f..1f9d43b335213 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -70,6 +70,6 @@ mkDerivation rec { homepage = "http://qgroundcontrol.org/"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ pxc ]; + maintainers = with maintainers; [ ]; }; } |