Commit graph

72 commits

Author SHA1 Message Date
Michal Sojka
68126a4b82 Add test for --fetch 2024-12-22 22:24:58 +01:00
Michal Sojka
2669f6e7d9 Add more tests for --compare 2024-12-22 22:09:20 +01:00
Michal Sojka
6afabdfe02 Fix __main__ to exit with correct exit code 2024-12-22 22:02:11 +01:00
Michal Sojka
70a0703a0e Add initial version of test suite 2024-12-22 21:58:19 +01:00
Michal Sojka
b2de70cc66 Add ROS workspace that will be used by our planned test suite 2024-12-22 21:38:45 +01:00
Michal Sojka
a850550783 Don't fail with --compare when a .nix file is missing on disk
The switch --compare is typically used during CI, to check whether all
automatically generated files are up to date. When some files are
missing (e.g. a ROS package was added but its Nix expression was not
generated), ros2nix would fail with "FileNotFoundError" and would not
return exit code 2 as it should.

This commit fixes that. Missing files are reported with an error
message and execution continues. Exit code 2 is correctly reported.
2024-12-18 09:39:55 +01:00
github-actions[bot]
c42d7ecaa1 rosdistro update
Flake lock file updates:

• Updated input 'rosdistro':
    'github:ros/rosdistro/00de49f5efa7b1060598d6e079193f2eed1d11ca?narHash=sha256-GU7ADCGL/zUVL6q7gz3LcB4sVwkqDYq2IQDcZMIfWto%3D' (2024-11-22)
  → 'github:ros/rosdistro/555ea36685bebdb5929517593e2da5fce8a46fc9?narHash=sha256-CdLG91HOG9dJ2q9VnhFNAQAA2ToBPNB6qriCYDCPSJU%3D' (2024-12-04)

diff --git a/tmp/rosdistro-old.txt b/tmp/rosdistro-new.txt
index 81bc49a..1b486ab 100644
--- a/tmp/rosdistro-old.txt
+++ b/tmp/rosdistro-new.txt
@@ -281,0 +282 @@
+  nixos: [python3Packages.pillow]
2024-12-05 13:41:12 +01:00
github-actions[bot]
2657ec7c20 rosdistro update
Flake lock file updates:

• Updated input 'rosdistro':
    'github:ros/rosdistro/b53353abe6d376416c00d41818219fa9467214ef?narHash=sha256-c20Tf6IvDiCKTpHGLKg7negZxpl/PfNs%2BbBKNZJiBIc%3D' (2024-11-21)
  → 'github:ros/rosdistro/00de49f5efa7b1060598d6e079193f2eed1d11ca?narHash=sha256-GU7ADCGL/zUVL6q7gz3LcB4sVwkqDYq2IQDcZMIfWto%3D' (2024-11-22)

diff --git a/tmp/rosdistro-old.txt b/tmp/rosdistro-new.txt
index 0edc5e8..81bc49a 100644
--- a/tmp/rosdistro-old.txt
+++ b/tmp/rosdistro-new.txt
@@ -368,0 +369 @@
+  nixos: [python311Packages.textual]
2024-11-23 13:13:55 +01:00
github-actions[bot]
600e071f6c rosdistro update
Flake lock file updates:

• Updated input 'rosdistro':
    'github:ros/rosdistro/a24be1af4d7449eb50c4eea5fe3debe16dbb1771?narHash=sha256-sj/mfhaabnJ4cxjtdVOBS48KD6fvn1/yApuo9J2YlHA%3D' (2024-11-18)
  → 'github:ros/rosdistro/b53353abe6d376416c00d41818219fa9467214ef?narHash=sha256-c20Tf6IvDiCKTpHGLKg7negZxpl/PfNs%2BbBKNZJiBIc%3D' (2024-11-21)

diff --git a/tmp/rosdistro-old.txt b/tmp/rosdistro-new.txt
index 4475958..0edc5e8 100644
--- a/tmp/rosdistro-old.txt
+++ b/tmp/rosdistro-new.txt
@@ -200,0 +201 @@
+  nixos: [Fabric]
@@ -717,0 +719 @@
+  nixos: [fcl]
2024-11-21 13:22:23 +01:00
github-actions[bot]
4d23a0404b rosdistro update
Flake lock file updates:

