Skip to content

Commit 265e535

Browse files
Ericson2314Ericson2314
authored
Merge pull request #13786 from NixOS/mergify/bp/2.28-maintenance/pr-13785
flake: nixpkgs: nixos-unstable -> nixos-25.05-small (backport #13785)
2 parents 2939ee0 + 25b6535 commit 265e535

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+655
-570
lines changed

‎.git-blame-ignore-revs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
# bulk initial re-formatting with clang-format
22
a5264aa46eadb89c055b4d1442e814edb2d4414e # !autorebase ./maintainers/format.sh --until-stable
3+
# clang-format 18 -> clang-format 19
4+
945d9d7264b0dc7d0a8c8edf1cab34f38cd49a7f # !autorebase ./maintainers/format.sh --until-stable
5+
# nixfmt 1.0.0
6+
448bbbe0fd1fbe09cb46a238fec25b220f172122 # !autorebase ./maintainers/format.sh --until-stable

‎docker.nix‎

Lines changed: 47 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -38,59 +38,57 @@ let
3838
]
3939
++ extraPkgs;
4040

41-
users =
42-
{
41+
users = {
42+
43+
root = {
44+
uid = 0;
45+
shell = "${pkgs.bashInteractive}/bin/bash";
46+
home = "/root";
47+
gid = 0;
48+
groups = [ "root" ];
49+
description = "System administrator";
50+
};
4351

44-
root = {
45-
uid = 0;
46-
shell = "${pkgs.bashInteractive}/bin/bash";
47-
home = "/root";
48-
gid = 0;
49-
groups = [ "root" ];
50-
description = "System administrator";
51-
};
52+
nobody = {
53+
uid = 65534;
54+
shell = "${pkgs.shadow}/bin/nologin";
55+
home = "/var/empty";
56+
gid = 65534;
57+
groups = [ "nobody" ];
58+
description = "Unprivileged account (don't use!)";
59+
};
5260

53-
nobody = {
54-
uid = 65534;
55-
shell = "${pkgs.shadow}/bin/nologin";
56-
home = "/var/empty";
57-
gid = 65534;
58-
groups = [ "nobody" ];
59-
description = "Unprivileged account (don't use!)";
61+
}
62+
// lib.optionalAttrs (uid != 0) {
63+
"${uname}" = {
64+
uid = uid;
65+
shell = "${pkgs.bashInteractive}/bin/bash";
66+
home = "/home/${uname}";
67+
gid = gid;
68+
groups = [ "${gname}" ];
69+
description = "Nix user";
70+
};
71+
}
72+
// lib.listToAttrs (
73+
map (n: {
74+
name = "nixbld${toString n}";
75+
value = {
76+
uid = 30000 + n;
77+
gid = 30000;
78+
groups = [ "nixbld" ];
79+
description = "Nix build user ${toString n}";
6080
};
81+
}) (lib.lists.range 1 32)
82+
);
6183

62-
}
63-
// lib.optionalAttrs (uid != 0) {
64-
"${uname}" = {
65-
uid = uid;
66-
shell = "${pkgs.bashInteractive}/bin/bash";
67-
home = "/home/${uname}";
68-
gid = gid;
69-
groups = [ "${gname}" ];
70-
description = "Nix user";
71-
};
72-
}
73-
// lib.listToAttrs (
74-
map (n: {
75-
name = "nixbld${toString n}";
76-
value = {
77-
uid = 30000 + n;
78-
gid = 30000;
79-
groups = [ "nixbld" ];
80-
description = "Nix build user ${toString n}";
81-
};
82-
}) (lib.lists.range 1 32)
83-
);
84-
85-
groups =
86-
{
87-
root.gid = 0;
88-
nixbld.gid = 30000;
89-
nobody.gid = 65534;
90-
}
91-
// lib.optionalAttrs (gid != 0) {
92-
"${gname}".gid = gid;
93-
};
84+
groups = {
85+
root.gid = 0;
86+
nixbld.gid = 30000;
87+
nobody.gid = 65534;
88+
}
89+
// lib.optionalAttrs (gid != 0) {
90+
"${gname}".gid = gid;
91+
};
9492

