wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 01:51:47 +02:00
Code Activity

Merge remote-tracking branch 'upstream/master' into more-nix-shell

Browse source
This commit is contained in:
Robert Hensing 2024-07-10 16:19:18 +02:00
commit d942d505ca
71 changed files with 518 additions and 321 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/unit/libexpr-support/package.nix
View file

@ -14,13 +14,11 @@
# Configuration Options
, versionSuffix ? ""
, version
}:
let
inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix;
in
mkMesonDerivation (finalAttrs: {

2
tests/unit/libexpr/meson.build
View file

@ -41,7 +41,7 @@ add_project_arguments(
# It would be nice for our headers to be idempotent instead.
'-include', 'config-util.hh',
'-include', 'config-store.hh',
'-include', 'config-store.hh',
'-include', 'config-expr.hh',
'-include', 'config-util.h',
'-include', 'config-store.h',
'-include', 'config-expr.h',

7
tests/unit/libexpr/package.nix
View file

@ -17,13 +17,12 @@
# Configuration Options
, versionSuffix ? ""
, version
, resolvePath
}:
let
inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix;
in
mkMesonDerivation (finalAttrs: {
@ -86,7 +85,7 @@ mkMesonDerivation (finalAttrs: {
run = runCommand "${finalAttrs.pname}-run" {
} ''
PATH="${lib.makeBinPath [ finalAttrs.finalPackage ]}:$PATH"
export _NIX_TEST_UNIT_DATA=${./data}
export _NIX_TEST_UNIT_DATA=${resolvePath ./data}
nix-expr-tests
touch $out
'';

2
tests/unit/libfetchers/meson.build
View file

@ -37,7 +37,7 @@ add_project_arguments(
# It would be nice for our headers to be idempotent instead.
'-include', 'config-util.hh',
'-include', 'config-store.hh',
'-include', 'config-store.hh',
# '-include', 'config-fetchers.h',
language : 'cpp',
)

7
tests/unit/libfetchers/package.nix
View file

@ -16,13 +16,12 @@
# Configuration Options
, versionSuffix ? ""
, version
, resolvePath
}:
let
inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix;
in
mkMesonDerivation (finalAttrs: {
@ -84,7 +83,7 @@ mkMesonDerivation (finalAttrs: {
run = runCommand "${finalAttrs.pname}-run" {
} ''
PATH="${lib.makeBinPath [ finalAttrs.finalPackage ]}:$PATH"
export _NIX_TEST_UNIT_DATA=${./data}
export _NIX_TEST_UNIT_DATA=${resolvePath ./data}
nix-fetchers-tests
touch $out
'';

7
tests/unit/libflake/package.nix
View file

@ -16,13 +16,12 @@
# Configuration Options
, versionSuffix ? ""
, version
, resolvePath
}:
let
inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix;
in
mkMesonDerivation (finalAttrs: {
@ -84,7 +83,7 @@ mkMesonDerivation (finalAttrs: {
run = runCommand "${finalAttrs.pname}-run" {
} ''
PATH="${lib.makeBinPath [ finalAttrs.finalPackage ]}:$PATH"
export _NIX_TEST_UNIT_DATA=${./data}
export _NIX_TEST_UNIT_DATA=${resolvePath ./data}
nix-flake-tests
touch $out
'';

4
tests/unit/libstore-support/package.nix
View file

@ -14,13 +14,11 @@
# Configuration Options
, versionSuffix ? ""
, version
}:
let
inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix;
in
mkMesonDerivation (finalAttrs: {

7
tests/unit/libstore/package.nix
View file

@ -18,13 +18,12 @@
# Configuration Options
, versionSuffix ? ""
, version
, filesetToSource
}:
let
inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix;
in
mkMesonDerivation (finalAttrs: {
@ -88,7 +87,7 @@ mkMesonDerivation (finalAttrs: {
run = let
# Some data is shared with the functional tests: they create it,
# we consume it.
data = lib.fileset.toSource {
data = filesetToSource {
root = ../..;
fileset = lib.fileset.unions [
./data

4
tests/unit/libutil-support/package.nix
View file

@ -13,13 +13,11 @@
# Configuration Options
, versionSuffix ? ""
, version
}:
let
inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix;
in
mkMesonDerivation (finalAttrs: {

4
tests/unit/libutil/package.nix
View file

@ -17,13 +17,11 @@
# Configuration Options
, versionSuffix ? ""
, version
}:
let
inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix;
in
mkMesonDerivation (finalAttrs: {