From 21044991a3a22c5ef9405f00aacad4e23ad19d61 Mon Sep 17 00:00:00 2001
From: Jack Kelly <jack@jackkelly.name>
Date: Sun, 31 Oct 2021 22:31:01 +1000
Subject: [PATCH] Use non-flake inputs for custom haskell packages

---
 flake.lock | 44 ++++++++++++++++++++++++++++++++------------
 flake.nix  | 32 +++++++++++++++-----------------
 2 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/flake.lock b/flake.lock
index 35dd023..3c9de08 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,21 @@
 {
   "nodes": {
+    "casa-abbreviations-and-acronyms": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1635683112,
+        "narHash": "sha256-OSpHYZi4/+ltZI86KEJKercx46AhNvSJO/wpYH5JM1I=",
+        "owner": "system-f",
+        "repo": "casa-abbreviations-and-acronyms",
+        "rev": "f6b7edacbdf24e92937cde3f9d11ee5448b86294",
+        "type": "github"
+      },
+      "original": {
+        "owner": "system-f",
+        "repo": "casa-abbreviations-and-acronyms",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -31,28 +47,31 @@
         "type": "github"
       }
     },
-    "nixpkgs": {
+    "monoid-subclasses": {
+      "flake": false,
       "locked": {
-        "lastModified": 1635544589,
-        "narHash": "sha256-v6PTartv2TlsntrCz9YFIdRU6ihPKFvrEfKK2BSFOoE=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "47b36ad103aeff17f9be6fb7b4847d63d53f227a",
+        "lastModified": 1635627255,
+        "narHash": "sha256-Rm2vRZwwoARma7Tre9yuAPEa8goaDtJFy48GcxQNZ74=",
+        "owner": "endgame",
+        "repo": "monoid-subclasses",
+        "rev": "a98efc492778145ecbc80b51165c14644bba7a89",
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
+        "owner": "endgame",
+        "ref": "ghcjs",
+        "repo": "monoid-subclasses",
+        "type": "github"
       }
     },
     "reflex-platform": {
       "flake": false,
       "locked": {
-        "lastModified": 1635469743,
-        "narHash": "sha256-hfl4jPgcB6EVtI82K+RolDCI4C2wX77BDwFaHcRRqVs=",
+        "lastModified": 1635470016,
+        "narHash": "sha256-laWzpkRrMWNxlIp6A15ujuqxMizSeKl5iB5dIK+XbvY=",
         "owner": "reflex-frp",
         "repo": "reflex-platform",
-        "rev": "dad7bdaa6624a7dd833c0f22745b7b5daca38281",
+        "rev": "677fa9af8451cf26859f0e6bc4433edfe11b0664",
         "type": "github"
       },
       "original": {
@@ -63,9 +82,10 @@
     },
     "root": {
       "inputs": {
+        "casa-abbreviations-and-acronyms": "casa-abbreviations-and-acronyms",
         "flake-compat": "flake-compat",
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs",
+        "monoid-subclasses": "monoid-subclasses",
         "reflex-platform": "reflex-platform"
       }
     }
diff --git a/flake.nix b/flake.nix
index 49069f8..7d3f96f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,17 +7,25 @@
       flake = false;
     };
     flake-utils.url = "github:numtide/flake-utils";
+    casa-abbreviations-and-acronyms = {
+      url = "github:system-f/casa-abbreviations-and-acronyms";
+      flake = false;
+    };
+    monoid-subclasses = {
+      url = "github:endgame/monoid-subclasses/ghcjs";
+      flake = false;
+    };
     reflex-platform = {
       url = "github:reflex-frp/reflex-platform";
       flake = false;
     };
   };
 
-  outputs = inputs@{ self, flake-utils, nixpkgs, reflex-platform, ... }:
-    flake-utils.lib.eachDefaultSystem (system:
+  outputs = inputs:
+    inputs.flake-utils.lib.eachDefaultSystem (system:
       let
-        reflex = import reflex-platform { inherit system; };
-        project = reflex.project ({ pkgs, ... }: {
+        reflex-platform = import inputs.reflex-platform { inherit system; };
+        project = reflex-platform.project ({ pkgs, ... }: {
           name = "casaaaaa";
           packages.casaaaaa = ./.;
           useWarp = true;
@@ -32,22 +40,12 @@
             casa-abbreviations-and-acronyms =
               prev.callCabal2nix
                 "casa-abbreviations-and-acronyms"
-                (pkgs.fetchFromGitHub {
-                  owner = "endgame";
-                  repo = "casa-abbreviations-and-acronyms";
-                  rev = "476ae12866eecae6729461e969d7511cc7e5fdb9";
-                  sha256 = "sha256-0xnqtc+42EmY1/ULFRJ3JxUitlIq3rLydhOUHkw+EtE";
-                })
+                inputs.casa-abbreviations-and-acronyms
                 { };
 
             monoid-subclasses =
               prev.callCabal2nix "monoid-subclasses"
-                (pkgs.fetchFromGitHub {
-                  owner = "endgame";
-                  repo = "monoid-subclasses";
-                  rev = "a98efc492778145ecbc80b51165c14644bba7a89";
-                  sha256 = "sha256-Rm2vRZwwoARma7Tre9yuAPEa8goaDtJFy48GcxQNZ74=";
-                })
+                inputs.monoid-subclasses
                 { };
           };
         });
@@ -57,7 +55,7 @@
         devShell = devShells.ghc;
         defaultPackage = import ./defaultPackage.nix {
           inherit project;
-          inherit (reflex) nixpkgs;
+          inherit (reflex-platform) nixpkgs;
         };
       }
     );
-- 
2.38.5