flake-utils inputs optimisation

This commit is contained in:
Igor Brylyov 2024-02-09 14:26:08 +03:00
parent 20e99e027a
commit 4b2babc858
2 changed files with 7 additions and 37 deletions

40
flake.lock generated
View file

@ -4,24 +4,6 @@
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
}, },
"locked": {
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": { "locked": {
"lastModified": 1689068808, "lastModified": 1689068808,
"narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
@ -70,14 +52,17 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": [
"ros-flake",
"flake-utils"
],
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"ros-flake": "ros-flake" "ros-flake": "ros-flake"
} }
}, },
"ros-flake": { "ros-flake": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
@ -109,21 +94,6 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -2,7 +2,7 @@
description = "Robossembler Development Environments on Nix"; description = "Robossembler Development Environments on Nix";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs?ref=master"; nixpkgs.url = "github:NixOS/nixpkgs?ref=master";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.follows = "ros-flake/flake-utils";
ros-flake.url = "github:lopsided98/nix-ros-overlay?ref=develop"; ros-flake.url = "github:lopsided98/nix-ros-overlay?ref=develop";
}; };
@ -76,7 +76,7 @@
}; };
packages = { packages = {
inherit mayo pysdf fstl unified-planning test-script; inherit mayo pysdf fstl unified-planning test-script blender;
zoz = pkgs.btop; zoz = pkgs.btop;
}; };