1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-30 00:00:11 +01:00

nix: Remove fpga and common inputs

Signed-off-by: Steffen Vogel <post@steffenvogel.de>
This commit is contained in:
Steffen Vogel 2024-02-29 19:42:13 +01:00
parent 5f42f09a87
commit 38f649a11d
3 changed files with 0 additions and 57 deletions

36
flake.lock generated
View file

@ -1,21 +1,5 @@
{ {
"nodes": { "nodes": {
"common": {
"flake": false,
"locked": {
"lastModified": 1707903631,
"narHash": "sha256-zC6uc/lvaURWsQ0m/inmwVkGmJrryq4HpXucnQOghIw=",
"owner": "VILLASframework",
"repo": "common",
"rev": "15e338d2be87d7d4d54ec9735ccd055b2abff084",
"type": "github"
},
"original": {
"owner": "VILLASframework",
"repo": "common",
"type": "github"
}
},
"ethercat": { "ethercat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -33,24 +17,6 @@
"type": "gitlab" "type": "gitlab"
} }
}, },
"fpga": {
"flake": false,
"locked": {
"lastModified": 1708962818,
"narHash": "sha256-gau5GKP2n+m+AbaELyqeECg2vjKIgUiHY52LdQmMja4=",
"ref": "refs/heads/master",
"rev": "b71fdbec7deeea6d178cfe184d4ad7b3da758d4f",
"revCount": 598,
"submodules": true,
"type": "git",
"url": "https://github.com/VILLASframework/fpga.git"
},
"original": {
"submodules": true,
"type": "git",
"url": "https://github.com/VILLASframework/fpga.git"
}
},
"lib60870": { "lib60870": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -122,9 +88,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"common": "common",
"ethercat": "ethercat", "ethercat": "ethercat",
"fpga": "fpga",
"lib60870": "lib60870", "lib60870": "lib60870",
"libdatachannel": "libdatachannel", "libdatachannel": "libdatachannel",
"libiec61850": "libiec61850", "libiec61850": "libiec61850",

View file

@ -6,18 +6,6 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/release-23.05"; nixpkgs.url = "github:NixOS/nixpkgs/release-23.05";
common = {
url = "github:VILLASframework/common";
flake = false;
};
fpga = {
type = "git";
url = "https://github.com/VILLASframework/fpga.git";
submodules = true;
flake = false;
};
ethercat = { ethercat = {
url = "gitlab:etherlab.org/ethercat/stable-1.5"; url = "gitlab:etherlab.org/ethercat/stable-1.5";
flake = false; flake = false;
@ -106,7 +94,6 @@
villas-minimal = pkgs.callPackage (nixDir + "/villas.nix") { villas-minimal = pkgs.callPackage (nixDir + "/villas.nix") {
src = ./.; src = ./.;
version = "minimal"; version = "minimal";
inherit (inputs) fpga common;
}; };
villas = villas-minimal.override { villas = villas-minimal.override {

View file

@ -37,9 +37,7 @@
withNodeZeromq ? withAllNodes, withNodeZeromq ? withAllNodes,
# Minimal dependencies # Minimal dependencies
cmake, cmake,
common,
coreutils, coreutils,
fpga,
graphviz, graphviz,
jq, jq,
lib, lib,
@ -90,12 +88,6 @@ stdenv.mkDerivation {
postPatch = '' postPatch = ''
patchShebangs --host ./tools patchShebangs --host ./tools
''; '';
preConfigure = ''
rm -df common
rm -df fpga
ln -s ${common} common
${lib.optionalString withNodeFpga "ln -s ${fpga} fpga"}
'';
postInstall = '' postInstall = ''
if [ -d $out/include/villas/ ] && [ -d $dev/include/villas/ ]; then if [ -d $out/include/villas/ ] && [ -d $dev/include/villas/ ]; then
mv $out/include/villas/* $dev/include/villas/ mv $out/include/villas/* $dev/include/villas/