aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-10-21Add NIX_CONFIG env var for applying nix.conf overridesChristian Kampka
2020-10-20Merge pull request #4168 from mkenigs/fix-3975Eelco Dolstra
Make bash non-interactive for nix develop --phase
2020-10-20Make bash non-interactive for nix develop --phaseMatthew Kenigsberg
Fix #3975: Currently if Ctrl-C is pressed during a phase, the interactive subshell is not exited. Removing --rcfile when --phase is present makes bash non-interactive
2020-10-20Merge pull request #3996 from abathur/macos_big_sur_fixesDomen Kožar
Macos big sur installer fixes
2020-10-19discourage casual Big Sur installsTravis A. Everett
2020-10-19create missing profile files to fix zsh envvarsTravis A. Everett
Env vars for ZSH were moved from /etc/zshrc to /etc/zshenv in #3608 to address an issue with zshrc getting clobbered by OS updates, but /etc/zshenv doesn't exist by default--so *nothing* would get set up for zsh users unless they already happened to have /etc/zshenv. Creating these files if they don't exist. Also cut separate creation of profile.d/nix.sh, which isn't needed now.
2020-10-19fix skipped multi-user install steps on macOSTravis A. Everett
Some of the changes in #3788 to support non-systemd Nix installs don't appear to be aware that the darwin installer exists, which resulted in some skipped steps and inappropriate instructions.
2020-10-19restore create-darwin-volume to release tarballTravis A. Everett
The move from release.nix to flake.nix appears to have lost some changes from #3628 / 1c56f18a8122b605c28000e295d5e223f272cccd, leaving create-darwin-volume.sh out of the release tarball. Under the assumption that this was just an accident/byproduct of when flake.nix split off and not intentional, I am restoring those edits.
2020-10-19adapt to apfs.util flag diff in catalina/big surTravis A. Everett
Fixes #3957. Just runs both forms to minimize moving parts.
2020-10-19replace xpath with xmllint --xpath; simplifyTravis A. Everett
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-19fix xpath and conditional bugs; xpath -> xmllintTravis A. Everett
- 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-19update macOS version handling for Big SurTravis A. Everett
Keeping this commit narrow for reviewability, but some of these conditionals will change in subsequent commits in this PR. Fixes #3852.
2020-10-19Merge pull request #4080 from kquick/kwq/flake-int-docEelco Dolstra
Add some internal documentation for flake support objects.
2020-10-19Merge pull request #4162 from edolstra/nixpkgs-20.09Eelco Dolstra
Switch to Nixpkgs 20.09
2020-10-18Remove buildStatic from checksEelco Dolstra
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-18Switch to Nixpkgs 20.09Eelco Dolstra
2020-10-18flake.lock: UpdateEelco Dolstra
Flake input changes: * Updated 'nixpkgs': 'github:NixOS/nixpkgs/3a10a004bb5802d5f23c58886722e4239705e733' -> 'github:NixOS/nixpkgs/ad0d20345219790533ebe06571f82ed6b034db31'
2020-10-18Add some missing clean-filesEelco Dolstra
2020-10-18Update .gitignoreEelco Dolstra
2020-10-18Merge pull request #4143 from obsidiansystems/typed-goal-mapsEelco Dolstra
Properly type the derivation and substitution goal maps
2020-10-18Merge pull request #4157 from SFrijters/doc-nix-shell-pure-bashrcEelco Dolstra
doc: nix-shell in pure mode does *not* source user bashrc
2020-10-18Merge pull request #4158 from hercules-ci/issue-3964-substitution-loopEelco Dolstra
Fix substitution loop #3964, #3534
2020-10-18DerivationGoal: only retry if output closure incomplete is only problemRobert Hensing
2020-10-18Tests for #3964Robert Hensing
2020-10-18TypoRobert Hensing
2020-10-18doc: nix-shell in pure mode does *not* source user bashrcStefan Frijters
2020-10-17Explain that `upcast_goal` is still a static castJohn Ericson
2020-10-17Just use `auto` in two places.John Ericson
2020-10-17tab -> spaceJohn Ericson
2020-10-17Merge remote-tracking branch 'upstream/master' into typed-goal-mapsJohn Ericson
2020-10-17Merge pull request #4156 from aszlig/vm-test-pythonEelco Dolstra
Convert VM tests to Python
2020-10-17tests: Add names to VM testsaszlig
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-17Convert VM tests to Pythonaszlig
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-17Merge branch 'fix-and-ci-static-builds' of ↵Eelco Dolstra
https://github.com/obsidiansystems/nix into master
2020-10-16Merge pull request #4151 from obsidiansystems/bump-nixpkgsEelco Dolstra
Bump Nixpkgs to hopefully fix linkrot
2020-10-16Merge remote-tracking branch 'obsidian/bump-nixpkgs' into ↵John Ericson
fix-and-ci-static-builds
2020-10-15Bump Nixpkgs to hopefully fix linkrotJohn Ericson
2020-10-15Make a better -lz hackJohn Ericson
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-15Add missing include for MAX_PATHJohn Ericson
And remove one that we didn't actually need to add
2020-10-15Merge remote-tracking branch 'upstream/master' into fix-and-ci-static-buildsJohn Ericson
2020-10-15`build-static` -> `buildStatic` in Nix's flakeJohn Ericson
2020-10-14Merge remote-tracking branch 'upstream/master' into typed-goal-mapsJohn Ericson
2020-10-14Create /etc/passwd *after* figuring out the sandbox uid/gidEelco Dolstra
Fixes build failures like # nix log /nix/store/gjaa0psfcmqvw7ivggsncx9w364p3s8s-sshd.conf-validated.drv No user exists for uid 30012
2020-10-13Add some more docsJohn Ericson
2020-10-13Merge remote-tracking branch 'upstream/master' into typed-goal-mapsJohn Ericson
2020-10-13Merge branch 'split_build_cc' of https://github.com/obsidiansystems/nixEelco Dolstra
2020-10-13Merge pull request #4141 from volth/patch-11Eelco Dolstra
Handle amount of disk space saved by hard linking being negative
2020-10-12Merge remote-tracking branch 'obsidian/split_build_cc' into typed-goal-mapsJohn Ericson
2020-10-12Merge remote-tracking branch 'upstream/master' into split_build_ccJohn Ericson
2020-10-12Merge branches 'split_build_hh-0', 'split_build_hh-1', 'split_build_hh-2', ↵John Ericson
'split_build_hh-3' and 'split_build_hh-4' into split_build_cc