Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0744f7f83bfa
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 358da474d767
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Jul 30, 2020

  1. Add test for builtins.path

    @matthewbauer
    matthewbauer committed Jul 30, 2020
    Copy the full SHA
    0bdd6cf View commit details

  2. Make expectedHash optional in prim_path 

    This fixes an error found in builtins.path that looks like:

store path mismatch in (possibly filtered) path added from '/private/tmp/nix-shell.CyXViH/nix-test/filter-source/filterin'

when no hash is specified
    @matthewbauer
    matthewbauer committed Jul 30, 2020
    Copy the full SHA
    cdc2386 View commit details

Commits on Jul 31, 2020

  1. Merge pull request #3881 from matthewbauer/fix-builtins-path 

    Fix builtins.path
    @edolstra
    edolstra authored Jul 31, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    358da47 View commit details
Showing with 27 additions and 7 deletions.
  1. +1 −1 src/libexpr/primops.cc
  2. +12 −6 tests/filter-source.sh
  3. +14 −0 tests/path.nix
2 changes: 1 addition & 1 deletion src/libexpr/primops.cc
View file
Original file line number Diff line number Diff line change
@@ -1199,7 +1199,7 @@ static void prim_path(EvalState & state, const Pos & pos, Value * * args, Value
string name;
Value * filterFun = nullptr;
auto method = FileIngestionMethod::Recursive;
Hash expectedHash(htSHA256);
std::optional<Hash> expectedHash;

for (auto & attr : *args[0]->attrs) {
const string & n(attr.name);
18 changes: 12 additions & 6 deletions tests/filter-source.sh
View file
Original file line number Diff line number Diff line change
@@ -10,10 +10,16 @@ touch $TEST_ROOT/filterin/bak
touch $TEST_ROOT/filterin/bla.c.bak
ln -s xyzzy $TEST_ROOT/filterin/link

nix-build ./filter-source.nix -o $TEST_ROOT/filterout
checkFilter() {
test ! -e $1/foo/bar
test -e $1/xyzzy
test -e $1/bak
test ! -e $1/bla.c.bak
test ! -L $1/link
}

test ! -e $TEST_ROOT/filterout/foo/bar
test -e $TEST_ROOT/filterout/xyzzy
test -e $TEST_ROOT/filterout/bak
test ! -e $TEST_ROOT/filterout/bla.c.bak
test ! -L $TEST_ROOT/filterout/link
nix-build ./filter-source.nix -o $TEST_ROOT/filterout1
checkFilter $TEST_ROOT/filterout1

nix-build ./path.nix -o $TEST_ROOT/filterout2
checkFilter $TEST_ROOT/filterout2
14 changes: 14 additions & 0 deletions tests/path.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
with import ./config.nix;

mkDerivation {
name = "filter";
builder = builtins.toFile "builder" "ln -s $input $out";
input =
builtins.path {
path = ((builtins.getEnv "TEST_ROOT") + "/filterin");
filter = path: type:
type != "symlink"
&& baseNameOf path != "foo"
&& !((import ./lang/lib.nix).hasSuffix ".bak" (baseNameOf path));
};
}