ignition: update all packages

pkgs/default.nix

@@ -67,26 +67,33 @@ in {
     cmake = self.ignition.cmake2;
 
     common1 = self.callPackage ./ignition/common/1.nix { };
-    common3 = self.callPackage ./ignition/common { };
-    common = self.ignition.common3;
+    common3 = self.callPackage ./ignition/common/3.nix { };
+    common4 = self.callPackage ./ignition/common { };
+    common = self.ignition.common4;
 
     fuel-tools1 = self.callPackage ./ignition/fuel-tools/1.nix { };
-    fuel-tools4 = self.callPackage ./ignition/fuel-tools { };
-    fuel-tools = self.ignition.fuel-tools4;
+    fuel-tools4 = self.callPackage ./ignition/fuel-tools/4.nix { };
+    fuel-tools6 = self.callPackage ./ignition/fuel-tools { };
+    fuel-tools = self.ignition.fuel-tools6;
 
     math4 = self.callPackage ./ignition/math/4.nix { };
     math6 = self.callPackage ./ignition/math { };
     math = self.ignition.math6;
 
     msgs1 = self.callPackage ./ignition/msgs/1.nix { };
-    msgs5 = self.callPackage ./ignition/msgs { };
-    msgs = self.ignition.msgs5;
+    msgs5 = self.callPackage ./ignition/msgs/5.nix { };
+    msgs7 = self.callPackage ./ignition/msgs { };
+    msgs = self.ignition.msgs7;
 
     tools = self.callPackage ./ignition/tools { };
 
     transport4 = self.callPackage ./ignition/transport/4.nix { };
-    transport8 = self.callPackage ./ignition/transport { };
-    transport = self.ignition.transport8;
+    transport8 = self.callPackage ./ignition/transport/8.nix { };
+    transport10 = self.callPackage ./ignition/transport { };
+    transport = self.ignition.transport10;
+
+    utils1 = self.callPackage ./ignition/utils { };
+    utils = self.ignition.utils1;
   };
 
   openni2 = self.callPackage ./openni2 { };

pkgs/gazebo/default.nix

@@ -3,8 +3,8 @@
 , libuuid, graphviz, libsForQt5, freeimage, boost, protobuf, sdformat, tbb
 , ogre1_10, ffmpeg, ignition, ignition-cmake ? ignition.cmake0
 , ignition-common ? ignition.common, ignition-math ? ignition.math4
-, ignition-transport ? ignition.transport, ignition-msgs ? ignition.msgs
-, ignition-fuel-tools ? ignition.fuel-tools
+, ignition-transport ? ignition.transport8, ignition-msgs ? ignition.msgs
+, ignition-fuel-tools ? ignition.fuel-tools4
 
 , bullet, withBulletEngineSupport ? false
 , version ? "11.5.1"

pkgs/ignition/common/3.nix

