movefasta/nix-ros-overlay
1
0
Fork 0
mirror of https://github.com/lopsided98/nix-ros-overlay.git synced 2025-06-13 19:24:50 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Rename patchVendorGit to patchExternalProjectGit

Browse source
This commit is contained in:
Ben Wolsieffer 2023-09-08 20:45:48 -04:00
parent d8cea8b151
commit e9d9ef5749
6 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
distros/distro-overlay.nix
View file

@ -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"; url = "https://github.com/novatel/novatel_edie";
fetchgitArgs = { fetchgitArgs = {
rev = "d02ccc2dfe531d642c1e2ca8a8c0f8205c856f23"; rev = "d02ccc2dfe531d642c1e2ca8a8c0f8205c856f23";

6
distros/humble/overrides.nix
View file

@ -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"; url = "https://github.com/skystrife/cpptoml.git";
file = "cmake/cpptoml/cpptoml.cmake.in"; file = "cmake/cpptoml/cpptoml.cmake.in";
fetchgitArgs = { fetchgitArgs = {
@ -53,7 +53,7 @@ rosSelf: rosSuper: with rosSelf.lib; {
sha256 = "sha256-CJ1ZC7ydrZzEsZChrKuWg4/d20r6szFWeQCctiKFLgY="; sha256 = "sha256-CJ1ZC7ydrZzEsZChrKuWg4/d20r6szFWeQCctiKFLgY=";
}; };
libyaml-vendor = patchVendorGit rosSuper.libyaml-vendor { libyaml-vendor = patchExternalProjectGit rosSuper.libyaml-vendor {
url = "https://github.com/yaml/libyaml.git"; url = "https://github.com/yaml/libyaml.git";
fetchgitArgs = { fetchgitArgs = {
rev = "2c891fc7a770e8ba2fec34fc6b545c672beb37e6"; 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"; url = "https://github.com/foxglove/mcap/archive/refs/tags/releases/cpp/v0.8.0.tar.gz";
sha256 = "sha256-KDP3I0QwjqWGOfOzY6DPF2aVgK56tDX0PzsQTP9u9Ug="; sha256 = "sha256-KDP3I0QwjqWGOfOzY6DPF2aVgK56tDX0PzsQTP9u9Ug=";
}) { }) {

6
distros/iron/overrides.nix
View file

@ -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"; url = "https://github.com/skystrife/cpptoml.git";
file = "cmake/cpptoml/cpptoml.cmake.in"; file = "cmake/cpptoml/cpptoml.cmake.in";
fetchgitArgs = { fetchgitArgs = {
@ -53,7 +53,7 @@ rosSelf: rosSuper: with rosSelf.lib; {
sha256 = "sha256-HQeVEQUX6xjIBkcoh8r8hh3QtqHBBFJGxVW8R/a9d+M="; sha256 = "sha256-HQeVEQUX6xjIBkcoh8r8hh3QtqHBBFJGxVW8R/a9d+M=";
}; };
libyaml-vendor = patchVendorGit rosSuper.libyaml-vendor { libyaml-vendor = patchExternalProjectGit rosSuper.libyaml-vendor {
url = "https://github.com/yaml/libyaml.git"; url = "https://github.com/yaml/libyaml.git";
fetchgitArgs = { fetchgitArgs = {
rev = "2c891fc7a770e8ba2fec34fc6b545c672beb37e6"; 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"; url = "https://github.com/foxglove/mcap/archive/refs/tags/releases/cpp/v0.8.0.tar.gz";
sha256 = "sha256-KDP3I0QwjqWGOfOzY6DPF2aVgK56tDX0PzsQTP9u9Ug="; sha256 = "sha256-KDP3I0QwjqWGOfOzY6DPF2aVgK56tDX0PzsQTP9u9Ug=";
}) { }) {

6
distros/rolling/overrides.nix
View file

@ -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"; url = "https://github.com/skystrife/cpptoml.git";
file = "cmake/cpptoml/cpptoml.cmake.in"; file = "cmake/cpptoml/cpptoml.cmake.in";
fetchgitArgs = { 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"; url = "https://gitlab.com/lely_industries/lely-core.git";
fetchgitArgs = { fetchgitArgs = {
rev = "7824cbb2ac08d091c4fa2fb397669b938de9e3f5"; rev = "7824cbb2ac08d091c4fa2fb397669b938de9e3f5";
@ -62,7 +62,7 @@ rosSelf: rosSuper: with rosSelf.lib; {
sha256 = "sha256-HQeVEQUX6xjIBkcoh8r8hh3QtqHBBFJGxVW8R/a9d+M="; 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"; url = "https://github.com/foxglove/mcap/archive/refs/tags/releases/cpp/v1.1.0.tar.gz";
hash = "sha256-HLKuny6RDusuk7OrcidE0YBbnaRXZOT9iHA7ZpQTNQ0="; hash = "sha256-HLKuny6RDusuk7OrcidE0YBbnaRXZOT9iHA7ZpQTNQ0=";
}) { }) {

6
distros/ros2-overlay.nix
View file

@ -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"; url = "https://github.com/modelon-community/fmi-library.git";
fetchgitArgs = { fetchgitArgs = {
rev = "2.1"; 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 # 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. # 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"; url = "https://github.com/foonathan/memory.git";
fetchgitArgs = { fetchgitArgs = {
rev = "v0.7-2"; 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"; url = "https://github.com/ocornut/imgui.git";
fetchgitArgs = { fetchgitArgs = {
rev = "3ea0fad204e994d669f79ed29dcaf61cd5cb571d"; rev = "3ea0fad204e994d669f79ed29dcaf61cd5cb571d";

2
lib/default.nix
View file

@ -36,7 +36,7 @@
'' + postPatch; '' + postPatch;
}); });
patchVendorGit = pkg: { patchExternalProjectGit = pkg: {
url, url,
originalUrl ? url, originalUrl ? url,
file ? "CMakeLists.txt", file ? "CMakeLists.txt",