From 254a45c173e65507941806189f84ab5ffdbf8fe3 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Wed, 29 Jul 2026 10:40:43 +0200 Subject: [PATCH 1/4] fix(nix): Remove nix-ld env vars which break dev shell with Lix Signed-off-by: Steffen Vogel --- flake.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/flake.nix b/flake.nix index c7484f02a..c20560318 100644 --- a/flake.nix +++ b/flake.nix @@ -179,12 +179,6 @@ 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 { From e89b7d0c03c429e3b9df9f3b8dfb6dc2f8666a50 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Wed, 29 Jul 2026 10:42:14 +0200 Subject: [PATCH 2/4] fix(style): Make comments start with uppercase letter in Nix files Signed-off-by: Steffen Vogel --- flake.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index c20560318..25db1bef6 100644 --- a/flake.nix +++ b/flake.nix @@ -163,7 +163,7 @@ reuse cppcheck pre-commit - ruby # for pre-commit markdownlint hook + ruby # For pre-commit markdownlint hook ]; mkShellFor = @@ -171,10 +171,10 @@ 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; From b5ca1db5e289a0e7b0463a084347bef638f5a1f7 Mon Sep 17 00:00:00 2001 From: Philipp Jungkamp Date: Wed, 29 Jul 2026 10:57:40 +0200 Subject: [PATCH 3/4] nix: Pin villas and opendss to gcc14Stdenv Signed-off-by: Philipp Jungkamp Signed-off-by: Steffen Vogel --- packaging/nix/opendssc.nix | 7 +++++-- packaging/nix/villas.nix | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/packaging/nix/opendssc.nix b/packaging/nix/opendssc.nix index a93abf624..f2dd203b4 100644 --- a/packaging/nix/opendssc.nix +++ b/packaging/nix/opendssc.nix @@ -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"; diff --git a/packaging/nix/villas.nix b/packaging/nix/villas.nix index 246150a67..2826816c0 100644 --- a/packaging/nix/villas.nix +++ b/packaging/nix/villas.nix @@ -46,7 +46,7 @@ lib, makeWrapper, pkg-config, - stdenv, + gcc14Stdenv, system, # Optional dependencies boxfort, @@ -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 = [ From d83a1882a6e5c477e439196f7260d983837a431c Mon Sep 17 00:00:00 2001 From: Philipp Jungkamp Date: Wed, 29 Jul 2026 11:23:27 +0200 Subject: [PATCH 4/4] flake: Update Signed-off-by: Philipp Jungkamp Signed-off-by: Steffen Vogel --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 85306af64..cbc90502f 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1756696532, - "narHash": "sha256-6FWagzm0b7I/IGigOv9pr6LL7NQ86mextfE8g8Q6HBg=", + "lastModified": 1785141334, + "narHash": "sha256-kh35kIx7el4Jk8Ki3BH9/Pn1eZYSYLJ6LMALos0zOy0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "58dcbf1ec551914c3756c267b8b9c8c86baa1b2f", + "rev": "38a4887411571457d700c51c64a6e49ead2ed5ab", "type": "github" }, "original": {