nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-10-30 22:21:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #88466 from puzzlewolf/gazebo_remove

Browse Source 
gazebo: remove
This commit is contained in:
Lassulus 2020-06-04 12:47:42 +02:00 committed by GitHub
commit a15262665a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 2 additions and 247 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
maintainers/maintainer-list.nix
View File

@ -6308,10 +6308,6 @@
githubId = 23097564;
name = "Nora Widdecke";
};
pxc = {
email = "patrick.callahan@latitudeengineering.com";
name = "Patrick Callahan";
};
pyrolagus = {
email = "pyrolagus@gmail.com";
github = "PyroLagus";

8
pkgs/applications/science/robotics/gazebo/6.nix
View File

@ -1,8 +0,0 @@
{ stdenv, fetchurl, callPackage, ignition, gazeboSimulator, ... } @ args:
callPackage ./default.nix (args // {
version = "6.5.1";
src-sha256 = "96260aa23f1a1f24bc116f8e359d31f3bc65011033977cb7fb2c64d574321908";
sdformat = gazeboSimulator.sdformat3;
})

84
pkgs/applications/science/robotics/gazebo/default.nix
View File

@ -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;
};
}

2
pkgs/applications/science/robotics/qgroundcontrol/default.nix
View File

@ -70,6 +70,6 @@ mkDerivation rec {
homepage = "http://qgroundcontrol.org/";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ pxc ];
maintainers = with maintainers; [ ];
};
}

27
pkgs/development/libraries/ignition-math/default.nix
View File

@ -1,27 +0,0 @@
{ stdenv, fetchurl, cmake }:
let
version = "2.6.0";
in
stdenv.mkDerivation {
pname = "ign-math2";
inherit version;
src = fetchurl {
url = "http://gazebosim.org/distributions/ign-math/releases/ignition-math2-${version}.tar.bz2";
sha256 = "1d4naq0zp704c7ckj2wwmhplxmwkvcs1jib8bklnnd09lhg9j92j";
};
buildInputs = [ cmake ];
preConfigure = ''
cmakeFlags="$cmakeFlags -DCMAKE_INSTALL_INCLUDEDIR=include -DCMAKE_INSTALL_LIBDIR=lib"
'';
meta = with stdenv.lib; {
homepage = "https://ignitionrobotics.org/libraries/math";
description = "Math library by Ingition Robotics, created for the Gazebo project";
license = licenses.asl20;
maintainers = with maintainers; [ pxc ];
platforms = platforms.all;
};
}

9
pkgs/development/libraries/ignition-transport/0.9.0.nix
View File

@ -1,9 +0,0 @@
{ stdenv, fetchurl, callPackage, ... } @ args :
callPackage ./generic.nix (args // rec {
version = "0.9.0";
src = fetchurl {
url = "http://gazebosim.org/distributions/ign-transport/releases/ignition-transport-${version}.tar.bz2";
sha256 = "15a8lkxri8q2gc7h0pj1dg2kivhy46v8d3mlxpjy90l77788bw1z";
};
})

9
pkgs/development/libraries/ignition-transport/1.0.1.nix
View File

@ -1,9 +0,0 @@
{ stdenv, fetchurl, callPackage, ... } @ args :
callPackage ./generic.nix (args // rec {
version = "1.0.1";
src = fetchurl {
url = "http://gazebosim.org/distributions/ign-transport/releases/ignition-transport-${version}.tar.bz2";
sha256 = "08qyd70vlymms1g4smblags9f057zsn62xxrx29rhd4wy8prnjsq";
};
})

32
pkgs/development/libraries/ignition-transport/generic.nix
View File

