mirror of
https://github.com/NixOS/nix
synced 2025-07-10 21:23:56 +02:00
Tagging release 2.28.0
-----BEGIN PGP SIGNATURE----- iQFHBAABCAAxFiEEtUHVUwEnDgvPFcpdgXC0cm1xmN4FAmfv9fITHGVkb2xzdHJh QGdtYWlsLmNvbQAKCRCBcLRybXGY3ohrCAC1Uw/JJr3yEPlJ/jLc9t9HqEKMY08W W6SEjpYJHYixMXmoonexkqojncNWBaiytRa+vBY7JQq0xTOOBwj42TM2ZzMF4GXi vO4Ox0hEsRa/v7tSmK6GFz1sNEKEUOHDNbilg4kzkkBHPEGPUGMwdWkT0akO576Q SQ6ERwPPLsHDI2YtAeAD8R4p07CraiyA34ljDPz3rChTAXRPVKWxJUt1enwEWYTr cKk45RcR4S8rP1BVwf3wsNsrHjqjbaY45kPAo8GD79hFH0zkyJarS3Kgv8qsWLra 9ph0DVVG0wiArlET7Y3uchqtAC0Z5LOnutAmOFYFw6DKfWp9yGfl/SVW =XRda -----END PGP SIGNATURE----- Merge tag '2.28.0' into sync-2.28.0 Tagging release 2.28.0
This commit is contained in:
commit
852075ec9d
697 changed files with 4531 additions and 3970 deletions
|
@ -79,4 +79,13 @@ rec {
|
|||
buildCommand = ''echo ${dep} > "''${outputs[out]}"'';
|
||||
};
|
||||
|
||||
test12 = makeTest 12 {
|
||||
builder = builtins.toFile "builder.sh" "mkdir $out $lib";
|
||||
outputs = [
|
||||
"out"
|
||||
"lib"
|
||||
];
|
||||
disallowedReferences = [ "dev" ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
@ -60,3 +60,9 @@ if ! isTestOnNixOS; then
|
|||
fi
|
||||
|
||||
fi
|
||||
|
||||
if isDaemonNewer "2.28pre20241225"; then
|
||||
# test12 should fail (syntactically invalid).
|
||||
expectStderr 1 nix-build -vvv -o "$RESULT" check-refs.nix -A test12 >"$TEST_ROOT/test12.stderr"
|
||||
grepQuiet -F "output check for 'lib' contains an illegal reference specifier 'dev', expected store path or output name (one of [lib, out])" < "$TEST_ROOT/test12.stderr"
|
||||
fi
|
||||
|
|
|
@ -1,14 +1,6 @@
|
|||
libplugintest = shared_module(
|
||||
'plugintest',
|
||||
'plugintest.cc',
|
||||
cpp_args : [
|
||||
# TODO(Qyriad): Yes this is how the autoconf+Make system did it.
|
||||
# It would be nice for our headers to be idempotent instead.
|
||||
'-include', 'config-util.hh',
|
||||
'-include', 'config-store.hh',
|
||||
# '-include', 'config-fetchers.hh',
|
||||
'-include', 'config-expr.hh',
|
||||
],
|
||||
dependencies : [
|
||||
dependency('nix-expr'),
|
||||
],
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#include "config-global.hh"
|
||||
#include "primops.hh"
|
||||
#include "nix/util/config-global.hh"
|
||||
#include "nix/expr/primops.hh"
|
||||
|
||||
using namespace nix;
|
||||
|
||||
|
|
|
@ -56,6 +56,10 @@ testRepl () {
|
|||
nix repl "${nixArgs[@]}" 2>&1 <<< "builtins.currentSystem" \
|
||||
| grep "$(nix-instantiate --eval -E 'builtins.currentSystem')"
|
||||
|
||||
# regression test for #12163
|
||||
replOutput=$(nix repl "${nixArgs[@]}" 2>&1 <<< ":sh import $testDir/simple.nix")
|
||||
echo "$replOutput" | grepInverse "error: Cannot run 'nix-shell'"
|
||||
|
||||
expectStderr 1 nix repl "${testDir}/simple.nix" \
|
||||
| grepQuiet -s "error: path '$testDir/simple.nix' is not a flake"
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#include "globals.hh"
|
||||
#include "store-api.hh"
|
||||
#include "build-result.hh"
|
||||
#include "nix/store/globals.hh"
|
||||
#include "nix/store/store-api.hh"
|
||||
#include "nix/store/build-result.hh"
|
||||
#include <iostream>
|
||||
|
||||
using namespace nix;
|
||||
|
|
|
@ -1,12 +1,6 @@
|
|||
libstoreconsumer_tester = executable(
|
||||
'test-libstoreconsumer',
|
||||
'main.cc',
|
||||
cpp_args : [
|
||||
# TODO(Qyriad): Yes this is how the autoconf+Make system did it.
|
||||
# It would be nice for our headers to be idempotent instead.
|
||||
'-include', 'config-util.hh',
|
||||
'-include', 'config-store.hh',
|
||||
],
|
||||
dependencies : [
|
||||
dependency('nix-store'),
|
||||
],
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue