lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity
9621 commits 29 branches 6 tags 85 MiB
Commit graph

9621 commits

This branch
This branch
All branches
Author SHA1 Message Date
Travis A. Everett fe807904e5 adapt to apfs.util flag diff in catalina/big sur 
Fixes #3957. Just runs both forms to minimize moving parts.
 2020-10-19 12:24:31 -05:00
Travis A. Everett e736f8f6e4 replace xpath with xmllint --xpath; simplify 
As mentioned in previous commit, Big Sur changes the syntax for the
xpath command slightly.

In the process of testing out replacements for these, I noticed a few
small simplification wins.
 2020-10-19 12:24:04 -05:00
Travis A. Everett 1f02b65c59 fix xpath and conditional bugs; xpath -> xmllint 
- xpath -> xmllint: xpath's cli interface changed in Big Sur
  rather than add conditional logic for picking the correct
  syntax for xpath, I'm changing to xmllint --xpath, which
  appears to be consistent across versions I've tested...

- /plist/dict/key[text()='Writable']/following-sibling::true[1]
  doesn't do quite what's expected. It was written to try to
  select a <true /> node paired with the Writable key, but it
  will also select the *next* <true /> node that appears even
  if it was paired with another key.

- I think there's also a logic bug in the conditionals here.
  I'm not sure anyone ever actuall saw it, thanks to the xpath
  bug, though. With the xpath fix, this conditional passes if /nix
  does not exist, / IS writable, and the version is Catalina+.

  I think it meant to test for /nix does not exist, / is NOT
  writable, and the version is Catalina+. I reworked this lightly
  to make it a little clearer at the code level.
 2020-10-19 12:23:29 -05:00
Travis A. Everett 9c3dc9d7ca update macOS version handling for Big Sur 
Keeping this commit narrow for reviewability, but some of these
conditionals will change in subsequent commits in this PR.

Fixes #3852.
 2020-10-19 12:22:30 -05:00
Eelco Dolstra 9635fb77bd
Merge pull request #4080 from kquick/kwq/flake-int-doc 
Add some internal documentation for flake support objects.
 2020-10-19 11:29:12 +02:00
Eelco Dolstra 05347387e7
Merge pull request #4162 from edolstra/nixpkgs-20.09 
Switch to Nixpkgs 20.09
 2020-10-19 11:26:00 +02:00
Eelco Dolstra c27fcd94ce Remove buildStatic from checks 
checks should be relatively fast, but buildStatic depends on a lot of
stuff that isn't in the binary cache (e.g. musl builds of Git and
Mercurial that we probably don't need since we don't link against
them...).
 2020-10-18 21:44:07 +02:00
Eelco Dolstra 62cf1d815a Switch to Nixpkgs 20.09 2020-10-18 21:31:27 +02:00
Eelco Dolstra 532d2bc189 flake.lock: Update 
Flake input changes:

* Updated 'nixpkgs': 'github:NixOS/nixpkgs/3a10a004bb5802d5f23c58886722e4239705e733' -> 'github:NixOS/nixpkgs/ad0d20345219790533ebe06571f82ed6b034db31'
 2020-10-18 21:20:35 +02:00
Eelco Dolstra 20a7d8d23a Add some missing clean-files 2020-10-18 20:32:59 +02:00
Eelco Dolstra 93bd014c8c Update .gitignore 2020-10-18 20:32:46 +02:00
Eelco Dolstra fda835b231
Merge pull request #4143 from obsidiansystems/typed-goal-maps 
Properly type the derivation and substitution goal maps
 2020-10-18 18:12:21 +02:00
Eelco Dolstra 6bca8f82c7
Merge pull request #4157 from SFrijters/doc-nix-shell-pure-bashrc 
doc: nix-shell in pure mode does *not* source user bashrc
 2020-10-18 18:10:18 +02:00
Eelco Dolstra 67cc94b80b
Merge pull request #4158 from hercules-ci/issue-3964-substitution-loop 
Fix substitution loop #3964, #3534
 2020-10-18 18:09:11 +02:00
Robert Hensing bd9eb5c743 DerivationGoal: only retry if output closure incomplete is only problem 2020-10-18 14:26:37 +02:00
Robert Hensing ea8d32020e Tests for #3964 2020-10-18 14:26:37 +02:00
Robert Hensing 94f1e4a441 Typo 2020-10-18 14:26:37 +02:00
Stefan Frijters a53438d18f
doc: nix-shell in pure mode does *not* source user bashrc 2020-10-18 14:26:05 +02:00
John Ericson 7ed46c1574 Explain that upcast_goal is still a static cast 2020-10-17 21:50:12 +00:00
John Ericson 57d0432b39 Just use auto in two places. 2020-10-17 21:47:52 +00:00
John Ericson e6f8ae56d8 tab -> space 2020-10-17 21:45:31 +00:00
John Ericson 619d262c97 Merge remote-tracking branch 'upstream/master' into typed-goal-maps 2020-10-17 21:44:27 +00:00
Eelco Dolstra 05e6fe69f9
Merge pull request #4156 from aszlig/vm-test-python 
Convert VM tests to Python
 2020-10-17 23:40:44 +02:00
