bb010g/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity
11499 commits 1 branch 5 tags 83 MiB
Commit graph

11499 commits

This branch
This branch
All branches
Author SHA1 Message Date
tomberek 2bf96bd9f2
Merge branch 'master' into bundler_drv 2022-01-28 10:18:29 -05:00
Tom Bereknyei 73e82ae954 bundler: tests various combinations of referring to installables 2022-01-28 10:17:51 -05:00
Tom Bereknyei 4ebc50d92e bundler: revert default behavior to use defaultApp 
Bundlers are now responsible for correctly handling their inputs which
are no longer constrained to be (Drv->Drv)->Drv->Drv, but can be of
type (attrset->Drv)->attrset->Drv.
 2022-01-28 09:56:58 -05:00
Eelco Dolstra 4bf6af7b55 Remove a repeated std::move in a for loop 2022-01-28 15:10:43 +01:00
pennae d439dceb3b optionally return string_view from coerceToString 
we'll retain the old coerceToString interface that returns a string, but callers
that don't need the returned value to outlive the Value it came from can save
copies by using the new interface instead. for values that weren't stringy we'll
pass a new buffer argument that'll be used for storage and shouldn't be
inspected.
 2022-01-27 22:15:30 +01:00
Domen Kožar f05fefcd03
Merge pull request #5951 from abathur/install_add_getconf_fallback 
install-darwin: dodge bash 3.2 command bug
 2022-01-27 20:18:11 +01:00
pennae 41d70a2fc8 return string_views from forceString* 
once a string has been forced we already have dynamic storage allocated for it,
so we can easily reuse that storage instead of copying.
 2022-01-27 17:15:43 +01:00
pennae 0d7fae6a57 convert a for more utilities to string_view 2022-01-27 17:15:43 +01:00
Eelco Dolstra 558c4ee3e3
Merge pull request #6001 from NixOS/fix-nix-path 
Don’t require `NIX_PATH` entries to be valid paths
 2022-01-27 17:04:02 +01:00
Eelco Dolstra 27b4056154
Merge pull request #6000 from NixOS/use-flakes-in-ci 
Use the `nix` command (and flakes) in the CI
 2022-01-27 17:01:45 +01:00
regnat fcdc60ed22 Don’t require NIX_PATH entries to be valid paths 
It’s totally valid to have entries in `NIX_PATH` that aren’t valid paths
(they can even be arbitrary urls or `channel:<channel-name>`).

Fix #5998 and #5980
 2022-01-27 16:26:39 +01:00
regnat 7bd85a3bf6 Use the nix command (and flakes) in the CI 
Apart from a slight simplification and a bit of dogfooding, this also
make the cache behavior more predictable.
For example `nix build .` and `nix build nix/$(git rev-parse HEAD)` will
yield the exact same path, while their “intuitive” non-flake equivalents
(`nix-build` and
`nix-build https://github.com/nixos/nix/archives/$(git rev-parse HEAD).tar.gz`)
don’t.

This was a pain for example in https://github.com/NixOS/nix/pull/5059

Also, the `bar-with-logs` log format is imho nicer (even in an
non-interactive context) because prefixing each log line with the name
of the derivation that produced it makes it much easier to follow what’s
going on.
 2022-01-26 16:41:37 +01:00
Eelco Dolstra 1fe3bfdeaf
Merge pull request #5997 from NixOS/test-nix-store-ping 
Fix the `store ping` test
 2022-01-26 15:22:15 +01:00
Eelco Dolstra b0de24cc89
Merge pull request #5996 from edolstra/remove-nlohmann 
Stop vendoring nlohmann_json
 2022-01-26 14:49:34 +01:00
regnat 3dc1418216 Fix the store ping test 2022-01-26 14:15:03 +01:00
Eelco Dolstra 9691f86ff7 Stop vendoring nlohmann_json 2022-01-26 11:50:53 +01:00
Eelco Dolstra e9d2ac6d7f
Merge pull request #5995 from NixOS/test-nix-store-ping 
Add some tests for `nix store ping`
 2022-01-26 11:50:04 +01:00
regnat d139474f48 Add some tests for nix store ping 
Always good to have :)
 2022-01-26 11:01:25 +01:00
Eelco Dolstra 4f24a33d34
Merge pull request #5991 from edolstra/remote-nix-version 
nix store ping: Report Nix daemon version
 2022-01-26 09:59:59 +01:00
lincoln auster c746a429db
fix typo 
Co-authored-by: Cole Helbling <cole.e.helbling@outlook.com>
 2022-01-25 14:55:49 -07:00
Eelco Dolstra 35dbdbedd4 nix store ping: Report Nix daemon version 
Fixes #5952.
 2022-01-25 21:15:58 +01:00
lincoln auster [they/them] 203ef26974 flakes: document nixConfig option 
Fixes #5988.
 2022-01-25 12:23:52 -07:00