• Updated input 'rosdistro':
    'github:ros/rosdistro/5d3c90ee3df34578fcf0e93a6026dc1df852fb9e?narHash=sha256-UTKoYkXeGXx2erqaQAyiZDrxY4IFaLm4CopN%2BYxDbkk%3D' (2024-11-15)
  → 'github:ros/rosdistro/a24be1af4d7449eb50c4eea5fe3debe16dbb1771?narHash=sha256-sj/mfhaabnJ4cxjtdVOBS48KD6fvn1/yApuo9J2YlHA%3D' (2024-11-18)

diff --git a/tmp/rosdistro-old.txt b/tmp/rosdistro-new.txt
index 9f843b7..4475958 100644
--- a/tmp/rosdistro-old.txt
+++ b/tmp/rosdistro-new.txt
@@ -7 +7 @@
-  nixos: [jupyter]
+  nixos: [python3Packages.notebook]
@@ -714,0 +715 @@
+  nixos: [exiv2]
@@ -1072,0 +1074 @@
+  nixos: [psmisc]
2024-11-19 13:29:34 +01:00
github-actions[bot]
6cac56645b rosdistro update
Flake lock file updates:

• Updated input 'rosdistro':
    'github:ros/rosdistro/3b0cf448df6f53dc36496590c3f485edeb86aa75?narHash=sha256-dCopFR0sorpEAQYaQwfU3HCkHwKhpxS0kJzDQY9nhOc%3D' (2024-11-08)
  → 'github:ros/rosdistro/5d3c90ee3df34578fcf0e93a6026dc1df852fb9e?narHash=sha256-UTKoYkXeGXx2erqaQAyiZDrxY4IFaLm4CopN%2BYxDbkk%3D' (2024-11-15)

diff --git a/tmp/rosdistro-old.txt b/tmp/rosdistro-new.txt
index 2c8aebb..9f843b7 100644
--- a/tmp/rosdistro-old.txt
+++ b/tmp/rosdistro-new.txt
@@ -242,0 +243 @@
+  nixos: [lensfun]
@@ -624,0 +626,2 @@
+  nixos: [lensfun]
+  nixos: [lensfun]
@@ -709,0 +713,2 @@
+  nixos: [libexif]
+  nixos: [libexif]
2024-11-16 13:35:04 +01:00
github-actions[bot]
1e7f2255d2 rosdistro update
Flake lock file updates:

• Updated input 'rosdistro':
    'github:ros/rosdistro/54b5ed3529185302288f8c956942312791f7e32c?narHash=sha256-D8zTJ9YoTvjsVKCQ0FLB3IX1YFSkNsbqAlAMPrmiJHw%3D' (2024-10-30)
  → 'github:ros/rosdistro/3b0cf448df6f53dc36496590c3f485edeb86aa75?narHash=sha256-dCopFR0sorpEAQYaQwfU3HCkHwKhpxS0kJzDQY9nhOc%3D' (2024-11-08)

diff --git a/tmp/rosdistro-old.txt b/tmp/rosdistro-new.txt
index c52799f..2c8aebb 100644
--- a/tmp/rosdistro-old.txt
+++ b/tmp/rosdistro-new.txt
@@ -239,0 +240 @@
+  nixos: [python3Packages.pyjwt]
@@ -462,0 +464 @@
+  nixos: [cli11]
2024-11-09 15:39:55 +01:00
github-actions[bot]
1e8383dbbf rosdistro update
Flake lock file updates:

• Updated input 'rosdistro':
    'github:ros/rosdistro/1316fadf563b210ea096fa480eef63d362a7af3d?narHash=sha256-v3Dfmr67dPb/P9LNHBQj2Nb/A5qCQGwak4x4qQlehXU%3D' (2024-10-18)
  → 'github:ros/rosdistro/54b5ed3529185302288f8c956942312791f7e32c?narHash=sha256-D8zTJ9YoTvjsVKCQ0FLB3IX1YFSkNsbqAlAMPrmiJHw%3D' (2024-10-30)

