Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Nix 2.26.0 #41

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Upgrade to Nix 2.26.0 #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7098113
Upgrade to Nix 2.26.0
edolstra Jan 22, 2025
0cf3f07
checks.binaryTarball -> packages.binaryTarball
edolstra Jan 13, 2025
5beb921
Nix's `nix flake check` now needs IFD
edolstra Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
set -eux

# Ensure all the checks can be built without internet
nix flake check --all-systems --max-jobs 0
nix flake check --all-systems
nix build .#tarballs_json
cat result

Expand All @@ -45,7 +45,7 @@
steps:
- uses: actions/checkout@v4
- uses: DeterminateSystems/nix-installer-action@main
- uses: DeterminateSystems/magic-nix-cache-action@main

Check warning on line 48 in .github/workflows/build-publish.yml

View workflow job for this annotation

GitHub Actions / test-modules (ubuntu-latest)

Magic Nix Cache is deprecated 

Magic Nix Cache has been deprecated due to a change in the underlying GitHub APIs and will stop working on 1 February 2025.
To continue caching Nix builds in GitHub Actions, use FlakeHub Cache instead.

Replace...
      - uses: DeterminateSystems/magic-nix-cache-action@main

...with...
      - uses: DeterminateSystems/flakehub-cache-action@main

For more details: https://dtr.mn/magic-nix-cache-eol

Check warning on line 48 in .github/workflows/build-publish.yml

View workflow job for this annotation

GitHub Actions / test-modules (macos-latest)

Magic Nix Cache is deprecated 

Magic Nix Cache has been deprecated due to a change in the underlying GitHub APIs and will stop working on 1 February 2025.
To continue caching Nix builds in GitHub Actions, use FlakeHub Cache instead.

Replace...
      - uses: DeterminateSystems/magic-nix-cache-action@main

...with...
      - uses: DeterminateSystems/flakehub-cache-action@main

For more details: https://dtr.mn/magic-nix-cache-eol
- run: |
set -eux

Expand All @@ -63,7 +63,7 @@
set -eux

# Ensure all the checks can be built without internet
nix flake check --all-systems --max-jobs 0
nix flake check --all-systems
nix build .#tarballs_json
cat result

Expand Down
8 changes: 4 additions & 4 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
description = "Determinate Nix";
inputs = {
nix.url = "https://flakehub.com/f/NixOS/nix/=2.25.3";
nix.url = "https://flakehub.com/f/NixOS/nix/=2.26.0";
nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/*";
};

Expand All @@ -26,12 +26,12 @@
in
{
closures = forAllSystems ({ system, ... }: nix.packages."${system}".default);
tarballs_indirect = forAllSystems ({ system, ... }: nix.checks."${system}".binaryTarball);
tarballs_direct = forAllSystems ({ system, ... }: "${nix.checks."${system}".binaryTarball}/nix-${nix.packages."${system}".default.version}-${system}.tar.xz");
tarballs_indirect = forAllSystems ({ system, ... }: nix.packages."${system}".binaryTarball);
tarballs_direct = forAllSystems ({ system, ... }: "${nix.packages."${system}".binaryTarball}/nix-${nix.packages."${system}".default.version}-${system}.tar.xz");

checks = forAllSystems ({ system, ... }: {
closure = nix.packages."${system}".default;
tarball = nix.checks."${system}".binaryTarball;
tarball = nix.packages."${system}".binaryTarball;
});

packages = forAllSystems ({ system, pkgs, ... }: {
Expand Down
166 changes: 75 additions & 91 deletions tests/flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading