puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity
14997 commits 19 branches 0 tags 68 MiB
Commit graph

18 commits

Author SHA1 Message Date
eldritch horrors 2ba9788003 Merge pull request #9555 from 9999years/positions-in-errors 
Pass positions when evaluating

(cherry picked from commit c8458bd731)
Change-Id: I1b4a5d58973be6264ffdb23b4492da200fdb71be
 2024-03-04 07:11:25 +01:00
eldritch horrors e9243c849a Merge pull request #9529 from wh0/patch-1 
tests: avoid a chroot store without sandbox support
(cherry picked from commit 5910140f25)
Change-Id: Ic2255261334012f36a465a96073f50669952dc26
 2024-03-04 07:11:25 +01:00
eldritch horrors 4018fcb9b8 Merge pull request #9233 from bouk/bouk/apply-config-inner 
config: add included files into parsedContents before applying
(cherry picked from commit 82359eba6b)
Change-Id: Idde3177010fec7b8bafe6088c3c23d5caf491845
 2024-03-04 07:11:25 +01:00
eldritch horrors a089d8f5f6 Merge pull request #9465 from obsidiansystems/build-dir 
Use `buildprefix` in a few more places

(cherry picked from commit b6a3fde6b7)
Change-Id: I2790663fa9f8242ac2db6582b7e421d2fdf42942
 2024-03-04 07:11:25 +01:00
eldritch horrors 340a6cf977 Merge pull request #9257 from Artturin/nixenvjsondrvpath 
`nix-env --query`: fix `--json` ignoring `--drv-path`

(cherry picked from commit 516e7ddc41)
Change-Id: I84b5bccea9d0383e2e74544743b703942e7be547
 2024-03-04 05:59:15 +01:00
eldritch horrors 1b135e6e7b Fix boost::bad_format_string exception in builtins.addErrorContext (#9291) 
* Fix boost::bad_format_string exception in builtins.addErrorContext

The message passed to addTrace was incorrectly being used as a format
string and this this would cause an exception when the string contained
a '%', which can be hit in places where arbitrary file paths are
interpolated.

* add test

(cherry picked from commit 61d6fe059e)
Change-Id: Idd671127a9c1ccc8b94e58e727632fcc064f3cbe
 2024-03-04 05:39:12 +01:00
eldritch horrors 8ed486ebe6 Merge pull request #9225 from drupol/nixpkgs-pr-107251/make-gnutar-reproducible 
fix: make sure `tar` reproducibility flags are set
(cherry picked from commit 28dddde0ac)
Change-Id: I57c4d4374f5195099e6d763827b6d7d05785b3a8
 2024-03-04 05:34:19 +01:00
eldritch horrors 2633ca3f88 Merge pull request #9288 from edolstra/fix-nar-access-test 
Fix nar-access test on macOS

(cherry picked from commit e9a857e418)
Change-Id: I2fd2ec3e6ccb88350bdcd2ba15ccfd77275399c9
 2024-03-04 05:27:18 +01:00
eldritch horrors ea10088703 Merge pull request #9216 from obsidiansystems/addDrvOutputDependencies-pre 
Add `builtins.addDrvOutputDependencies`

(cherry picked from commit a58d7f143e)
Change-Id: Ia5a1790bf29dfaf29287cc35cdae6b6d650e7a83
 2024-03-04 05:06:56 +01:00
eldritch horrors 032eff7f69 Merge pull request #8470 from ncfavier/shebang-single-quotes 
nix-shell: support single quotes in shebangs, fix whitespace parsing
(cherry picked from commit 3b99c62913)
Change-Id: I2a431b21c3467eefa1ef95d5a36d672f45b6937a
 2024-03-04 05:06:32 +01:00
eldritch horrors 5ddd1a9166 Merge pull request #9168 from obsidiansystems/fix-lang-tests-read-only 
Fix language tests a bit

(cherry picked from commit e92cac789f)
Change-Id: I527e94c5af0921ff2559ce5a4ac7635be791c22e
 2024-03-04 04:42:21 +01:00
eldritch horrors d28a6618a8 Merge pull request #9167 from obsidiansystems/pre-overhaul-completions 
Improve tests and docs prior to refactoring completions

(cherry picked from commit 5442d9b472)
Change-Id: Ief99ac2cd9c92981a9a522d15b9c3daf99182c9d
 2024-03-04 04:38:33 +01:00
eldritch horrors fd1299cef3 Merge pull request #9106 from Ericson2314/positive-source-filtering 
Use positive source filtering for the standalone functional tests job and Perl bindings

(cherry picked from commit 6b6bd90030)
Change-Id: I896be67654f893d543ed6beb5d0d0d6c6d36e027
 2024-03-04 04:36:42 +01:00
eldritch horrors 4517de00cb Merge pull request #8905 from hercules-ci/no-unknown-location 
Don't print unknown locations unless requested for dev purposes

(cherry picked from commit 3dd4475826)
Change-Id: I04a91277d1d9d09f5c1bf4a28fc99f0702b161e5
 2024-03-04 04:36:38 +01:00
eldritch horrors c36ba796dd Merge pull request #9096 from NixOS/dont-rebuild-twice-on-ci 
Don't run the tests that require building if we're not building

(cherry picked from commit 8cfa582f43)
Change-Id: I6085ca6107349669407340d7a5e52639a2febc90
 2024-03-04 04:36:33 +01:00
Eelco Dolstra bef68e53b9 Fix symlink handling 
This restores the symlink handling behaviour prior to
94812cca98.

Fixes #9298.

(cherry picked from commit 31ebc6028b)
 2024-01-21 20:53:30 +00:00
Shea Levy ba48ab4b95
Merge branch '2.18-maintenance' into ifd-buildStore-2.18 2024-01-11 07:21:16 -05:00
John Ericson 30dcc19d1f Put functional tests in tests/functional 
I think it is bad for these reasons when `tests/` contains a mix of
functional and integration tests

 - Concepts is harder to understand, the documentation makes a good
   unit vs functional vs integration distinction, but when the
   integration tests are just two subdirs within `tests/` this is not
   clear.

 - Source filtering in the `flake.nix` is more complex. We need to
   filter out some of the dirs from `tests/`, rather than simply pick
   the dirs we want and take all of them. This is a good sign the
   structure of what we are trying to do is not matching the structure
   of the files.

With this change we have a clean:
```shell-session
$ git show 'HEAD:tests'
tree HEAD:tests

functional/
installer/
nixos/
```

(cherry picked from commit 68c81c7375)
 2023-12-01 12:06:43 -05:00