From e9d9ef5749101ea34dba12156c693e20cfb693a1 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Fri, 8 Sep 2023 20:45:48 -0400 Subject: [PATCH] Rename patchVendorGit to patchExternalProjectGit --- distros/distro-overlay.nix | 2 +- distros/humble/overrides.nix | 6 +++--- distros/iron/overrides.nix | 6 +++--- distros/rolling/overrides.nix | 6 +++--- distros/ros2-overlay.nix | 6 +++--- lib/default.nix | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/distros/distro-overlay.nix b/distros/distro-overlay.nix index 265fdd81f2..fc3b9f6749 100644 --- a/distros/distro-overlay.nix +++ b/distros/distro-overlay.nix @@ -141,7 +141,7 @@ let ''; }); - novatel-oem7-driver = (patchVendorGit rosSuper.novatel-oem7-driver { + novatel-oem7-driver = (patchExternalProjectGit rosSuper.novatel-oem7-driver { url = "https://github.com/novatel/novatel_edie"; fetchgitArgs = { rev = "d02ccc2dfe531d642c1e2ca8a8c0f8205c856f23"; diff --git a/distros/humble/overrides.nix b/distros/humble/overrides.nix index d2a751f326..c0834a87c1 100644 --- a/distros/humble/overrides.nix +++ b/distros/humble/overrides.nix @@ -29,7 +29,7 @@ rosSelf: rosSuper: with rosSelf.lib; { ]; }); - iceoryx-posh = (patchVendorGit rosSuper.iceoryx-posh { + iceoryx-posh = (patchExternalProjectGit rosSuper.iceoryx-posh { url = "https://github.com/skystrife/cpptoml.git"; file = "cmake/cpptoml/cpptoml.cmake.in"; fetchgitArgs = { @@ -53,7 +53,7 @@ rosSelf: rosSuper: with rosSelf.lib; { sha256 = "sha256-CJ1ZC7ydrZzEsZChrKuWg4/d20r6szFWeQCctiKFLgY="; }; - libyaml-vendor = patchVendorGit rosSuper.libyaml-vendor { + libyaml-vendor = patchExternalProjectGit rosSuper.libyaml-vendor { url = "https://github.com/yaml/libyaml.git"; fetchgitArgs = { rev = "2c891fc7a770e8ba2fec34fc6b545c672beb37e6"; @@ -61,7 +61,7 @@ rosSelf: rosSuper: with rosSelf.lib; { }; }; - mcap-vendor = patchVendorGit (patchVendorUrl rosSuper.mcap-vendor { + mcap-vendor = patchExternalProjectGit (patchVendorUrl rosSuper.mcap-vendor { url = "https://github.com/foxglove/mcap/archive/refs/tags/releases/cpp/v0.8.0.tar.gz"; sha256 = "sha256-KDP3I0QwjqWGOfOzY6DPF2aVgK56tDX0PzsQTP9u9Ug="; }) { diff --git a/distros/iron/overrides.nix b/distros/iron/overrides.nix index 7ae702368c..15e116cf58 100644 --- a/distros/iron/overrides.nix +++ b/distros/iron/overrides.nix @@ -29,7 +29,7 @@ rosSelf: rosSuper: with rosSelf.lib; { ]; }); - iceoryx-posh = (patchVendorGit rosSuper.iceoryx-posh { + iceoryx-posh = (patchExternalProjectGit rosSuper.iceoryx-posh { url = "https://github.com/skystrife/cpptoml.git"; file = "cmake/cpptoml/cpptoml.cmake.in"; fetchgitArgs = { @@ -53,7 +53,7 @@ rosSelf: rosSuper: with rosSelf.lib; { sha256 = "sha256-HQeVEQUX6xjIBkcoh8r8hh3QtqHBBFJGxVW8R/a9d+M="; }; - libyaml-vendor = patchVendorGit rosSuper.libyaml-vendor { + libyaml-vendor = patchExternalProjectGit rosSuper.libyaml-vendor { url = "https://github.com/yaml/libyaml.git"; fetchgitArgs = { rev = "2c891fc7a770e8ba2fec34fc6b545c672beb37e6"; @@ -61,7 +61,7 @@ rosSelf: rosSuper: with rosSelf.lib; { }; }; - mcap-vendor = patchVendorGit (patchVendorUrl rosSuper.mcap-vendor { + mcap-vendor = patchExternalProjectGit (patchVendorUrl rosSuper.mcap-vendor { url = "https://github.com/foxglove/mcap/archive/refs/tags/releases/cpp/v0.8.0.tar.gz"; sha256 = "sha256-KDP3I0QwjqWGOfOzY6DPF2aVgK56tDX0PzsQTP9u9Ug="; }) { diff --git a/distros/rolling/overrides.nix b/distros/rolling/overrides.nix index 10e6f5eb41..fd99d30d7d 100644 --- a/distros/rolling/overrides.nix +++ b/distros/rolling/overrides.nix @@ -29,7 +29,7 @@ rosSelf: rosSuper: with rosSelf.lib; { ]; }); - iceoryx-posh = (patchVendorGit rosSuper.iceoryx-posh { + iceoryx-posh = (patchExternalProjectGit rosSuper.iceoryx-posh { url = "https://github.com/skystrife/cpptoml.git"; file = "cmake/cpptoml/cpptoml.cmake.in"; fetchgitArgs = { @@ -48,7 +48,7 @@ rosSelf: rosSuper: with rosSelf.lib; { ]; }); - lely-core-libraries = patchVendorGit rosSuper.lely-core-libraries { + lely-core-libraries = patchExternalProjectGit rosSuper.lely-core-libraries { url = "https://gitlab.com/lely_industries/lely-core.git"; fetchgitArgs = { rev = "7824cbb2ac08d091c4fa2fb397669b938de9e3f5"; @@ -62,7 +62,7 @@ rosSelf: rosSuper: with rosSelf.lib; { sha256 = "sha256-HQeVEQUX6xjIBkcoh8r8hh3QtqHBBFJGxVW8R/a9d+M="; }; - mcap-vendor = patchVendorGit (patchVendorUrl rosSuper.mcap-vendor { + mcap-vendor = patchExternalProjectGit (patchVendorUrl rosSuper.mcap-vendor { url = "https://github.com/foxglove/mcap/archive/refs/tags/releases/cpp/v1.1.0.tar.gz"; hash = "sha256-HLKuny6RDusuk7OrcidE0YBbnaRXZOT9iHA7ZpQTNQ0="; }) { diff --git a/distros/ros2-overlay.nix b/distros/ros2-overlay.nix index 2777ee4750..c2ff71a7a2 100644 --- a/distros/ros2-overlay.nix +++ b/distros/ros2-overlay.nix @@ -33,7 +33,7 @@ rosSelf: rosSuper: with rosSelf.lib; { ); }); - fmilibrary-vendor = patchVendorGit rosSuper.fmilibrary-vendor { + fmilibrary-vendor = patchExternalProjectGit rosSuper.fmilibrary-vendor { url = "https://github.com/modelon-community/fmi-library.git"; fetchgitArgs = { rev = "2.1"; @@ -43,7 +43,7 @@ rosSelf: rosSuper: with rosSelf.lib; { # This is a newer version than the build system tries to download, but this # version doesn't try run host platform binaries on the build platform. - foonathan-memory-vendor = patchVendorGit rosSuper.foonathan-memory-vendor { + foonathan-memory-vendor = patchExternalProjectGit rosSuper.foonathan-memory-vendor { url = "https://github.com/foonathan/memory.git"; fetchgitArgs = { rev = "v0.7-2"; @@ -97,7 +97,7 @@ rosSelf: rosSuper: with rosSelf.lib; { ]; }); - rig-reconfigure = patchVendorGit rosSuper.rig-reconfigure { + rig-reconfigure = patchExternalProjectGit rosSuper.rig-reconfigure { url = "https://github.com/ocornut/imgui.git"; fetchgitArgs = { rev = "3ea0fad204e994d669f79ed29dcaf61cd5cb571d"; diff --git a/lib/default.nix b/lib/default.nix index e76c44ed64..2502fa3415 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -36,7 +36,7 @@ '' + postPatch; }); - patchVendorGit = pkg: { + patchExternalProjectGit = pkg: { url, originalUrl ? url, file ? "CMakeLists.txt",