From 1f9787cf112ebc82be6000c4bd1c09b7dc88c319 Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Thu, 6 Feb 2025 17:40:53 -0500
Subject: Update nixpkgs and stupid fixes

Some things got through the CI system, probably during updates. So I had more
stupid little fixes to do. I should really improve bild to the point that these
won't happen anymore and builds don't take so long.
---
 Omni/Bild/Deps.nix     |  2 --
 Omni/Bild/Sources.json | 12 ++++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'Omni/Bild')

diff --git a/Omni/Bild/Deps.nix b/Omni/Bild/Deps.nix
index 6f5cc5c..b410f3b 100644
--- a/Omni/Bild/Deps.nix
+++ b/Omni/Bild/Deps.nix
@@ -28,7 +28,5 @@ _self: super: {
 
   nostr-rs-relay = super.callPackage ./Deps/nostr-rs-relay.nix {};
 
-  ollama = super.unstable.ollama.override {acceleration = "cuda";};
-
   radicale = super.radicale.overrideAttrs (_old: {doCheck = false;});
 }
diff --git a/Omni/Bild/Sources.json b/Omni/Bild/Sources.json
index 5f9be22..5d43855 100644
--- a/Omni/Bild/Sources.json
+++ b/Omni/Bild/Sources.json
@@ -140,10 +140,10 @@
         "homepage": "",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9",
-        "sha256": "0zffg0m7rhdpk94df578wln5lw3plamadac86cd7cfjcb1n13xmm",
+        "rev": "030ba1976b7c0e1a67d9716b17308ccdab5b381e",
+        "sha256": "14rpk53mia7j0hr4yaf5m3b2d4lzjx8qi2rszxjhqq00pxzzr64w",
         "type": "tarball",
-        "url": "https://github.com/nixos/nixpkgs/archive/edf04b75c13c2ac0e54df5ec5c543e300f76f1c9.tar.gz",
+        "url": "https://github.com/nixos/nixpkgs/archive/030ba1976b7c0e1a67d9716b17308ccdab5b381e.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixos-mailserver": {
@@ -162,10 +162,10 @@
         "homepage": "",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ff0654c494b7484c4854ddabecdb91b0b7f7c4d0",
-        "sha256": "0iq3ygljsf28qzlawdxyipd467ha9chy75sj938wgvxc4qaaipk6",
+        "rev": "ceaea203f3ae1787b1bd13f021f686391696fc5b",
+        "sha256": "0dgmjq8sng8dbfkzkkmcigkgk5n4mlv6cljaqahhssppygi177q9",
         "type": "tarball",
-        "url": "https://github.com/nixos/nixpkgs/archive/ff0654c494b7484c4854ddabecdb91b0b7f7c4d0.tar.gz",
+        "url": "https://github.com/nixos/nixpkgs/archive/ceaea203f3ae1787b1bd13f021f686391696fc5b.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nvidia-patch-nixos": {
-- 
cgit v1.2.3