Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

Merge pull request #657 from VILLASframework/packaging-nix

Browse source 
packaging-nix: use the 22.11 release of nixpkgs
This commit is contained in:
Steffen Vogel 2023-06-14 18:13:27 +02:00 • committed by GitHub
commit 2397c88f79
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
packaging/nix/flake.lock generated
View file

@ -89,15 +89,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1686671746,
"narHash": "sha256-cPVdpUv+PzLuF6EFWPwtkT42Y6lomSA3npmW+Yzx878=",
"lastModified": 1686656800,
"narHash": "sha256-duScdQZNeZcde0JwmQ9W4XfqlO/Z24MDhlTq2MokuSM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4ab538636f64f624c49cef4393d1a0d4ebf12a66",
"rev": "2b273c2351fe1ab490158cf8acc8aafad02592ce",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-22.11",
"repo": "nixpkgs",
"type": "github"
}

2
packaging/nix/flake.nix
View file

@ -2,7 +2,7 @@
description = "a tool for connecting real-time power grid simulation equipment";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs";
nixpkgs.url = "github:NixOS/nixpkgs/release-22.11";
common = {
url = "github:VILLASframework/common";

11
packaging/nix/villas.nix
View file

@ -7,19 +7,19 @@
withAllHooks ? false,
withAllNodes ? false,
withExtraConfig ? withAllExtras,
withExtraGraphviz ? false, # unknown type boolean in villas-graph
withExtraGraphviz ? withAllExtras,
withFormatProtobuf ? withAllFormats,
withHookLua ? false, # deprecated functions
withNodeAmqp ? false, # deprecated functions
withHookLua ? withAllHooks,
withNodeAmqp ? withAllNodes,
withNodeComedi ? withAllNodes,
withNodeFpga ? false, # spdlog formatting error
withNodeFpga ? false, # submodule commit has warnings and master broke the interface
withNodeIec60870 ? withAllNodes,
withNodeIec61850 ? withAllNodes,
withNodeInfiniband ? withAllNodes,
withNodeKafka ? withAllNodes,
withNodeMqtt ? withAllNodes,
withNodeNanomsg ? withAllNodes,
withNodeRedis ? false, # spdlog formatting error
withNodeRedis ? withAllNodes,
withNodeRtp ? withAllNodes,
withNodeSocket ? withAllNodes,
withNodeTemper ? withAllNodes,
@ -73,7 +73,6 @@ stdenv.mkDerivation {
[
"-DDOWNLOAD_GO=OFF"
"-DCMAKE_BUILD_TYPE=Release"
"-DCMAKE_CXX_FLAGS_RELEASE=-Wno-error=maybe-uninitialized"
]
++ lib.optionals withFormatProtobuf ["-DCMAKE_FIND_ROOT_PATH=${protobufcBuildBuild}/bin"];
preConfigure = ''