9593
userToPasswd = (
9694
k:

‎flake.lock‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎flake.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
description = "The purely functional package manager";
33

4-
inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-24.11";
4+
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05-small";
55

66
inputs.nixpkgs-regression.url = "github:NixOS/nixpkgs/215d4d0fd80ca5163643b03a33fde804a29cc1e2";
77
inputs.nixpkgs-23-11.url = "github:NixOS/nixpkgs/a62e6edd6d5e1fa0329b8653c801147986f8d446";

‎packaging/components.nix‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ let
5454
preConfigure =
5555
prevAttrs.preConfigure or ""
5656
+
57-
# Update the repo-global .version file.
58-
# Symlink ./.version points there, but by default only workDir is writable.
59-
''
60-
chmod u+w ./.version
61-
echo ${finalAttrs.version} > ./.version
62-
'';
57+
# Update the repo-global .version file.
58+
# Symlink ./.version points there, but by default only workDir is writable.
59+
''
60+
chmod u+w ./.version
61+
echo ${finalAttrs.version} > ./.version
62+
'';
6363
};
6464

6565
localSourceLayer =
@@ -148,7 +148,8 @@ let
148148
nativeBuildInputs = [
149149
meson
150150
ninja
151-
] ++ prevAttrs.nativeBuildInputs or [ ];
151+
]
152+
++ prevAttrs.nativeBuildInputs or [ ];
152153
mesonCheckFlags = prevAttrs.mesonCheckFlags or [ ] ++ [
153154
"--print-errorlogs"
154155
];

‎packaging/everything.nix‎

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -46,24 +46,24 @@
4646
}:
4747

