diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2019-06-05 16:51:54 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2019-06-05 16:51:54 +0200 |
| commit | 54aff8430c4e7739903f6dbed713cc088e38507f (patch) | |
| tree | 4e8f84b5682b0480deb2c4943d244b9a5fe552e0 | |
| parent | 1b057929885fd3f339d4c85b44ad9f10fef7d8a9 (diff) | |
Move flake-related stuff to src/libexpr/flake
| -rw-r--r-- | src/libexpr/eval.cc | 2 | ||||
| -rw-r--r-- | src/libexpr/flake/flake.cc (renamed from src/libexpr/primops/flake.cc) | 2 | ||||
| -rw-r--r-- | src/libexpr/flake/flake.hh (renamed from src/libexpr/primops/flake.hh) | 0 | ||||
| -rw-r--r-- | src/libexpr/flake/flakeref.cc (renamed from src/libexpr/primops/flakeref.cc) | 0 | ||||
| -rw-r--r-- | src/libexpr/flake/flakeref.hh (renamed from src/libexpr/primops/flakeref.hh) | 0 | ||||
| -rw-r--r-- | src/libexpr/flake/lockfile.cc (renamed from src/libexpr/primops/lockfile.cc) | 0 | ||||
| -rw-r--r-- | src/libexpr/flake/lockfile.hh (renamed from src/libexpr/primops/lockfile.hh) | 0 | ||||
| -rw-r--r-- | src/libexpr/local.mk | 7 | ||||
| -rw-r--r-- | src/nix/flake.cc | 2 | ||||
| -rw-r--r-- | src/nix/installables.cc | 2 |
10 files changed, 10 insertions, 5 deletions
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc index 0f8a105b1..46c622ee8 100644 --- a/src/libexpr/eval.cc +++ b/src/libexpr/eval.cc @@ -7,7 +7,7 @@ #include "eval-inline.hh" #include "download.hh" #include "json.hh" -#include "primops/flake.hh" +#include "flake/flake.hh" #include <algorithm> #include <cstring> diff --git a/src/libexpr/primops/flake.cc b/src/libexpr/flake/flake.cc index 793d6da35..bb0543541 100644 --- a/src/libexpr/primops/flake.cc +++ b/src/libexpr/flake/flake.cc @@ -2,7 +2,7 @@ #include "lockfile.hh" #include "primops.hh" #include "eval-inline.hh" -#include "fetchGit.hh" +#include "primops/fetchGit.hh" #include "download.hh" #include "args.hh" diff --git a/src/libexpr/primops/flake.hh b/src/libexpr/flake/flake.hh index b8d0da252..b8d0da252 100644 --- a/src/libexpr/primops/flake.hh +++ b/src/libexpr/flake/flake.hh diff --git a/src/libexpr/primops/flakeref.cc b/src/libexpr/flake/flakeref.cc index 24af09124..24af09124 100644 --- a/src/libexpr/primops/flakeref.cc +++ b/src/libexpr/flake/flakeref.cc diff --git a/src/libexpr/primops/flakeref.hh b/src/libexpr/flake/flakeref.hh index 52bb82ddb..52bb82ddb 100644 --- a/src/libexpr/primops/flakeref.hh +++ b/src/libexpr/flake/flakeref.hh diff --git a/src/libexpr/primops/lockfile.cc b/src/libexpr/flake/lockfile.cc index 97c748c66..97c748c66 100644 --- a/src/libexpr/primops/lockfile.cc +++ b/src/libexpr/flake/lockfile.cc diff --git a/src/libexpr/primops/lockfile.hh b/src/libexpr/flake/lockfile.hh index b76124190..b76124190 100644 --- a/src/libexpr/primops/lockfile.hh +++ b/src/libexpr/flake/lockfile.hh diff --git a/src/libexpr/local.mk b/src/libexpr/local.mk index ccd5293e4..a9cb6b7b6 100644 --- a/src/libexpr/local.mk +++ b/src/libexpr/local.mk @@ -4,7 +4,12 @@ libexpr_NAME = libnixexpr libexpr_DIR := $(d) -libexpr_SOURCES := $(wildcard $(d)/*.cc) $(wildcard $(d)/primops/*.cc) $(d)/lexer-tab.cc $(d)/parser-tab.cc +libexpr_SOURCES := \ + $(wildcard $(d)/*.cc) \ + $(wildcard $(d)/primops/*.cc) \ + $(wildcard $(d)/flake/*.cc) \ + $(d)/lexer-tab.cc \ + $(d)/parser-tab.cc libexpr_LIBS = libutil libstore diff --git a/src/nix/flake.cc b/src/nix/flake.cc index 653154aaa..af1a361b3 100644 --- a/src/nix/flake.cc +++ b/src/nix/flake.cc @@ -4,7 +4,7 @@ #include "progress-bar.hh" #include "eval.hh" #include "eval-inline.hh" -#include "primops/flake.hh" +#include "flake/flake.hh" #include "get-drvs.hh" #include "store-api.hh" diff --git a/src/nix/installables.cc b/src/nix/installables.cc index ca88ec0da..a85295a09 100644 --- a/src/nix/installables.cc +++ b/src/nix/installables.cc @@ -7,7 +7,7 @@ #include "get-drvs.hh" #include "store-api.hh" #include "shared.hh" -#include "primops/flake.hh" +#include "flake/flake.hh" #include <regex> #include <queue> |