From bf61ea9af75b1df85a7c4abe37b2aabbbb4d4bd8 Mon Sep 17 00:00:00 2001
From: Michal Sojka <michal.sojka@cvut.cz>
Date: Thu, 24 Oct 2024 01:29:11 +0200
Subject: [PATCH] release.nix: Add top-level packages like colcon

This allows running CI on the complete content of this repository.
---
 release.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/release.nix b/release.nix
index 3dd34414df..7477eddc20 100644
--- a/release.nix
+++ b/release.nix
@@ -7,7 +7,7 @@ let
 in
 { nixpkgs ? lockedNixpkgs, nix-ros-overlay ? ./., distro ? null, system ? builtins.currentSystem }:
 let
-  rosPackages = (import nix-ros-overlay { inherit nixpkgs system; }).rosPackages;
+  pkgs = import nix-ros-overlay { inherit nixpkgs system; };
   releaseDistros = builtins.mapAttrs (_: a: removeAttrs a [
     "lib"
     "python"
@@ -17,9 +17,12 @@ let
     "python2Packages"
     "python3Packages"
     "boost"
-  ]) rosPackages;
-  releasePackages = removeAttrs releaseDistros [
-    "lib"
-    "mkRosDistroOverlay"
-  ];
-in if distro == null then releasePackages else releasePackages.${distro}
+  ]) pkgs.rosPackages;
+  toplevelPackages = (pkgs.lib.intersectAttrs ((import ./overlay.nix) null pkgs) pkgs);
+  releasePackages = toplevelPackages // {
+    rosPackages = removeAttrs releaseDistros [
+      "lib"
+      "mkRosDistroOverlay"
+    ];
+  };
+in if distro == null then releasePackages else releasePackages.rosPackages.${distro}