From 8840689a60ce5ced1d5b21b47fd17287b2fffd29 Mon Sep 17 00:00:00 2001
From: Connor Prussin <connor@prussin.net>
Date: Sat, 20 Nov 2021 09:35:08 -0800
Subject: [PATCH] Upgrade sources

---
 shell.nix    | 10 +++-------
 sources.json | 24 ++++++------------------
 2 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/shell.nix b/shell.nix
index 5facd7d..9b710d8 100644
--- a/shell.nix
+++ b/shell.nix
@@ -12,17 +12,13 @@ let
       '';
     };
   };
-  purs-tidy-overlay = pkgs: _: {
-    inherit (import sources.easy-purescript-nix { inherit pkgs; }) purs-tidy;
-  };
-  unstable-packages-overlay = _: _: {
-    inherit (import sources.nixpkgs-unstable {}) purescript;
+  easy-purescript-nix-overlay = pkgs: _: {
+    inherit (import sources.easy-purescript-nix { inherit pkgs; }) purescript purs-tidy spago;
   };
   pkgs = import sources.nixpkgs {
     overlays = [
       niv-overlay
-      purs-tidy-overlay
-      unstable-packages-overlay
+      easy-purescript-nix-overlay
     ];
   };
   build = pkgs.writeShellScriptBin "build" ''
diff --git a/sources.json b/sources.json
index d2980a0..0e876de 100644
--- a/sources.json
+++ b/sources.json
@@ -5,10 +5,10 @@
         "homepage": "",
         "owner": "justinwoo",
         "repo": "easy-purescript-nix",
-        "rev": "7802db65618c2ead3a55121355816b4c41d276d9",
-        "sha256": "0n99hxxcp9yc8yvx7bx4ac6askinfark7dnps3hzz5v9skrvq15q",
+        "rev": "82f901ce0a2d86327e2d65993a75c2ea74f229f2",
+        "sha256": "0qsq8bj76y3bxdl2iphknjib139z0jw75xlaih7viv9kvfm9b1lx",
         "type": "tarball",
-        "url": "https://github.com/justinwoo/easy-purescript-nix/archive/7802db65618c2ead3a55121355816b4c41d276d9.tar.gz",
+        "url": "https://github.com/justinwoo/easy-purescript-nix/archive/82f901ce0a2d86327e2d65993a75c2ea74f229f2.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {
@@ -17,22 +17,10 @@
         "homepage": "https://github.com/NixOS/nixpkgs",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1c1f5649bb9c1b0d98637c8c365228f57126f361",
-        "sha256": "0f2nvdijyxfgl5kwyb4465pppd5vkhqxddx6v40k2s0z9jfhj0xl",
+        "rev": "f7949198dcff52265b322ca8abf7450610e7e49e",
+        "sha256": "1q7538dj47yp9azwk3bl193d0bwmsvm53rxwww4wr9qk6qljd2r7",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/1c1f5649bb9c1b0d98637c8c365228f57126f361.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
-    "nixpkgs-unstable": {
-        "branch": "nixpkgs-unstable",
-        "description": "Nix Packages collection",
-        "homepage": "",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "8f39ad3da14ce78daf249c8291a4e43a17bbcf98",
-        "sha256": "1sdfb6bq8n0v5m6962cz5nfw3hkcrlzc1xnw6b0xnkr3sxxj6m34",
-        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/8f39ad3da14ce78daf249c8291a4e43a17bbcf98.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/f7949198dcff52265b322ca8abf7450610e7e49e.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }