From f1a45806c7504448ccdb297978181513842946f7 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Sun, 2 Jun 2024 01:41:14 +0000 Subject: [PATCH] flake: test using lix Previously we used a nix install tarball built from nix 2.20.5, download with flakehub. That does not make sense for a lix installer, use Lix 2.90 beta 1 instead. Also use this opportunity to remove the unused flake-compat input. Change-Id: I622bb9fedb45f3a03c1e5f43757afbd0222c6b90 --- flake.lock | 95 +++++++++++++++++++++++------------------------------- flake.nix | 12 +++---- 2 files changed, 46 insertions(+), 61 deletions(-) diff --git a/flake.lock b/flake.lock index e9f750a..da40dcb 100644 --- a/flake.lock +++ b/flake.lock @@ -22,27 +22,13 @@ } }, "flake-compat": { + "flake": false, "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.0.0.tar.gz" - } - }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { @@ -51,20 +37,26 @@ "type": "github" } }, - "libgit2": { - "flake": false, + "lix": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": "nixpkgs", + "nixpkgs-regression": "nixpkgs-regression", + "pre-commit-hooks": "pre-commit-hooks" + }, "locked": { - "lastModified": 1697646580, - "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", - "owner": "libgit2", - "repo": "libgit2", - "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5", - "type": "github" + "lastModified": 1714955862, + "narHash": "sha256-REWlo2RYHfJkxnmZTEJu3Cd/2VM+wjjpPy7Xi4BdDTQ=", + "ref": "refs/tags/2.90-beta.1", + "rev": "b6799ab0374a8e1907a48915d3187e07da41d88c", + "revCount": 15501, + "type": "git", + "url": "https://git.lix.systems/lix-project/lix" }, "original": { - "owner": "libgit2", - "repo": "libgit2", - "type": "github" + "ref": "refs/tags/2.90-beta.1", + "type": "git", + "url": "https://git.lix.systems/lix-project/lix" } }, "naersk": { @@ -87,38 +79,18 @@ "type": "github" } }, - "nix": { - "inputs": { - "flake-compat": "flake-compat_2", - "libgit2": "libgit2", - "nixpkgs": "nixpkgs", - "nixpkgs-regression": "nixpkgs-regression" - }, - "locked": { - "lastModified": 1709808984, - "narHash": "sha256-bfFe38BkoQws7om4gBtBWoNTLkt9piMXdLLoHYl+vBQ=", - "rev": "f8170ce9f119e5e6724eb81ff1b5a2d4c0024000", - "revCount": 16143, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nix/2.20.5/018e199b-ae2c-703d-ab99-4c648be473b2/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/NixOS/nix/%3D2.20.5.tar.gz" - } - }, "nixpkgs": { "locked": { - "lastModified": 1705033721, - "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=", + "lastModified": 1711481231, + "narHash": "sha256-J/fW3Xhm3WsJPNd8ksZmfMnol5aOG2qEMDPbOnNNdTQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea", + "rev": "9d6ddb13cee3cc1192e4430277708c732685f38a", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05-small", + "ref": "nixos-23.11-small", "repo": "nixpkgs", "type": "github" } @@ -155,12 +127,27 @@ "type": "github" } }, + "pre-commit-hooks": { + "flake": false, + "locked": { + "lastModified": 1712055707, + "narHash": "sha256-4XLvuSIDZJGS17xEwSrNuJLL7UjDYKGJSbK1WWX2AK8=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "e35aed5fda3cc79f88ed7f1795021e559582093a", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "fenix": "fenix", - "flake-compat": "flake-compat", + "lix": "lix", "naersk": "naersk", - "nix": "nix", "nixpkgs": "nixpkgs_2" } }, diff --git a/flake.nix b/flake.nix index 3cbdb05..fd0d292 100644 --- a/flake.nix +++ b/flake.nix @@ -14,12 +14,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nix = { - url = "https://flakehub.com/f/NixOS/nix/=2.20.5.tar.gz"; + lix = { + url = "git+https://git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1"; # Omitting `inputs.nixpkgs.follows = "nixpkgs";` on purpose }; - - flake-compat.url = "https://flakehub.com/f/edolstra/flake-compat/1.0.0.tar.gz"; }; outputs = @@ -27,7 +25,7 @@ , nixpkgs , fenix , naersk - , nix + , lix , ... } @ inputs: let @@ -211,12 +209,12 @@ hydraJobs = { vm-test = import ./nix/tests/vm-test { inherit forSystem; - inherit (nix.hydraJobs) binaryTarball; + inherit (lix.hydraJobs) binaryTarball; inherit (nixpkgs) lib; }; container-test = import ./nix/tests/container-test { inherit forSystem; - inherit (nix.hydraJobs) binaryTarball; + inherit (lix.hydraJobs) binaryTarball; }; }; };