Skip to content

nixVersions.git: Fix version and test it #323140

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
Artturin merged 2 commits into from
Jul 2, 2024
Merged

nixVersions.git: Fix version and test it #323140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5660f47
nixVersions.git: Fix version
roberth Jun 28, 2024
42877a5
nixVersions.*.tests.srcVersion: Test that version is ${src}/.version
roberth Jun 28, 2024
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
16 changes: 16 additions & 0 deletions pkgs/tools/package-management/nix/common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ in

# passthru tests
, pkgsi686Linux
, runCommand
}: let
self = stdenv.mkDerivation {
pname = "nix";
Expand Down Expand Up @@ -259,6 +260,21 @@ self = stdenv.mkDerivation {
# Basic smoke test that needs to pass when upgrading nix.
# Note that this test does only test the nixVersions.stable attribute.
misc = nixosTests.nix-misc.default;

srcVersion = runCommand "nix-src-version" {
inherit version;
} ''
# This file is an implementation detail, but it's a good sanity check
# If upstream changes that, we'll have to adapt.
srcVersion=$(cat ${src}/.version)
echo "Version in nix nix expression: $version"
echo "Version in nix.src: $srcVersion"
if [ "$version" != "$srcVersion" ]; then
echo "Version mismatch!"
exit 1
fi
touch $out
'';
};
};

Expand Down
2 changes: 1 addition & 1 deletion pkgs/tools/package-management/nix/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ in lib.makeExtensible (self: ({
};

git = common rec {
version = "2.23.1";
version = "2.24.0";
suffix = "pre20240627_${lib.substring 0 8 src.rev}";
src = fetchFromGitHub {
owner = "NixOS";
Expand Down