update github workflow and flake

nix-community · Jan 1, 2023 · da82da1 · da82da1 · nh2 · Jul 1, 2023
1 parent f3f4597
commit da82da1
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 66 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -4,14 +4,14 @@ on:
   push:
 jobs:
   tests:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2.3.4
-    - uses: cachix/install-nix-action@v15
-    - uses: cachix/cachix-action@v10
+    - uses: actions/checkout@v3
+    - uses: cachix/install-nix-action@v18
+    - uses: cachix/cachix-action@v12
       with:
         name: nixpkgs-update
         signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
         authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-    - run: nix-build
-    - run: nix-shell --run "echo OK"
+    - run: nix build
+    - run: nix flake check
diff --git a/default.nix b/default.nix
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,22 +1,17 @@
 {
-  description = "A flake for nixpkgs-update";
+  description = "update nixpkgs automatically";
 
-  inputs.flake-compat = { url = "github:edolstra/flake-compat"; flake = false; };
-  inputs.nixpkgs = { type = "github"; owner = "nixos"; repo = "nixpkgs"; };
   inputs.mmdoc.url = "github:ryantm/mmdoc";
   inputs.mmdoc.inputs.nixpkgs.follows = "nixpkgs";
 
-  nixConfig.extra-substituters = [ "https://nixpkgs-update.cachix.org" ];
-  nixConfig.extra-trusted-public-keys = [ "nixpkgs-update.cachix.org-1:6y6Z2JdoL3APdu6/+Iy8eZX2ajf09e4EE9SnxSML1W8=" ];
+  nixConfig.extra-substituters = "https://nixpkgs-update.cachix.org";
+  nixConfig.extra-trusted-public-keys = "nixpkgs-update.cachix.org-1:6y6Z2JdoL3APdu6/+Iy8eZX2ajf09e4EE9SnxSML1W8=";
 
-  outputs = { self, flake-compat, nixpkgs, mmdoc } @ args:
+  outputs = { self, nixpkgs, mmdoc } @ args:
     {
-      packages."x86_64-linux" = import ./pkgs/default.nix (args // { system = "x86_64-linux"; });
-      defaultPackage."x86_64-linux" = self.packages."x86_64-linux".nixpkgs-update;
-      devShell."x86_64-linux" = self.packages."x86_64-linux".devShell;
-
-      packages."x86_64-darwin" = import ./pkgs/default.nix (args // { system = "x86_64-darwin"; });
-      defaultPackage."x86_64-darwin" = self.packages."x86_64-darwin".nixpkgs-update;
-      devShell."x86_64-darwin" = self.packages."x86_64-darwin".devShell;
+      packages.x86_64-linux = import ./pkgs/default.nix (args // { system = "x86_64-linux"; });
+      devShell.x86_64-linux = self.packages."x86_64-linux".devShell;
+      packages.x86_64-darwin = import ./pkgs/default.nix (args // { system = "x86_64-darwin"; });
+      devShell.x86_64-darwin = self.packages."x86_64-darwin".devShell;
     };
 }
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -66,6 +66,7 @@ let
 in
 {
   nixpkgs-update = haskellPackages.nixpkgs-update;
+  default = haskellPackages.nixpkgs-update;
   nixpkgs-update-doc = doc;
   devShell = shell;
 }
diff --git a/shell.nix b/shell.nix