From 7036f7aac87a36b55609047ade03fa9e62bfea8b Mon Sep 17 00:00:00 2001
From: Ruben Astudillo <ruben.astud@gmail.com>
Date: Mon, 1 May 2023 11:21:59 -0400
Subject: [PATCH] Fix flake.nix definition to work with more recent nixpkgs
 snapshots (#266)

* Rework flake.nix

* Add devShell environment on flake.nix

* Update flake.lock
---
 flake.lock      |  6 +++---
 flake.nix       |  8 ++++++++
 nix/monomer.nix |  2 +-
 nix/qemu.nix    | 16 ++++++++--------
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/flake.lock b/flake.lock
index 2fe0f0c1..8d4a2bbe 100644
--- a/flake.lock
+++ b/flake.lock
@@ -18,11 +18,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1629366148,
-        "narHash": "sha256-CIfmrcptxXiCVH9UCKRq44IHcSW8WQ8yQQPTavOpUF8=",
+        "lastModified": 1682554371,
+        "narHash": "sha256-UYm0a60XOmBDBQqgySDRN8LUV5xWZn26OzjTCeVrYDs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b5c2212cdfceb727b072223e460eb7dcefbc4062",
+        "rev": "dc9fe27b825a4196fe81a583eb3a174da847660e",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 92c455bf..5b1eefbb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -29,5 +29,13 @@
         };
         defaultPackage = packages.monomer;
         defaultApp = apps.tutorial;
+        devShell = haskellPackages.shellFor {
+          packages = p: [ packages.monomer ];
+          withHoogle = true;
+          buildInputs = with haskellPackages; [
+            haskell-language-server
+            cabal-install
+          ];
+        };
       });
 }
diff --git a/nix/monomer.nix b/nix/monomer.nix
index 4e937533..f340ae8c 100644
--- a/nix/monomer.nix
+++ b/nix/monomer.nix
@@ -16,7 +16,7 @@ with super.haskellPackages.extend (self: super:
       rev = "283516a337c4d3606555728df0a39294e78a7cdf";
       sha256 = "1vggli76ijqmx633yix4yg5dv58a14p8561jnprjc061sjngphzv";
     }) "-fexamples -fstb_truetype" {
-      inherit GLEW glew libGL libGLU;
+      inherit glew libGL libGLU;
       inherit (xorg) libX11;
     });
     GLEW = glew;
diff --git a/nix/qemu.nix b/nix/qemu.nix
index 3a3fa6cb..fbe044cf 100644
--- a/nix/qemu.nix
+++ b/nix/qemu.nix
@@ -92,14 +92,14 @@ in rec {
             };
           };
 
-          virtualisation = {
-            graphics = true;
-            cores = 4;
-            qemu.networkingOptions = [
-              "-device virtio-net-pci,netdev=user.0"
-              "-netdev type=user,id=user.0\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}"
-            ];
-          };
+          # virtualisation = {
+          #   graphics = true;
+          #   cores = 4;
+          #   qemu.networkingOptions = [
+          #     "-device virtio-net-pci,netdev=user.0"
+          #     "-netdev type=user,id=user.0\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}"
+          #   ];
+          # };
         };
     }).vm;
   };