lehmanator/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity
11114 commits 29 branches 5 tags 81 MiB
Commit graph

11114 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Eelco Dolstra 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
Eelco Dolstra 51ffc19f02 Merge branch 'add-docker-image-to-hydra-jobs' of https://github.com/garbas/nix 2021-11-16 13:00:54 +01:00
Eelco Dolstra 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
Eelco Dolstra 6463eaca14
Merge pull request #5472 from NixOS/async-realisation-substitution 
async realisation substitution
 2021-11-16 12:54:20 +01:00
Eelco Dolstra 6d0aa8d175
Merge pull request #5559 from Kloenk/libfetchers-gitlab-headers 
libfetchers: set free gitlab headers
 2021-11-16 12:47:49 +01:00
dependabot[bot] 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
dependabot[bot] 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
Eelco Dolstra 9fe0343bfd Merge branch 'master' of github.com:NixOS/nix 2021-11-15 18:45:20 +01:00
Eelco Dolstra 671817a858 Simplify lockFlake() a bit 2021-11-15 18:44:27 +01:00
Eelco Dolstra d1d223838b Merge branch 'balsoft/fix-subinputs-not-getting-updated' of https://github.com/tweag/nix 2021-11-15 18:37:13 +01:00
Domen Kožar c5c7cca2be
Merge pull request #5394 from NixOS/backport 
Add backport action
 2021-11-15 10:36:55 -06:00
Domen Kožar 1d0bc96c96 Add backport action 2021-11-15 08:41:03 -06:00
Domen Kožar 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
Eelco Dolstra ed33033926
Merge pull request #5553 from kamadorueda/issue-3505 
toXML: display errors position
 2021-11-15 11:49:52 +01:00
Eelco Dolstra a10a72b4e0
Merge pull request #5555 from kamadorueda/typos 
fix many doc typos
 2021-11-15 11:48:33 +01:00
kloenk 79d07d0980 libfetchers: set free gitlab headers 2021-11-14 12:23:46 +01:00
Kevin Amado eae54f2d52
fix many doc typos 2021-11-13 22:28:20 -05:00
Kevin Amado d0e9e18489
toXML: display errors position 
- 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-13 20:33:34 -05:00
regnat 83af9550a1 Add a test for the --accept-flake-config option 2021-11-12 16:02:32 +01:00
Tom Bereknyei 30496af598 Adds an accept-flake-config flag 2021-11-12 09:50:07 -05:00
Eelco Dolstra bceda30498 Typo 2021-11-12 13:41:15 +01:00
Eelco Dolstra f7afc26803
Merge pull request #5533 from abathur/improve_existing_backup_profile_msg_2 
installer: make rc replacement instructions explicit
 2021-11-12 10:40:26 +01:00
Eelco Dolstra 44aed58538
Merge pull request #5540 from samueldr/fix/key-subcommand 
nix key: Fix error message and don't require flakes
 2021-11-12 10:38:00 +01:00
Eelco Dolstra c78155b436
Merge pull request #5542 from samueldr/fix/registry-experimental 
nix registry: Mark experimental
 2021-11-12 10:37:00 +01:00
Samuel Dionne-Riel 30e5c5c55f nix registry: Mark experimental 
This is part of the flakes feature. Mark it as such.
 2021-11-12 03:18:31 -05:00
Samuel Dionne-Riel c1dea92dd6 nix key: Fix error message and don't require flakes 2021-11-11 21:31:26 -05:00
Rok Garbas a118a70649
Documenting how to use/build Nix' Docker image 2021-11-11 16:07:01 +01:00
Eelco Dolstra c1bf9e39f1
docker.nix: Use 'with' 
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
 2021-11-11 16:07:01 +01:00
Rok Garbas 93f7fb6e74
Docker image with Nix inside 2021-11-11 16:07:01 +01:00
Alexander Bantyev 07bffe7998
Flakes: refetch the input when a follows disappears 
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-11 12:05:18 +03:00
Travis A. Everett cc78901ccb installer: make rc replacement instructions explicit 2021-11-10 14:06:18 -06:00
Eelco Dolstra 52a3b2ee63
Merge pull request #5524 from abathur/improve_existing_backup_profile_msg 
installer: improve existing rc backup nag
 2021-11-10 20:50:09 +01:00
Eelco Dolstra a218cfd6c7
Merge pull request #5528 from matthewbauer/recognize-nixosModule 
Recognize singular "nixosModule" in nix flake show
 2021-11-10 12:17:11 +01:00
Matthew Bauer ceeecf2f9e Recognize singular "nixosModule" in nix flake show 
This makes nixosModule appears as a "NixOS Module" like nixosModules
does.
 2021-11-09 11:14:15 -06:00
Eelco Dolstra 67179472df
Merge pull request #5494 from tweag/balsoft/allow-references-in-addPath 
Allow references in addPath
 2021-11-09 15:57:39 +01:00
Travis A. Everett f7859eef49 installer: improve existing rc backup nag 2021-11-09 08:14:51 -06:00
Eelco Dolstra 884ef336c4
Merge pull request #5519 from edolstra/move-unshare 
Unshare mount namespace in main()
 2021-11-09 12:33:25 +01:00
Alexander Bantyev 0b005bc9d6
addToStore, addToStoreFromDump: refactor: pass refs by const reference 
Co-Authored-By: Eelco Dolstra <edolstra@gmail.com>
 2021-11-09 12:24:49 +03:00
Eelco Dolstra 25d2316e8f
Merge pull request #5520 from NixOS/dependabot/github_actions/actions/checkout-2.4.0 
Bump actions/checkout from 2.3.5 to 2.4.0
 2021-11-09 09:16:42 +01:00
dependabot[bot] 732dd90428
Bump actions/checkout from 2.3.5 to 2.4.0 
Bumps [actions/checkout](https://github.com/actions/checkout) from 2.3.5 to 2.4.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2.3.5...v2.4.0)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-08 22:00:58 +00:00
Eelco Dolstra ff2af4d64e Unshare mount namespace in main() 
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-08 22:00:45 +01:00
Eelco Dolstra 7a71621b7c Merge branch 'fix-writable-shell' of https://github.com/yorickvP/nix 2021-11-08 21:12:51 +01:00