aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-10-29Fix assertion failure in tab completion for --optionEelco Dolstra
2020-10-29Generalize extra-* settingsEelco Dolstra
This removes the extra-substituters and extra-sandbox-paths settings and instead makes every array setting extensible by setting "extra-<name> = <value>" in the configuration file or passing "--<name> <value>" on the command line.
2020-10-29Merge pull request #4199 from stefanjaax/replaceWantedBySpecifiedEelco Dolstra
Alter "wanted:" to "specified:" in hash mismatch output
2020-10-29Merge pull request #4198 from mkenigs/capitalize-JSONEelco Dolstra
Capitalize JSON for consistency
2020-10-29Alter "wanted:" to "specified:" in hash mismatch outputstev
This makes it even clearer which of the two hashes was specified in the nix files. Some may think that "wanted" and "got" is obvious, but: "got" could mean "got in nix file" and "wanted" could mean "want to see in nix file".
2020-10-28Capitalize JSON for consistencyMatthew Kenigsberg
2020-10-28ConsistencyEelco Dolstra
2020-10-28Merge pull request #4194 from Ericson2314/skip-bad-staticEelco Dolstra
No x86_32 static nix jobs for now
2020-10-28No x86_32 static nix jobs for nowJohn Ericson
Fixes #4175
2020-10-27Merge pull request #4056 from tweag/non-ca-depending-on-caEelco Dolstra
Allow non-CA derivations to depend on CA ones
2020-10-27Test the remote caching of non-ca-depending-on-ca derivationsregnat
Although the non-resolved derivation will never get a cache-hit (it doesn't have an output path to query the cache for anyways), we might get one on the resolved derivation.
2020-10-27Inline `unkownHashes`regnat
See https://github.com/NixOS/nix/pull/4056#discussion_r493661632
2020-10-27Allow non-CA derivations to depend on CA derivationsregnat
2020-10-26isTrivial(): Support trivial listsEelco Dolstra
2020-10-26BaseSetting<StringMap>::set(): Don't append to previous valueEelco Dolstra
2020-10-26Remove edition fieldEelco Dolstra
2020-10-26Fix testEelco Dolstra
2020-10-26Move ExplicitEelco Dolstra
2020-10-26Make the prompt used in development shells configurableEelco Dolstra
2020-10-26Revert "Bump version to 3.0"Eelco Dolstra
This reverts commit 189e6f5e1d949f50ab0b6e5acd25e230d206692d. After some discussion, it seems better not to bump the major version number since most of the new features since 2.3 are marked experimental.
2020-10-25Add sha512 to hashAlgo listings in manpages (#4186)tnias
2020-10-22Merge pull request #4161 from edolstra/nix-develop-redirectsEelco Dolstra
nix develop: Add --redirect flag to redirect dependencies
2020-10-22Fix clang buildEelco Dolstra
2020-10-22nix develop: Add --redirect flag to redirect dependenciesEelco Dolstra
This is primarily useful if you're hacking simultaneously on a package and one of its dependencies. E.g. if you're hacking on Hydra and Nix, you would start a dev shell for Nix, and then a dev shell for Hydra as follows: $ nix develop \ --redirect .#hydraJobs.build.x86_64-linux.nix ~/Dev/nix/outputs/out \ --redirect .#hydraJobs.build.x86_64-linux.nix.dev ~/Dev/nix/outputs/dev (This assumes hydraJobs.build.x86_64-linux has a passthru.nix attribute. You can also use a store path.) This causes all references in the environment to those store paths to be rewritten to ~/Dev/nix/outputs/{out,dev}. Note: unfortunately, you may need to set LD_LIBRARY_PATH=~/Dev/nix/outputs/out/lib because Nixpkgs' ld-wrapper only adds -rpath entries for -L flags that point to the Nix store.
2020-10-21Merge pull request #4177 from knedlsepp/fix-NIX_CONFIG-docEelco Dolstra
Fix the docs about the new NIX_CONFIG env var
2020-10-21nix develop: Handle 'declare -ax' in bash outputEelco Dolstra
Fixes 'nix develop nixpkgs#qpdfview'.
2020-10-21Fix the docs about the new NIX_CONFIG env varJosef Kemetmüller
This was accidentally documented as NIX_OPTIONS.
2020-10-21Merge pull request #4166 from kampka/nix-conf-envEelco Dolstra
Add NIX_CONFIG env var for applying nix.conf overrides
2020-10-21Remove conf-file.xmlEelco Dolstra
This was probably revived in a bad merge.
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 18:31:51 +0000