Eelco Dolstra 5fa624f59a
Merge pull request #5987 from edolstra/rust-cleanup 
Remove unused Rust stuff
 2022-01-25 13:57:22 +01:00
Eelco Dolstra a04a66c196
Merge pull request #5922 from fzakaria/fzakaria/json-ignore-assertion 
Add try/catch to queryJSON for assertion and errors
 2022-01-25 12:44:20 +01:00
Eelco Dolstra a5bdffaae9
Merge pull request #5966 from SuperSandro2000/patch-2 
Remove url literal
 2022-01-25 11:59:33 +01:00
Eelco Dolstra fcf3528ad1 Remove unused Rust stuff 
In particular we were still compiling rust-ffi.cc even though we're
not using it.
 2022-01-25 11:58:00 +01:00
Eelco Dolstra a9a90b3c1f
Merge pull request #5984 from NixOS/5982-correctly-parse-__curPosFoo 
Fix parsing of variable names that are a suffix of '__curPos'
 2022-01-25 11:54:04 +01:00
regnat f113ea6c73 Fix parsing of variable names that are a suffix of '__curPos' 
Follow-up from #5969
Fix #5982
 2022-01-25 10:49:27 +01:00
Tom Bereknyei dc85e20684 bundler: notes and doc update to include bundlers repo 2022-01-25 03:48:44 -05:00
Tom Bereknyei 93299efc7c bundler: add tests and change defaults to use a derivation 2022-01-25 03:39:18 -05:00
Farid Zakaria 8ba7a2d3a8 Do not suppress errors in nix-env from feedback by Eelco 2022-01-24 19:12:13 -08:00
Tom Bereknyei c94db0535c Refactor bundler API 
Bundlers now expect to be located at bundlers.<system>.<name> and are a
function from derivations to derivations.
 2022-01-24 21:43:04 -05:00
Tom Bereknyei 3be810f5db bundler: pass drv attrset instead of path 2022-01-24 21:43:04 -05:00
Eelco Dolstra 0a70b37b56 flake.nix: Fix indentation 2022-01-25 01:28:44 +01:00
Eelco Dolstra 2e4d5f220e Bump version 2022-01-25 00:14:59 +01:00
Eelco Dolstra 039c9008b1
Merge pull request #5978 from edolstra/nixpkgs-regression-tests 
Add regression / performance tests against a fixed revision of Nixpkgs
 2022-01-25 00:11:38 +01:00
Eelco Dolstra 9faad4c5eb Move rl-next.md to rl-2.5.md 2022-01-25 00:11:00 +01:00
Eelco Dolstra 9ce2511206 Add regression / performance tests against a fixed revision of Nixpkgs 2022-01-25 00:07:30 +01:00
Eelco Dolstra 716a08827e
Merge pull request #5976 from edolstra/read-invalid-paths 
Allow builtins.{readFile,path} on invalid paths
 2022-01-25 00:04:01 +01:00
Eelco Dolstra 8cbbaf23e8 Allow builtins.{readFile,path} on invalid paths 
Stop-gap measure to fix #5975.
 2022-01-24 23:02:28 +01:00
Eelco Dolstra e66550c917
Merge pull request #5969 from edolstra/curpos-fix 
Fix parsing of variable names that are a prefix of '__curPos'
 2022-01-24 16:30:13 +01:00
Eelco Dolstra bed8270c0c Fix parsing of variable names that are a prefix of '__curPos' 
Fixes

  $ nix-instantiate --parse -E 'x: with x; _'
  (x: (with x; __curPos))
 2022-01-24 15:18:18 +01:00
Eelco Dolstra c4fc9b6a8d ExprConcatStrings::show(): Print values instead of pointers 2022-01-24 15:08:16 +01:00
Eelco Dolstra 3ff6186af1 Add a test for nix-assertion failures in nix-env 2022-01-24 14:49:32 +01:00
Eelco Dolstra 7afbdf2545 hiliteMatches(): Style fixes, pass more stuff by reference 2022-01-24 14:47:34 +01:00
Sandro 72aeae54e5
Remove url literals 2022-01-24 13:28:21 +01:00
Théophane Hufschmitt 4530574363
Merge pull request #5945 from afishhh/master 
Make `nix search` highlight all regexes and matches
 2022-01-24 13:02:51 +01:00
Eelco Dolstra edf0cde1a7
Merge pull request #5960 from zombiezen/patch-1 
Correct `NIX_BUILD_PATH` default description
 2022-01-24 12:46:43 +01:00
Eelco Dolstra 5c3b6fbe00
Merge pull request #5963 from FlorianFranzen/test-flake-git 
tests: skip flake search test if no git is present
 2022-01-24 12:45:49 +01:00
Eelco Dolstra 3782017272 Tweak release notes 2022-01-24 12:45:35 +01:00