From 77aaaee24c7e5f43c5e405aec156c5d20b06ba88 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Sat, 19 Oct 2024 12:02:33 -0700 Subject: [PATCH] roll out 2.91.1-1 module --- content/add-to-config.md | 6 +++--- content/add-to-config.md.in | 12 ++++++------ content/install.md.in | 4 ++-- update_version.py | 5 ++++- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/content/add-to-config.md b/content/add-to-config.md index cf679351..9a321274 100644 --- a/content/add-to-config.md +++ b/content/add-to-config.md @@ -76,7 +76,7 @@ Adding Lix to a flake-based configuration is relatively simple. First, add the L # which is often the case. If you've named it something else, # you'll need to change the `nixpkgs` below. lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1.tar.gz"; + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -187,8 +187,8 @@ section, and add the line provided in the configuration (let module = fetchTarball { name = "source"; - url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1.tar.gz"; - sha256 = "sha256-slp0zWHKvbCzhiBwwe6VX6jODEY+PKhHyiAoHgM5Bdc="; + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz"; + sha256 = "sha256-6U0CyPycIBc04hbYy2hBINnVso58n/ZyywY2BD3hu+s="; }; lixSrc = fetchTarball { name = "source"; diff --git a/content/add-to-config.md.in b/content/add-to-config.md.in index b7034c50..0fae9066 100644 --- a/content/add-to-config.md.in +++ b/content/add-to-config.md.in @@ -51,7 +51,7 @@ You can verify that it works by running the following command: ```sh $ nix --version -nix (Lix, like Nix) @VERSION@ +nix (Lix, like Nix) @VERSION_NOTRAIL@ ``` # Using the Lix NixOS module @@ -153,7 +153,7 @@ You should now be using Lix! You can verify this by asking the `nix` command to ```sh $ nix --version -nix (Lix, like Nix) @VERSION@ +nix (Lix, like Nix) @VERSION_NOTRAIL@ ``` As long as you see `Lix` in the output, you're good! If you're not sure what to do now, it's a @@ -180,9 +180,9 @@ section, and add the line provided in the configuration # # The sha256 hashes were obtained with the following command in Lix (n.b. # this relies on --unpack, which is only in Lix and CppNix > 2.18): - # nix store prefetch-file --name source --unpack https://git.lix.systems/lix-project/lix/archive/@VERSION@.tar.gz + # nix store prefetch-file --name source --unpack https://git.lix.systems/lix-project/lix/archive/@VERSION_NOTRAIL@.tar.gz # - # Note that the tag (e.g. @VERSION@) in the URL here is what determines + # Note that the tag (e.g. @VERSION_NOTRAIL@) in the URL here is what determines # which version of Lix you'll wind up with. (let module = fetchTarball { @@ -192,7 +192,7 @@ section, and add the line provided in the configuration }; lixSrc = fetchTarball { name = "source"; - url = "https://git.lix.systems/lix-project/lix/archive/@VERSION@.tar.gz"; + url = "https://git.lix.systems/lix-project/lix/archive/@VERSION_NOTRAIL@.tar.gz"; sha256 = "@LIX_ARCHIVE_HASH@"; }; # This is the core of the code you need; it is an exercise to the @@ -230,7 +230,7 @@ You should now be using Lix! You can verify this by asking the `nix` command to ```sh $ nix --version -nix (Lix, like Nix) @VERSION@ +nix (Lix, like Nix) @VERSION_NOTRAIL@ ``` As long as you see `Lix` in the output, you're good! If you're not sure what to do now, it's a diff --git a/content/install.md.in b/content/install.md.in index 8012e7a1..40abc113 100644 --- a/content/install.md.in +++ b/content/install.md.in @@ -78,7 +78,7 @@ Thanks to Nix, we can actually ask Lix to upgrade your system directly. Run the sudo --preserve-env=PATH nix run \ --experimental-features "nix-command flakes" \ --extra-substituters https://cache.lix.systems --extra-trusted-public-keys "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" \ - 'git+https://git.lix.systems/lix-project/lix?ref=refs/tags/@VERSION@' -- \ + 'git+https://git.lix.systems/lix-project/lix?ref=refs/tags/@VERSION_NOTRAIL@' -- \ upgrade-nix \ --extra-substituters https://cache.lix.systems --extra-trusted-public-keys "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" ``` @@ -88,7 +88,7 @@ to report its version: ```sh $ nix --version -nix (Lix, like Nix) @VERSION@ +nix (Lix, like Nix) @VERSION_NOTRAIL@ ``` As long as you see `Lix` in the output, you're good! If you're not sure what to do now, it's a diff --git a/update_version.py b/update_version.py index f264d8ec..cf76cb74 100644 --- a/update_version.py +++ b/update_version.py @@ -29,9 +29,12 @@ def go(version: str): Path('./content/install.md') ] + version_notrail = version.partition('-')[0] + substitutions = { + '@VERSION_NOTRAIL@': version_notrail, '@VERSION@': version, - '@LIX_ARCHIVE_HASH@': get_archive_hash(BASE_URL + f'/lix-project/lix/archive/{version}.tar.gz'), + '@LIX_ARCHIVE_HASH@': get_archive_hash(BASE_URL + f'/lix-project/lix/archive/{version_notrail}.tar.gz'), '@NIXOS_MODULE_HASH@': get_archive_hash(BASE_URL + f'/lix-project/nixos-module/archive/{version}.tar.gz'), }