From dc08c73efe3edf6b74e9c853f158076eb5fa9ebc Mon Sep 17 00:00:00 2001
From: Troels Henriksen <athas@sigkill.dk>
Date: Thu, 15 Aug 2024 16:11:40 +0200
Subject: [PATCH] Bump Nix.

---
 nix/sources.json |  6 +++---
 shell.nix        | 25 ++++++++++++++-----------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/nix/sources.json b/nix/sources.json
index 64bb208e41..36cd35c834 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -17,10 +17,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a39290dfdf0a769a3fda56b61fdf40f7d9db7ea1",
-        "sha256": "0yaww493m6zlfhjh9xwh7vi1iqwkdw9s4dq6xsj2wcfwwpmg0lym",
+        "rev": "0f1874526206d8a2d6f0a3925618cc45ac83049f",
+        "sha256": "0fab3015jdy6dsrjcsa8ipsl4pr7cizg8bs3ff2dawxfgrgizyqp",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/a39290dfdf0a769a3fda56b61fdf40f7d9db7ea1.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/0f1874526206d8a2d6f0a3925618cc45ac83049f.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }
diff --git a/shell.nix b/shell.nix
index cf8424a2be..c9700e3f7e 100644
--- a/shell.nix
+++ b/shell.nix
@@ -2,6 +2,8 @@
 let
   sources = import ./nix/sources.nix;
   pkgs = import sources.nixpkgs {};
+  python = pkgs.python311Packages;
+  haskell = pkgs.haskell.packages.ghc96;
 in
 pkgs.stdenv.mkDerivation {
   name = "futhark";
@@ -14,10 +16,10 @@ pkgs.stdenv.mkDerivation {
       file
       git
       parallel
-      haskell.compiler.ghc94
+      haskell.ghc
       ormolu
-      haskell.packages.ghc94.weeder
-      #haskell.packages.ghc94.haskell-language-server
+      haskell.weeder
+      haskell.haskell-language-server
       haskellPackages.graphmod
       haskellPackages.apply-refact
       xdot
@@ -29,14 +31,15 @@ pkgs.stdenv.mkDerivation {
       ghcid
       niv
       ispc
-      python3Packages.mypy
-      python3Packages.black
-      python3Packages.numpy
-      python3Packages.pyopencl
-      python3Packages.matplotlib
-      python3Packages.jsonschema
-      python3Packages.sphinx
-      python3Packages.sphinxcontrib-bibtex
+      python.python
+      python.mypy
+      python.black
+      python.numpy
+      python.pyopencl
+      python.matplotlib
+      python.jsonschema
+      python.sphinx
+      python.sphinxcontrib-bibtex
       imagemagick # needed for literate tests
     ]
     ++ lib.optionals (stdenv.isLinux)