robossembler/ros2nix
7
0
Fork 0
mirror of https://github.com/wentasah/ros2nix.git synced 2025-06-09 15:52:23 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Update nixpkgs and nix-ros-overlay

Browse source 
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.
This commit is contained in:
Michal Sojka 2024-10-03 00:05:04 +02:00
parent 8a9f703575
commit af42011236
2 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

29
flake.lock generated
View file

@ -53,35 +53,37 @@
"nix-ros-overlay": { "nix-ros-overlay": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs" "nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1712797796, "lastModified": 1727450207,
"narHash": "sha256-SkCWsnJ6H+LbXt7PLroXCPlb0k52+EG7WKEXtWjuNbI=", "narHash": "sha256-IYfuTysAvph03Iyc/XwuM04yd0qJhm/OtziZglwYys0=",
"owner": "lopsided98", "owner": "lopsided98",
"repo": "nix-ros-overlay", "repo": "nix-ros-overlay",
"rev": "e239e71fd2ce40ce1f7499328a4c92e9473fec88", "rev": "31e1e361f41a0e4116d4c34eb608931dfd101492",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "lopsided98", "owner": "lopsided98",
"ref": "master", "ref": "develop",
"repo": "nix-ros-overlay", "repo": "nix-ros-overlay",
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1707268954, "lastModified": 1727802920,
"narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=",
"owner": "lopsided98", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "lopsided98", "owner": "NixOS",
"ref": "nix-ros", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -91,10 +93,7 @@
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nix-ros-overlay": "nix-ros-overlay", "nix-ros-overlay": "nix-ros-overlay",
"nixpkgs": [ "nixpkgs": "nixpkgs",
"nix-ros-overlay",
"nixpkgs"
],
"rosdistro": "rosdistro" "rosdistro": "rosdistro"
} }
}, },

4
flake.nix
View file

@ -1,8 +1,8 @@
{ {
description = "Tool to convert ROS package.xml to Nix expressions compatible with nix-ros-overlay"; description = "Tool to convert ROS package.xml to Nix expressions compatible with nix-ros-overlay";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
inputs.flake-utils.url = "github:numtide/flake-utils"; inputs.flake-utils.url = "github:numtide/flake-utils";
inputs.nix-ros-overlay.url = "github:lopsided98/nix-ros-overlay/master"; inputs.nix-ros-overlay = { url = "github:lopsided98/nix-ros-overlay/develop"; inputs.nixpkgs.follows = "nixpkgs"; };
inputs.nixpkgs.follows = "nix-ros-overlay/nixpkgs";
inputs.rosdistro = { url = "github:ros/rosdistro"; flake = false; }; inputs.rosdistro = { url = "github:ros/rosdistro"; flake = false; };
inputs.flake-compat.url = "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"; inputs.flake-compat.url = "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz";