Skip to content

Update to Nix 2.28 #669

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
merged 3 commits into from
Apr 12, 2025
Merged

Update to Nix 2.28 #669

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
d276cd9
flake.lock: Update, temporarily to Nix master
Ericson2314 Apr 8, 2025
dd9d7bb
Run `nix fmt`
Ericson2314 Apr 9, 2025
7162bce
Update to Nix 2.28
Ericson2314 Apr 9, 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
2 changes: 0 additions & 2 deletions default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ stdenv.mkDerivation {
nlohmann_json
];

env.CXXFLAGS = "-include ${nix.dev}/include/nix/config.h";
Copy link
Member

@inclyc inclyc Apr 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confirm that this is not needed anymore?

Copy link
Contributor Author

@Ericson2314 Ericson2314 Apr 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, config file cleanup is the big milestone in 2.28!


doCheck = !stdenv.isDarwin;

checkPhase = ''
Expand Down
7 changes: 3 additions & 4 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.

5 changes: 3 additions & 2 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
# Temporary, until channel catchs up with Nix 2.28
nixpkgs.url = "github:NixOS/nixpkgs";

flake-parts.url = "github:hercules-ci/flake-parts";

Expand Down Expand Up @@ -33,7 +34,7 @@
callPackage
stdenv
;
nix = nixVersions.nix_2_25;
nix = nixVersions.nix_2_28;
llvmPackages = llvmPackages_19;
nixf = callPackage ./libnixf { };
nixt = callPackage ./libnixt { inherit nix; };
Expand Down
2 changes: 0 additions & 2 deletions libnixt/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ stdenv.mkDerivation {
boost182
];

env.CXXFLAGS = "-include ${nix.dev}/include/nix/config.h";

