From 73e1f0b206f6ecb6e1af6b63d142b7a140313eb2 Mon Sep 17 00:00:00 2001
From: Quinn Dougherty <quinnd@riseup.net>
Date: Tue, 30 Aug 2022 09:34:35 +0800
Subject: [PATCH] rm spurious override of `nixpkgs` from `flake-utils` input;
 cleanup `ci-cachix.yml`

---
 .github/workflows/ci-cachix.yml | 9 +++++----
 flake.nix                       | 7 ++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci-cachix.yml b/.github/workflows/ci-cachix.yml
index 39051677..817a7251 100644
--- a/.github/workflows/ci-cachix.yml
+++ b/.github/workflows/ci-cachix.yml
@@ -1,4 +1,4 @@
-name: Builds, lints, tests in nix
+name: Nix build
 
 on: [push, pull_request]
 
@@ -12,12 +12,13 @@ jobs:
     - name: Install nix
       uses: cachix/install-nix-action@v17
       with:
-        nix_path: nixpkgs=channel:nixos-unstable
+        nix_path: nixpkgs=channel:nixos-22.05
     - name: Use cachix
       uses: cachix/cachix-action@v10
       with:
         name: quantified-uncertainty
         authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
+
     - name: Check that lang lints
       run: nix build .#lang-lint
     - name: Check that components lints
@@ -27,10 +28,10 @@ jobs:
     - name: Check that vscode extension lints
       run: nix build .#vscode-lint
 
-    - name: Check that lang bundles
-      run: nix build .#lang-bundle
     - name: Check all lang tests
       run: nix build .#lang-test
+    - name: Check that lang bundles
+      run: nix build .#lang-bundle
     - name: Check that components builds
       run: nix build .#components
     - name: Check that components bundles
diff --git a/flake.nix b/flake.nix
index fa8efa59..ea9dee1c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,5 +1,5 @@
 {
-  description = "Squiggle CI";
+  description = "Squiggle packages";
 
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-22.05";
@@ -7,10 +7,7 @@
       url = github:quinn-dougherty/genType;
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    flake-utils = {
-      url = github:numtide/flake-utils;
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    flake-utils.url = github:numtide/flake-utils;
   };
 
   outputs = { self, nixpkgs, gentype, flake-utils }: