From 79390d4eea20ca15fd8e088345528f31ed5fad1e Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
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.nix | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'Biz/Bild/Deps.nix')

diff --git a/Biz/Bild/Deps.nix b/Biz/Bild/Deps.nix
index 46fa00f..23b096d 100644
--- a/Biz/Bild/Deps.nix
+++ b/Biz/Bild/Deps.nix
@@ -1,13 +1,9 @@
 _self: super:
 
 {
-  autogen = super.callPackage ./Deps/autogen.nix { };
+  # Needs upgrading for guile 3
+  # inspekt3d = super.callPackage ./Deps/inspekt3d.nix {};
 
-  guile = super.guile_3_0;
-
-  guile-opengl = super.callPackage ./Deps/guile-opengl.nix { };
-  # The libfive build is broken...
-  #inspekt3d = super.callPackage ./Deps/inspekt3d.nix {};
   guix = super.pkgs.stdenv.mkDerivation rec {
     pname = "guix";
     name = "${pname}-${version}";
@@ -35,4 +31,15 @@ _self: super:
   nostr-rs-relay = super.callPackage ./Deps/nostr-rs-relay.nix { };
 
   ollama = super.callPackage ./Deps/ollama.nix { acceleration = "cuda"; };
+
+  # https://github.com/NixOS/nixpkgs/issues/317147#issuecomment-2147343125
+  radicale = super.radicale.overrideAttrs (_old: rec {
+    version = "3.2.0";
+    src = super.fetchFromGitHub {
+      owner = "Kozea";
+      repo = "Radicale";
+      rev = "v${version}";
+      hash = "sha256-RxC8VOfdTXJZiAroDHTKjJqGWu65Z5uyb4WK1LOqubQ=";
+    };
+  });
 }
-- 
cgit v1.2.3