eff48e84d9
Apply some shellcheck suggestions
2021-11-19 15:18:10 +01:00
9cd8cffefc
Merge pull request #5607 from kmt-lnh/install-ergonomics
...
curl usage in install script in sync with instructions
2021-11-19 15:13:52 +01:00
2eefdc7208
Merge pull request #5597 from edolstra/remove-old-scripts
...
Remove nix-reduce-build and nix-http-export
2021-11-19 13:25:37 +01:00
d5b36bdb58
switch order of wget and curl
...
This change makes the script consistent with the installation
instructions while keeping wget as an alternative.
2021-11-19 13:10:04 +01:00
f8d0311e75
Merge pull request #5598 from obsidiansystems/fix-daemon-tests
...
Fix testing the other daemon
2021-11-19 10:34:27 +01:00
06fb6aecea
Fix testing the other daemon
...
The eventual PATH entry needs the `.../bin` or we will not use the right
daemon.
2021-11-18 22:23:36 +00:00
9de324f554
Remove nix-reduce-build and nix-http-export
...
These scripts are not installed and haven't been updated in many
years.
2021-11-18 21:17:57 +01:00
f836e3e2ce
Merge pull request #5595 from lorenzleutgeb/patch-2
...
doc: Fix escape for operator "logical or"
2021-11-18 17:25:03 +01:00
e1192116d3
doc: Fix escape for operator "logical or"
...
See https://matrix.to/#/!KqkRjyTEzAGRiZFBYT:nixos.org/$hhMb6AdRIXfRkv_LsNsiQJuch7AQ_b6szr4tfawFy-4
2021-11-18 15:08:01 +01:00
e88fb63e28
Merge pull request #5585 from jtojnar/env-a
...
doc: De-emphasize nix-env without -A
2021-11-18 14:34:45 +01:00
79f27500a4
Test that untrusted config is ignored without --accept-flake-config
2021-11-18 13:32:52 +01:00
0961c1068a
Merge branch 'accept_conf' of https://github.com/tomberek/nix
2021-11-18 12:56:09 +01:00
72e67c4b2d
Merge pull request #5568 from NixOS/dependabot/github_actions/cachix/install-nix-action-15
...
Bump cachix/install-nix-action from 14.1 to 15
2021-11-18 12:32:06 +01:00
f4ae804b35
Merge pull request #5569 from NixOS/dependabot/github_actions/zeebe-io/backport-action-0.0.7
...
Bump zeebe-io/backport-action from 0.0.5 to 0.0.7
2021-11-18 12:31:50 +01:00
0adced4b9e
Merge pull request #5580 from ksonj/fix/non-standard-ssh
...
Fix detection of scp-style URIs to support non-standard SSH ports
2021-11-18 12:30:29 +01:00
262a3c7ce3
Simplify
2021-11-18 12:12:31 +01:00
acf381b061
Merge branch 'faridzakaria/fix-stack-buffer-overflow' of https://github.com/fzakaria/nix
2021-11-18 12:10:52 +01:00
205655e98b
Merge pull request #5586 from tweag/fix-stdout-for-editors-in-repl
...
Fix :e in repl
2021-11-18 11:46:44 +01:00
1d0c6a4b99
Merge pull request #5583 from jtojnar/patch-1
...
Fix XDG_CONFIG_DIRS fallback
2021-11-18 11:35:18 +01:00
9e845df339
Merge pull request #5581 from edolstra/parse-calls
...
Parse '(f x) y' the same as 'f x y'
2021-11-18 11:34:04 +01:00
9653858ce6
Fix :e in repl
...
Closes https://github.com/NixOS/nix/issues/5487
Co-authored-by: Alexander Bantyev balsoft@balsoft.ru
2021-11-18 09:03:33 +01:00
bc14465e08
Fix stack buffer overflow
...
Fix a stack buffer overflow found by running MemorySanitizer.
2021-11-18 04:05:25 +00:00
ca4d8ce9e2
doc: De-emphasize nix-env without -A
...
The manual uses `nix-env -i` without `-A` prominently, teaching a bad practice to newcomers.
2021-11-17 17:04:25 +01:00
e96faadcd6
Fix XDG_CONFIG_DIRS fallback
...
According to XDG Base Directory Specification,
it should fall back to /etc/xdg when the env var is not present.
2021-11-17 14:31:15 +01:00
46d2a5a10b
Simplify fix by disallowing / in front of @ to match scp style
2021-11-17 13:49:10 +01:00
480c883f36
Merge pull request #5573 from Ericson2314/docker-nixpkgs-idioms
...
Make docker.nix match Nixpkgs's idioms
2021-11-17 10:05:05 +01:00
d03e89e5d1
Parse '(f x) y' the same as 'f x y'
...
(cherry picked from commit 5253cb4b68ad248f37b27849c0ebf3614e4f2777)
2021-11-17 09:53:57 +01:00
6d46b5b609
Fix detection of scp-style URIs to support non-standard SSH ports for git
2021-11-17 08:41:26 +01:00
b191213b8b
Merge pull request #5578 from edolstra/call-functor
...
Call functors with both arguments at once
2021-11-16 23:39:12 +01:00
d7bae52b9d
Call functors with both arguments at once
...
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-16 22:34:17 +01:00
9a9afca712
Merge pull request #5575 from edolstra/attrset-call
...
Don't hang when calling an attrset
2021-11-16 19:13:02 +01:00
e41cf8511f
Don't hang when calling an attrset
...
Fixes #5565 .
2021-11-16 17:44:19 +01:00
8368a8aff1
Make docker.nix match Nixpkgs's idioms
...
1. `target` is the wrong name, that is just for compilers per out
standard terminology. We just need to worry about "build" and "host".
2. We only need one `pkgs`. `pkgs.buildPackages` is how we get anything
we need at build time.
3. `crossSystem` is the name of a nixpkgs parameter that is actually an
attribute set, not a 2-part "cpu-os" string.
3. `pkgsCross` effectively evaluates Nixpkgs twice, which is
inefficient. It is just there for people poking around the CLI / REPL
(and I am skeptical even that is a good idea), and *not* what written
code should use, especially code that is merely parametric in the package set
it is given.
4. We don't need to memoize Nixpkgs here because we are only doing one
pkg set at a time (no `genAttrs`) so it's better to just delete all this
stuff. `flake.nix` instead would do something like that, with
`genAttrs` (though without `pkgsCross`), if and when we have hydra jobs
for cross builds.
2021-11-16 11:04:25 -05:00
8c93a481af
Ignore errors unsharing/restoring the mount namespace
...
This prevents Nix from barfing when run in a container where it
doesn't have the appropriate privileges.
2021-11-16 14:48:44 +01:00
51ffc19f02
Merge branch 'add-docker-image-to-hydra-jobs' of https://github.com/garbas/nix
2021-11-16 13:00:54 +01:00
ec608e3def
Merge pull request #5452 from Kha/git-extend-lock
...
git: extend cache dir lock over all mutating operations
2021-11-16 12:55:12 +01:00
6463eaca14
Merge pull request #5472 from NixOS/async-realisation-substitution
...
async realisation substitution
2021-11-16 12:54:20 +01:00
6d0aa8d175
Merge pull request #5559 from Kloenk/libfetchers-gitlab-headers
...
libfetchers: set free gitlab headers
2021-11-16 12:47:49 +01:00
3771f931bf
Bump zeebe-io/backport-action from 0.0.5 to 0.0.7
...
Bumps [zeebe-io/backport-action](https://github.com/zeebe-io/backport-action ) from 0.0.5 to 0.0.7.
- [Release notes](https://github.com/zeebe-io/backport-action/releases )
- [Commits](https://github.com/zeebe-io/backport-action/compare/v0.0.5...v0.0.7 )
---
updated-dependencies:
- dependency-name: zeebe-io/backport-action
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-11-15 22:01:17 +00:00
4ba355e593
Bump cachix/install-nix-action from 14.1 to 15
...
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action ) from 14.1 to 15.
- [Release notes](https://github.com/cachix/install-nix-action/releases )
- [Commits](https://github.com/cachix/install-nix-action/compare/v14.1...v15 )
---
updated-dependencies:
- dependency-name: cachix/install-nix-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-11-15 22:01:13 +00:00
9fe0343bfd
Merge branch 'master' of github.com:NixOS/nix
2021-11-15 18:45:20 +01:00
671817a858
Simplify lockFlake() a bit
2021-11-15 18:44:27 +01:00
d1d223838b
Merge branch 'balsoft/fix-subinputs-not-getting-updated' of https://github.com/tweag/nix
2021-11-15 18:37:13 +01:00
c5c7cca2be
Merge pull request #5394 from NixOS/backport
...
Add backport action
2021-11-15 10:36:55 -06:00
1d0bc96c96
Add backport action
2021-11-15 08:41:03 -06:00
164179983e
Merge pull request #5428 from kreisys/add-pos-to-json-type-error
...
toJSON: report error position for fancier output
2021-11-15 07:57:46 -06:00
ed33033926
Merge pull request #5553 from kamadorueda/issue-3505
...
toXML: display errors position
2021-11-15 11:49:52 +01:00
a10a72b4e0
Merge pull request #5555 from kamadorueda/typos
...
fix many doc typos
2021-11-15 11:48:33 +01:00
79d07d0980
libfetchers: set free gitlab headers
2021-11-14 12:23:46 +01:00
eae54f2d52
fix many doc typos
2021-11-13 22:28:20 -05:00
Sandro Jäckel