From d41f577fb7da6447abdb8aaafab2bdb549d0e7b8 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Tue, 3 Oct 2023 20:53:32 -0400 Subject: [PATCH] ignition.msgs1: remove --- pkgs/default.nix | 1 - pkgs/ignition/msgs/1.nix | 9 --------- pkgs/ignition/msgs/default.nix | 3 +-- 3 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 pkgs/ignition/msgs/1.nix diff --git a/pkgs/default.nix b/pkgs/default.nix index e006d270de..47ad695b01 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -113,7 +113,6 @@ in { math6 = self.callPackage ./ignition/math { }; math = self.ignition.math6; - msgs1 = self.callPackage ./ignition/msgs/1.nix { }; msgs5 = self.callPackage ./ignition/msgs/5.nix { }; msgs8 = self.callPackage ./ignition/msgs { }; msgs = self.ignition.msgs8; diff --git a/pkgs/ignition/msgs/1.nix b/pkgs/ignition/msgs/1.nix deleted file mode 100644 index 4ce5d142e5..0000000000 --- a/pkgs/ignition/msgs/1.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ callPackage, ignition, ... } @ args : - -callPackage ./. ({ - majorVersion = ""; - version = "1.0.0"; - srcHash = "sha256-9kAzm9EUQ2evqqM2rSquCYs3DXgT+3E0OKqP/2xEaUI="; - ignition-cmake = ignition.cmake0; - ignition-math = ignition.math4; -} // args) diff --git a/pkgs/ignition/msgs/default.nix b/pkgs/ignition/msgs/default.nix index 8c1cec3735..2800902ece 100644 --- a/pkgs/ignition/msgs/default.nix +++ b/pkgs/ignition/msgs/default.nix @@ -25,8 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; propagatedNativeBuildInputs = [ ignition-cmake ]; - propagatedBuildInputs = [ protobuf ignition-math ] - ++ lib.optional (lib.versionAtLeast version "5") tinyxml-2; + propagatedBuildInputs = [ protobuf ignition-math tinyxml-2 ]; meta = with lib; { homepage = "https://ignitionrobotics.org/libs/msgs";