rm spurious override of nixpkgs from flake-utils input; cleanup ci-cachix.yml

This commit is contained in:
Quinn Dougherty 2022-08-30 09:34:35 +08:00
parent 8319a484ac
commit 73e1f0b206
2 changed files with 7 additions and 9 deletions

View File

@ -1,4 +1,4 @@
name: Builds, lints, tests in nix name: Nix build
on: [push, pull_request] on: [push, pull_request]
@ -12,12 +12,13 @@ jobs:
- name: Install nix - name: Install nix
uses: cachix/install-nix-action@v17 uses: cachix/install-nix-action@v17
with: with:
nix_path: nixpkgs=channel:nixos-unstable nix_path: nixpkgs=channel:nixos-22.05
- name: Use cachix - name: Use cachix
uses: cachix/cachix-action@v10 uses: cachix/cachix-action@v10
with: with:
name: quantified-uncertainty name: quantified-uncertainty
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- name: Check that lang lints - name: Check that lang lints
run: nix build .#lang-lint run: nix build .#lang-lint
- name: Check that components lints - name: Check that components lints
@ -27,10 +28,10 @@ jobs:
- name: Check that vscode extension lints - name: Check that vscode extension lints
run: nix build .#vscode-lint run: nix build .#vscode-lint
- name: Check that lang bundles
run: nix build .#lang-bundle
- name: Check all lang tests - name: Check all lang tests
run: nix build .#lang-test run: nix build .#lang-test
- name: Check that lang bundles
run: nix build .#lang-bundle
- name: Check that components builds - name: Check that components builds
run: nix build .#components run: nix build .#components
- name: Check that components bundles - name: Check that components bundles

View File

@ -1,5 +1,5 @@
{ {
description = "Squiggle CI"; description = "Squiggle packages";
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-22.05"; nixpkgs.url = "nixpkgs/nixos-22.05";
@ -7,10 +7,7 @@
url = github:quinn-dougherty/genType; url = github:quinn-dougherty/genType;
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
flake-utils = { flake-utils.url = github:numtide/flake-utils;
url = github:numtide/flake-utils;
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = { self, nixpkgs, gentype, flake-utils }: outputs = { self, nixpkgs, gentype, flake-utils }: