yu-re-ka/lix-website
0
0
Fork 0
forked from lix-project/lix-website
Code Pull requests Activity

roll out 2.91.1-1 module

Browse source
This commit is contained in:
jade 2024-10-19 12:02:33 -07:00
parent 32c70a33c2
commit 77aaaee24c
4 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
content/add-to-config.md
View file

@ -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, # which is often the case. If you've named it something else,
# you'll need to change the `nixpkgs` below. # you'll need to change the `nixpkgs` below.
lix-module = { 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"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -187,8 +187,8 @@ section, and add the line provided in the configuration
(let (let
module = fetchTarball { module = fetchTarball {
name = "source"; name = "source";
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";
sha256 = "sha256-slp0zWHKvbCzhiBwwe6VX6jODEY+PKhHyiAoHgM5Bdc="; sha256 = "sha256-6U0CyPycIBc04hbYy2hBINnVso58n/ZyywY2BD3hu+s=";
}; };
lixSrc = fetchTarball { lixSrc = fetchTarball {
name = "source"; name = "source";

12
content/add-to-config.md.in
View file

@ -51,7 +51,7 @@ You can verify that it works by running the following command:
```sh ```sh
$ nix --version $ nix --version
nix (Lix, like Nix) @VERSION@ nix (Lix, like Nix) @VERSION_NOTRAIL@
``` ```
# Using the Lix NixOS module # 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 ```sh
$ nix --version $ 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 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. # 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): # 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. # which version of Lix you'll wind up with.
(let (let
module = fetchTarball { module = fetchTarball {
@ -192,7 +192,7 @@ section, and add the line provided in the configuration
}; };
lixSrc = fetchTarball { lixSrc = fetchTarball {
name = "source"; 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@"; sha256 = "@LIX_ARCHIVE_HASH@";
}; };
# This is the core of the code you need; it is an exercise to the # 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 ```sh
$ nix --version $ 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 As long as you see `Lix` in the output, you're good! If you're not sure what to do now, it's a

4
content/install.md.in
View file

@ -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 \ sudo --preserve-env=PATH nix run \
--experimental-features "nix-command flakes" \ --experimental-features "nix-command flakes" \
--extra-substituters https://cache.lix.systems --extra-trusted-public-keys "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" \ --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 \ upgrade-nix \
--extra-substituters https://cache.lix.systems --extra-trusted-public-keys "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" --extra-substituters https://cache.lix.systems --extra-trusted-public-keys "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
``` ```
@ -88,7 +88,7 @@ to report its version:
```sh ```sh
$ nix --version $ 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 As long as you see `Lix` in the output, you're good! If you're not sure what to do now, it's a

5
update_version.py
View file

@ -29,9 +29,12 @@ def go(version: str):
Path('./content/install.md') Path('./content/install.md')
] ]
version_notrail = version.partition('-')[0]
substitutions = { substitutions = {
'@VERSION_NOTRAIL@': version_notrail,
'@VERSION@': version, '@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'), '@NIXOS_MODULE_HASH@': get_archive_hash(BASE_URL + f'/lix-project/nixos-module/archive/{version}.tar.gz'),
} }