meta = {
mainProgram = "nixt";
description = "Nix language frontend, parser & semantic analysis";
Expand Down
2 changes: 1 addition & 1 deletion libnixt/include/nixt/Deserialize.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#include "HookExpr.h"
#include "PtrPool.h"

#include <nix/expr/nixexpr.hh>
#include <nix/input-accessor.hh>
Copy link
Contributor Author

@Ericson2314 Ericson2314 Apr 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

input-accessor.hh doesn't exist anymore, yet I built everything. Is this file dead code?

Copy link
Member

@inclyc inclyc Apr 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. Related issue: #574

#include <nix/nixexpr.hh>

#include <string_view>

Expand Down
2 changes: 1 addition & 1 deletion libnixt/include/nixt/Displacement.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#pragma once

#include <nix/nixexpr.hh>
#include <nix/expr/nixexpr.hh>

namespace nixt {

Expand Down
2 changes: 1 addition & 1 deletion libnixt/include/nixt/Flake.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#pragma once

#include <nix/eval.hh>
#include <nix/expr/eval.hh>

#include <string_view>

Expand Down
2 changes: 1 addition & 1 deletion libnixt/include/nixt/HackCache.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#pragma once

#include <nix/eval.hh>
#include <nix/expr/eval.hh>

namespace nixt {

Expand Down
2 changes: 1 addition & 1 deletion libnixt/include/nixt/HookExpr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <nix/nixexpr.hh>
#include <nix/expr/nixexpr.hh>

#include <map>

Expand Down
17 changes: 9 additions & 8 deletions libnixt/include/nixt/InitEval.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
#pragma once

#include <nix/common-eval-args.hh>
#include <nix/eval-gc.hh>
#include <nix/eval-settings.hh>
#include <nix/eval.hh>
#include <nix/cmd/common-eval-args.hh>
#include <nix/expr/eval-gc.hh>
#include <nix/expr/eval-settings.hh>
#include <nix/expr/eval.hh>
#include <nix/flake/flake.hh>
#include <nix/plugin.hh>
#include <nix/shared.hh>
#include <nix/store-api.hh>
#include <nix/flake/settings.hh>
#include <nix/main/plugin.hh>
#include <nix/main/shared.hh>
#include <nix/store/store-api.hh>

namespace nixt {

inline void initEval() {
nix::initNix();
nix::initLibStore();
nix::flake::initLib(nix::flakeSettings);
nix::flakeSettings.configureEvalSettings(nix::evalSettings);
nix::initPlugins();
nix::initGC();
}
Expand Down
2 changes: 1 addition & 1 deletion libnixt/include/nixt/Serialize.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include <nixbc/Type.h>

#include <nix/nixexpr.hh>
#include <nix/expr/nixexpr.hh>

namespace nixt {

Expand Down
2 changes: 1 addition & 1 deletion libnixt/include/nixt/Value.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <nix/eval.hh>
#include <nix/expr/eval.hh>

namespace nixt {

Expand Down
8 changes: 5 additions & 3 deletions libnixt/include/nixt/Visitor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

#pragma once

#include <nix/nixexpr.hh>
#include <nix/symbol-table.hh>
#include <nix/expr/nixexpr.hh>
#include <nix/expr/symbol-table.hh>

/// \brief Library for playing with `nix::Expr` nodes.
///
Expand Down Expand Up @@ -89,7 +89,9 @@ template <class Derived> struct RecursiveASTVisitor {
bool RecursiveASTVisitor<Derived>::traverse##TYPE(const nix::TYPE *T) { \
if (!getDerived().shouldTraversePostOrder()) \
TRY_TO(visit##TYPE(T)); \
{ CODE; } \
{ \
CODE; \
} \
if (getDerived().shouldTraversePostOrder()) \
TRY_TO(visit##TYPE(T)); \
return true; \
Expand Down
2 changes: 1 addition & 1 deletion libnixt/lib/Kinds.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "nixt/Kinds.h"

#include <nix/nixexpr.hh>
#include <nix/expr/nixexpr.hh>

namespace nixt {

Expand Down
8 changes: 4 additions & 4 deletions libnixt/lib/Value.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#include "nixt/Value.h"

#include <nix/attr-path.hh>
#include <nix/nixexpr.hh>
#include <nix/symbol-table.hh>
#include <nix/value.hh>
#include <nix/expr/attr-path.hh>
#include <nix/expr/nixexpr.hh>
#include <nix/expr/symbol-table.hh>
#include <nix/expr/value.hh>

using namespace nixt;

Expand Down
2 changes: 1 addition & 1 deletion libnixt/test/Kinds.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include "nixt/Kinds.h"

#include <nix/nixexpr.hh>
#include <nix/expr/nixexpr.hh>

namespace {

Expand Down
6 changes: 3 additions & 3 deletions libnixt/test/StateTest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <gtest/gtest.h>

#include <nix/common-eval-args.hh>
#include <nix/eval.hh>
#include <nix/store-api.hh>
#include <nix/cmd/common-eval-args.hh>
#include <nix/expr/eval.hh>
#include <nix/store/store-api.hh>

namespace nixt {

Expand Down
2 changes: 0 additions & 2 deletions nixd/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ stdenv.mkDerivation {
boost182
];

env.CXXFLAGS = "-include ${nix.dev}/include/nix/config.h";

meta = {
mainProgram = "nixd";
description = "Nix language server";
Expand Down
2 changes: 1 addition & 1 deletion nixd/include/nixd/Eval/AttrSetProvider.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#include "lspserver/LSPServer.h"

#include <nix/eval.hh>
#include <nix/expr/eval.hh>

#include <memory>

Expand Down
2 changes: 1 addition & 1 deletion nixd/include/nixd/Eval/EvalProvider.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <nixt/HookExpr.h>
#include <nixt/PtrPool.h>

#include <nix/nixexpr.hh>
#include <nix/expr/nixexpr.hh>

namespace nixd {

Expand Down
2 changes: 1 addition & 1 deletion nixd/include/nixd/Protocol/AttrSet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#pragma clang diagnostic ignored "-Wdocumentation"
#endif

#include <nix/value.hh>
#include <nix/expr/value.hh>

#ifdef __clang__
#pragma clang diagnostic pop
Expand Down
8 changes: 4 additions & 4 deletions nixd/lib/Eval/AttrSetProvider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

#include "lspserver/Protocol.h"

#include <nix/attr-path.hh>
#include <nix/common-eval-args.hh>
#include <nix/nixexpr.hh>
#include <nix/store-api.hh>
#include <nix/cmd/common-eval-args.hh>
#include <nix/expr/attr-path.hh>
#include <nix/expr/nixexpr.hh>
#include <nix/store/store-api.hh>
#include <nixt/Value.h>

using namespace nixd;
Expand Down