From ae86ca9a37e30c008a80117f5e93d81da3e78986 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Tue, 3 Oct 2023 20:49:52 -0400
Subject: [PATCH] ignition.common1: remove

---
 pkgs/default.nix                 |  1 -
 pkgs/ignition/common/1.nix       | 10 ----------
 pkgs/ignition/common/default.nix |  8 ++------
 3 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/ignition/common/1.nix

diff --git a/pkgs/default.nix b/pkgs/default.nix
index fb38ba68be..d9c53d8031 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -101,7 +101,6 @@ in {
     cmake2 = self.callPackage ./ignition/cmake { };
     cmake = self.ignition.cmake2;
 
-    common1 = self.callPackage ./ignition/common/1.nix { };
     common3 = self.callPackage ./ignition/common/3.nix { };
     common4 = self.callPackage ./ignition/common { };
     common = self.ignition.common4;
diff --git a/pkgs/ignition/common/1.nix b/pkgs/ignition/common/1.nix
deleted file mode 100644
index ae6c792422..0000000000
--- a/pkgs/ignition/common/1.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ callPackage, ignition, ffmpeg_4, ... } @ args :
-
-callPackage ./. ({
-  majorVersion = "";
-  version = "1.1.1";
-  srcHash = "sha256-n3/7mbI53c81PT5x9uzF5e3xNjxNYJvEo0pcVD3kaAw=";
-  ignition-cmake = ignition.cmake0;
-  ignition-math = ignition.math4;
-  ffmpeg = ffmpeg_4;
-} // args)
diff --git a/pkgs/ignition/common/default.nix b/pkgs/ignition/common/default.nix
index a1b31acceb..ce7bc75011 100644
--- a/pkgs/ignition/common/default.nix
+++ b/pkgs/ignition/common/default.nix
@@ -26,13 +26,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
   propagatedNativeBuildInputs = [ ignition-cmake ];
-  buildInputs = [ ignition-math tinyxml-2 ]
-    ++ lib.optionals (lib.versionAtLeast version "3")
-      [ ignition-math gts freeimage ffmpeg ]
+  buildInputs = [ ignition-math tinyxml-2 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 ];
+  propagatedBuildInputs = [ libuuid ];
 
   meta = with lib; {
     homepage = "https://ignitionrobotics.org/libs/common";