Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 3 additions & 9 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -163,28 +163,22 @@
reuse
cppcheck
pre-commit
ruby # for pre-commit markdownlint hook
ruby # For pre-commit markdownlint hook
];

mkShellFor =
stdenv: pkg:
stdenv.mkDerivation {
name = "${pkg.pname}-${stdenv.cc.cc.pname}-devShell";

# disable all hardening to suppress warnings in debug builds
# Disable all hardening to suppress warnings in debug builds
hardeningDisable = [ "all" ];

# inherit inputs from pkg
# Inherit inputs from pkg
buildInputs = pkg.buildInputs ++ packages;
nativeBuildInputs = pkg.nativeBuildInputs ++ packages;
propagatedBuildInputs = pkg.propagatedBuildInputs;
propagatedNativeBuildInputs = pkg.propagatedNativeBuildInputs;

# configure nix-ld for pre-commit
env = {
NIX_LD = lib.fileContents "${stdenv.cc}/nix-support/dynamic-linker";
NIX_LD_LIBRARY_PATH = lib.makeLibraryPath [ pkgs.gcc-unwrapped.lib ];
};
};
in
rec {
Expand Down
7 changes: 5 additions & 2 deletions packaging/nix/opendssc.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@
# SPDX-License-Identifier: Apache-2.0
{
lib,
stdenv,
gcc14Stdenv,
cmake,
fetchsvn,
libuuid,
}:
stdenv.mkDerivation {

# We need to stick to gcc14 because OpenDSS is broken and doesn't build on GCC 15.
# See: https://sourceforge.net/p/electricdss/discussion/experts/thread/732634c990/
gcc14Stdenv.mkDerivation {
pname = "opendssc";
version = "10.1.0.1";

Expand Down
7 changes: 5 additions & 2 deletions packaging/nix/villas.nix
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
lib,
makeWrapper,
pkg-config,
stdenv,
gcc14Stdenv,
system,
# Optional dependencies
boxfort,
Expand Down Expand Up @@ -92,7 +92,10 @@
spdlog,
linuxHeaders,
}:
stdenv.mkDerivation {

# We need to stick to gcc14 because OpenDSS is broken and doesn't build on GCC 15.
# See: https://sourceforge.net/p/electricdss/discussion/experts/thread/732634c990/
gcc14Stdenv.mkDerivation {
inherit src version;
pname = "villas";
outputs = [
Expand Down
Loading