4848
let
49-
libs =
50-
{
51-
inherit
52-
nix-util
53-
nix-util-c
54-
nix-store
55-
nix-store-c
56-
nix-fetchers
57-
nix-expr
58-
nix-expr-c
59-
nix-flake
60-
nix-flake-c
61-
nix-main
62-
nix-main-c
63-
nix-cmd
64-
;
65-
}
66-
// lib.optionalAttrs
49+
libs = {
50+
inherit
51+
nix-util
52+
nix-util-c
53+
nix-store
54+
nix-store-c
55+
nix-fetchers
56+
nix-expr
57+
nix-expr-c
58+
nix-flake
59+
nix-flake-c
60+
nix-main
61+
nix-main-c
62+
nix-cmd
63+
;
64+
}
65+
//
66+
lib.optionalAttrs
6767
(!stdenv.hostPlatform.isStatic && stdenv.buildPlatform.canExecute stdenv.hostPlatform)
6868
{
6969
# Currently fails in static build
@@ -125,20 +125,19 @@ stdenv.mkDerivation (finalAttrs: {
125125
*/
126126
dontFixup = true;
127127

128-
checkInputs =
129-
[
130-
# Make sure the unit tests have passed
131-
nix-util-tests.tests.run
132-
nix-store-tests.tests.run
133-
nix-expr-tests.tests.run
134-
nix-fetchers-tests.tests.run
135-
nix-flake-tests.tests.run
136-
137-
# Make sure the functional tests have passed
138-
nix-functional-tests
139-
]
140-
++ lib.optionals
141-
(!stdenv.hostPlatform.isStatic && stdenv.buildPlatform.canExecute stdenv.hostPlatform)
128+
checkInputs = [
129+
# Make sure the unit tests have passed
130+
nix-util-tests.tests.run
131+
nix-store-tests.tests.run
132+
nix-expr-tests.tests.run
133+
nix-fetchers-tests.tests.run
134+
nix-flake-tests.tests.run
135+
136+
# Make sure the functional tests have passed
137+
nix-functional-tests
138+
]
139+
++
140+
lib.optionals (!stdenv.hostPlatform.isStatic && stdenv.buildPlatform.canExecute stdenv.hostPlatform)
142141
[
143142
# Perl currently fails in static build
144143
# TODO: Split out tests into a separate derivation?

‎src/libcmd/installables.cc‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -505,8 +505,9 @@ Installables SourceExprCommand::parseInstallables(ref<Store> store, std::vector<
505505

506506
for (auto & s : ss) {
507507
auto [prefix, extendedOutputsSpec] = ExtendedOutputsSpec::parse(s);
508-
result.push_back(make_ref<InstallableAttrPath>(
509-
InstallableAttrPath::parse(state, *this, vFile, std::move(prefix), std::move(extendedOutputsSpec))));
508+
result.push_back(
509+
make_ref<InstallableAttrPath>(InstallableAttrPath::parse(
510+
state, *this, vFile, std::move(prefix), std::move(extendedOutputsSpec))));
510511
}
511512

512513
} else {
@@ -521,8 +522,9 @@ Installables SourceExprCommand::parseInstallables(ref<Store> store, std::vector<
521522

522523
if (prefix.find('/') != std::string::npos) {
523524
try {
524-
result.push_back(make_ref<InstallableDerivedPath>(
525-
InstallableDerivedPath::parse(store, prefix, extendedOutputsSpec.raw)));
525+
result.push_back(
526+
make_ref<InstallableDerivedPath>(
527+
InstallableDerivedPath::parse(store, prefix, extendedOutputsSpec.raw)));
526528
continue;
527529
} catch (BadStorePath &) {
528530
} catch (...) {
@@ -534,15 +536,16 @@ Installables SourceExprCommand::parseInstallables(ref<Store> store, std::vector<
534536
try {
535537
auto [flakeRef, fragment] =
536538
parseFlakeRefWithFragment(fetchSettings, std::string{prefix}, absPath(getCommandBaseDir()));
537-
result.push_back(make_ref<InstallableFlake>(
538-
this,
539-
getEvalState(),
540-
std::move(flakeRef),
541-
fragment,
542-
std::move(extendedOutputsSpec),
543-
getDefaultFlakeAttrPaths(),
544-
getDefaultFlakeAttrPathPrefixes(),
545-
lockFlags));
539+
result.push_back(
540+
make_ref<InstallableFlake>(
541+
this,
542+
getEvalState(),
543+
std::move(flakeRef),
544+
fragment,
545+
std::move(extendedOutputsSpec),
546+
getDefaultFlakeAttrPaths(),
547+
getDefaultFlakeAttrPathPrefixes(),
548+
lockFlags));
546549
continue;
547550
} catch (...) {
548551
ex = std::current_exception();
@@ -610,10 +613,11 @@ static void throwBuildErrors(std::vector<KeyedBuildResult> & buildResults, const
610613
StringSet failedPaths;
611614
for (; failedResult != failed.end(); failedResult++) {
612615
if (!failedResult->errorMsg.empty()) {
613-
logError(ErrorInfo{
614-
.level = lvlError,
615-
.msg = failedResult->errorMsg,
616-
});
616+
logError(
617+
ErrorInfo{
618+
.level = lvlError,
619+
.msg = failedResult->errorMsg,
620+
});
617621
}
618622
failedPaths.insert(failedResult->path.to_string(store));
619623
}

‎src/libcmd/package.nix‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ mkMesonLibrary (finalAttrs: {
5353

5454
buildInputs = [
5555
({ inherit editline readline; }.${readlineFlavor})
56-
] ++ lib.optional enableMarkdown lowdown;
56+
]
57+
++ lib.optional enableMarkdown lowdown;
5758

5859
propagatedBuildInputs = [
5960
nix-util

‎src/libcmd/repl.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,7 @@ ProcessLineResult NixRepl::processLine(std::string line)
650650
for (auto & arg : args)
651651
arg = "*" + arg + "*";
652652

653-
markdown += "**Synopsis:** `builtins." + (std::string)(*doc->name) + "` " + concatStringsSep(" ", args)
653+
markdown += "**Synopsis:** `builtins." + (std::string) (*doc->name) + "` " + concatStringsSep(" ", args)
654654
+ "\n\n";
655655
}
656656

‎src/libexpr-tests/trivial.cc‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -220,25 +220,28 @@ INSTANTIATE_TEST_SUITE_P(
220220
// expanded.
221221
#define X_EXPAND_IF0(k, v) k "." v
222222
#define X_EXPAND_IF1(k, v) k " = { " v " };"
223-
#define X4(w, x, y, z) \
224-
TEST_F(TrivialExpressionTest, nestedAttrsetMerge##w##x##y##z) \
225-
{ \
226-
auto v = eval("{ a.b = { c = 1; d = 2; }; } == { " X_EXPAND_IF##w( \
227-
"a", X_EXPAND_IF##x("b", "c = 1;")) " " X_EXPAND_IF##y("a", X_EXPAND_IF##z("b", "d = 2;")) " }"); \
228-
ASSERT_THAT(v, IsTrue()); \
229-
}; \
230-
TEST_F(TrivialExpressionTest, nestedAttrsetMergeDup##w##x##y##z) \
231-
{ \
232-
ASSERT_THROW( \
233-
eval("{ " X_EXPAND_IF##w("a", X_EXPAND_IF##x("b", "c = 1;")) " " X_EXPAND_IF##y( \
234-
"a", X_EXPAND_IF##z("b", "c = 2;")) " }"), \
235-
Error); \
236-
}; \
237-
TEST_F(TrivialExpressionTest, nestedAttrsetMergeLet##w##x##y##z) \
238-
{ \
239-
auto v = eval("{ b = { c = 1; d = 2; }; } == (let " X_EXPAND_IF##w( \
240-
"a", X_EXPAND_IF##x("b", "c = 1;")) " " X_EXPAND_IF##y("a", X_EXPAND_IF##z("b", "d = 2;")) " in a)"); \
241-
ASSERT_THAT(v, IsTrue()); \
223+
#define X4(w, x, y, z) \
224+
TEST_F(TrivialExpressionTest, nestedAttrsetMerge##w##x##y##z) \
225+
{ \
226+
auto v = eval( \
227+
"{ a.b = { c = 1; d = 2; }; } == { " X_EXPAND_IF##w( \
228+
"a", X_EXPAND_IF##x("b", "c = 1;")) " " X_EXPAND_IF##y("a", X_EXPAND_IF##z("b", "d = 2;")) " }"); \
229+
ASSERT_THAT(v, IsTrue()); \
230+
}; \
231+
TEST_F(TrivialExpressionTest, nestedAttrsetMergeDup##w##x##y##z) \
232+
{ \
233+
ASSERT_THROW( \
234+
eval( \
235+
"{ " X_EXPAND_IF##w("a", X_EXPAND_IF##x("b", "c = 1;")) " " X_EXPAND_IF##y( \
236+
"a", X_EXPAND_IF##z("b", "c = 2;")) " }"), \
237+
Error); \
238+
}; \
239+
TEST_F(TrivialExpressionTest, nestedAttrsetMergeLet##w##x##y##z) \
240+
{ \
241+
auto v = eval( \
242+
"{ b = { c = 1; d = 2; }; } == (let " X_EXPAND_IF##w( \
243+
"a", X_EXPAND_IF##x("b", "c = 1;")) " " X_EXPAND_IF##y("a", X_EXPAND_IF##z("b", "d = 2;")) " in a)"); \
244+
ASSERT_THAT(v, IsTrue()); \
242245
};
243246
#define X3(...) X4(__VA_ARGS__, 0) X4(__VA_ARGS__, 1)
244247
#define X2(...) X3(__VA_ARGS__, 0) X3(__VA_ARGS__, 1)

0 commit comments

Comments
 (0)