From 4e67ef22a7508150798413081bf8a5bb4adab6e5 Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Thu, 10 Aug 2023 21:10:24 -0400
Subject: Update nixpkgs to 23.05

---
 Biz/Bild.nix          | 9 ++++++---
 Biz/Bild/Deps.nix     | 2 --
 Biz/Bild/Sources.json | 8 ++++----
 Biz/Dev/Hardware.nix  | 3 ---
 4 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'Biz')

diff --git a/Biz/Bild.nix b/Biz/Bild.nix
index ca9223f..0391d84 100644
--- a/Biz/Bild.nix
+++ b/Biz/Bild.nix
@@ -35,7 +35,7 @@ rec {
       tasty-hunit tasty-quickcheck text neat-interpolation
       wai # can remove when removed from Biz.Log
     ]);
-    ghcPackageSetMin = private.ghcWith (hpkgs: with hpkgs; []);
+
   };
 
   # generally-useful things from nixpkgs
@@ -47,14 +47,17 @@ rec {
   # remove this when I switch to all-nix builds
   bildRuntimeDeps = with nixpkgs; [
     pkg-config
-    private.ghcPackageSetMin
-    gnutls
+    # this is just to get access to ghc-pkg in bild
+    (private.ghcWith (hpkgs: with hpkgs; []))
+
+    /* disable until nixified builds are complete
     rustc
     # c deps
     gcc gdb valgrind argp-standalone SDL
     # lisp deps
     guile
     (private.sbclWith (p: with p; [asdf alexandria])) # just enough to build Example.lisp
+    */
   ];
 
   # a standard nix build for `bild` - this should be the only hand-written
diff --git a/Biz/Bild/Deps.nix b/Biz/Bild/Deps.nix
index 20a5e34..8fc9fc8 100644
--- a/Biz/Bild/Deps.nix
+++ b/Biz/Bild/Deps.nix
@@ -43,8 +43,6 @@ in rec
 
   autogen = super.callPackage ./Deps/autogen.nix {};
 
-  gnutls = super.gnutls.override { guileBindings = true; };
-
   guile = super.guile_3_0;
 
   guile-opengl = super.callPackage ./Deps/guile-opengl.nix {};
diff --git a/Biz/Bild/Sources.json b/Biz/Bild/Sources.json
index ffeea03..6213d95 100644
--- a/Biz/Bild/Sources.json
+++ b/Biz/Bild/Sources.json
@@ -86,16 +86,16 @@
         "version": "master"
     },
     "nixpkgs": {
-        "branch": "nixos-22.11",
+        "branch": "nixos-23.05",
         "description": "Nix Packages collection",
         "homepage": "https://github.com/nixos/nixpkgs",
         "name": "nixpkgs",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "dac57a4eccf1442e8bf4030df6fcbb55883cb682",
-        "sha256": "025q5d9sjpamlbxyxzrisn3f6x8hnfx666favp0n59mfvh16hphb",
+        "rev": "61676e4dcfeeb058f255294bcb08ea7f3bc3ce56",
+        "sha256": "1rhzwbhf64lhqfjjmbyxaqhx5kwsxmdjq2gklnpb8hw37kblv7y3",
         "type": "tarball",
-        "url": "https://github.com/nixos/nixpkgs/archive/dac57a4eccf1442e8bf4030df6fcbb55883cb682.tar.gz",
+        "url": "https://github.com/nixos/nixpkgs/archive/61676e4dcfeeb058f255294bcb08ea7f3bc3ce56.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "regex-applicative": {
diff --git a/Biz/Dev/Hardware.nix b/Biz/Dev/Hardware.nix
index eaf1bd9..4d835aa 100644
--- a/Biz/Dev/Hardware.nix
+++ b/Biz/Dev/Hardware.nix
@@ -33,7 +33,4 @@
   swapDevices = [ ];
 
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-
-  # high-resolution display
-  hardware.video.hidpi.enable = lib.mkDefault true;
 }
-- 
cgit v1.2.3