diff --git a/tmp/rosdistro-old.txt b/tmp/rosdistro-new.txt
index 462e25a..c52799f 100644
--- a/tmp/rosdistro-old.txt
+++ b/tmp/rosdistro-new.txt
@@ -310,0 +311 @@
+  nixos: [python3Packages.pytest-order]
2024-10-31 17:30:31 +01:00
github-actions[bot]
ee1e33fe36 rosdistro update
Flake lock file updates:

• Updated input 'rosdistro':
    'github:ros/rosdistro/d7014cf14d8a1f9883ee0f8f2c85b7dba4d09670?narHash=sha256-Wsp7x8fTVYCIunL9HFLCOI4WbeUau/kYLCss1VWrJMI%3D' (2024-10-03)
  → 'github:ros/rosdistro/1316fadf563b210ea096fa480eef63d362a7af3d?narHash=sha256-v3Dfmr67dPb/P9LNHBQj2Nb/A5qCQGwak4x4qQlehXU%3D' (2024-10-18)

diff --git a/tmp/rosdistro-old.txt b/tmp/rosdistro-new.txt
index adbcea5..462e25a 100644
--- a/tmp/rosdistro-old.txt
+++ b/tmp/rosdistro-new.txt
@@ -460,0 +461 @@
+  nixos: [clang]
2024-10-18 16:41:46 +02:00
github-actions[bot]
a5789a4e72 rosdistro update
Flake lock file updates:

• Updated input 'rosdistro':
    'github:ros/rosdistro/719a24cd571df99dcbf059d0b26ff6129877440a?narHash=sha256-aC4fmpKW5l6jva7sTM6msR%2BOT4NRg1xE46UUeLn8ddY%3D' (2024-09-23)
  → 'github:ros/rosdistro/d7014cf14d8a1f9883ee0f8f2c85b7dba4d09670?narHash=sha256-Wsp7x8fTVYCIunL9HFLCOI4WbeUau/kYLCss1VWrJMI%3D' (2024-10-03)

diff --git a/tmp/rosdistro-old.txt b/tmp/rosdistro-new.txt
index 1317c1c..ec1b8c0 100644
--- a/tmp/rosdistro-old.txt
+++ b/tmp/rosdistro-new.txt
@@ -30,0 +31 @@
+  nixos: [bandit]
@@ -45,0 +47 @@
+  nixos: [castxml]
@@ -66,0 +69,2 @@
+  nixos: [collectd]
+  nixos: [comedilib]
@@ -77,0 +82 @@
+  nixos: [dcraw]
@@ -78,0 +84 @@
+  nixos: [debian-devscripts]
@@ -106,0 +113 @@
+  nixos: [flawfinder]
@@ -110,0 +118 @@
+  nixos: [fluidsynth]
@@ -111,0 +120,2 @@
+  nixos: [noto-fonts]
+  nixos: [fping]
@@ -116,0 +127 @@
+  nixos: [fxload]
@@ -122,0 +134 @@
+  nixos: [gcovr]
@@ -135,0 +148 @@
+  nixos: [gitFull]
@@ -137,0 +151 @@
+  nixos: [glpk]
@@ -146,0 +161 @@
+  nixos: [gperf]
@@ -167,0 +183 @@
+  nixos: [haproxy]
@@ -186,0 +203 @@
+  nixos: [inxi]
@@ -205,0 +223 @@
+  nixos: [alglib]
@@ -281,0 +300 @@
+  nixos: [libepoxy]
@@ -284,0 +304,2 @@
+  nixos: [libevent]
+  nixos: [e2fsprogs]
@@ -298,0 +320 @@
+  nixos: [ftgl]
@@ -304,0 +327 @@
+  nixos: [geographiclib]
@@ -311,0 +335 @@
+  nixos: [glm]
@@ -574,0 +599 @@
+  nixos: [mpfr]
@@ -577,0 +603 @@
+  nixos: [msr-tools]
@@ -578,0 +605 @@
+  nixos: [nanoflann]
@@ -579,0 +607 @@
+  nixos: [nbtscan]
@@ -592,0 +621 @@
+  nixos: [nvidia_cg_toolkit]
@@ -593,0 +623 @@
+  nixos: [libodb]
@@ -595,0 +626 @@
+  nixos: [opencascade-occt]
@@ -613,0 +645 @@
+  nixos: [pigz]
@@ -619,0 +652,2 @@
+  nixos: [postfix]
+  nixos: [postgresql]
@@ -620,0 +655,2 @@
+  nixos: [postgresqlPackages.postgis]
+  nixos: [potrace]
@@ -668,0 +705 @@
+  nixos: [rsyslog]
@@ -682,0 +720 @@
+  nixos: [SDL2_image]
@@ -686,0 +725 @@
+  nixos: [emacsPackages.slime]
@@ -694,0 +734 @@
+  nixos: [speechd]
@@ -703,0 +744 @@
+  nixos: [swiProlog]
@@ -706,0 +748 @@
+  nixos: [systemd]
2024-10-04 15:52:13 +02:00
Michal Sojka
af42011236 Update nixpkgs and nix-ros-overlay
This fixes zsh CLI completion. For some magic reason, previously used
combination of versions produced completion file _ros2nix without
"#compdef ros2nix" on its first line, which breaks zsh completion
autoloading.

