From 79390d4eea20ca15fd8e088345528f31ed5fad1e Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Sat, 21 Dec 2024 10:40:06 -0400 Subject: Upgrade to nixos-24.05 I think this is the only "supported" nixos version now. But in any case scipy seemed to be broken on the older version, and I couldn't build my code that uses llm. Also, this allows me to get rid of the bild.os-unstable thing for Beryllium, which was just a sitting timebomb of breaking stuff. There are a lot of changes here because ruff updated to the very latest, and it changed some minor lint things. Also with the new nixos I get a proper cgit module, and some other breaking changes needed fixing. --- Biz/Bild/Deps/inspekt3d.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Biz/Bild/Deps/inspekt3d.nix') diff --git a/Biz/Bild/Deps/inspekt3d.nix b/Biz/Bild/Deps/inspekt3d.nix index d1cf60e..a9dac3d 100644 --- a/Biz/Bild/Deps/inspekt3d.nix +++ b/Biz/Bild/Deps/inspekt3d.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, autoreconfHook, pkgconfig, guile, guile-opengl, mesa +{ stdenv, lib, autoreconfHook, pkg-config, guile, guile-opengl, mesa , glibcLocales, libfive, sources }: stdenv.mkDerivation { @@ -7,7 +7,7 @@ stdenv.mkDerivation { src = sources.inspekt3d; version = "unstable-2018-10-17"; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ guile glibcLocales mesa ]; propagatedBuildInputs = [ guile-opengl libfive ]; @@ -28,4 +28,3 @@ stdenv.mkDerivation { platforms = platforms.all; }; } - -- cgit v1.2.3