From 54c66028c1a5a57e9da36a11a36a6b12f774c27d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 29 Dec 2024 01:10:59 +0000 Subject: [PATCH 1/6] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/d70bd19e0a38ad4790d3913bf08fcbfc9eeca507?narHash=sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ%3D' (2024-12-19) → 'github:NixOS/nixpkgs/634fd46801442d760e09493a794c4f15db2d0cbb?narHash=sha256-NYVcA06%2BblsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M%3D' (2024-12-27) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index ed51638..ab87732 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1735291276, + "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", "type": "github" }, "original": { From 24821deaa285cbf0a156d78f56531fa6460bf409 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Sun, 29 Dec 2024 15:35:03 +0100 Subject: [PATCH 2/6] update-flake-lock: run CI --- .github/workflows/update-flake-lock.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/update-flake-lock.yml b/.github/workflows/update-flake-lock.yml index 9f01b4e..15dbe6d 100644 --- a/.github/workflows/update-flake-lock.yml +++ b/.github/workflows/update-flake-lock.yml @@ -15,3 +15,5 @@ jobs: uses: DeterminateSystems/nix-installer-action@main - name: Update flake.lock uses: DeterminateSystems/update-flake-lock@main + with: + token: ${{ secrets.GH_TOKEN_FOR_UPDATES }} From 00376360f428fc9ae73cc5ad316f8bae8a4a6a6b Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Sun, 29 Dec 2024 17:12:17 +0100 Subject: [PATCH 3/6] nix flake update --- flake.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index ab87732..1b6adb9 100644 --- a/flake.lock +++ b/flake.lock @@ -108,7 +108,7 @@ "patch-hpp": { "flake": false, "locked": { - "narHash": "sha256-PjUvva7/n33obAxwVXrR9W/3j9qGGa1Sh6oG4q/Rl5M=", + "narHash": "sha256-wMDWz+rdEKctYHrcV2ujA+/0q/1okXejipRZKuvmwX4=", "type": "file", "url": "https://github.com/NixOS/nixpkgs/pull/362956.patch" }, From 9f7bd9dffc8d179e57ba0cbd659f38cddff9d8c4 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Sun, 29 Dec 2024 18:24:29 +0100 Subject: [PATCH 4/6] track lopsided98/nixpkgs/nix-ros --- flake.lock | 51 ++++++++++++++++++++++++++------------------------- flake.nix | 20 +++----------------- 2 files changed, 29 insertions(+), 42 deletions(-) diff --git a/flake.lock b/flake.lock index 1b6adb9..467a1f2 100644 --- a/flake.lock +++ b/flake.lock @@ -36,21 +36,19 @@ "nix-ros-overlay": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1733694898, - "narHash": "sha256-AEs2yV+XNGe+gyWRD5gEkZ27H+vHasljbVxx8qmU+Sk=", - "owner": "nim65s", + "lastModified": 1731728011, + "narHash": "sha256-TzKPxouvrol38ng/VmHkNxObdon0taXHhcPmo/09cJo=", + "owner": "lopsided98", "repo": "nix-ros-overlay", - "rev": "78425c2056cb9324bea4ab0d6fffe420605c5c16", + "rev": "c3e6e964fcdd917193dca68cc5cb16f128fe5e1b", "type": "github" }, "original": { - "owner": "nim65s", - "ref": "pin", + "owner": "lopsided98", + "ref": "master", "repo": "nix-ros-overlay", "type": "github" } @@ -58,7 +56,7 @@ "nixgl": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1713543440, @@ -76,31 +74,31 @@ }, "nixpkgs": { "locked": { - "lastModified": 1660551188, - "narHash": "sha256-a1LARMMYQ8DPx1BgoI/UN4bXe12hhZkCNqdxNi6uS0g=", - "owner": "nixos", + "lastModified": 1726243404, + "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", + "owner": "lopsided98", "repo": "nixpkgs", - "rev": "441dc5d512153039f19ef198e662e4f3dbb9fd65", + "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", "type": "github" }, "original": { - "owner": "nixos", + "owner": "lopsided98", + "ref": "nix-ros", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1735291276, - "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", - "owner": "NixOS", + "lastModified": 1660551188, + "narHash": "sha256-a1LARMMYQ8DPx1BgoI/UN4bXe12hhZkCNqdxNi6uS0g=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", + "rev": "441dc5d512153039f19ef198e662e4f3dbb9fd65", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", + "owner": "nixos", "repo": "nixpkgs", "type": "github" } @@ -108,20 +106,23 @@ "patch-hpp": { "flake": false, "locked": { - "narHash": "sha256-wMDWz+rdEKctYHrcV2ujA+/0q/1okXejipRZKuvmwX4=", + "narHash": "sha256-H3FDc6QA501TMwwnWuLdpudnEiyPvDWnuMazZ3pNsdE=", "type": "file", - "url": "https://github.com/NixOS/nixpkgs/pull/362956.patch" + "url": "https://github.com/nim65s/nixpkgs/pull/1.patch" }, "original": { "type": "file", - "url": "https://github.com/NixOS/nixpkgs/pull/362956.patch" + "url": "https://github.com/nim65s/nixpkgs/pull/1.patch" } }, "root": { "inputs": { "nix-ros-overlay": "nix-ros-overlay", "nixgl": "nixgl", - "nixpkgs": "nixpkgs_2", + "nixpkgs": [ + "nix-ros-overlay", + "nixpkgs" + ], "patch-hpp": "patch-hpp" } }, diff --git a/flake.nix b/flake.nix index c724833..ff99e34 100644 --- a/flake.nix +++ b/flake.nix @@ -1,27 +1,13 @@ { inputs = { - ## TODO: this is the expected use - # we can't do that for now, and therefore we are loosing ros.cachix.org - #nix-ros-overlay.url = "github:lopsided98/nix-ros-overlay/master"; - #nixpkgs.follows = "nix-ros-overlay/nixpkgs"; # IMPORTANT!!! - - # ref. https://github.com/lopsided98/nix-ros-overlay/pull/538: ros pinocchio is nixpkgs pinocchio - nix-ros-overlay = { - url = "github:nim65s/nix-ros-overlay/pin"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - # nix-ros-overlay.inputs.nixpkgs is too old for now, - # patching packages which were moved to by-name is tedious, - # so let's switch to upstream for now. - # We'll have to compile / cache ROS stuff we need to gepetto.cachix.org for now. - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nix-ros-overlay.url = "github:lopsided98/nix-ros-overlay/master"; + nixpkgs.follows = "nix-ros-overlay/nixpkgs"; ## Patches for nixpkgs # init HPP v6.0.0 # also: hpp-fcl v2.4.5 -> coal v3.0.0 patch-hpp = { - url = "https://github.com/NixOS/nixpkgs/pull/362956.patch"; + url = "https://github.com/nim65s/nixpkgs/pull/1.patch"; flake = false; }; From 3e1d7933616ed38d9896cbc0a6a17f366fce0072 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Sun, 29 Dec 2024 18:25:49 +0100 Subject: [PATCH 5/6] leverage ros.cachix.org --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 483f69e..f573cec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,4 +18,5 @@ jobs: with: name: gepetto authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' + extraPullNames: ros - run: nix build -L .#devShells.x86_64-linux.pure From 8f5d4cd6256eb6eb335c0ab41365653fd2b310b9 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Sun, 29 Dec 2024 18:27:47 +0100 Subject: [PATCH 6/6] nix flake update --override-input nix-ros-overlay github:lopsided98/nix-ros-overlay/develop --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 467a1f2..0367907 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -39,11 +39,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1731728011, - "narHash": "sha256-TzKPxouvrol38ng/VmHkNxObdon0taXHhcPmo/09cJo=", + "lastModified": 1734738170, + "narHash": "sha256-6IWJGVYww4IRPvwZIqZXEVEn6Msl6WtZfyWXlurGQpw=", "owner": "lopsided98", "repo": "nix-ros-overlay", - "rev": "c3e6e964fcdd917193dca68cc5cb16f128fe5e1b", + "rev": "3f0195fb5d5dd678cb92c327214b50afd56fb728", "type": "github" }, "original": { @@ -74,11 +74,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726243404, - "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", + "lastModified": 1733581040, + "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", "owner": "lopsided98", "repo": "nixpkgs", - "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", + "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", "type": "github" }, "original": {