Compare commits
No commits in common. "main" and "jade/2.91-post" have entirely different histories.
main
...
jade/2.91-
|
|
@ -51,7 +51,7 @@ You can verify that it works by running the following command:
|
|||
|
||||
```sh
|
||||
$ nix --version
|
||||
nix (Lix, like Nix) 2.91.1
|
||||
nix (Lix, like Nix) 2.91.0
|
||||
```
|
||||
|
||||
# Using the Lix NixOS module
|
||||
|
|
@ -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-1.tar.gz";
|
||||
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
|
|
@ -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) 2.91.1
|
||||
nix (Lix, like Nix) 2.91.0
|
||||
```
|
||||
|
||||
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,20 +180,20 @@ 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/2.91.1.tar.gz
|
||||
# nix store prefetch-file --name source --unpack https://git.lix.systems/lix-project/lix/archive/2.91.0.tar.gz
|
||||
#
|
||||
# Note that the tag (e.g. 2.91.1) in the URL here is what determines
|
||||
# Note that the tag (e.g. 2.91.0) in the URL here is what determines
|
||||
# which version of Lix you'll wind up with.
|
||||
(let
|
||||
module = fetchTarball {
|
||||
name = "source";
|
||||
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz";
|
||||
sha256 = "sha256-6U0CyPycIBc04hbYy2hBINnVso58n/ZyywY2BD3hu+s=";
|
||||
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz";
|
||||
sha256 = "sha256-zNW/rqNJwhq2lYmQf19wJerRuNimjhxHKmzrWWFJYts=";
|
||||
};
|
||||
lixSrc = fetchTarball {
|
||||
name = "source";
|
||||
url = "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz";
|
||||
sha256 = "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=";
|
||||
url = "https://git.lix.systems/lix-project/lix/archive/2.91.0.tar.gz";
|
||||
sha256 = "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s=";
|
||||
};
|
||||
# This is the core of the code you need; it is an exercise to the
|
||||
# reader to write the sources in a nicer way, or by using npins or
|
||||
|
|
@ -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) 2.91.1
|
||||
nix (Lix, like Nix) 2.91.0
|
||||
```
|
||||
|
||||
As long as you see `Lix` in the output, you're good! If you're not sure what to do now, it's a
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ You can verify that it works by running the following command:
|
|||
|
||||
```sh
|
||||
$ nix --version
|
||||
nix (Lix, like Nix) @VERSION_NOTRAIL@
|
||||
nix (Lix, like Nix) @VERSION@
|
||||
```
|
||||
|
||||
# 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_NOTRAIL@
|
||||
nix (Lix, like Nix) @VERSION@
|
||||
```
|
||||
|
||||
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_NOTRAIL@.tar.gz
|
||||
# nix store prefetch-file --name source --unpack https://git.lix.systems/lix-project/lix/archive/@VERSION@.tar.gz
|
||||
#
|
||||
# Note that the tag (e.g. @VERSION_NOTRAIL@) in the URL here is what determines
|
||||
# Note that the tag (e.g. @VERSION@) 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_NOTRAIL@.tar.gz";
|
||||
url = "https://git.lix.systems/lix-project/lix/archive/@VERSION@.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_NOTRAIL@
|
||||
nix (Lix, like Nix) @VERSION@
|
||||
```
|
||||
|
||||
As long as you see `Lix` in the output, you're good! If you're not sure what to do now, it's a
|
||||
|
|
|
|||
|
|
@ -16,12 +16,12 @@ We have long term plans to incrementally evolve Nix to work in more places, to m
|
|||
|
||||
The upgrade procedure depends on how you installed Lix or CppNix, and is fully described in the [Lix installation guide][install-guide].
|
||||
|
||||
If you are using Lix from nixpkgs on NixOS, you just need to upgrade your nixpkgs once the [upgrade pull request][upgrade-pr] has passed through the build farm into your channel; no other action is required.
|
||||
If you are using Lix from nixpkgs on NixOS, you just need to upgrade your nixpkgs once the upgrade pull request has passed through the build farm into your channel; no other action is required.
|
||||
The build progress can be checked on the [unofficial pull request tracker].
|
||||
|
||||
[upgrade-pr]: https://github.com/NixOS/nixpkgs/pull/334269
|
||||
# FIXME add the pr number once it is known
|
||||
|
||||
[unofficial pull request tracker]: https://nixpk.gs/pr-tracker.html?pr=334269
|
||||
[unofficial pull request tracker]: https://nixpk.gs/pr-tracker.html
|
||||
|
||||
[install-guide]: https://lix.systems/install/
|
||||
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
+++
|
||||
title = "Lix installations upgrading to macOS Sequoia require manual repair"
|
||||
author = "Lix Team"
|
||||
date = "2024-09-15"
|
||||
+++
|
||||
|
||||
macOS Sequoia release day is almost upon us, and that means all your Lix and Nix installations on macOS are going to break when you upgrade your OS.
|
||||
Apple claimed some user IDs that are used in the default Nix installation which are then clobbered by the updater, leading to builds failing with the following error:
|
||||
|
||||
```
|
||||
error: the user '_nixbld1' in the group 'nixbld' does not exist
|
||||
```
|
||||
|
||||
To fix this, you can use the repair functionality of the installer (thanks to cole-h at DetSys for implementing the repair functionality and emilazy for porting it to lix-installer!):
|
||||
|
||||
```
|
||||
curl -sSf -L https://install.lix.systems/lix | sh -s -- repair sequoia
|
||||
```
|
||||
|
||||
If you want to apply the repair before upgrading, add `--move-existing-users` to the end of the command.
|
||||
|
||||
We have a wiki page with more links and details here: https://wiki.lix.systems/link/81
|
||||
|
|
@ -44,11 +44,9 @@ We encourage working through conflicts privately with involved parties, but we a
|
|||
|
||||
If you wish to contact a member of the interim community team about a concern, consider contacting one of the following people:
|
||||
|
||||
<!-- throw a die and insert at random position -->
|
||||
- qyriad (@qyriad:katesiria.org)
|
||||
- piegames (@piegames:flausch.social)
|
||||
- ktemkin (@ktemkin:katesiria.org)
|
||||
- hexchen (@hexchen:colon.at)
|
||||
- lunaphied (@lunaphied:lunaphied.me)
|
||||
- k900 (@k900:0upti.me)
|
||||
- jade (@jade_:matrix.org)
|
||||
|
|
|
|||
|
|
@ -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/2.91.1' -- \
|
||||
'git+https://git.lix.systems/lix-project/lix?ref=refs/tags/2.91.0' -- \
|
||||
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) 2.91.1
|
||||
nix (Lix, like Nix) 2.91.0
|
||||
```
|
||||
|
||||
As long as you see `Lix` in the output, you're good! If you're not sure what to do now, it's a
|
||||
|
|
|
|||
|
|
@ -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_NOTRAIL@' -- \
|
||||
'git+https://git.lix.systems/lix-project/lix?ref=refs/tags/@VERSION@' -- \
|
||||
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_NOTRAIL@
|
||||
nix (Lix, like Nix) @VERSION@
|
||||
```
|
||||
|
||||
As long as you see `Lix` in the output, you're good! If you're not sure what to do now, it's a
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
---
|
||||
title: "Quick Links"
|
||||
description: "Just the Lix links and very little else"
|
||||
date: "2024-09-06"
|
||||
author: "Lix Team"
|
||||
# Use our special template that renders the `links.yaml`.
|
||||
layout: quicklinks
|
||||
---
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
---
|
||||
# This defines the cards that appear in `index.md`
|
||||
|
||||
- label: user manual
|
||||
url: https://docs.lix.systems/manual/lix/stable/
|
||||
|
||||
- label: (nightly)
|
||||
url: https://docs.lix.systems/manual/lix/nightly/
|
||||
|
||||
- label: git repo
|
||||
url: https://git.lix.systems/lix-project/lix
|
||||
|
||||
- label: issue tracker
|
||||
url: https://git.lix.systems/lix-project/lix/issues
|
||||
|
||||
- label: lix-installer
|
||||
url: https://git.lix.systems/lix-project/lix-installer
|
||||
|
||||
- label: lix-website
|
||||
url: https://git.lix.systems/lix-project/lix-website
|
||||
|
||||
- label: code review
|
||||
url: https://gerrit.lix.systems/
|
||||
|
||||
- label: buildbot (ci)
|
||||
url: https://buildbot.lix.systems/
|
||||
|
||||
- label: gitiles
|
||||
url: https://gerrit.lix.systems/plugins/gitiles/lix
|
||||
|
||||
- label: wiki
|
||||
url: https://wiki.lix.systems/books
|
||||
|
||||
- label: matrix (chat)
|
||||
url: https://matrix.to/#/#space:lix.systems
|
||||
|
||||
- label: |
|
||||
`git clone ssh://{username}@gerrit.lix.systems:2022/lix`
|
||||
|
|
@ -37,7 +37,7 @@ If you're learning about those topics because you want to understand the ideas t
|
|||
## Understanding Flakes
|
||||
|
||||
- [Flakes aren't real and can't hurt you](https://jade.fyi/blog/flakes-arent-real/), by our own **jade**.
|
||||
- Several of Lix community member [Xe Iaso](https://xeiaso.net)'s blog posts:
|
||||
- Several of Lix community member [Xe Iaso]()'s blog posts:
|
||||
- [Nix Flakes: An Introduction](https://xeiaso.net/blog/nix-flakes-1-2022-02-21/)
|
||||
- [Nix Flakes: Packages and How To Use Them](https://xeiaso.net/blog/nix-flakes-2-2022-02-27/)
|
||||
- [Nix Flakes: Exposing and using NixOS Modules](https://xeiaso.net/blog/nix-flakes-3-2022-04-07/)
|
||||
|
|
|
|||
|
|
@ -1,10 +0,0 @@
|
|||
html {
|
||||
/* The default body text size of 16px is slightly too small. Make it 18px
|
||||
* (relatively, of course, so that people can change their browser settings).
|
||||
*
|
||||
* Doing it this way ensures that the entire type scale aligns with the body
|
||||
* text size rather than being detached from it (and possibly having
|
||||
* too-small headers and similar problems).
|
||||
*/
|
||||
font-size: 112.5%;
|
||||
}
|
||||
|
|
@ -3,7 +3,6 @@
|
|||
@import "fonts";
|
||||
@import "utilities";
|
||||
|
||||
@import "type";
|
||||
@import "blockquote";
|
||||
@import "code";
|
||||
@import "header";
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<div class="row justify-content-center pb-5">
|
||||
<div class="col-12">
|
||||
{{ with .Title | safeHTML }}
|
||||
<h2 class="display-2 fw-bold text-center text-primary pb-3">{{ . }}</h2>
|
||||
<h2 class="display-1 fw-bold text-center text-primary pb-3">{{ . }}</h2>
|
||||
{{ end }}
|
||||
{{ with .Params.description }}
|
||||
<p class="text-black-61 text-center pb-3">{{ . }}</p>
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
</div>
|
||||
<div class="row pb-5">
|
||||
<div class="col-12 d-flex justify-content-center">
|
||||
<div class="blog-content">
|
||||
<div class="blog-content fs-5">
|
||||
{{ .Content }}
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,50 +0,0 @@
|
|||
{{ define "main" }}
|
||||
<section class="section blog-single py-5">
|
||||
<div class="container">
|
||||
<div class="row justify-content-center pb-5">
|
||||
<div class="col-12">
|
||||
{{ with .Title | safeHTML }}
|
||||
<h2 class="display-2 fw-bold text-center text-primary pb-3">{{ . }}</h2>
|
||||
{{ end }}
|
||||
{{ with .Params.description }}
|
||||
<p class="text-black-61 text-center pb-3">{{ . }}</p>
|
||||
{{ end }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row pb-5">
|
||||
<div class="col-12 d-flex justify-content-center">
|
||||
<div class="blog-content">
|
||||
{{ .Content }}
|
||||
|
||||
{{ $data := dict }}
|
||||
{{ $path := "links.yaml" }}
|
||||
{{ with .Resources.Get $path }}
|
||||
{{ with . | transform.Unmarshal }}
|
||||
{{ $data = . }}
|
||||
{{ end }}
|
||||
{{ else }}
|
||||
{{ errorf "Unable to get quicklinks %q" $path }}
|
||||
{{ end }}
|
||||
|
||||
<div class="flex">
|
||||
{{ range $data }}
|
||||
{{ with .url }}
|
||||
<a href="{{ . }}">
|
||||
{{- end -}}
|
||||
<div class="btn btn-primary text-light px-3 mt-2">
|
||||
{{- .label | markdownify -}}
|
||||
</div>
|
||||
{{- with .url -}}
|
||||
</a>
|
||||
{{- end -}}
|
||||
{{ end }}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row pb-5">
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
{{ end }}
|
||||
|
|
@ -6,21 +6,21 @@
|
|||
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarContent" aria-controls="navbarContent" aria-expanded="false" aria-label="Toggle navigation">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
</button>
|
||||
<nav id="navbarContent" class="collapse navbar-collapse">
|
||||
<div class="collapse navbar-collapse" id="navbarContent">
|
||||
<ul class="navbar-nav ms-auto mb-2 mb-xl-0">
|
||||
{{ range .Site.Menus.main }}
|
||||
<li class="nav-item text-center">
|
||||
<a class="nav-link text-primary px-3" href="{{ .URL }}">{{ .Name }}</a>
|
||||
<a class="nav-link text-primary px-4" href="{{ .URL }}">{{ .Name }}</a>
|
||||
</li>
|
||||
{{ end }}
|
||||
</ul>
|
||||
<ul class="navbar-nav ms-xl-3 mb-2 mb-xl-0">
|
||||
{{ range .Site.Menus.buttons }}
|
||||
<li class="nav-item">
|
||||
<a class="nav-link btn btn-primary text-light px-3" href="{{ .URL }}">{{ .Name }}</a>
|
||||
<a class="nav-link btn btn-primary text-light px-4" href="{{ .URL }}">{{ .Name }}</a>
|
||||
</li>
|
||||
{{ end }}
|
||||
</ul>
|
||||
</nav>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
|
|
|
|||
|
|
@ -29,12 +29,9 @@ 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_notrail}.tar.gz'),
|
||||
'@LIX_ARCHIVE_HASH@': get_archive_hash(BASE_URL + f'/lix-project/lix/archive/{version}.tar.gz'),
|
||||
'@NIXOS_MODULE_HASH@': get_archive_hash(BASE_URL + f'/lix-project/nixos-module/archive/{version}.tar.gz'),
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue