summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2021-01-08Fix: Remove unused variablecleanupMatthias Beyer
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
2021-01-08Fix testsHEADmasterEelco Dolstra
2021-01-08Support binary unit prefixes in command line argumentsEelco Dolstra
2021-01-08string2Int(): Return std::optionalEelco Dolstra
2021-01-08Remove unused mkFlag1Eelco Dolstra
2021-01-08Remove mkFlag integer specialisationEelco Dolstra
2021-01-08Remove mkIntFlagEelco Dolstra
2021-01-07Merge pull request #4434 from NixOS/nix-prefetchEelco Dolstra
Add 'nix store prefetch-{file,tarball}'
2021-01-07Add 'nix store prefetch-{file,tarball}'Eelco Dolstra
These replace nix-prefetch-url and nix-prefetch-url --unpack, respectively.
2021-01-06Make sodium a required dependencyEelco Dolstra
2021-01-06Add commands for generating secret/public keysEelco Dolstra
2021-01-06crypto.cc: API cleanup and add generate() / to_string() methodsEelco Dolstra
2021-01-06Move sodium_init() callEelco Dolstra
2021-01-06Merge pull request #4310 from matthewbauer/rosetta2-extra-platformsEelco Dolstra
Add x86_64-darwin and aarch64 to "extra-platforms" automatically when Rosetta2 is detected
2021-01-05Fix deadlock in LocalStore::addSignatures()Eelco Dolstra
Fixes #4367.
2021-01-05Merge pull request #4424 from DanilaFe/fix-attr-from-jsonEelco Dolstra
Fix conversion from JSON to fetch attributes
2021-01-05Fix conversion from JSON to fetch attributesDanila Fedorin
It appears as through the fetch attribute, which is simply a variant with 3 elements, implicitly converts boolean arguments to integers. One must use Explicit<bool> to correctly populate it with a boolean. This was missing from the implementation, and resulted in clearly boolean JSON fields being treated as numbers.
2021-01-01Merge pull request #4412 from acx0/fix-intro-docEelco Dolstra
Fix `configure` error in introduction doc
2020-12-31Fix `configure` error in introduction docSam Lidder
2020-12-30Merge pull request #4411 from corngood/env-assert-fixEelco Dolstra
Fix insufficent attribute capacity in user profile
2020-12-30Fix insufficent attribute capacity in user profileDavid McFarland
2020-12-30Merge pull request #4397 from matthewbauer/support-libcxx10Eelco Dolstra
Cast variants fully for libc++10
2020-12-28FixupMatthew Bauer
2020-12-28Merge pull request #4407 from cole-h/fix-hacking-linkEelco Dolstra
README: fix link to hacking guide
2020-12-28README: fix link to hacking guideCole Helbling
2020-12-28scanForReferences: Remove misleading commentEelco Dolstra
References have always been determined only by the hash part, not the name or the store prefix. Fixes #4396.
2020-12-28Merge pull request #4399 from sevan/patch-1Eelco Dolstra
Update URL where bzip2 can be obtained in docs
2020-12-28Merge pull request #4400 from sevan/patch-2Eelco Dolstra
Update URL where bzip2 can be obtained in configure script
2020-12-25Update URL where bzip2 can be obtainedSevan Janiyan
2020-12-25Update URL where bzip2 can be obtainedSevan Janiyan
2020-12-24Merge branch 'master' into support-libcxx10Matthew Bauer
2020-12-23Cast variants fully for libc++10Matthew Bauer
libc++10 seems to be stricter on what it allows in variant conversion. I'm not sure what the rules are here, but this is the minimal change needed to get through the compilation errors.
2020-12-23Merge pull request #4336 from NixOS/manpagesEelco Dolstra
Documentation for nix subcommands
2020-12-23Add 'nix' manpageEelco Dolstra
2020-12-23Add TODOEelco Dolstra
2020-12-23Command: Remove examples()Eelco Dolstra
2020-12-23Add 'nix flake' manpagesEelco Dolstra
2020-12-23Merge pull request #4366 from NixOS/readInvalidDerivation-on-remote-cachesEelco Dolstra
Use the fs accessor for readInvalidDerivation
2020-12-22Merge branch 'git-rev-error' of https://github.com/Ma27/nix into masterEelco Dolstra
2020-12-22Fix testsEelco Dolstra
2020-12-22Move <nix/fetchurl.nix> into the nix binaryEelco Dolstra
This makes the statically linked nix binary just work, without needing any additional files.
2020-12-22chrootHelper: Handle symlinks in the root directoryEelco Dolstra
This is necessary on Ubuntu where /bin and /lib* are symlinks.
2020-12-22tests/fetchGit: test behavior of `allRefs = true;`Maximilian Bosch
2020-12-22Document `allRefs` argument of `builtins.fetchTree`Maximilian Bosch
2020-12-22Don't log from inside the loggerEelco Dolstra
This deadlocks ProgressBar, e.g. # nix run --impure --no-substitute --store '/tmp/nix2?store=/foo' --expr 'derivation { builder = /nix/store/zi90rxslsm4mlr46l2xws1rm94g7pk8p-busybox-1.31.1-x86_64-unknown-linux-musl/bin/busybox; }' leads to Thread 1 (Thread 0x7ffff6126e80 (LWP 12250)): #0 0x00007ffff7215d62 in __lll_lock_wait () from /nix/store/9df65igwjmf2wbw0gbrrgair6piqjgmi-glibc-2.31/lib/libpthread.so.0 #1 0x00007ffff720e721 in pthread_mutex_lock () from /nix/store/9df65igwjmf2wbw0gbrrgair6piqjgmi-glibc-2.31/lib/libpthread.so.0 #2 0x00007ffff7ad17fa in __gthread_mutex_lock (__mutex=0x6c5448) at /nix/store/h31cy7jm6g7cfqbhc5pm4rf9c53i3qfb-gcc-9.3.0/include/c++/9.3.0/x86_64-unknown-linux-gnu/bits/gthr-default.h:749 #3 std::mutex::lock (this=0x6c5448) at /nix/store/h31cy7jm6g7cfqbhc5pm4rf9c53i3qfb-gcc-9.3.0/include/c++/9.3.0/bits/std_mutex.h:100 #4 std::unique_lock<std::mutex>::lock (this=0x7fffffff09a8, this=0x7fffffff09a8) at /nix/store/h31cy7jm6g7cfqbhc5pm4rf9c53i3qfb-gcc-9.3.0/include/c++/9.3.0/bits/unique_lock.h:141 #5 std::unique_lock<std::mutex>::unique_lock (__m=..., this=0x7fffffff09a8) at /nix/store/h31cy7jm6g7cfqbhc5pm4rf9c53i3qfb-gcc-9.3.0/include/c++/9.3.0/bits/unique_lock.h:71 #6 nix::Sync<nix::ProgressBar::State, std::mutex>::Lock::Lock (s=0x6c5448, this=0x7fffffff09a0) at src/libutil/sync.hh:45 #7 nix::Sync<nix::ProgressBar::State, std::mutex>::lock (this=0x6c5448) at src/libutil/sync.hh:85 #8 nix::ProgressBar::logEI (this=0x6c5440, ei=...) at src/libmain/progress-bar.cc:131 #9 0x00007ffff7608cfd in nix::Logger::logEI (ei=..., lvl=nix::lvlError, this=0x6c5440) at src/libutil/logging.hh:88 #10 nix::getCodeLines (errPos=...) at src/libutil/error.cc:66 #11 0x00007ffff76073f2 in nix::showErrorInfo (out=..., einfo=..., showTrace=<optimized out>) at /nix/store/h31cy7jm6g7cfqbhc5pm4rf9c53i3qfb-gcc-9.3.0/include/c++/9.3.0/optional:897 #12 0x00007ffff7ad19e7 in nix::ProgressBar::logEI (this=0x6c5440, ei=...) at src/libmain/progress-bar.cc:134 #13 0x00007ffff7ab9d10 in nix::Logger::logEI (ei=..., lvl=nix::lvlError, this=0x6c5440) at src/libutil/logging.hh:88 #14 nix::handleExceptions(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::function<void ()>) (programName="/home/eelco/Dev/nix/outputs/out/bin/nix", fun=...) at src/libmain/shared.cc:328 #15 0x000000000046226b in main (argc=<optimized out>, argv=<optimized out>) at /nix/store/h31cy7jm6g7cfqbhc5pm4rf9c53i3qfb-gcc-9.3.0/include/c++/9.3.0/ext/new_allocator.h:80
2020-12-22Add explicit `allRefs = true;` argument to `fetchGit`Maximilian Bosch
Sometimes it's necessary to fetch a git repository at a revision and it's unknown which ref contains the revision in question. An example would be a Cargo.lock which only provides the URL and the revision when using a git repository as build input. However it's considered a bad practice to perform a full checkout of a repository since this may take a lot of time and can eat up a lot of disk space. This patch makes a full checkout explicit by adding an `allRefs` argument to `builtins.fetchGit` which fetches all refs if explicitly set to true. Closes #2409
2020-12-22Provide a more meaningful error-message for `builtins.fetchGit` if a ↵Maximilian Bosch
revision can't be checked out A common pitfall when using e.g. `builtins.fetchGit` is the `fatal: not a tree object`-error when trying to fetch a revision of a git-repository that isn't on the `master` branch and no `ref` is specified. In order to make clear what's the problem, I added a simple check whether the revision in question exists and if it doesn't a more meaningful error-message is displayed: ``` nix-repl> builtins.fetchGit { url = "https://github.com/owner/myrepo"; rev = "<commit not on master>"; } moderror: --- Error -------------------------------------------------------------------- nix Cannot find Git revision 'bf1cc5c648e6aed7360448a3745bb2fe4fbbf0e9' in ref 'master' of repository 'https://gitlab.com/Ma27/nvim.nix'! Please make sure that the rev exists on the ref you've specified or add allRefs = true; to fetchGit. ``` Closes #2431
2020-12-21Add 'nix profile' manpageEelco Dolstra
2020-12-21Add 'nix bundle' manpageEelco Dolstra
Fixes #4375.
2020-12-21Add 'nix store diff-closures' manpageEelco Dolstra