qyriad/lix
1
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Move flake-related stuff to src/libexpr/flake

Browse source
This commit is contained in:
Eelco Dolstra 2019-06-05 16:51:54 +02:00
parent 1b05792988
commit 54aff8430c
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
10 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libexpr/eval.cc
View file

@ -7,7 +7,7 @@
#include "eval-inline.hh" #include "eval-inline.hh"
#include "download.hh" #include "download.hh"
#include "json.hh" #include "json.hh"
#include "primops/flake.hh" #include "flake/flake.hh"
#include <algorithm> #include <algorithm>
#include <cstring> #include <cstring>

2
src/libexpr/primops/flake.cc → src/libexpr/flake/flake.cc
View file

@ -2,7 +2,7 @@
#include "lockfile.hh" #include "lockfile.hh"
#include "primops.hh" #include "primops.hh"
#include "eval-inline.hh" #include "eval-inline.hh"
#include "fetchGit.hh" #include "primops/fetchGit.hh"
#include "download.hh" #include "download.hh"
#include "args.hh" #include "args.hh"

0
src/libexpr/primops/flake.hh → src/libexpr/flake/flake.hh
View file

0
src/libexpr/primops/flakeref.cc → src/libexpr/flake/flakeref.cc
View file

0
src/libexpr/primops/flakeref.hh → src/libexpr/flake/flakeref.hh
View file

0
src/libexpr/primops/lockfile.cc → src/libexpr/flake/lockfile.cc
View file

0
src/libexpr/primops/lockfile.hh → src/libexpr/flake/lockfile.hh
View file

7
src/libexpr/local.mk
View file

@ -4,7 +4,12 @@ libexpr_NAME = libnixexpr
libexpr_DIR := $(d) 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 libexpr_LIBS = libutil libstore

2
src/nix/flake.cc
View file

@ -4,7 +4,7 @@
#include "progress-bar.hh" #include "progress-bar.hh"
#include "eval.hh" #include "eval.hh"
#include "eval-inline.hh" #include "eval-inline.hh"
#include "primops/flake.hh" #include "flake/flake.hh"
#include "get-drvs.hh" #include "get-drvs.hh"
#include "store-api.hh" #include "store-api.hh"

2
src/nix/installables.cc
View file

@ -7,7 +7,7 @@
#include "get-drvs.hh" #include "get-drvs.hh"
#include "store-api.hh" #include "store-api.hh"
#include "shared.hh" #include "shared.hh"
#include "primops/flake.hh" #include "flake/flake.hh"
#include <regex> #include <regex>
#include <queue> #include <queue>