From 48f26afdd2ca2afa20d6a035a8d44d11689cf5b7 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 14 Jul 2023 17:36:10 +1200 Subject: [PATCH 1/2] Remove ci.nix --- .github/ci.nix | 43 ------------------------------------------- 1 file changed, 43 deletions(-) delete mode 100644 .github/ci.nix diff --git a/.github/ci.nix b/.github/ci.nix deleted file mode 100644 index d79daea..0000000 --- a/.github/ci.nix +++ /dev/null @@ -1,43 +0,0 @@ -let - sources = import ../nix/sources.nix; - - inherit (import sources.nix-github-actions) mkGithubMatrix; - - mkPkgs = system: import sources.nixpkgs { - config = { - allowAliases = false; - allowInsecurePredicate = x: true; - }; - overlays = [ - (import ../overlay.nix) - ]; - inherit system; - }; - -in -mkGithubMatrix { - attrPrefix = ""; - checks = { - x86_64-linux = - let - pkgs = mkPkgs "x86_64-linux"; - in - import ../tests { inherit pkgs; }; - - x86_64-darwin = - let - pkgs = mkPkgs "x86_64-darwin"; - inherit (pkgs) lib; - - - tests = import ../tests { inherit pkgs; }; - in - { - # Aggregate all tests into one derivation so that only one GHA runner is scheduled for all darwin jobs - aggregate = pkgs.runCommand "darwin-aggregate" - { - env.TEST_INPUTS = (lib.concatStringsSep " " (lib.attrValues (lib.filterAttrs (n: v: lib.isDerivation v) tests))); - } "touch $out"; - }; - }; -} From 57af4be1d8e8b33d77e2a4dd0bcb8557def3118f Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 14 Jul 2023 19:28:33 +1200 Subject: [PATCH 2/2] Bump flake inputs --- flake.lock | 8 ++++---- flake.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 58b876b..48f6293 100644 --- a/flake.lock +++ b/flake.lock @@ -40,17 +40,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1680609323, - "narHash": "sha256-Od7WQbOLmlY/bQwkIzIMy/zs7mAplawReZcHzHtXbPc=", + "lastModified": 1689192006, + "narHash": "sha256-QM0f0d8oPphOTYJebsHioR9+FzJcy1QNIzREyubB91U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "45dc78cb0a93fc84eaa1fea85bda28865eab1a44", + "rev": "2de8efefb6ce7f5e4e75bdf57376a96555986841", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", - "rev": "45dc78cb0a93fc84eaa1fea85bda28865eab1a44", "type": "github" } }, diff --git a/flake.nix b/flake.nix index de8395b..0427148 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Poetry2nix flake"; inputs.flake-utils.url = "github:numtide/flake-utils"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/45dc78cb0a93fc84eaa1fea85bda28865eab1a44"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; inputs.nix-github-actions.url = "github:nix-community/nix-github-actions"; inputs.nix-github-actions.inputs.nixpkgs.follows = "nixpkgs";