From 9920bea6e3be845e7cd00fb9c89c842c5e6bc3a6 Mon Sep 17 00:00:00 2001
From: rhiannon morris <rhi@rhiannon.website>
Date: Thu, 26 May 2022 19:00:08 +0200
Subject: [PATCH] nix stuff

---
 flake.lock | 58 ++++++++++++++++++++----------------------------------
 flake.nix  | 41 ++++++++++++++++++++------------------
 2 files changed, 43 insertions(+), 56 deletions(-)

diff --git a/flake.lock b/flake.lock
index 27db544..3d64a5e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -114,26 +114,11 @@
     },
     "flake-utils": {
       "locked": {
-        "lastModified": 1649676176,
-        "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
+        "lastModified": 1652776076,
+        "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
-      "locked": {
-        "lastModified": 1638122382,
-        "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
+        "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8",
         "type": "github"
       },
       "original": {
@@ -264,7 +249,9 @@
         "dot-parse": "dot-parse",
         "effect": "effect",
         "elab-util": "elab-util",
-        "flake-utils": "flake-utils_2",
+        "flake-utils": [
+          "flake-utils"
+        ],
         "frex": "frex",
         "fvect": "fvect",
         "hashable": "hashable",
@@ -278,7 +265,9 @@
         "json": "json",
         "katla": "katla",
         "lsp": "lsp",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "odf": "odf",
         "pretty-show": "pretty-show",
         "python": "python",
@@ -401,18 +390,17 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1639213685,
-        "narHash": "sha256-Evuobw7o9uVjAZuwz06Al0fOWZ5JMKOktgXR0XgWBtg=",
-        "owner": "nixos",
+        "lastModified": 1638239011,
+        "narHash": "sha256-AjhmbT4UBlJWqxY0ea8a6GU2C2HdKUREkG43oRr3TZg=",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "453bcb8380fd1777348245b3c44ce2a2b93b2e2d",
+        "rev": "a7ecde854aee5c4c7cd6177f54a99d2c1ff28a31",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-21.11-darwin",
-        "repo": "nixpkgs",
-        "type": "github"
+        "id": "nixpkgs",
+        "ref": "21.11",
+        "type": "indirect"
       }
     },
     "odf": {
@@ -499,10 +487,7 @@
       "inputs": {
         "flake-utils": "flake-utils",
         "idris2-pkgs": "idris2-pkgs",
-        "nixpkgs": [
-          "idris2-pkgs",
-          "nixpkgs"
-        ],
+        "nixpkgs": "nixpkgs",
         "tap": "tap"
       }
     },
@@ -563,16 +548,15 @@
           "idris2-pkgs"
         ],
         "nixpkgs": [
-          "idris2-pkgs",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1653572671,
-        "narHash": "sha256-ev1z+LW5f6AAWegLQjGpsH6qGccJ5kelzTx4pQddT7k=",
+        "lastModified": 1653651071,
+        "narHash": "sha256-fHr67LkChBYwDa3e4tFT0d4zhP5Ufhj0f9iakOdor8A=",
         "ref": "main",
-        "rev": "4c0ab9ca9b669869b341851f3fd2fa591d5aa4b2",
-        "revCount": 4,
+        "rev": "97deb5f288fccc091d62f708a5bd2efabd08e220",
+        "revCount": 9,
         "type": "git",
         "url": "https://git.rhiannon.website/rhi/idris2-tap"
       },
diff --git a/flake.nix b/flake.nix
index 21cf707..f40268a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,24 +1,29 @@
 { description = "quox: quantitative extensional type theory";
 
   inputs = {
-    flake-utils.url = "github:numtide/flake-utils";
-    idris2-pkgs.url = "github:claymager/idris2-pkgs";
-    nixpkgs.follows = "idris2-pkgs/nixpkgs";
+    nixpkgs.url = "nixpkgs/21.11";
 
-    tap.url = "git+https://git.rhiannon.website/rhi/idris2-tap?ref=main";
-    tap.inputs = {
-      flake-utils.follows = "flake-utils";
-      idris2-pkgs.follows = "idris2-pkgs";
-      nixpkgs.follows = "idris2-pkgs/nixpkgs";
+    flake-utils = {
+      url = "github:numtide/flake-utils";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    idris2-pkgs = {
+      url = "github:claymager/idris2-pkgs";
+      inputs.flake-utils.follows = "flake-utils";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    tap = {
+      url = "git+https://git.rhiannon.website/rhi/idris2-tap?ref=main";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-utils.follows = "flake-utils";
+      inputs.idris2-pkgs.follows = "idris2-pkgs";
     };
   };
 
   outputs = { self, nixpkgs, idris2-pkgs, flake-utils, tap }:
-    let systems = with flake-utils.lib.system;
-          # [ x86_64-darwin x86_64-linux i686-linux ];    # FIXME
-          [ x86_64-linux ];
-    in
-    flake-utils.lib.eachSystem systems (system:
+    flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = import nixpkgs {
           inherit system;
@@ -28,12 +33,10 @@
 
         testDeps = tap.packages.${system};
 
-        packages = rec {
-          quox-lib   = builders.idrisPackage ./lib   { };
-          quox       = builders.idrisPackage ./exe   { extraPkgs = packages; };
-          quox-tests = builders.idrisPackage ./tests {
-            extraPkgs = packages // testDeps;
-          };
+        packages = let ipkg = builders.idrisPackage; in rec {
+          quox-lib   = ipkg ./lib   { };
+          quox       = ipkg ./exe   { extraPkgs = packages; };
+          quox-tests = ipkg ./tests { extraPkgs = packages // testDeps; };
         };
 
         devShells =