Switching of both nixpkgs and nix-ros-overlay to the latest versions
fixes the problem. Switching only one of these led to various other
problems, so we do both.
2024-10-03 00:24:28 +02:00
Michal Sojka
8a9f703575 Make ros2nix version (date-time) more human readable 2024-10-03 00:24:28 +02:00
Michal Sojka
8736e74512 Add FilesCompleter for package.xml parameter 2024-10-01 20:32:35 +02:00
Michal Sojka
0fd819b4a2 Add shell completion scripts 2024-10-01 13:01:16 +02:00
Michal Sojka
8528f3558f Fix errors when package.xml is in the current directory 2024-10-01 12:08:22 +02:00
Michal Sojka
2595123e12 Ignore --compare in the "Automatically generated" comment 2024-09-26 23:31:48 +02:00
Michal Sojka
33e6271b65 Make --compare print diffs 2024-09-26 23:31:14 +02:00
Michal Sojka
61f9d71bc8 Fix exception when printing an error message
pkg may not be always set.
2024-09-26 17:03:05 +02:00
github-actions[bot]
c0dcec99ca rosdistro update
Flake lock file updates:

• Updated input 'rosdistro':
    'github:ros/rosdistro/c4dae4aab7adf9aab23cabbfb0a485911c35cffb?narHash=sha256-S2F5k%2BmzSoZ3%2BMNg8VUsSSc4jOPSFkSEsG5C48p%2BKZc%3D' (2024-09-17)
  → 'github:ros/rosdistro/719a24cd571df99dcbf059d0b26ff6129877440a?narHash=sha256-aC4fmpKW5l6jva7sTM6msR%2BOT4NRg1xE46UUeLn8ddY%3D' (2024-09-23)

diff --git a/tmp/rosdistro-old.txt b/tmp/rosdistro-new.txt
index 1f81047..1317c1c 100644
--- a/tmp/rosdistro-old.txt
+++ b/tmp/rosdistro-new.txt
@@ -70,0 +71 @@
+  nixos: [cryptopp]
@@ -316 +317 @@
-  nixos: [libgpiod]
+  nixos: [libgpiod_1]
@@ -623,0 +625 @@
+  nixos: [grpc]
2024-09-24 15:22:40 +02:00
Michal Sojka
00044e9bad README: Fix heading level 2024-09-22 11:49:09 +02:00
Michal Sojka
8ca5a871ff Allow overriding nix-ros-overlay version 2024-09-22 10:58:27 +02:00
Michal Sojka
c6b1a2c507 Add --default and --no-default option 2024-09-22 09:39:30 +02:00
Michal Sojka
38d2f17d89 Add --no-overlay option 2024-09-22 09:38:49 +02:00
Michal Sojka
3315d0cd36 Extend README 2024-09-21 20:18:05 +02:00
Michal Sojka
11e7f90414 github: Prevent update action to fail when there are no changes 2024-09-18 15:26:15 +02:00
Michal Sojka
3cf992916a README: Update possible failure reasons 2024-09-18 10:30:29 +02:00
Michal Sojka
ecf83f90d9 Update --help 2024-09-18 10:07:34 +02:00
Michal Sojka
84bf4880ff Update --help 2024-09-18 10:03:00 +02:00
Michal Sojka
84eda8f295 Fix setuptools error
error: Multiple top-level packages discovered in a flat-layout: ['maint', 'ros2nix'].
2024-09-18 09:59:02 +02:00
github-actions[bot]
da6e6d83bd rosdistro update
Flake lock file updates:

