summary refs log tree commit diff
diff options
context:
space:
mode:
authorpuzzlewolf <mail@nora.pink>2020-05-21 00:01:16 +0200
committerpuzzlewolf <mail@nora.pink>2020-05-30 18:38:28 +0200
commitc906c45fec0c27cd747bb2a7d1551f420f6fa787 (patch)
tree10f0ac8f01e58262639d60538ebd8e8636c790cd
parentf75d62941d8ad616bfc334ae19d71a0a6677dd19 (diff)
downloadnixpkgs-c906c45fec0c27cd747bb2a7d1551f420f6fa787.tar
nixpkgs-c906c45fec0c27cd747bb2a7d1551f420f6fa787.tar.gz
nixpkgs-c906c45fec0c27cd747bb2a7d1551f420f6fa787.tar.bz2
nixpkgs-c906c45fec0c27cd747bb2a7d1551f420f6fa787.tar.lz
nixpkgs-c906c45fec0c27cd747bb2a7d1551f420f6fa787.tar.xz
nixpkgs-c906c45fec0c27cd747bb2a7d1551f420f6fa787.tar.zst
nixpkgs-c906c45fec0c27cd747bb2a7d1551f420f6fa787.zip
gazebo, sdformat: remove
-rw-r--r--pkgs/applications/science/robotics/gazebo/6.nix8
-rw-r--r--pkgs/applications/science/robotics/gazebo/default.nix84
-rw-r--r--pkgs/development/libraries/sdformat/3.nix7
-rw-r--r--pkgs/development/libraries/sdformat/default.nix29
-rw-r--r--pkgs/top-level/all-packages.nix22
5 files changed, 0 insertions, 150 deletions
diff --git a/pkgs/applications/science/robotics/gazebo/6.nix b/pkgs/applications/science/robotics/gazebo/6.nix
deleted file mode 100644
index 80c52b49e47..00000000000
--- 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 86572e73c75..00000000000
--- 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/development/libraries/sdformat/3.nix b/pkgs/development/libraries/sdformat/3.nix
deleted file mode 100644
index b78f1d5624c..00000000000
--- a/pkgs/development/libraries/sdformat/3.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ stdenv, fetchurl, callPackage, ... } @ args:
-
-callPackage ./default.nix (args // {
-  version = "3.7.0";
-  srchash-sha256 = "07kn8bgvj9mwwinsp2cbmz11z7zw2lgnj61mi1gi1pjg7q9in98q";
-})
-
diff --git a/pkgs/development/libraries/sdformat/default.nix b/pkgs/development/libraries/sdformat/default.nix
deleted file mode 100644
index 66ad311387f..00000000000
--- a/pkgs/development/libraries/sdformat/default.nix
+++ /dev/null
@@ -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;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6fcca20d8f4..f9b24bc6bf8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3634,28 +3634,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;
   };