From af420112361628578a309e60a4324984b11969ef Mon Sep 17 00:00:00 2001
From: Michal Sojka <michal.sojka@cvut.cz>
Date: Thu, 3 Oct 2024 00:05:04 +0200
Subject: [PATCH] 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.
---
 flake.lock | 29 ++++++++++++++---------------
 flake.nix  |  4 ++--
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/flake.lock b/flake.lock
index 811177c..8a6bfb3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -53,35 +53,37 @@
     "nix-ros-overlay": {
       "inputs": {
         "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1712797796,
-        "narHash": "sha256-SkCWsnJ6H+LbXt7PLroXCPlb0k52+EG7WKEXtWjuNbI=",
+        "lastModified": 1727450207,
+        "narHash": "sha256-IYfuTysAvph03Iyc/XwuM04yd0qJhm/OtziZglwYys0=",
         "owner": "lopsided98",
         "repo": "nix-ros-overlay",
-        "rev": "e239e71fd2ce40ce1f7499328a4c92e9473fec88",
+        "rev": "31e1e361f41a0e4116d4c34eb608931dfd101492",
         "type": "github"
       },
       "original": {
         "owner": "lopsided98",
-        "ref": "master",
+        "ref": "develop",
         "repo": "nix-ros-overlay",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1707268954,
-        "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=",
-        "owner": "lopsided98",
+        "lastModified": 1727802920,
+        "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1",
+        "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515",
         "type": "github"
       },
       "original": {
-        "owner": "lopsided98",
-        "ref": "nix-ros",
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -91,10 +93,7 @@
         "flake-compat": "flake-compat",
         "flake-utils": "flake-utils",
         "nix-ros-overlay": "nix-ros-overlay",
-        "nixpkgs": [
-          "nix-ros-overlay",
-          "nixpkgs"
-        ],
+        "nixpkgs": "nixpkgs",
         "rosdistro": "rosdistro"
       }
     },
diff --git a/flake.nix b/flake.nix
index c40759b..f4b079a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,8 +1,8 @@
 {
   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.nix-ros-overlay.url = "github:lopsided98/nix-ros-overlay/master";
-  inputs.nixpkgs.follows = "nix-ros-overlay/nixpkgs";
+  inputs.nix-ros-overlay = { url = "github:lopsided98/nix-ros-overlay/develop"; inputs.nixpkgs.follows = "nixpkgs"; };
   inputs.rosdistro = { url = "github:ros/rosdistro"; flake = false; };
   inputs.flake-compat.url = "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz";