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.hs | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

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

diff --git a/Biz/Bild/Deps.hs b/Biz/Bild/Deps.hs
index 2b2a72a..e268a74 100644
--- a/Biz/Bild/Deps.hs
+++ b/Biz/Bild/Deps.hs
@@ -416,10 +416,9 @@ parseCmdUpdate =
         Opts.headerDoc
           <| Just
           <| Opts.nest 2
-          <| "Examples:"
-          Opts.<$$> ""
-          Opts.<$$> Opts.vcat
-            [ Opts.fill 30 "deps update" Opts.<+> "# update all packages",
+          <| Opts.vcat
+            [ "Examples:",
+              Opts.fill 30 "deps update" Opts.<+> "# update all packages",
               Opts.fill 30 "deps update nixpkgs" Opts.<+> "# update nixpkgs",
               Opts.fill 30 "deps update my-package -v beta-0.2" Opts.<+> "# update my-package to version \"beta-0.2\""
             ]
@@ -507,10 +506,12 @@ parseCmdModify =
         Opts.progDesc "Modify dependency attributes without performing an update",
         Opts.headerDoc
           <| Just
-          <| "Examples:"
-          Opts.<$$> ""
-          Opts.<$$> "  niv modify nixpkgs -v beta-0.2"
-          Opts.<$$> "  niv modify nixpkgs -a branch=nixpkgs-unstable"
+          <| Opts.vcat
+            [ "Examples:",
+              "",
+              "  niv modify nixpkgs -v beta-0.2",
+              "  niv modify nixpkgs -a branch=nixpkgs-unstable"
+            ]
       ]
     optName =
       Opts.optional
@@ -556,10 +557,12 @@ parseCmdDrop =
         Opts.progDesc "Drop dependency",
         Opts.headerDoc
           <| Just
-          <| "Examples:"
-          Opts.<$$> ""
-          Opts.<$$> "  niv drop jq"
-          Opts.<$$> "  niv drop my-package version"
+          <| Opts.vcat
+            [ "Examples:",
+              "",
+              "  niv drop jq",
+              "  niv drop my-package version"
+            ]
       ]
     parseDropAttributes :: Opts.Parser [T.Text]
     parseDropAttributes =
-- 
cgit v1.2.3