From 234522cc3bd40d0ae4c98aa192dccd38db876c86 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 17 Jul 2024 13:10:53 +0200 Subject: [PATCH] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'hydra': 'git+https://git.lix.systems/lix-project/hydra.git?ref=refs/heads/main&rev=fb9e29d4d0f2f591cd1d706fd3b7334af7d34b84' (2024-07-13) → 'git+https://git.lix.systems/lix-project/hydra.git?ref=refs/heads/main&rev=b0e9b4b2f99f9d8f5c4e780e89f955c394b5ced4' (2024-07-17) • Added input 'hydra/lix': 'git+https://git.lix.systems/lix-project/lix?ref=refs/heads/main&rev=6b4d46e9e0e1dd80e0977684ab20d14bcd1a6bc3' (2024-07-16) • Added input 'hydra/lix/flake-compat': 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33' (2023-10-04) • Added input 'hydra/lix/nix2container': 'github:nlewo/nix2container/20aad300c925639d5d6cbe30013c8357ce9f2a2e' (2024-04-13) • Added input 'hydra/lix/nixpkgs': follows 'hydra/nixpkgs' • Added input 'hydra/lix/nixpkgs-regression': 'github:NixOS/nixpkgs/215d4d0fd80ca5163643b03a33fde804a29cc1e2' (2022-01-24) • Added input 'hydra/lix/pre-commit-hooks': 'github:cachix/git-hooks.nix/e35aed5fda3cc79f88ed7f1795021e559582093a' (2024-04-02) • Removed input 'hydra/nix' • Removed input 'hydra/nix/flake-compat' • Removed input 'hydra/nix/nix2container' • Removed input 'hydra/nix/nixpkgs' • Removed input 'hydra/nix/nixpkgs-regression' • Removed input 'hydra/nix/pre-commit-hooks' • Added input 'hydra/nix-eval-jobs': 'git+https://git.lix.systems/lix-project/nix-eval-jobs?ref=refs/heads/main&rev=c057494450f2d1420726ddb0bab145a5ff4ddfdd' (2024-07-17) • Added input 'hydra/nix-eval-jobs/flake-parts': 'github:hercules-ci/flake-parts/9227223f6d922fee3c7b190b2cc238a99527bbb7' (2024-07-03) • Added input 'hydra/nix-eval-jobs/flake-parts/nixpkgs-lib': follows 'hydra/nix-eval-jobs/nixpkgs' • Added input 'hydra/nix-eval-jobs/lix': follows 'hydra/lix' • Added input 'hydra/nix-eval-jobs/nix-github-actions': 'github:nix-community/nix-github-actions/622f829f5fe69310a866c8a6cd07e747c44ef820' (2024-07-04) • Added input 'hydra/nix-eval-jobs/nix-github-actions/nixpkgs': follows 'hydra/nix-eval-jobs/nixpkgs' • Added input 'hydra/nix-eval-jobs/nixpkgs': follows 'hydra/nixpkgs' • Added input 'hydra/nix-eval-jobs/treefmt-nix': 'github:numtide/treefmt-nix/0fb28f237f83295b4dd05e342f333b447c097398' (2024-07-15) • Added input 'hydra/nix-eval-jobs/treefmt-nix/nixpkgs': follows 'hydra/nix-eval-jobs/nixpkgs' • Updated input 'lix': follows 'hydra/nix' → follows 'hydra/lix' • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/6794d064edc69918bb0fc0e0eda33ece324be17a' (2024-07-12) → 'github:NixOS/nixpkgs/9355fa86e6f27422963132c2c9aeedb0fb963d93' (2024-07-16) --- flake.lock | 127 ++++++++++++++++++++++++++++++++++++++++++++++------- flake.nix | 2 +- 2 files changed, 112 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index afe2f5f..066cd89 100644 --- a/flake.lock +++ b/flake.lock @@ -132,6 +132,28 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "hydra", + "nix-eval-jobs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -185,17 +207,18 @@ }, "hydra": { "inputs": { - "nix": "nix", + "lix": "lix", + "nix-eval-jobs": "nix-eval-jobs", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1720843955, - "narHash": "sha256-GpkZ7OorcArMaFVZMPHkXHKQVJAWjMSCaPmS8hw0PB0=", + "lastModified": 1721210741, + "narHash": "sha256-jAFXbe8CA6S25NmAwncidyPgBvLK7a8dcj8AdRGaxUY=", "ref": "refs/heads/main", - "rev": "fb9e29d4d0f2f591cd1d706fd3b7334af7d34b84", - "revCount": 4174, + "rev": "b0e9b4b2f99f9d8f5c4e780e89f955c394b5ced4", + "revCount": 4181, "type": "git", "url": "https://git.lix.systems/lix-project/hydra.git" }, @@ -204,7 +227,7 @@ "url": "https://git.lix.systems/lix-project/hydra.git" } }, - "nix": { + "lix": { "inputs": { "flake-compat": "flake-compat_2", "nix2container": "nix2container", @@ -216,17 +239,45 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1720733512, - "narHash": "sha256-vq9CLDvqSSvH4L7YhDa0ihTOrAry4jntKiuoNb5n98M=", + "lastModified": 1721091462, + "narHash": "sha256-0cmEeoOiB91BviTJHzIyxkY+Gxv3O8ZnnExVAoXEFGI=", "ref": "refs/heads/main", - "rev": "4b109ec1a8fc4550150f56f0f46f2f41d844bda8", - "revCount": 15950, + "rev": "6b4d46e9e0e1dd80e0977684ab20d14bcd1a6bc3", + "revCount": 15967, "type": "git", - "url": "https://git@git.lix.systems/lix-project/lix" + "url": "https://git.lix.systems/lix-project/lix" }, "original": { "type": "git", - "url": "https://git@git.lix.systems/lix-project/lix" + "url": "https://git.lix.systems/lix-project/lix" + } + }, + "nix-eval-jobs": { + "inputs": { + "flake-parts": "flake-parts", + "lix": [ + "hydra", + "lix" + ], + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "hydra", + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1721195872, + "narHash": "sha256-TlvRq634MSl22BWLmpTy2vdtKntbZlsUwdMq8Mp9AWs=", + "ref": "refs/heads/main", + "rev": "c057494450f2d1420726ddb0bab145a5ff4ddfdd", + "revCount": 608, + "type": "git", + "url": "https://git.lix.systems/lix-project/nix-eval-jobs" + }, + "original": { + "type": "git", + "url": "https://git.lix.systems/lix-project/nix-eval-jobs" } }, "nix-gerrit": { @@ -249,6 +300,28 @@ "url": "https://git.lix.systems/the-distro/nix-gerrit.git" } }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "hydra", + "nix-eval-jobs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1720066371, + "narHash": "sha256-uPlLYH2S0ACj0IcgaK9Lsf4spmJoGejR9DotXiXSBZQ=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "622f829f5fe69310a866c8a6cd07e747c44ef820", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, "nix2container": { "flake": false, "locked": { @@ -267,11 +340,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1720750130, - "narHash": "sha256-y2wc7CdK0vVSIbx7MdVoZzuMcUoLvZXm+pQf2RIr1OU=", + "lastModified": 1721116560, + "narHash": "sha256-++TYlGMAJM1Q+0nMVaWBSEvEUjRs7ZGiNQOpqbQApCU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6794d064edc69918bb0fc0e0eda33ece324be17a", + "rev": "9355fa86e6f27422963132c2c9aeedb0fb963d93", "type": "github" }, "original": { @@ -335,7 +408,7 @@ "hydra": "hydra", "lix": [ "hydra", - "nix" + "lix" ], "nix-gerrit": "nix-gerrit", "nixpkgs": "nixpkgs", @@ -409,6 +482,28 @@ "repo": "terranix-examples", "type": "github" } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "hydra", + "nix-eval-jobs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1721059077, + "narHash": "sha256-gCICMMX7VMSKKt99giDDtRLkHJ0cwSgBtDijJAqTlto=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "0fb28f237f83295b4dd05e342f333b447c097398", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 84f7cff..1a929e8 100644 --- a/flake.nix +++ b/flake.nix @@ -17,7 +17,7 @@ nix-gerrit.url = "git+https://git.lix.systems/the-distro/nix-gerrit.git"; nix-gerrit.inputs.nixpkgs.follows = "nixpkgs"; - lix.follows = "hydra/nix"; + lix.follows = "hydra/lix"; }; outputs = { self, nixpkgs, terranix, colmena, ... } @ inputs: