Skip to content

Commit

Permalink
rename: _build -> _sourcess
Browse files Browse the repository at this point in the history
  • Loading branch information
David Arnold authored and David Arnold committed Jun 15, 2021
1 parent b6970c0 commit fd7f6c5
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
run : nix shell --command nvfetcher --config nvfetcher_example.toml

- name: Cleanup
run: rm -r _build sources.nix
run: rm -r _sources sources.nix

- name: Test Main_example.hs
run: nix develop .\#ghcWithNvfetcher --command runghc Main_example.hs
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ TAGS
# other
.DS_Store

_build
_sources
sources.nix

result
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Revision history for nvfetcher

## unreleased

* Rename `_build` to `_sources`


## 0.3.0.0

There are massive enhancements since the last release:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ and nvfetcher will help us keep their version and prefetched SHA256 sums up-to-d
Shake will help us handle necessary rebuilds -- we check versions of packages during each run, but only prefetch them when needed.


`sources.nix` is a symlink of `_build/generated.nix`, which means that the "build" results produced by `nvfetcher` are under `_build`,
`sources.nix` is a symlink of `_sources/generated.nix`, which means that the "build" results produced by `nvfetcher` are under `_sources`,
so you have to keep this directory for further use.

### Live examples
Expand Down
4 changes: 2 additions & 2 deletions src/NvFetcher.hs
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ runNvFetcherNoCLI args@Args {..} packageSet = do
let opts =
argShakeOptions
{ shakeExtra = addShakeExtra shakeExtras (shakeExtra argShakeOptions),
shakeFiles = "_build"
shakeFiles = "_sources"
}
rules = mainRules args
shake opts $ want [argTarget] >> rules
Expand All @@ -149,7 +149,7 @@ runNvFetcherNoCLI args@Args {..} packageSet = do
mainRules :: Args -> Rules ()
mainRules Args {..} = do
"clean" ~> do
removeFilesAfter "_build" ["//*"]
removeFilesAfter "_sources" ["//*"]
whenJust argOutputFilePath $ \out -> removeFilesAfter "." [out]
argActionAfterClean

Expand Down
2 changes: 1 addition & 1 deletion src/NvFetcher/Options.hs
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ getCLIOptions parser = do
version
"nvfetcher - generate nix sources expr for the latest version of packages"
( unlines
[ "It's important to keep _build dir.",
[ "It's important to keep _sources dir.",
"If you change any field of an existing package, you may have to run target \"clean\" to invalidate the databse,",
"making sure the consistency of our build system."
]
Expand Down

0 comments on commit fd7f6c5

Please sign in to comment.