aszlig cfa26cf181
tests: Add names to VM tests 
Having vm-test-run-unnamed for all the test derivation doesn't look very
nice, so in order to better distinguish them from their store path,
let's actually give them proper names.

Signed-off-by: aszlig <aszlig@nix.build>
 2020-10-17 23:34:38 +02:00
aszlig 5cfdf16dd6
Convert VM tests to Python 
Perl-based tests are deprecated since NixOS 20.03 and subsequently got
removed in NixOS 20.09, which effectively means that tests are going to
fail as soon as we build it with NixOS 20.09 or anything newer.

I've put "# fmt: off" at the start of every testScript, because
formatting with Black really messes up indentation and I don't think it
really adds anything in value or readability for inlined Python scripts.

Signed-off-by: aszlig <aszlig@nix.build>
 2020-10-17 23:32:03 +02:00
Eelco Dolstra e6247a584d Merge branch 'fix-and-ci-static-builds' of https://github.com/obsidiansystems/nix into master 2020-10-17 22:59:27 +02:00
Eelco Dolstra 2a37c35650
Merge pull request #4151 from obsidiansystems/bump-nixpkgs 
Bump Nixpkgs to hopefully fix linkrot
 2020-10-16 15:05:20 +02:00
John Ericson 1d09923d5b Merge remote-tracking branch 'obsidian/bump-nixpkgs' into fix-and-ci-static-builds 2020-10-16 04:25:24 +00:00
John Ericson 257090d030 Bump Nixpkgs to hopefully fix linkrot 2020-10-15 21:54:22 +00:00
John Ericson 48ce627377 Make a better -lz hack 
Per the comments, the underlying issue is
https://github.com/libarchive/libarchive/issues/1446, knowing this
allows the hack to be much more targetted.
 2020-10-15 20:13:01 +00:00
John Ericson 64be1c15c2 Add missing include for MAX_PATH 
And remove one that we didn't actually need to add
 2020-10-15 19:05:17 +00:00
John Ericson fccef6a7fa Merge remote-tracking branch 'upstream/master' into fix-and-ci-static-builds 2020-10-15 18:55:03 +00:00
John Ericson f6ed1a96b3 build-static -> buildStatic in Nix's flake 2020-10-15 18:54:36 +00:00
John Ericson 0fefc2a439 Merge remote-tracking branch 'upstream/master' into typed-goal-maps 2020-10-14 20:49:01 +00:00
Eelco Dolstra 11882d7c7c Create /etc/passwd *after* figuring out the sandbox uid/gid 
Fixes build failures like

  # nix log /nix/store/gjaa0psfcmqvw7ivggsncx9w364p3s8s-sshd.conf-validated.drv
  No user exists for uid 30012
 2020-10-14 12:20:58 +02:00
John Ericson 55592b253f Add some more docs 2020-10-13 18:04:24 +00:00
John Ericson 13804f126e Merge remote-tracking branch 'upstream/master' into typed-goal-maps 2020-10-13 18:02:32 +00:00
Eelco Dolstra 2653801939 Merge branch 'split_build_cc' of https://github.com/obsidiansystems/nix 2020-10-13 15:36:55 +02:00
Eelco Dolstra 7e44adda46
Merge pull request #4141 from volth/patch-11 
Handle amount of disk space saved by hard linking being negative
 2020-10-13 11:06:29 +02:00
John Ericson 1b8ebe92dc Merge remote-tracking branch 'obsidian/split_build_cc' into typed-goal-maps 2020-10-12 20:47:22 +00:00
John Ericson a73959e6be Merge remote-tracking branch 'upstream/master' into split_build_cc 2020-10-12 17:20:46 +00:00
John Ericson d334fd4882 Merge branches 'split_build_hh-0', 'split_build_hh-1', 'split_build_hh-2', 'split_build_hh-3' and 'split_build_hh-4' into split_build_cc 2020-10-12 17:20:12 +00:00
John Ericson 542972f029 Trim worker.hh 2020-10-12 17:16:48 +00:00
John Ericson 0e2306204a Rename to hand-hold git (worker.hh) 2020-10-12 17:16:48 +00:00
John Ericson 3ffa3546bd Trim substitution-goal.hh 2020-10-12 17:16:25 +00:00
John Ericson e77a2344d5 Rename to hand-hold git (substitution-goal.hh) 2020-10-12 17:16:25 +00:00
John Ericson d585b4c54f Trim hook-instance.hh 2020-10-12 17:16:13 +00:00
John Ericson 10b749a156 Rename to hand-hold git (hook-instance.hh) 2020-10-12 17:16:13 +00:00
John Ericson 8067d32f2a Trim goal.hh 2020-10-12 17:16:00 +00:00
John Ericson 0d0e345cdc Rename to hand-hold git (goal.hh) 2020-10-12 17:16:00 +00:00