Merge commit '9480bae337095fd24f61380bce3174fdfe926a00'

This is the last nixos-unstable release before 13b2903169f, which I'm a
bit nervous about.  So I want the update including that one to be as
small as possible, hence going to this one first.

1 files changed, 0 insertions, 32 deletions

diff --git a/nixpkgs/pkgs/development/libraries/ignition-transport/generic.nix b/nixpkgs/pkgs/development/libraries/ignition-transport/generic.nix
deleted file mode 100644
index 2573c97aa09f..000000000000
--- a/nixpkgs/pkgs/development/libraries/ignition-transport/generic.nix
+++ /dev/null
@@ -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
-  };
-}