From 376ecb80385642329ce274abda2da0bc7b7906c9 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 18 Jun 2024 23:31:00 -0700 Subject: [PATCH] restore back to dev state --- flake.lock | 10 +++++----- flake.nix | 2 +- overlay.nix | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index 9e0c457..041fc47 100644 --- a/flake.lock +++ b/flake.lock @@ -36,15 +36,15 @@ "lix": { "flake": false, "locked": { - "lastModified": 1718419213, - "narHash": "sha256-WY7BGnu5PnbK4O8cKKv9kvxwzZIGbIQUQLGPHFXitI0=", - "rev": "253546d5fbf8a5aa60ac8164c1b4f5794dc4e9d1", + "lastModified": 1718590005, + "narHash": "sha256-fiWc1ZyMlTXXSjcmoEQ+NHhIgtcImPHszbOu5c515cU=", + "rev": "98d0249d5c7f5dcc1d2436c4829f073fca668f80", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/253546d5fbf8a5aa60ac8164c1b4f5794dc4e9d1.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/98d0249d5c7f5dcc1d2436c4829f073fca668f80.tar.gz" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/2.90.0-rc1.tar.gz" + "url": "https://git.lix.systems/lix-project/lix/archive/release-2.90.tar.gz" } }, "nixpkgs": { diff --git a/flake.nix b/flake.nix index b6f0a73..928dd2a 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/2.90.0-rc1.tar.gz"; + url = "https://git.lix.systems/lix-project/lix/archive/release-2.90.tar.gz"; flake = false; }; inputs.flake-utils.url = "github:numtide/flake-utils"; diff --git a/overlay.nix b/overlay.nix index b7c0244..2ef6a19 100644 --- a/overlay.nix +++ b/overlay.nix @@ -6,10 +6,10 @@ let # usage. # https://github.com/nixos/nixpkgs/blob/6afb255d976f85f3359e4929abd6f5149c323a02/nixos/modules/config/nix.nix#L121 lixPkg = final.callPackage (lix + "/package.nix") ({ - # versionSuffix = "-lix${versionSuffix}"; + versionSuffix = "-${versionSuffix}"; # FIXME: do this more sensibly for future releases # https://git.lix.systems/lix-project/lix/issues/406 - officialRelease = true; + officialRelease = false; }); # These packages depend on Nix features that Lix does not support