@@ -0,0 +1,7 @@
+{ callPackage, ignition, ... } @ args :
+
+callPackage ./. ({
+  majorVersion = "3";
+  version = "3.13.2";
+  srcSha256 = "0kh2x8lmyxwms1s1fqyf331463j191337jcvhc77ga9x5igspfb5";
+} // args)

pkgs/ignition/common/default.nix

@@ -1,9 +1,9 @@
 { lib, stdenv, fetchFromGitHub, cmake, pkg-config, ignition
-, ignition-cmake ? ignition.cmake, ignition-math ? ignition.math, libuuid
-, tinyxml-2, freeimage, gts, ffmpeg
-, majorVersion ? "3"
-, version ? "3.7.0"
-, srcSha256 ? "06a0s4bqmyjxkg2lq6xa88lybfgqmz195l2nl3cqqdlnczhzshag"
+, ignition-cmake ? ignition.cmake, ignition-math ? ignition.math
+, ignition-utils ? ignition.utils, libuuid, tinyxml-2, freeimage, gts, ffmpeg
+, majorVersion ? "4"
+, version ? "4.0.0"
+, srcSha256 ? "1vfgjd527z3jypdvnz6w2yfm8n6brrxxh4mcb9srf4bn9apawzwp"
 , ... }:
 
 stdenv.mkDerivation rec {
@@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
   propagatedNativeBuildInputs = [ ignition-cmake ];
   buildInputs = [ ignition-math tinyxml-2 ]
     ++ lib.optionals (lib.versionAtLeast version "3")
-      [ ignition-math gts freeimage ffmpeg ];
+      [ ignition-math gts freeimage ffmpeg ]
+    ++ lib.optional (lib.versionAtLeast version "4") ignition-utils;
   propagatedBuildInputs = [ libuuid ]
     ++ lib.optionals (lib.versionOlder version "3")
       [ ignition-math gts freeimage ffmpeg ];

pkgs/ignition/fuel-tools/4.nix

@@ -0,0 +1,9 @@
+{ callPackage, ignition } @ args :
+
+callPackage ./. ({
+  majorVersion = "4";
+  version = "4.3.0";
+  srcSha256 = "028f6ai61fxdg0ilss3hx7m9kdpahpwrcjqw1gv2rjdb9wh1iwn6";
+  ignition-common = ignition.common3;
+  ignition-msgs = ignition.msgs5;
+} // args)

pkgs/ignition/fuel-tools/default.nix

@@ -1,9 +1,9 @@
 { lib, stdenv, fetchFromGitHub, cmake, ignition
-, ignition-cmake ? ignition.cmake, ignition-common ? ignition.common, tinyxml-2
-, curl, jsoncpp, libyaml, libzip
-, majorVersion ? "4"
-, version ? "4.2.1"
-, srcSha256 ? "1nkkg70z2b7b8aa5sk9hd0ggm0rymrynzn8rfkv82866nkkxc83i"
+, ignition-cmake ? ignition.cmake, ignition-common ? ignition.common
+, ignition-msgs ? ignition.msgs, tinyxml-2, curl, jsoncpp, libyaml, libzip
+, majorVersion ? "6"
+, version ? "6.0.0"
+, srcSha256 ? "07c489yc0n7gry0czp85siaqy9ar03ggaj70lcphwq6zp98gzz4h"
 , ... }:
 
 stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   propagatedNativeBuildInputs = [ ignition-cmake ];
   propagatedBuildInputs = [ ignition-common tinyxml-2 curl jsoncpp libyaml
     libzip ]
-    ++ lib.optional (lib.versionAtLeast version "4") ignition.msgs;
+    ++ lib.optional (lib.versionAtLeast version "4") ignition-msgs;
 
   meta = with lib; {
     homepage = "https://ignitionrobotics.org/libs/fuel_tools";

pkgs/ignition/msgs/5.nix

@@ -0,0 +1,7 @@
+{ callPackage, ignition, ... } @ args :
+
+callPackage ./. ({
+  majorVersion = "5";
+  version = "5.7.0";
+  srcSha256 = "0qky3bapa5r396wfl2fhrjljzya3k845dp6pzld4pkk588w9q3mj";
+} // args)

pkgs/ignition/msgs/default.nix

@@ -1,8 +1,8 @@
 { lib, stdenv, fetchFromGitHub, cmake, tinyxml-2, ignition
 , ignition-cmake ? ignition.cmake, protobuf, ignition-math ? ignition.math
-, majorVersion ? "5"
-, version ? "5.4.0"
-, srcSha256 ? "165i79fnx6g4zdnzmlna6yiw9zifbpxf1qan24r81x5cnk3faf92"
+, majorVersion ? "7"
+, version ? "7.1.0"
+, srcSha256 ? "0sc6mgjxdyx973ziq9svkna35pz9f5cikcf7980vc69vlfaiv9k7"
 , ... }:
 
 stdenv.mkDerivation rec {

pkgs/ignition/transport/8.nix

@@ -0,0 +1,8 @@
+{ callPackage, ignition, ... } @ args :
+
+callPackage ./. ({
+  majorVersion = "8";
+  version = "8.2.0";
+  srcSha256 = "0s1xcvnynfq8dr2j41xxcczl6jc2rfqwhlh26jhwbh1338fqxgnr";
+  ignition-msgs = ignition.msgs5;
+} // args)

pkgs/ignition/transport/default.nix

@@ -1,9 +1,9 @@
 { lib, stdenv, fetchFromGitHub, cmake, ignition, ignition-cmake ? ignition.cmake
-, ignition-math ? ignition.math, ignition-msgs ? ignition.msgs, protobuf
-, libuuid, sqlite, cppzmq, zeromq
-, majorVersion ? "8"
-, version ? "8.1.0"
-, srcSha256 ? "124zdc5mvryjkafc2iq3xmsiagv8mlgyknhwzmi3i7g5abmr58bk"
+, ignition-math ? ignition.math, ignition-msgs ? ignition.msgs
+, ignition-utils ? ignition.utils, protobuf, libuuid, sqlite, cppzmq, zeromq
+, majorVersion ? "10"
+, version ? "10.0.0"
+, srcSha256 ? "0jhqn1hai25mg1807ixhp903jg8gqwl8kqrm4na50q8gl6jnv7hi"
 , ... }:
 
 stdenv.mkDerivation rec {
@@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
   propagatedNativeBuildInputs = [ ignition-cmake ];
-  buildInputs = [ ignition-math sqlite ];
+  buildInputs = [ ignition-math sqlite ]
+    ++ lib.optional (lib.versionAtLeast version "5") ignition-utils;
   propagatedBuildInputs = [ protobuf cppzmq zeromq libuuid ignition-msgs ];
 
   cmakeFlags= [

pkgs/ignition/utils/default.nix

@@ -0,0 +1,28 @@
+{ lib, stdenv, fetchFromGitHub, cmake, ignition
+, ignition-cmake ? ignition.cmake
+, majorVersion ? "1"
+, version ? "1.0.0"
+, srcSha256 ? "1y7x1gpwm2ws7sljxgk7yqsngjcgya4vi3xlasfl7hzh9lfps8zg"
+, ... }:
+
+stdenv.mkDerivation rec {
+  pname = "ignition-utils${majorVersion}";
+  inherit version;
+
+  src = fetchFromGitHub {
+    owner = "ignitionrobotics";
+    repo = "ign-utils";
+    rev = "${pname}_${version}";
+    sha256 = srcSha256;
+  };
+
+  nativeBuildInputs = [ cmake ignition-cmake ];
+
+  meta = with lib; {
+    homepage = "https://ignitionrobotics.org/libs/common";
+    description = "Classes and functions for robot applications";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ lopsided98 ];
+    platforms = platforms.all;
+  };
+}