• Updated input 'rosdistro':
    'github:ros/rosdistro/bab0a532400c16d89606a8c7fb450f26e6028745?narHash=sha256-Aj43AvXYn8etRXhyDc1RwJXV0g37NilmduevcYrcaZY%3D' (2024-08-25)
  → 'github:ros/rosdistro/c4dae4aab7adf9aab23cabbfb0a485911c35cffb?narHash=sha256-S2F5k%2BmzSoZ3%2BMNg8VUsSSc4jOPSFkSEsG5C48p%2BKZc%3D' (2024-09-17)

diff --git a/tmp/rosdistro-old.txt b/tmp/rosdistro-new.txt
index 8d82e43..1f81047 100644
--- a/tmp/rosdistro-old.txt
+++ b/tmp/rosdistro-new.txt
@@ -334,0 +335 @@
+  nixos: [perlPackages.ImageExifTool]
@@ -343,0 +345,2 @@
+  nixos: [lcm]
+  nixos: [lcm.dev]
@@ -361,0 +365,3 @@
+  nixos: [nanoflann]
+  nixos: [nanopb]
+  nixos: [ncurses]
@@ -589 +595 @@
-  nixos: [opencl-headers]
+  nixos: [opencl-clhpp]
@@ -712,0 +719 @@
+  nixos: [tshark]
@@ -713,0 +721 @@
+  nixos: [unclutter]
@@ -734,0 +743,3 @@
+  nixos: [wkhtmltopdf]
+  nixos: [wmctrl]
+  nixos: [workrave]
@@ -739,0 +751 @@
+  nixos: [xercesc]
@@ -741,0 +754 @@
+  nixos: [perlPackages.XMLXPath]
@@ -746,0 +760 @@
+  nixos: [xz]
@@ -995,0 +1010 @@
+  nixos: [python3Packages.influxdb]
@@ -1032,0 +1048 @@
+  nixos: [python312Packages.owslib]
@@ -1097,0 +1114,2 @@
+  nixos: [python3Packages.seaborn]
+  nixos: [python3Packages.segno]
2024-09-18 09:29:36 +02:00
Michal Sojka
527b8460e5 Move rosdistro updating to a separate script
... and fix bugs
2024-09-18 09:26:00 +02:00
Michal Sojka
ee76acc9c9 Update rosdistro only when necessary 2024-09-18 09:06:27 +02:00
Michal Sojka
2fd2d627ae github: Update rosdistro update workflow 2024-09-18 08:18:40 +02:00
Michal Sojka
f6d9f91eb1 Update CI workflow 2024-09-18 08:16:31 +02:00
Michal Sojka
c087166c38 github: Update rosdistro update workflow 2024-09-18 08:14:37 +02:00
Michal Sojka
fecc76a754 github: Add automatic rosdistro update 2024-09-18 07:57:56 +02:00
Michal Sojka
fa777c4ec2 README: Remove WiP note 2024-09-18 00:03:51 +02:00
Michal Sojka
2ac42b76ca README: Fix TIP 2024-09-18 00:01:55 +02:00
Michal Sojka
52f87e6e8c README: Document how to nixify 3rd-party packages 2024-09-17 23:56:38 +02:00
Michal Sojka
28f4ce2673 README: Add basic info 2024-09-16 17:26:07 +02:00
Michal Sojka
245c8972a1 Improve CI 2024-09-16 14:02:58 +02:00
Michal Sojka
3b52a81623 Add github action workflow 2024-09-16 12:52:25 +02:00
Michal Sojka
3fc1fcf337 Update README 2024-09-16 08:26:46 +02:00
Michal Sojka
59cfa1be32 Use mdsh during nix flake check 2024-09-16 08:26:07 +02:00
Michal Sojka
c4bc177658 Add --do-check 2024-09-16 08:19:34 +02:00