diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/science/robotics')
5 files changed, 22 insertions, 121 deletions
diff --git a/nixpkgs/pkgs/applications/science/robotics/apmplanner2/default.nix b/nixpkgs/pkgs/applications/science/robotics/apmplanner2/default.nix index ede698e2b0b..e6d1c544ee4 100644 --- a/nixpkgs/pkgs/applications/science/robotics/apmplanner2/default.nix +++ b/nixpkgs/pkgs/applications/science/robotics/apmplanner2/default.nix @@ -5,23 +5,15 @@ mkDerivation rec { pname = "apmplanner2"; - version = "2.0.27-rc1"; + version = "2.0.28-rc1"; src = fetchFromGitHub { owner = "ArduPilot"; repo = "apm_planner"; rev = version; - sha256 = "1k0786mjzi49nb6yw4chh9l4dmkf9gybpxg9zqkr5yg019nyzcvd"; + sha256 = "18yn8bdz5hmgb0m5hlk8bibz4cj4g25w75pm1rvc4ds0mr1qgyjd"; }; - patches = [ - # can be dropped after 2.0.27-rc1 - (fetchpatch { - url = "https://github.com/ArduPilot/apm_planner/commit/299ff23b5e9910de04edfc06b6893bb06b47a57b.patch"; - sha256 = "16rc81iwqp2i46g6bm9lbvcjfsk83999r9h8w1pz0mys7rsilvqy"; - }) - ]; - buildInputs = [ alsaLib libsndfile flite openssl udev SDL2 qtbase qtscript qtwebkit qtserialport qtsvg qtdeclarative qtquickcontrols2 @@ -35,7 +27,7 @@ mkDerivation rec { preFixup = '' ln --relative --symbolic $out/share/APMPlanner2/* $out/bin/ substituteInPlace $out/share/applications/apmplanner2.desktop \ - --replace /usr $out + --replace /usr $out ''; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/nixpkgs/pkgs/applications/science/robotics/betaflight-configurator/default.nix index 4684ba8c193..66b9a1ef63a 100644 --- a/nixpkgs/pkgs/applications/science/robotics/betaflight-configurator/default.nix +++ b/nixpkgs/pkgs/applications/science/robotics/betaflight-configurator/default.nix @@ -13,10 +13,10 @@ let in stdenv.mkDerivation rec { inherit pname; - version = "10.6.0"; + version = "10.7.0"; src = fetchurl { url = "https://github.com/betaflight/${pname}/releases/download/${version}/${pname}_${version}_linux64.zip"; - sha256 = "09hayzhwangh8b81r038p320vbg0xxlyzrdp9pcmfyxp6s00xslw"; + sha256 = "07r60n9422g5sm7x5b62p044cp961l51vx0s8ig2hy24s74hkam1"; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/applications/science/robotics/gazebo/6.nix b/nixpkgs/pkgs/applications/science/robotics/gazebo/6.nix deleted file mode 100644 index 80c52b49e47..00000000000 --- a/nixpkgs/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/nixpkgs/pkgs/applications/science/robotics/gazebo/default.nix b/nixpkgs/pkgs/applications/science/robotics/gazebo/default.nix deleted file mode 100644 index 86572e73c75..00000000000 --- a/nixpkgs/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/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix index c17ffb00118..8710b88ced3 100644 --- a/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -1,34 +1,31 @@ -{ lib, mkDerivation, fetchgit, SDL2 +{ lib, mkDerivation, fetchFromGitHub, SDL2 , qtbase, qtcharts, qtlocation, qtserialport, qtsvg, qtquickcontrols2 -, qtgraphicaleffects, qtspeech, qmake -, makeWrapper -, gst_all_1, pkgconfig +, qtgraphicaleffects, qtspeech, qtx11extras, qmake, qttools +, gst_all_1, wayland, pkgconfig }: mkDerivation rec { pname = "qgroundcontrol"; - version = "3.5.5"; + version = "4.0.10"; qtInputs = [ qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2 - qtgraphicaleffects qtspeech + qtgraphicaleffects qtspeech qtx11extras ]; gstInputs = with gst_all_1; [ - gstreamer gst-plugins-base + gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad wayland ]; enableParallelBuilding = true; buildInputs = [ SDL2 ] ++ gstInputs ++ qtInputs; - nativeBuildInputs = [ pkgconfig makeWrapper qmake ]; + nativeBuildInputs = [ pkgconfig qmake qttools ]; preConfigure = '' mkdir build cd build ''; - NIX_CFLAGS_COMPILE = [ "-Wno-address-of-packed-member" ]; # Don't litter logs with these warnings - qmakeFlags = [ # Default install tries to copy Qt files into package "CONFIG+=QGC_DISABLE_BUILD_SETUP" @@ -36,6 +33,8 @@ mkDerivation rec { ]; installPhase = '' + runHook preInstall + cd .. mkdir -p $out/share/applications @@ -50,18 +49,20 @@ mkDerivation rec { mkdir -p $out/share/pixmaps cp -v resources/icons/qgroundcontrol.png $out/share/pixmaps + + runHook postInstall ''; postInstall = '' - wrapProgram "$out/bin/qgroundcontrol" \ - --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" + qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") ''; # TODO: package mavlink so we can build from a normal source tarball - src = fetchgit { - url = "https://github.com/mavlink/qgroundcontrol.git"; + src = fetchFromGitHub { + owner = "mavlink"; + repo = pname; rev = "v${version}"; - sha256 = "05zy6w9lwwh254wa8c6wysa67kk0flywcvipii9b1rmy47slflhs"; + sha256 = "1jmhhd2nwxq3m9rzzmrjls8f6hhj52ia71b1sv4vvcjh802cha8g"; fetchSubmodules = true; }; @@ -70,6 +71,6 @@ mkDerivation rec { homepage = "http://qgroundcontrol.org/"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ pxc ]; + maintainers = with maintainers; [ lopsided98 ]; }; } |