From 909e593ae9f5fe338ab19b4ed9d52bb0ea09bad8 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 18 Jun 2024 23:32:31 -0700 Subject: [PATCH] Return Lix module to main, with fixes from release-2.90 work --- flake.lock | 10 +++++----- flake.nix | 2 +- pins.json | 2 +- update_pins.py | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index 041fc47..12aa181 100644 --- a/flake.lock +++ b/flake.lock @@ -36,15 +36,15 @@ "lix": { "flake": false, "locked": { - "lastModified": 1718590005, - "narHash": "sha256-fiWc1ZyMlTXXSjcmoEQ+NHhIgtcImPHszbOu5c515cU=", - "rev": "98d0249d5c7f5dcc1d2436c4829f073fca668f80", + "lastModified": 1718767907, + "narHash": "sha256-gpd+mGQxqVHw2kO6rSPQel8TkChHh9UpqxjsmQi0QJM=", + "rev": "85f282ef572577899b3d80ba8def1b920a386218", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/98d0249d5c7f5dcc1d2436c4829f073fca668f80.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/85f282ef572577899b3d80ba8def1b920a386218.tar.gz" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/release-2.90.tar.gz" + "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz" } }, "nixpkgs": { diff --git a/flake.nix b/flake.nix index 928dd2a..6a83ec1 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; inputs.lix = { - url = "https://git.lix.systems/lix-project/lix/archive/release-2.90.tar.gz"; + url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"; flake = false; }; inputs.flake-utils.url = "github:numtide/flake-utils"; diff --git a/pins.json b/pins.json index ddb50af..c5b505a 100644 --- a/pins.json +++ b/pins.json @@ -1 +1 @@ -{"nix-eval-jobs": {"kind": "tarball", "rev": "9c23772cf25e0d891bef70b7bcb7df36239672a5", "nar_hash": "sha256-oT273pDmYzzI7ACAFUOcsxtT6y34V5KF7VBSqTza7j8=", "locked_url": "https://git.lix.systems/api/v1/repos/lix-project/nix-eval-jobs/archive/9c23772cf25e0d891bef70b7bcb7df36239672a5.tar.gz?rev=9c23772cf25e0d891bef70b7bcb7df36239672a5", "url": "https://git.lix.systems/lix-project/nix-eval-jobs/archive/release-2.90.tar.gz"}} \ No newline at end of file +{"nix-eval-jobs": {"kind": "tarball", "rev": "fd86a1a0687d27e8d65ca6d06912f8f97ae9dc52", "nar_hash": "sha256-T5QbLm/LUrKFpdWqLHdgfKA/LVQbVxQ9gnM0py+2pnI=", "locked_url": "https://git.lix.systems/api/v1/repos/lix-project/nix-eval-jobs/archive/fd86a1a0687d27e8d65ca6d06912f8f97ae9dc52.tar.gz?rev=fd86a1a0687d27e8d65ca6d06912f8f97ae9dc52", "url": "https://git.lix.systems/lix-project/nix-eval-jobs/archive/main.tar.gz"}} \ No newline at end of file diff --git a/update_pins.py b/update_pins.py index 356fe1a..e037fc5 100755 --- a/update_pins.py +++ b/update_pins.py @@ -147,7 +147,7 @@ def lock_git(url, branch) -> GitPinSerialized: PINS = { 'nix-eval-jobs': - TarballPinSpec('https://git.lix.systems/lix-project/nix-eval-jobs/archive/release-2.90.tar.gz') + TarballPinSpec('https://git.lix.systems/lix-project/nix-eval-jobs/archive/main.tar.gz') }