Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP Include our CA work and enable content-addressed tests #2

Open
wants to merge 855 commits into
base: terminal-ca-derivations
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
855 commits
Select commit Hold shift + click to select a range
ce3173e
nix flake info --json: Don't evaluate
edolstra Apr 6, 2020
68b43e0
nix flake info: Show resolved URL
edolstra Apr 6, 2020
5495586
Merge remote-tracking branch 'origin/master' into flakes
edolstra Apr 7, 2020
03a4a3c
Merge branch 'flakes' of github.com:NixOS/nix into flakes
edolstra Apr 7, 2020
d103c79
Merge remote-tracking branch 'origin/master' into flakes
edolstra Apr 9, 2020
3aaceeb
Fix build
edolstra Apr 9, 2020
e5ea01c
Remove flake 'edition' field
edolstra Apr 10, 2020
c0c2cb8
Merge remote-tracking branch 'origin/master' into flakes
edolstra Apr 14, 2020
3729df3
Make Registry::read() more robust
edolstra Apr 14, 2020
696c026
Logger: Add method for writing to stdout
edolstra Apr 16, 2020
8f41847
Use Logger::stdout()
edolstra Apr 16, 2020
0858738
Merge remote-tracking branch 'origin/master' into flakes
edolstra Apr 16, 2020
f89349f
Merge remote-tracking branch 'origin/master' into flakes
edolstra Apr 16, 2020
c277231
Use RootValue
edolstra Apr 16, 2020
29043e7
Fix
edolstra Apr 16, 2020
3b489e8
Add 'nix flake show' command
edolstra Apr 16, 2020
7a9687b
SQLiteStmt: Use std::string_view
edolstra Apr 16, 2020
12b7eef
nix flake show: Use evaluation cache
edolstra Apr 16, 2020
a6c4fd0
Hide progress bar on exit
edolstra Apr 16, 2020
9ea4f93
nix flake show: Support apps
edolstra Apr 16, 2020
aa34c0e
nix flake show: Speed up eval cache bigly
edolstra Apr 17, 2020
bdb3226
Add flag to disable the eval cache
edolstra Apr 17, 2020
aaa1095
Use a more space/time-efficient representation for the eval cache
edolstra Apr 17, 2020
69cb9f7
Wrap eval cache creation in a giant transaction
edolstra Apr 17, 2020
3738bcb
Eval cache: Don't replace real attributes with placeholders
edolstra Apr 18, 2020
0725ab2
Store more stuff in the evaluation cache
edolstra Apr 19, 2020
539a9c1
Get rid of the old eval cache
edolstra Apr 20, 2020
42a12f9
Move eval-cache.{cc,hh}
edolstra Apr 20, 2020
b69323f
Revive 'nix search'
edolstra Apr 20, 2020
8c75621
Fix typo
edolstra Apr 20, 2020
c7af247
Path fetcher: Fix store path name
edolstra Apr 22, 2020
ef4d3fc
Merge remote-tracking branch 'origin/master' into flakes
edolstra Apr 23, 2020
0469795
nix search: Show version
edolstra Apr 24, 2020
b4e23dc
nix search: Search legacyPackages recursively
edolstra Apr 27, 2020
b51dff4
Improve error message when an argument is not a flake
edolstra Apr 27, 2020
829dcb3
flake-template.nix: Add defaultPackage
edolstra Apr 27, 2020
6521c92
Improve path:// handling
edolstra Apr 27, 2020
5ada083
Merge remote-tracking branch 'origin/master' into flakes
edolstra Apr 29, 2020
70bcd6a
Evaluation cache: Don't barf in read-only mode
edolstra Apr 29, 2020
9c4e057
nix copy: Move --from / --to check
edolstra Apr 29, 2020
9570036
nix copy: Build derivations
edolstra Apr 29, 2020
5d8504b
rename nix run to nix shell and nix app to nix run
mkenigs Apr 29, 2020
f459ca5
rename run to shell in tests
mkenigs Apr 29, 2020
0038bba
Merge pull request #3551 from mkenigs/rename-commands
edolstra Apr 30, 2020
941f952
Merge remote-tracking branch 'origin/master' into flakes
edolstra May 1, 2020
6f3244c
Merge remote-tracking branch 'origin/master' into flakes
edolstra May 5, 2020
2f8ee45
Merge remote-tracking branch 'origin/master' into flakes
edolstra May 6, 2020
80f4b7b
Merge remote-tracking branch 'origin/master' into flakes
edolstra May 6, 2020
ff394ff
Remove the nixpkgs.<attr> compatibility hack
edolstra May 6, 2020
b0e9b07
Remove obsolete FIXME
edolstra May 6, 2020
1ad71bc
Remove support for old lockfiles and the epoch/uri attributes
edolstra May 6, 2020
14a3a62
Update src/nix/search.cc
edolstra May 7, 2020
bf81dd4
InstallableExpr unused
mkenigs May 9, 2020
9f4cfbb
Refactor installables
mkenigs May 9, 2020
73ee1af
Reorder to build
mkenigs May 9, 2020
91ddee6
nix: Implement basic bash completion
edolstra May 10, 2020
e0c19ee
Add completion for paths
edolstra May 10, 2020
0884f18
Simplify
edolstra May 10, 2020
4c3c638
Cleanup
edolstra May 11, 2020
da310fa
Bash completion: Don't break on ':'
edolstra May 11, 2020
e917332
Shut up warnings while running completers
edolstra May 11, 2020
259ff74
Add completion for installables
edolstra May 11, 2020
27d34ef
When completing flakerefs, only return directories
edolstra May 11, 2020
649c2db
nix flake: Add completion support
edolstra May 11, 2020
437614b
Fix macOS build
edolstra May 12, 2020
b8b2dbf
Fix InstallableCommand
edolstra May 12, 2020
fbade0b
Merge pull request #3583 from mkenigs/InstallablesRefactor
edolstra May 12, 2020
215f09d
Merge pull request #3587 from NixOS/bash-completion
edolstra May 12, 2020
849d396
Update src/libfetchers/git.cc
edolstra May 13, 2020
5f64655
Move registry-related commands from 'nix flake' to 'nix registry'
edolstra May 15, 2020
8fbc854
use nixpkgs#bashInteractive for dev-shell
mkenigs Apr 27, 2020
04821bc
use flake's nixpkgs to find bashInteractive
mkenigs May 5, 2020
0858793
Call lockFlake once and store in _lockedFlake
mkenigs May 13, 2020
ba7d7ed
Create bashInteractive InstallableFlake
mkenigs May 14, 2020
c4beded
rm includes
mkenigs May 16, 2020
00b562c
Fix GitHub test
edolstra May 21, 2020
8d67794
handle circular flake dependencies in list-inputs
mkenigs May 21, 2020
934cc80
circular test
mkenigs May 21, 2020
04fb4e8
Merge branch 'nixpkgs#bashInteractive' of https://github.com/mkenigs/…
edolstra May 28, 2020
6286272
nixpkgsFlakeRef(): Use locked nixpkgs
edolstra May 28, 2020
c3eff22
Merge branch 'store-visited' of https://github.com/mkenigs/nix into f…
edolstra May 28, 2020
17ca997
Merge remote-tracking branch 'origin/master' into flakes
edolstra May 28, 2020
5256bc7
add gitlab libfetcher
kloenk May 28, 2020
56f9abf
Merge branch 'gitlab' of https://github.com/Kloenk/nixos-nix into flakes
edolstra May 29, 2020
5633c09
Factor out GitHub / GitLab commonality
edolstra May 29, 2020
950b468
Remove TreeInfo
edolstra May 29, 2020
0e7f77a
Check revCount / lastModified input attributes if specified
edolstra May 29, 2020
89e0b3e
Move substitution into Input::fetch()
edolstra May 29, 2020
ff1320b
fetchOrSubstituteTree improvements
mkenigs Jun 1, 2020
7680993
Tree ctors
mkenigs Jun 1, 2020
c254254
use Tree ctor
mkenigs Jun 1, 2020
7dbba0a
Merge pull request #3645 from mkenigs/fetchOrSubstituteTree-improvements
edolstra Jun 2, 2020
c20591d
Merge remote-tracking branch 'origin/master' into flakes
edolstra Jun 3, 2020
81cafda
Fix GitHub test
edolstra Jun 3, 2020
6b7f4ec
Merge remote-tracking branch 'upstream/master' into ca-drv
Ericson2314 Jun 3, 2020
2500403
Use enum and predicates rather than bitfile for derivation type
Ericson2314 Jun 3, 2020
3a9e4c3
Don't anticipate CA but not fixed outputs for now
Ericson2314 Jun 3, 2020
74b251b
Don't anticipate multiple CA outputs for now
Ericson2314 Jun 3, 2020
f85606c
Merge remote-tracking branch 'origin/master' into flakes
edolstra Jun 4, 2020
959295c
Fix completion script install name
edolstra Jun 4, 2020
108debe
add support for selfhosted gitlab/github
kloenk Jun 4, 2020
d746ef4
Disable eval cache with --impure
edolstra Jun 4, 2020
dc30550
Merge pull request #3660 from Kloenk/selfhost-gitlab
edolstra Jun 4, 2020
810b2c6
nix flake init: Add a '--template' flag
edolstra Jun 4, 2020
ab54031
getDefaultUrl() -> value_or()
edolstra Jun 4, 2020
488ff83
Fix completion of --template
edolstra Jun 5, 2020
9ef6048
diffLockFiles(): Fix assertion failure
edolstra Jun 5, 2020
6470450
Add completion for --update-input
edolstra Jun 8, 2020
e073f2c
nix flake: Require 'flakes' feature
edolstra Jun 8, 2020
e938add
flake.nix: Remove edition
edolstra Jun 9, 2020
1205b41
flake.lock: Update
edolstra Jun 9, 2020
6cfc2db
Fix applyOverride() for github
edolstra Jun 9, 2020
447ea52
FileTransfer: Don't store status since curl already does that
edolstra Jun 9, 2020
29e0748
Show HTTP status message
edolstra Jun 9, 2020
fc6c7af
Add helper function printInputPath()
edolstra Jun 10, 2020
2226e97
Combine lock file update messages
edolstra Jun 10, 2020
195ed43
Preserve 'isFlake' when not updating a lock file entry
edolstra Jun 10, 2020
0c62b4a
Represent 'follows' inputs explicitly in the lock file
edolstra Jun 11, 2020
d15c20e
diffLockFiles(): Show 'follows' changes
edolstra Jun 11, 2020
7db879e
Check 'follows' inputs
edolstra Jun 11, 2020
49308ef
Merge remote-tracking branch 'upstream/master' into ca-drv
Ericson2314 Jun 17, 2020
02928f7
Merge remote-tracking branch 'upstream/master' into multi-output-hash…
Ericson2314 Jun 17, 2020
1524752
Merge remote-tracking branch 'origin/master' into flakes
edolstra Jun 17, 2020
fdff09e
Fix coverage build
edolstra Jun 17, 2020
0a1d3c1
Don't provide 'getFlake' if the 'flakes' feature is not enabled
edolstra Jun 17, 2020
ad66fb0
getFlake -> builtins.getFlake
edolstra Jun 17, 2020
5332c43
InstallableFlake: Show all possible attribute names
edolstra Jun 17, 2020
2e4bd78
nix eval: Add --apply flag for post-processing the result
edolstra Jun 17, 2020
5d69bbf
Simplify shell.nix and default.nix
edolstra Jun 17, 2020
3d49219
github: Respect default branch
edolstra Jun 18, 2020
377345e
Remove unneeded #include
edolstra Jun 18, 2020
fdeabf7
Merge remote-tracking branch 'upstream/master' into multi-output-hash…
Ericson2314 Jun 21, 2020
bf9f040
Tweak declaration
Ericson2314 Jun 21, 2020
3804e3d
Don't anticipate hash algo without hash in derivation for now
Ericson2314 Jun 21, 2020
93bbe6e
Merge remote-tracking branch 'upstream/master' into ca-drv
Ericson2314 Jun 21, 2020
334e26b
nix flake check: Don't build apps
edolstra Jun 22, 2020
09fc06d
nix flake init: Use git add --force
edolstra Jun 23, 2020
d9fb9e9
Merge remote-tracking branch 'upstream/master' into ca-drv
Ericson2314 Jun 24, 2020
adf2fbb
Merge remote-tracking branch 'origin/master' into flakes
edolstra Jun 26, 2020
bc03c6f
Move App
edolstra Jun 29, 2020
ca94686
Fix bash completion
edolstra Jun 29, 2020
b681408
Factor out EvalCache::forceDerivation()
edolstra Jun 29, 2020
50f13b0
EvalCache: Store string contexts
edolstra Jun 29, 2020
26cf0c6
nix run: Use packages/legacyPackages as fallback if there is no app d…
edolstra Jun 29, 2020
7d554f2
Support building flakes from a shallow Git repo
edolstra Jul 1, 2020
d746503
Add --inputs-from to use flake inputs as registry entries
edolstra Jul 1, 2020
6ff9aa8
Don't process an option if any of its arguments need completion
edolstra Jul 1, 2020
a168224
spacing
bburdette Jul 5, 2020
54712aa
Merge remote-tracking branch 'origin/master' into flakes
edolstra Jul 6, 2020
cd8eb8a
nix develop: Fall back to "bash" if nixpkgs#bashInteractive is unavai…
edolstra Jul 6, 2020
68f524d
nix develop: Support derivations with multiple outputs
edolstra Jul 6, 2020
75bfcf8
revamp trace code and test
bburdette Jul 6, 2020
efd6a8b
bump
bburdette Jul 6, 2020
c385535
Merge pull request #3783 from bburdette/macos-test
edolstra Jul 6, 2020
7c9ece5
exportReferencesGraph: Fix support for non-top-level store paths
edolstra Jul 7, 2020
4055cfe
Fix coverage build
edolstra Jul 7, 2020
1ab9da9
Merge remote-tracking branch 'origin/master' into flakes
edolstra Jul 7, 2020
16ec778
Fix 'got unknown message type 1 from Nix daemon'
edolstra Jul 8, 2020
9223603
Merge remote-tracking branch 'origin/master' into flakes
edolstra Jul 8, 2020
7d8d78f
upload-release.pl: Update latest-release branch
edolstra Jul 8, 2020
af95a7c
Add name to BasicDerivation
matthewbauer Jul 8, 2020
34f2512
Make LocalStore::addToStore(srcPath) run in constant memory
edolstra Apr 9, 2018
b981e5a
Cleanup
edolstra Jul 8, 2020
8e0d068
Only store hash of fixed derivation output
matthewbauer Jul 8, 2020
06a4e15
Fix build.cc on linux
matthewbauer Jul 8, 2020
cfe6ea7
add temp CI job to test syspolicy impact
abathur Jul 9, 2020
2dd8443
Merge pull request #3797 from nix-macos-perf-test/macos-perf-test
edolstra Jul 9, 2020
a2c2702
LocalStore::addToStore(srcPath): Handle the flat case
edolstra Jul 9, 2020
a788497
Fix DerivationOutputExtensional name
matthewbauer Jul 9, 2020
062a584
.dir-locals.el: Set c-block-comment-prefix
edolstra Jul 10, 2020
06e3dd9
nix-prefetch-url: Run in constant memory when using RemoteStore
edolstra Jul 10, 2020
7f1a86d
nix-store --add-fixed: Run in constant memory
edolstra Jul 10, 2020
5dff49f
Factor out commonality between nix-prefetch-url and nix-store --add-f…
edolstra Jul 10, 2020
8efa23b
Avoid a redundant hash
edolstra Jul 10, 2020
442d431
Merge remote-tracking branch 'upstream/master' into optional-derivati…
Ericson2314 Jul 11, 2020
abea26a
BasicDerivation::findOutput cannot return reference anymore
Ericson2314 Jul 12, 2020
1c9bec2
Don't improperly assume path is store path
Ericson2314 Jul 12, 2020
13ec627
Set derivation name in dervationStrict
Ericson2314 Jul 12, 2020
64f0363
Fix ANSI color constants
Ma27 Jul 12, 2020
5d0b75e
std::string_view for new derivation name parameters
Ericson2314 Jul 12, 2020
1815240
String .drv suffix to create derivation name
Ericson2314 Jul 12, 2020
a8d4707
Undo erroneous indentation change
Ericson2314 Jul 12, 2020
503b425
DerivationOutputExtensional -> DerivationOutputInputAddressed
Ericson2314 Jul 12, 2020
886c91d
Try to fix perl bindings
Ericson2314 Jul 12, 2020
ffc1858
Move C++17 "pattern matching" boilerplat to utils.hh
Ericson2314 Jul 12, 2020
fedfc91
Use more std::visit to prepare for new variant
Ericson2314 Jul 12, 2020
230c9b4
Change types to prepare the way for CA derivations
Ericson2314 Jul 12, 2020
d7026cc
Merge pull request #3805 from Ma27/ansi-color-fix
edolstra Jul 13, 2020
41bdf42
Add a test for NAR listing generation
edolstra Jul 13, 2020
2900a44
Add a test for DWARF debug info index generation
edolstra Jul 13, 2020
1d01ae8
Fix 'nix verify --all' on a binary cache and add a test
edolstra Jul 13, 2020
143a5f3
Add a test for local NAR caching
edolstra Jul 13, 2020
c0dd051
toStorePath(): Return a StorePath and the suffix
edolstra Jul 13, 2020
400f1a9
Store::pathInfoToJSON(): Use consistent format for downloadHash
edolstra Jul 10, 2020
fc84c35
Make 'nix copy' to file:// binary caches run in constant memory
edolstra Jul 10, 2020
0a9da00
NarAccessor: Run in constant memory
edolstra Jul 13, 2020
545bb2e
Remove 'accessor' from addToStore()
edolstra Jul 13, 2020
493961b
Remove istringstream_nocopy
edolstra Jul 13, 2020
cf9f339
Fix gitlab-fetcher to obtain tags and branches
Ma27 Jul 13, 2020
7c2fef0
Make 'nix copy' to s3:// binary caches run in constant memory
edolstra Jul 13, 2020
9502c0e
nix verify: Show correct path when using --all on a binary cache
edolstra Jul 13, 2020
43b8e96
Fix 'nix verify --all' on a binary cache (cached case)
edolstra Jul 13, 2020
926c3a6
Doh
edolstra Jul 14, 2020
832e111
Merge remote-tracking branch 'origin/master' into flakes
edolstra Jul 14, 2020
da3aea2
EvalCache: Ignore SQLite errors
edolstra Jul 14, 2020
298ff6a
Merge pull request #3809 from Ma27/gitlab-refs
edolstra Jul 14, 2020
cff2157
Revert "LocalStore::addToStore(srcPath): Handle the flat case"
edolstra Jul 15, 2020
0356f14
Add 'nix diff-closures' command
edolstra Jul 15, 2020
e3c2b00
Make InstallableStorePath behave consistently with InstallableValue
edolstra Jul 15, 2020
94eb5fa
Clean up RealiseMode
edolstra Jul 15, 2020
dfe8f3e
nix why-depends: Fix misleading message
edolstra Jul 15, 2020
3624c04
nix: Add --derivation flag to operate on .drv paths
edolstra Jul 15, 2020
2d6d53b
nix: Fix examples
edolstra Jul 15, 2020
36a1242
nix why-depends: Fix shortest path calculation
edolstra Jul 15, 2020
68dfb8c
Optimize `addToStoreSlow` and remove `TeeParseSink`
Ericson2314 Jul 16, 2020
3f26491
Merge remote-tracking branch 'origin/flakes'
edolstra Jul 16, 2020
716eafa
Merge branch 'diff-closures'
edolstra Jul 16, 2020
8807ff9
nix diff-closures: Fix build
edolstra Jul 16, 2020
5517eee
Generations API cleanup
edolstra Jul 16, 2020
16c9f67
Add command 'nix profile diff-closure'
edolstra Jul 16, 2020
048e916
Merge branch 'master' of github.com:NixOS/nix into optional-derivatio…
meditans Jul 16, 2020
745a03c
Merge branch 'optional-derivation-output-storepath' of github.com:obs…
meditans Jul 16, 2020
52c8be3
nix profile diff-closures: Don't inherit EvalCommand
edolstra Jul 17, 2020
17f75f9
parseFlakeRef(): Only search for the top-level directory for CLI flak…
edolstra Jul 17, 2020
5cb8405
Merge branch 'multi-output-hashDerivationModulo' of github.com:Ericso…
meditans Jul 17, 2020
c123fee
Add back flake-compat shell.nix
Ericson2314 Jul 17, 2020
3f01fa1
Merge pull request #3827 from obsidiansystems/add-back-compat-shell.nix
edolstra Jul 17, 2020
a395c12
Merge branch 'master' of github.com:NixOS/nix into misc-ca
meditans Jul 17, 2020
487c575
Merge branch 'ca-drv' of github.com:Ericson2314/nix into misc-ca
meditans Jul 17, 2020
bc73590
nix edit: call restoreSignals() before `execvp`-ing the $EDITOR
BurNiinTRee Jul 17, 2020
1feb898
Revert "Don't anticipate hash algo without hash in derivation for now"
meditans Jul 17, 2020
205dcd1
Revert "Don't anticipate multiple CA outputs for now"
meditans Jul 17, 2020
bbc633c
Revert "Don't anticipate CA but not fixed outputs for now"
meditans Jul 17, 2020
6756cec
Add `DerivationType::CAFloating`
Ericson2314 Jul 17, 2020
5ae747b
Remove stray added file
Ericson2314 Jul 17, 2020
5526683
fix make's impurity on /bin/sh
Mic92 Jul 18, 2020
0e9fb4a
Merge pull request #3828 from BurNiinTRee/restore-signals-before-edit
edolstra Jul 18, 2020
31826c6
Merge pull request #3832 from Mic92/shell-impurity
edolstra Jul 18, 2020
3294b0a
Add newline to profile sourcing line #3393
ajkovar Jul 18, 2020
a79b6dd
Merge pull request #3834 from ajkovar/source-line-3393
edolstra Jul 19, 2020
ac2fc7b
Apply suggestions from code review
Ericson2314 Jul 20, 2020
1c5f8bb
Merge pull request #3822 from obsidiansystems/dump-thrice-fixme
edolstra Jul 20, 2020
362ae93
Add UnimplementedError to ease grepping for these
meditans Jul 20, 2020
007bf6d
Merge branch 'ca-derivation-data-types' of github.com:obsidiansystems…
meditans Jul 20, 2020
6357b1b
Add another Unimplemented case
meditans Jul 20, 2020
9aae179
Correct bug, thoroughly document addToStoreSlow
meditans Jul 21, 2020
bf0dca7
Merge branch 'fix-and-document-addToStoreSlow' of github.com:obsidian…
Ericson2314 Jul 21, 2020
5ce95b9
Update src/libstore/build.cc
Ericson2314 Jul 21, 2020
3f730eb
Merge branch 'misc-ca' of github.com:obsidiansystems/nix into termina…
meditans Jul 21, 2020
4fb67ef
Enable content-addressed.sh tests
meditans Jul 21, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .dir-locals.el
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
((c++-mode . (
(c-file-style . "k&r")
(c-basic-offset . 4)
(c-block-comment-prefix . " ")
(indent-tabs-mode . nil)
(tab-width . 4)
(show-trailing-whitespace . t)
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,8 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: cachix/install-nix-action@v10
- run: nix-build release.nix --arg nix '{ outPath = ./.; revCount = 123; shortRev = "abcdefgh"; }' --arg systems '[ builtins.currentSystem ]' -A installerScript -A perlBindings
#- run: nix flake check
- run: nix-build -A checks.$(if [[ `uname` = Linux ]]; then echo x86_64-linux; else echo x86_64-darwin; fi)
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ makefiles = \
src/resolve-system-dependencies/local.mk \
scripts/local.mk \
corepkgs/local.mk \
misc/bash/local.mk \
misc/systemd/local.mk \
misc/launchd/local.mk \
misc/upstart/local.mk \
Expand Down
1 change: 1 addition & 0 deletions Makefile.config.in
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ LIBLZMA_LIBS = @LIBLZMA_LIBS@
OPENSSL_LIBS = @OPENSSL_LIBS@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
SHELL = @bash@
SODIUM_LIBS = @SODIUM_LIBS@
SQLITE3_LIBS = @SQLITE3_LIBS@
bash = @bash@
Expand Down
1 change: 1 addition & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ AC_PATH_PROG(flex, flex, false)
AC_PATH_PROG(bison, bison, false)
AC_PATH_PROG(dot, dot)
AC_PATH_PROG(lsof, lsof, lsof)
NEED_PROG(jq, jq)


AC_SUBST(coreutils, [$(dirname $(type -p cat))])
Expand Down
3 changes: 3 additions & 0 deletions default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
(import (fetchTarball https://github.com/edolstra/flake-compat/archive/master.tar.gz) {
src = ./.;
}).defaultNix
26 changes: 26 additions & 0 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading