emilytrau/lix
1
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity
11964 commits 12 branches 0 tags 64 MiB
Commit graph

11964 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eelco Dolstra 394506bc10
Merge pull request #5630 from NixOS/dependabot/github_actions/cachix/install-nix-action-16 
Bump cachix/install-nix-action from 15 to 16
 2021-11-23 10:46:07 +01:00
dependabot[bot] 5be8fbd740
Bump cachix/install-nix-action from 15 to 16 
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 15 to 16.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](https://github.com/cachix/install-nix-action/compare/v15...v16)

---
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-22 22:01:42 +00:00
Matthew Bauer 08b1ac3e38 Set new rosetta 2 path in sandbox 
see:

https://github.com/NixOS/nix/pull/5388

and

https://github.com/NixOS/nix/pull/5251
 2021-11-22 14:42:31 -06:00
Eelco Dolstra b367f1061c
Merge pull request #5624 from rofrol/typo-single-quote 
Typo: change to normal single quote
 2021-11-22 21:33:21 +01:00
Eelco Dolstra f3ef2263bb
Merge pull request #5626 from jtojnar/patch-2 
flake: Do not use aliases
 2021-11-22 21:32:11 +01:00
Jan Tojnar f68699963c
flake: Do not use aliases 
gmock is not available with `nixpkgs.config.allowAliases = false`.
 2021-11-22 17:57:30 +01:00
Eelco Dolstra 720ed47678
Merge pull request #5613 from tomberek/allow_realpath 
add real path to allowedPaths
 2021-11-22 15:10:47 +01:00
Eelco Dolstra dcaa8dfd10
Merge pull request #5620 from alyssais/wayland 
nix-shell --pure: let variables for Wayland through
 2021-11-22 15:09:52 +01:00
Eelco Dolstra a2c7cf9cbd
Merge pull request #5596 from SuperSandro2000/shellcheck 
Apply some shellcheck suggestions
 2021-11-22 15:02:14 +01:00
Théophane Hufschmitt 800e6e8194
Merge pull request #5608 from tweag/fix-build-warnings-on-macos 
Fix build warnings on MacOS
 2021-11-22 14:17:31 +01:00
Alex Shabalin db2e4489a5 Unify #if linux 2021-11-22 13:57:56 +01:00
Roman Frołow 0768c08d99 Typo: change to normal singlequote 2021-11-22 13:37:38 +01:00
Alyssa Ross 664ee49e0d
nix-shell --pure: let variables for Wayland through 
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-21 16:14:19 +00:00
Tom Bereknyei 4318ba2ec5 add real path to allowedPaths 2021-11-20 00:25:36 -05:00
Alex Shabalin 86b7962807 Use warn to print a warning 2021-11-19 16:29:55 +01:00
Alex Shabalin a18d9269a5 Fix build warnings on MacOS 2021-11-19 15:22:31 +01:00
Sandro Jäckel eff48e84d9
Apply some shellcheck suggestions 2021-11-19 15:18:10 +01:00
Eelco Dolstra 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
Eelco Dolstra 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
Kristof Molnar-Tatai 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
Théophane Hufschmitt f8d0311e75
Merge pull request #5598 from obsidiansystems/fix-daemon-tests 
Fix testing the other daemon
 2021-11-19 10:34:27 +01:00
John Ericson 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
Eelco Dolstra 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
Eelco Dolstra f836e3e2ce
Merge pull request #5595 from lorenzleutgeb/patch-2 
doc: Fix escape for operator "logical or"
 2021-11-18 17:25:03 +01:00
Alex Shabalin 4b28798bfc Offer suggestions for nix-env -i 
Closes https://github.com/NixOS/nix/issues/972
 2021-11-18 15:34:57 +01:00
Lorenz Leutgeb 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
Eelco Dolstra e88fb63e28
Merge pull request #5585 from jtojnar/env-a 
doc: De-emphasize nix-env without -A
 2021-11-18 14:34:45 +01:00
Eelco Dolstra 79f27500a4 Test that untrusted config is ignored without --accept-flake-config 2021-11-18 13:32:52 +01:00
Eelco Dolstra 0961c1068a Merge branch 'accept_conf' of https://github.com/tomberek/nix 2021-11-18 12:56:09 +01:00
Eelco Dolstra 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
Eelco Dolstra 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
Eelco Dolstra 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
Eelco Dolstra 262a3c7ce3 Simplify 2021-11-18 12:12:31 +01:00
Eelco Dolstra acf381b061 Merge branch 'faridzakaria/fix-stack-buffer-overflow' of https://github.com/fzakaria/nix 2021-11-18 12:10:52 +01:00
Eelco Dolstra 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
Eelco Dolstra 1d0c6a4b99
Merge pull request #5583 from jtojnar/patch-1 
Fix XDG_CONFIG_DIRS fallback
 2021-11-18 11:35:18 +01:00
Eelco Dolstra 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
Alex Shabalin 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
Farid Zakaria bc14465e08 Fix stack buffer overflow 
Fix a stack buffer overflow found by running MemorySanitizer.
 2021-11-18 04:05:25 +00:00
Jan Tojnar 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
Jan Tojnar 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
Kalle Jepsen 46d2a5a10b Simplify fix by disallowing / in front of @ to match scp style 2021-11-17 13:49:10 +01:00
Eelco Dolstra 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
Eelco Dolstra d03e89e5d1 Parse '(f x) y' the same as 'f x y' 
(cherry picked from commit 5253cb4b68ad248f37b27849c0ebf3614e4f2777)
 2021-11-17 09:53:57 +01:00
Kalle Jepsen 6d46b5b609 Fix detection of scp-style URIs to support non-standard SSH ports for git 2021-11-17 08:41:26 +01:00
Eelco Dolstra b191213b8b
Merge pull request #5578 from edolstra/call-functor 
Call functors with both arguments at once
 2021-11-16 23:39:12 +01:00
Eelco Dolstra 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
Eelco Dolstra 9a9afca712
Merge pull request #5575 from edolstra/attrset-call 
Don't hang when calling an attrset
 2021-11-16 19:13:02 +01:00
Eelco Dolstra e41cf8511f Don't hang when calling an attrset 
Fixes #5565.
 2021-11-16 17:44:19 +01:00
John Ericson 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