aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2021-11-22Merge pull request #5613 from tomberek/allow_realpathEelco Dolstra
add real path to allowedPaths
2021-11-22Merge pull request #5620 from alyssais/waylandEelco Dolstra
nix-shell --pure: let variables for Wayland through
2021-11-22Unify #if linuxAlex Shabalin
2021-11-21nix-shell --pure: let variables for Wayland throughAlyssa Ross
We let DISPLAY (X11) through, so we should let the Wayland equivalents through as well. Similarly, we let HOME through, so it should be okay to allow XDG_RUNTIME_DIR (which is needed for connecting to Wayland with WAYLAND_DISPLAY) through as well. Otherwise graphical applications will either fall back to X11 (if they support it), or just not work (if they don't).
2021-11-20add real path to allowedPathsTom Bereknyei
2021-11-19Fix build warnings on MacOSAlex Shabalin
2021-11-18Merge branch 'accept_conf' of https://github.com/tomberek/nixEelco Dolstra
2021-11-18Merge pull request #5580 from ksonj/fix/non-standard-sshEelco Dolstra
Fix detection of scp-style URIs to support non-standard SSH ports
2021-11-18SimplifyEelco Dolstra
2021-11-18Merge branch 'faridzakaria/fix-stack-buffer-overflow' of ↵Eelco Dolstra
https://github.com/fzakaria/nix
2021-11-18Merge pull request #5586 from tweag/fix-stdout-for-editors-in-replEelco Dolstra
Fix :e in repl
2021-11-18Merge pull request #5583 from jtojnar/patch-1Eelco Dolstra
Fix XDG_CONFIG_DIRS fallback
2021-11-18Fix :e in replAlex Shabalin
Closes https://github.com/NixOS/nix/issues/5487 Co-authored-by: Alexander Bantyev balsoft@balsoft.ru
2021-11-18Fix stack buffer overflowFarid Zakaria
Fix a stack buffer overflow found by running MemorySanitizer.
2021-11-17Fix XDG_CONFIG_DIRS fallbackJan Tojnar
According to XDG Base Directory Specification, it should fall back to /etc/xdg when the env var is not present.
2021-11-17Simplify fix by disallowing / in front of @ to match scp styleKalle Jepsen
2021-11-17Parse '(f x) y' the same as 'f x y'Eelco Dolstra
(cherry picked from commit 5253cb4b68ad248f37b27849c0ebf3614e4f2777)
2021-11-17Fix detection of scp-style URIs to support non-standard SSH ports for gitKalle Jepsen
2021-11-16Call functors with both arguments at onceEelco Dolstra
This is not really useful on its own, but it does recover the 'infinite recursion' error message for '{ __functor = x: x; } 1', and is more efficient in conjunction with #3718. Fixes #5515.
2021-11-16Don't hang when calling an attrsetEelco Dolstra
Fixes #5565.
2021-11-16Ignore errors unsharing/restoring the mount namespaceEelco Dolstra
This prevents Nix from barfing when run in a container where it doesn't have the appropriate privileges.
2021-11-16Merge pull request #5452 from Kha/git-extend-lockEelco Dolstra
git: extend cache dir lock over all mutating operations
2021-11-16Merge pull request #5472 from NixOS/async-realisation-substitutionEelco Dolstra
async realisation substitution
2021-11-16Merge pull request #5559 from Kloenk/libfetchers-gitlab-headersEelco Dolstra
libfetchers: set free gitlab headers
2021-11-15Merge branch 'master' of github.com:NixOS/nixEelco Dolstra
2021-11-15Simplify lockFlake() a bitEelco Dolstra
2021-11-15Merge branch 'balsoft/fix-subinputs-not-getting-updated' of ↵Eelco Dolstra
https://github.com/tweag/nix
2021-11-15Merge pull request #5428 from kreisys/add-pos-to-json-type-errorDomen Kožar
toJSON: report error position for fancier output
2021-11-14libfetchers: set free gitlab headersFinn Behrens
2021-11-13toXML: display errors positionKevin Amado
- This change applies to builtins.toXML and inner workings - Proof of concept: ```nix let e = builtins.toXML e; in e ``` - Before: ``` $ nix-instantiate --eval poc.nix error: infinite recursion encountered ``` - After: ``` $ nix-instantiate --eval poc.nix error: infinite recursion encountered at /data/github/kamadorueda/nix/poc.nix:1:9: 1| let e = builtins.toXML e; in e | ```
2021-11-12Adds an accept-flake-config flagTom Bereknyei
2021-11-12TypoEelco Dolstra
2021-11-12Merge pull request #5540 from samueldr/fix/key-subcommandEelco Dolstra
nix key: Fix error message and don't require flakes
2021-11-12nix registry: Mark experimentalSamuel Dionne-Riel
This is part of the flakes feature. Mark it as such.
2021-11-11nix key: Fix error message and don't require flakesSamuel Dionne-Riel
2021-11-11Flakes: refetch the input when a follows disappearsAlexander Bantyev
When an input follows disappears, we can't just reuse the old lock file entries since we may be missing some required ones. Refetch the input when this happens. Closes https://github.com/NixOS/nix/issues/5289
2021-11-10Merge pull request #5528 from matthewbauer/recognize-nixosModuleEelco Dolstra
Recognize singular "nixosModule" in nix flake show
2021-11-09Recognize singular "nixosModule" in nix flake showMatthew Bauer
This makes nixosModule appears as a "NixOS Module" like nixosModules does.
2021-11-09Merge pull request #5494 from tweag/balsoft/allow-references-in-addPathEelco Dolstra
Allow references in addPath
2021-11-09addToStore, addToStoreFromDump: refactor: pass refs by const referenceAlexander Bantyev
Co-Authored-By: Eelco Dolstra <edolstra@gmail.com>
2021-11-08Unshare mount namespace in main()Eelco Dolstra
Doing it as a side-effect of calling LocalStore::makeStoreWritable() is very ugly. Also, make sure that stopping the progress bar joins the update thread, otherwise that thread should be unshared as well.
2021-11-08Merge branch 'fix-writable-shell' of https://github.com/yorickvP/nixEelco Dolstra
2021-11-08Merge pull request #5434 from timothyklim/git-url-submodulesEelco Dolstra
Support building flakes from a Git repo url with submodules
2021-11-08Merge pull request #5504 from NixOS/flake-options-and-daemonEelco Dolstra
Make the flake options work when using the daemon
2021-11-07Remove unused "<let-body>" symbolAndreas Rammhold
The requirement for the symbol has been removed since at least 7d47498.
2021-11-05addPath: allow paths with referencesAlexander Bantyev
Since 4806f2f6b0fd2cae401b89fe19d8c528ffd88b5f, we can't have paths with references passed to builtins.{path,filterSource}. This prevents many cases of those functions called on IFD outputs from working. Resolve this by passing the references found in the original path to the added path.
2021-11-05Merge pull request #5476 from NixOS/ca/fix-build-in-nix-replThéophane Hufschmitt
Fix `nix repl`’s building of CA derivations
2021-11-05Make the flake options work when using the daemonregnat
When setting flake-local options (with the `nixConfig` field), forward these options to the daemon in case we’re using one. This is necessary in particular for options like `binary-caches` or `post-build-hook` to make sense. Fix <https://github.com/NixOS/nix/commit/343239fc8a1993f707a990c2cd54a41f1fa3de99#r44356843>
2021-11-05Fix `nix repl`’s building of CA derivationsregnat
When running a `:b` command in the repl, after building the derivations query the store for its outputs rather than just assuming that they are known in the derivation itself (which isn’t true for CA derivations) Fix #5328
2021-11-04Remove maxPrimOpArityEelco Dolstra