From 556cdbcd26109ba3d5cb9ff0ab4a59f4c45d3cfb Mon Sep 17 00:00:00 2001 From: Sukant Hajra Date: Sat, 28 Dec 2024 14:21:58 -0600 Subject: [PATCH] Update dependencies and documentation --- .github/workflows/ci.yml | 2 +- doc/internal/params.el | 2 +- doc/nix-installation.md | 4 ++-- doc/nix-introduction.md | 6 +++--- flake.lock | 24 ++++++++++++------------ 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c401032..ce39bec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: - uses: cachix/install-nix-action@v30 with: # DESIGN: matching current in NixOS 24.11 - install_url: https://releases.nixos.org/nix/nix-2.24.10/install + install_url: https://releases.nixos.org/nix/nix-2.24.11/install - uses: cachix/cachix-action@v15 with: name: shajra diff --git a/doc/internal/params.el b/doc/internal/params.el index c9610f0..97c1fc4 100644 --- a/doc/internal/params.el +++ b/doc/internal/params.el @@ -11,7 +11,7 @@ (run-target-short . "org2gfm") ;; run-target-long will always prefix "bin/" (nix-latest . "2.25.3") - (nix-stable . "2.24.10") + (nix-stable . "2.24.11") (nixos-latest . "24.11") (platforms . "\n\ - Linux on x86-64 machines\n\ diff --git a/doc/nix-installation.md b/doc/nix-installation.md index b97a036..4d62636 100644 --- a/doc/nix-installation.md +++ b/doc/nix-installation.md @@ -43,12 +43,12 @@ Hopefully, this alleviates any worry about installing a complex program on your > **NOTE:** You don't need this step if you're running NixOS, which comes with Nix baked in. -Though the latest version of Nix is Nix 2.25.3, we'll be installing the version that the last release of NixOS (24.11) uses, specifically Nix 2.24.10. As discussed in the included [introduction to Nix](nix-introduction.md), this version is considered stable by the Nix community. +Though the latest version of Nix is Nix 2.25.3, we'll be installing the version that the last release of NixOS (24.11) uses, specifically Nix 2.24.11. As discussed in the included [introduction to Nix](nix-introduction.md), this version is considered stable by the Nix community. The following command calls the official installation script for the recommended version of Nix. Note, this script will require `sudo` access. ```bash -sh <(curl -L https://releases.nixos.org/nix/nix-2.24.10/install) --daemon +sh <(curl -L https://releases.nixos.org/nix/nix-2.24.11/install) --daemon ``` The `--daemon` switch installs Nix in the multi-user mode, which is generally recommended (single-user installation with `--no-daemon` instead is recommended for WSL). The script reports everything it does and touches. diff --git a/doc/nix-introduction.md b/doc/nix-introduction.md index 98c6ee4..f648f12 100644 --- a/doc/nix-introduction.md +++ b/doc/nix-introduction.md @@ -196,11 +196,11 @@ However, if industrial users move to flakes to address these problems, we have t ### Nix quick releases compete with stability -The latest major version of the Nix package manager is currently Nix 2.25.3, but NixOS 24.11, the latest stable release of NixOS, uses Nix 2.24.10. NixOS is the primary way the Nix package manager gets used in the field. Far fewer users install Nix as a package manager atop another operating system. From a community perspective it makes sense to consider Nix 2.24.10 the stable release of the package manager. This version gets the most scrutiny and critical bug fixes. +The latest major version of the Nix package manager is currently Nix 2.25.3, but NixOS 24.11, the latest stable release of NixOS, uses Nix 2.24.11. NixOS is the primary way the Nix package manager gets used in the field. Far fewer users install Nix as a package manager atop another operating system. From a community perspective it makes sense to consider Nix 2.24.11 the stable release of the package manager. This version gets the most scrutiny and critical bug fixes. -As mentioned above, there are strong reasons to use still-experimental features, particularly flakes. However, APIs and calculated hashes change too frequently in experimental features from version-to-version. By sticking with the version used in NixOS, we get less breaking changes. For example, the [flake.lock](../flake.lock) file included with this project has calculated hashes for dependencies. These hashes were computed with Nix 2.24.10, and could change with later versions. +As mentioned above, there are strong reasons to use still-experimental features, particularly flakes. However, APIs and calculated hashes change too frequently in experimental features from version-to-version. By sticking with the version used in NixOS, we get less breaking changes. For example, the [flake.lock](../flake.lock) file included with this project has calculated hashes for dependencies. These hashes were computed with Nix 2.24.11, and could change with later versions. -For these reasons, the [installation guide included with this project](nix-installation.md) recommends installing Nix 2.24.10, rather than the latest official release. +For these reasons, the [installation guide included with this project](nix-installation.md) recommends installing Nix 2.24.11, rather than the latest official release. ## A few gaps in determinism diff --git a/flake.lock b/flake.lock index 933c4fd..2fac936 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1733977386, - "narHash": "sha256-euGUlu9WBeHGHDNXIeD75ZCRU0Svjg5zT+rws2DCvow=", + "lastModified": 1735416796, + "narHash": "sha256-+YcVhIoKJ1cra+sGgoR+CeRGvbqg68vb80ZCDsAlnu8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5731d41e47a19e9b048a54d3f2fffdc534fac24a", + "rev": "e965ea329a165ca739403f3c95151f48a002d65f", "type": "github" }, "original": { @@ -62,11 +62,11 @@ }, "nixpkgs-stable-darwin": { "locked": { - "lastModified": 1733874782, - "narHash": "sha256-U1iCUaFCDJepmQuauoo408q8ZzVqAoxZx+T4f7+CBPU=", + "lastModified": 1735171749, + "narHash": "sha256-UA56kDQSztRWbpsG9bK+jIGyZ0YZAcIsYAhXDHIr8zs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "df99c810dcdac631c3326a3e73c03bdd535b4eed", + "rev": "03b02bb3356e29e9d4d1200f9b1f5f36bf3780f0", "type": "github" }, "original": { @@ -78,11 +78,11 @@ }, "nixpkgs-stable-linux": { "locked": { - "lastModified": 1733808091, - "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", + "lastModified": 1735264675, + "narHash": "sha256-MgdXpeX2GuJbtlBrH9EdsUeWl/yXEubyvxM1G+yO4Ak=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", + "rev": "d49da4c08359e3c39c4e27c74ac7ac9b70085966", "type": "github" }, "original": { @@ -94,11 +94,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1733749988, - "narHash": "sha256-+5qdtgXceqhK5ZR1YbP1fAUsweBIrhL38726oIEAtDs=", + "lastModified": 1735268880, + "narHash": "sha256-7QEFnKkzD13SPxs+UFR5bUFN2fRw+GlL0am72ZjNre4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bc27f0fde01ce4e1bfec1ab122d72b7380278e68", + "rev": "7cc0bff31a3a705d3ac4fdceb030a17239412210", "type": "github" }, "original": {