From c27104acc66ca2f6d211cb63fb774ad9ca2adb6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20Christiansen=20S=C3=B8rby?= <anders@sorby.xyz>
Date: Sun, 26 Sep 2021 14:55:30 +0200
Subject: [PATCH] Remove flake.lock and nix CI

---
 .github/workflows/nix.yml | 25 -------------------------
 .gitignore                |  2 ++
 flake.lock                | 34 ++++++++++++++++++++++++----------
 3 files changed, 26 insertions(+), 35 deletions(-)
 delete mode 100644 .github/workflows/nix.yml

diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
deleted file mode 100644
index 86aab47b..00000000
--- a/.github/workflows/nix.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: "Nix CI"
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - main
-jobs:
-  "Nix Build and Check Ubuntu":
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2.3.4
-    - uses: cachix/install-nix-action@v13
-      with:
-        install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install
-        install_options: '--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve'
-        extra_nix_config: |
-          experimental-features = nix-command flakes
-          access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
-    - uses: cachix/cachix-action@v10
-      with:
-        name: yatima
-        authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-    - run: nix build
-    - run: nix flake check
diff --git a/.gitignore b/.gitignore
index a009caa7..f59d09fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 /build
 result*
+# Do not lock flake to avoid having to maintain it
+flake.lock
diff --git a/flake.lock b/flake.lock
index c8a92583..9a21eb14 100644
--- a/flake.lock
+++ b/flake.lock
@@ -36,17 +36,15 @@
         "lean-stage0": "lean-stage0",
         "mdBook": "mdBook",
         "nix": "nix",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
+        "nixpkgs": "nixpkgs_2",
         "temci": "temci"
       },
       "locked": {
-        "lastModified": 1631826694,
-        "narHash": "sha256-YvJfMgv/N24NUbLgfPp83p6Nas8p3jO+tSnNaJsJAAc=",
+        "lastModified": 1632619467,
+        "narHash": "sha256-hN99HkQyyWHzgrh4yvhdwIx9Laj5udOW8FjvO4dAhrA=",
         "owner": "leanprover",
         "repo": "lean4",
-        "rev": "d378df47d72c19a8783a75e45ef37b7b1c819363",
+        "rev": "094b70c3d489409010d93e55c7a64575ddc090f9",
         "type": "github"
       },
       "original": {
@@ -139,11 +137,27 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1632176121,
-        "narHash": "sha256-N2oSOhbW38rbc53R1R8qXC/Xstht1PIsAcTzJfmCpTc=",
+        "lastModified": 1628085532,
+        "narHash": "sha256-X639O/RVYRdasl+nYR80KCn5OqTNdeDfvsYECtSZVLQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "f6ccdfcd2ac4f2e259d20e378737dcbd0ca7debe",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1632418649,
+        "narHash": "sha256-4rZspkiQU7zbsuciRRMgoEPkAF/+FSv2jx/VIPxPVx4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "3397f0ede9ea2ded1f8b6fa689dda71a7a67b806",
+        "rev": "056a3c1fae30d06d14b171b9023743c21a23ec1a",
         "type": "github"
       },
       "original": {
@@ -157,7 +171,7 @@
       "inputs": {
         "flake-utils": "flake-utils",
         "lean": "lean",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_3"
       }
     },
     "temci": {