aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-06-23Remove a useless string splitThéophane Hufschmitt
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
2021-06-23Pass more values by referenceThéophane Hufschmitt
Rather than copying them around everywhere Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
2021-06-21Shorten a stupidly long sql query nameregnat
2021-05-26Aso track the output path of the realisation dependenciesregnat
2021-05-26Add a db migration scriptregnat
2021-05-26Make `copyPaths` copy the whole realisations closureregnat
Otherwise registering the realisations on the remote side might fail as it now expects a complete closure
2021-05-26Properly track the drvoutput references when buildingregnat
2021-05-26Add a method to compute the closure of a realisationregnat
Only considers the closure in term of `Realisation`, ignores all the opaque inputs. Dunno whether that’s the nicest solution, need to think it through a bit
2021-05-26Store the realisation deps on the local storeregnat
2021-05-26Add a dependencies field to DrvOutputInforegnat
Currently never used, nor set but will be useful shortly
2021-05-26Merge branch 'ca/json-realisations-in-worker-protocol'regnat
2021-05-26Always send the realisations as JSONregnat
Align all the worker protocol with `buildDerivation` which inlines the realisations as one opaque json blob. That way we don’t have to bother changing the remote store protocol when the definition of `Realisation` changes, as long as we keep the json backwards-compatible
2021-05-25Merge pull request #4846 from michaeladler/fix-docEelco Dolstra
fix doc: nix profile info -> nix profile list
2021-05-24fix doc: nix profile info -> nix profile listMichael Adler
Signed-off-by: Michael Adler <therisen06@gmail.com>
2021-05-19Merge pull request #4834 from NixOS/generic-closure-functionEelco Dolstra
Extract a generic `computeClosure` function
2021-05-19Extract a generic `computeClosure` functionregnat
Move the `closure` logic of `computeFSClosure` to its own (templated) function. This doesn’t bring much by itself (except for the ability to properly test the “closure” functionality independently from the rest), but it allows reusing it (in particular for the realisations which will require a very similar closure computation)
2021-05-19Merge pull request #4831 from matthewbauer/fix-extra-slash-in-canon-pathEelco Dolstra
Fix extra slash in canonPath output
2021-05-18Fix extra slash in canonPath outputMatthew Bauer
When you have a symlink like: /tmp -> ./private/tmp you need to resolve ./private/tmp relative to /tmp’s dir: ‘/’. Unlike any other path output by dirOf, / ends with a slash. We don’t want trailing slashes here since we will append another slash in the next comoponent, so clear s like we would if it was a symlink to an absoute path. This should fix at least part of the issue in https://github.com/NixOS/nix/issues/4822, will need confirmation that it actually fixes the problem to close though. Introduced in f3f228700a52857fe6e8632df4e935551ea219ff.
2021-05-18Merge pull request #4828 from NixOS/ca/fix-nix-runEelco Dolstra
Restore an accidentally suppressed negation
2021-05-18Restore an accidentally suppressed negationregnat
Accidentally removed in ca96f5219489c1002499bfe2c580fdd458219144. This caused `nix run` to systematically fail with ``` error: app program '/nix/store/…' is not in the Nix store ```
2021-05-18Merge pull request #4827 from matthewbauer/run-bashrc-first-in-nix-developEelco Dolstra
Source bashrc first in nix develop
2021-05-18Merge pull request #4825 from NixOS/split-app-parsing-and-resolvingEelco Dolstra
Split the parsing of an `App` and its resolving
2021-05-17Source bashrc first in nix developMatthew Bauer
~/.bashrc should be sourced first in the rc script so that PATH & other env vars give precedence over the bashrc PATH. Also, in my bashrc I alias rm as: alias rm='rm -Iv' To avoid running this alias (which shows ‘removed '/tmp/nix-shell.*'), we can just prefix rm with command.
2021-05-17Split the parsing of an `App` and its resolvingregnat
That way things (like `nix flake check`) can evaluate the `app` outputs without having to build anything
2021-05-17Merge pull request #4819 from NixOS/ca/fix-nix-runEelco Dolstra
Resolve the program path in `nix run`
2021-05-17Merge pull request #4818 from NixOS/ca/cli-use-builtpathsEelco Dolstra
Enforce the use of properly built paths in libcmd
2021-05-17Add a test for `nix run` with CA derivationsregnat
2021-05-17Merge pull request #4817 from ↵Eelco Dolstra
emilazy/fix-sandboxed-big-sur-system-version-access sandbox: allow SystemVersionCompat.plist on Darwin
2021-05-17Resolve the program path in `nix run`regnat
Fix #4768
2021-05-17Enfore the use of properly built paths in libcmdregnat
Replace `DerivedPathWithHints` by a new `BuiltPath` type that serves as a proof that the corresponding path has been built.
2021-05-17sandbox: allow SystemVersionCompat.plist on DarwinEmily
For whatever reason, many programs trying to access SystemVersion.plist also open SystemVersionCompat.plist; this includes Python code and coreutils’ `cat(1)` (but not the native macOS `/bin/cat`). Illustratory `dtruss(1m)` output: open("/System/Library/CoreServices/SystemVersion.plist\0", 0x0, 0x0) = 3 0 open("/System/Library/CoreServices/SystemVersionCompat.plist\0", 0x0, 0x0) = 4 0 I assume this is a Big Sur change relating to the 10.16.x/11.x version compatibility divide and that it’s something along the lines of a hook inside libSystem. Fixes a lot of sandboxed package builds under Big Sur.
2021-05-14Update nix-fallback-paths.nix onlyEelco Dolstra
2021-05-13Merge pull request #4798 from matthewbauer/relock-wait-for-build-slot-goalsEelco Dolstra
Relock wait for build slot goals
2021-05-13Merge pull request #4801 from matthewbauer/fix-tokenize-output-namesEelco Dolstra
Fix tokenize output names in DerivedPath
2021-05-12Fix tokenize output names in drvMatthew Bauer
This should fix the issue described in https://discourse.nixos.org/t/derivation-does-not-have-wanted-outputs-dev-out/12905. Specifically, we get an error of error: derivation '/nix/store/_.drv' does not have wanted outputs 'dev,out' when a path like /nix/store/_.drv!dev,out is sent to the daemon.
2021-05-12Relock wait for build slot goalsMatthew Bauer
When we don’t have enough free job slots to run a goal, we put it in the waitForBuildSlot list & unlock its output locks. This will continue from where we left off (tryLocalBuild). However, we need the locks to get reacquired when/if the goal ever restarts. So, we need to send it back through tryToBuild to get reqacquire those locks. I think this bug was introduced in https://github.com/NixOS/nix/pull/4570. It leads to some builds starting without proper locks.
2021-05-12DerivedPathWithHints -> BuiltPathregnat
Just a renaming for now
2021-05-12Merge pull request #4796 from asymmetric/doc-substitutersEelco Dolstra
doc: mention Priority for substituters
2021-05-12doc: mention Priority for substitutersLorenzo Manacorda
2021-05-11install: Fix hash variable for Darwin.arm64 (#4769)Anders Kaseorg
When commit 233b61d3d6482544c35b9d340240bf3260acff13 (#4224) renamed @binaryTarball_${system}@ to @tarballHash_${system}@, it updated this reference for every platform except Darwin.arm64. Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2021-05-11Merge pull request #4795 from mayflower/nix-shell-doc-fixEelco Dolstra
doc/nix-shell: Remove outdated bashrc information
2021-05-11doc/nix-shell: Remove outdated bashrc informationLinus Heckemann
This behaviour was removed in 65f6d5db6f5ef2724a3dc03e1773c510123287f1.
2021-05-10Merge pull request #4781 from NixOS/locally_cache_the_remote_realisationsEelco Dolstra
Add a realisations disk cache
2021-05-10Merge pull request #4787 from Ma27/builtins-ceil-floorEelco Dolstra
Implement `builtins.floor` and `builtins.ceil` using the C library functions internally
2021-05-10Simplify the realisations disk cacheregnat
2021-05-10Remove useless parentsregnat
I never remember the exact syntax of the `switch` statement
2021-05-10primops: math.h -> cmathMaximilian Bosch
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
2021-05-10Merge pull request #4776 from NixOS/fix-ca-normalizationEelco Dolstra
Properly normalize the content-addressed paths
2021-05-10Implement `builtins.floor` and `builtins.ceil` using the C library functions ↵Maximilian Bosch
internally Closes #4782 Note: even though the type is internally called `NixFloat`, it's actually a `double`.
2021-05-10Merge pull request #4771 from andersk/launchd-execEelco Dolstra
launchd: Use exec to avoid leaving the extra shell wrapper running