Merge pull request #1231 from nix-community/bump-inputs-2023-07-14

Bump inputs 2023-07-14
This commit is contained in:
adisbladis 2023-07-14 07:48:12 +00:00 committed by GitHub
commit 0797f9e052
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 48 deletions

43
.github/ci.nix vendored
View file

@ -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";
};
};
}

8
flake.lock generated
View file

@ -40,17 +40,17 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1680609323, "lastModified": 1689192006,
"narHash": "sha256-Od7WQbOLmlY/bQwkIzIMy/zs7mAplawReZcHzHtXbPc=", "narHash": "sha256-QM0f0d8oPphOTYJebsHioR9+FzJcy1QNIzREyubB91U=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "45dc78cb0a93fc84eaa1fea85bda28865eab1a44", "rev": "2de8efefb6ce7f5e4e75bdf57376a96555986841",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "45dc78cb0a93fc84eaa1fea85bda28865eab1a44",
"type": "github" "type": "github"
} }
}, },

View file

@ -2,7 +2,7 @@
description = "Poetry2nix flake"; description = "Poetry2nix flake";
inputs.flake-utils.url = "github:numtide/flake-utils"; 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.url = "github:nix-community/nix-github-actions";
inputs.nix-github-actions.inputs.nixpkgs.follows = "nixpkgs"; inputs.nix-github-actions.inputs.nixpkgs.follows = "nixpkgs";