@ -1,32 +0,0 @@
{ stdenv, cmake, pkgconfig, utillinux,
protobuf, zeromq, cppzmq,
version, src # parametrize version and src so we can easily have pkgs
# for different versions
, ...
}:
stdenv.mkDerivation {
pname = "ign-transport";
inherit version;
inherit src;
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake protobuf zeromq
utillinux # we need utillinux/e2fsprogs uuid/uuid.h
];
propagatedBuildInputs = [ cppzmq ];
postPatch = ''
substituteInPlace cmake/ignition-config.cmake.in --replace "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_" "@CMAKE_INSTALL_"
'';
meta = with stdenv.lib; {
homepage = "https://ignitionrobotics.org/libraries/math";
description = "Math library by Ingition Robotics, created for the Gazebo project";
license = licenses.asl20;
maintainers = with maintainers; [ pxc ];
platforms = platforms.all;
broken = true; # 2018-04-10
};
}

7
pkgs/development/libraries/sdformat/3.nix
View File

@ -1,7 +0,0 @@
{ stdenv, fetchurl, callPackage, ... } @ args:
callPackage ./default.nix (args // {
version = "3.7.0";
srchash-sha256 = "07kn8bgvj9mwwinsp2cbmz11z7zw2lgnj61mi1gi1pjg7q9in98q";
})

29
pkgs/development/libraries/sdformat/default.nix
View File

@ -1,29 +0,0 @@
{ stdenv, fetchurl, cmake, boost, ruby, ignition, tinyxml
, name ? "sdformat-${version}"
, version ? "4.0.0" # versions known to work with this expression include 3.7.0
, srchash-sha256 ? "b0f94bb40b0d83e35ff250a7916fdfd6df5cdc1e60c47bc53dd2da5e2378163e"
, ...
}:
stdenv.mkDerivation {
src = fetchurl {
url = "http://osrf-distributions.s3.amazonaws.com/sdformat/releases/${name}.tar.bz2";
sha256 = srchash-sha256;
};
inherit name;
prePatch = ''
substituteInPlace cmake/sdf_config.cmake.in --replace "@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@" "@LIB_INSTALL_DIR@"
'';
enableParallelBuilding = true;
buildInputs = [
cmake boost ruby ignition.math2 tinyxml
];
meta = {
broken = true;
platforms = stdenv.lib.platforms.unix;
};
}

2
pkgs/tools/filesystems/genromfs/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
homepage = "http://romfs.sourceforge.net/";
description = "Tool for creating romfs file system images";
license = licenses.gpl2;
maintainers = with maintainers; [ pxc ];
maintainers = with maintainers; [ ];
platforms = platforms.all;
};
}

36
pkgs/top-level/all-packages.nix
View File

@ -3649,28 +3649,6 @@ in
gawp = callPackage ../tools/misc/gawp { };
gazeboSimulator = recurseIntoAttrs rec {
sdformat = gazeboSimulator.sdformat4;
sdformat3 = callPackage ../development/libraries/sdformat/3.nix { };
sdformat4 = callPackage ../development/libraries/sdformat { };
gazebo6 = callPackage ../applications/science/robotics/gazebo/6.nix { boost = boost160; };
gazebo6-headless = gazebo6.override { withHeadless = true; };
gazebo7 = callPackage ../applications/science/robotics/gazebo { };
gazebo7-headless = gazebo7.override { withHeadless = true; };
};
# at present, Gazebo 7.0.0 does not match Gazebo 6.5.1 for compatibility
gazebo = gazeboSimulator.gazebo6;
gazebo-headless = gazeboSimulator.gazebo6-headless;
gbdfed = callPackage ../tools/misc/gbdfed {
gtk = gtk2-x11;
};
@ -4298,20 +4276,6 @@ in
irods
irods-icommands;
ignition = recurseIntoAttrs {
math = callPackage ../development/libraries/ignition-math { };
math2 = ignition.math;
transport0 = callPackage ../development/libraries/ignition-transport/0.9.0.nix { };
transport1 = callPackage ../development/libraries/ignition-transport/1.0.1.nix { };
transport = ignition.transport0;
};
ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix {
inherit (haskellPackages) ghcWithPackages;