Skip to content

Upgrade to Nix 2.26.1 #41

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

Merged
edolstra merged 5 commits into from
Feb 3, 2025
Merged

Upgrade to Nix 2.26.1 #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 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
b7a231a
Update to Nix 2.26.1
edolstra Jan 24, 2025
3ca45ae
Drop --all-systems since Nix's flake.nix now does some IFD
edolstra Jan 24, 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 @@ jobs:
set -eux

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

Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
set -eux

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

Expand Down
66 changes: 24 additions & 42 deletions flake.lock
View file
Open in desktop

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

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.1";
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
Loading
Loading