qyriad/lix
1
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity
10867 commits 57 branches 0 tags 73 MiB
Commit graph

10867 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eelco Dolstra 9559f74a99
Merge pull request #5440 from edolstra/build-remote 
Fix preferLocalBuild when max-jobs == 0
 2021-10-27 15:27:17 +02:00
Eelco Dolstra 1254e8753c build-remote: Implicitly add the 'builtin' system type to all machines 
This makes 'nix-env -i --max-jobs 0' work with remote builders.
 2021-10-27 14:25:13 +02:00
Eelco Dolstra f2280749b1 If max-jobs == 0, do preferLocalBuild on remote builders 2021-10-27 14:21:31 +02:00
Eelco Dolstra 6e684d1b87 daemon: Accept 'repeat' setting from untrusted users 
Fixes #5352.
 2021-10-27 13:09:13 +02:00
Eelco Dolstra 13a7a24ba5 Style 2021-10-27 13:02:37 +02:00
Eelco Dolstra 5667822edc
Merge pull request #5421 from bew/fix-devshell-build-on-non-nixos 
Fix devShell build on non-NixOS with a different boost version
 2021-10-26 14:45:30 +02:00
Eelco Dolstra 0d9e050ba7 parseExperimentalFeature(): Initialize atomically 2021-10-26 14:29:48 +02:00
Eelco Dolstra 9ce84c64c5 Tweak fetchTree docs 2021-10-26 14:21:24 +02:00
Eelco Dolstra 3155862bae Merge remote-tracking branch 'origin/overhaul-xp-features' 2021-10-26 14:08:27 +02:00
regnat af99941279 Make experimental-features a proper type 
Rather than having them plain strings scattered through the whole
codebase, create an enum containing all the known experimental features.

This means that
- Nix can now `warn` when an unkwown experimental feature is passed
  (making it much nicer to spot typos and spot deprecated features)
- It’s now easy to remove a feature altogether (once the feature isn’t
  experimental anymore or is dropped) by just removing the field for the
  enum and letting the compiler point us to all the now invalid usages
  of it.
 2021-10-26 07:02:31 +02:00
Benoit de Chezelles ec9c1286ad Fix devShell build on non-NixOS with a different boost version 2021-10-23 15:32:48 +02:00
Domen Kožar 4a2b7cc68c
Merge pull request #5405 from NixOS/dependabot/github_actions/actions/checkout-2.3.5 
Bump actions/checkout from 2.3.4 to 2.3.5
 2021-10-19 12:13:10 -05:00
dependabot[bot] 2400819809
Bump actions/checkout from 2.3.4 to 2.3.5 
Bumps [actions/checkout](https://github.com/actions/checkout) from 2.3.4 to 2.3.5.
- [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.4...v2.3.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-18 22:01:24 +00:00
Domen Kožar 623514bf9e
Merge pull request #5398 from kamadorueda/master 
fetch: nicer infinite recursion errors
 2021-10-17 20:55:36 -05:00
Domen Kožar 51c812d6bb
Merge pull request #5365 from arafangion/master 
Clarify that not all nix packages will use the default build phases
 2021-10-17 20:54:00 -05:00
Kevin Amado 823dce945a
fetch: nicer infinite recursion errors 
- This change applies to builtins.fetchurl and builtins.fetchTarball
- PoC: `let x = builtins.fetchurl x; in x`
- Before:
  ```bash
  $ nix-instantiate --extra-experimental-features flakes --strict
  error: infinite recursion encountered
  ```
- After:
  ```bash
  $ nix-instantiate --extra-experimental-features flakes --strict
  error: infinite recursion encountered

       at /data/github/kamadorueda/nix/test.nix:1:9:

            1| let x = builtins.fetchurl x; in x
             |         ^
  ```

Mentions: #3505
 2021-10-17 12:54:53 -05:00
Eelco Dolstra 97b4904136
Merge pull request #5396 from kamadorueda/master 
fetchTree: add pos to EvalState::forceValue
 2021-10-17 19:50:21 +02:00
John Chapman ffeec5f283 Clarify that not all nix packages will use the default build phases 2021-10-17 15:24:22 +11:00
Kevin Amado e5a27a3b4e
fetchTree: add pos to EvalState::forceValue 
- This way we improve error messages
  on infinite recursion
- Demo:
  ```nix
  let x = builtins.fetchTree {
    type = "git";
    inherit x;
  };
  in x
  ```
- Before:
  ```bash
  $ nix-instantiate --extra-experimental-features flakes --strict
  error: infinite recursion encountered
  ```
- After:
  ```bash
  $ nix-instantiate --extra-experimental-features flakes --strict
  error: infinite recursion encountered

       at /data/github/kamadorueda/nix/test.nix:3:10:

            2|   type = "git";
            3|   inherit x;
             |          ^
            4| };
  ```

Mentions: #3505
 2021-10-15 19:25:19 -05:00
Kevin Amado 18e3d63341
fetchTree: add pos to EvalState::forceValue 
- This way we improve error messages
  on infinite recursion
- Demo:
  ```nix
  let x = builtins.fetchTree x;
  in x
  ```
- Before:
  ```bash
  $ nix-instantiate --extra-experimental-features flakes --strict
  error: infinite recursion encountered
  ```
- After:
  ```bash
  $ nix-instantiate --extra-experimental-features flakes --strict
  error: infinite recursion encountered

       at /data/github/kamadorueda/nix/test.nix:1:9:

            1| let x = builtins.fetchTree x;
             |         ^
            2| in x
  ```

Mentions: #3505
 2021-10-15 19:25:19 -05:00
Eelco Dolstra 130284b850
Merge pull request #5390 from NixOS/fix-isnewerthan-check 
Fix the `isDaemonNewer` guard in the testsuite
 2021-10-15 15:50:20 +02:00
regnat 0b55c8767d Disable the eval-store test when using the daemon 
Using the daemon will break most of the assumptions of this test, so
it’s as simple to just disable it
 2021-10-15 14:15:43 +02:00
Eelco Dolstra c0951299b3
Merge pull request #5383 from kvtb/patch-7 
fix build with gcc11
 2021-10-15 09:03:12 +02:00
Eelco Dolstra c574ab3907
Merge pull request #5388 from yvt/fix-oahd-path 
Add another path where a Rosetta 2 daemon plist file is possibly located
 2021-10-15 09:02:16 +02:00
Domen Kožar 330650d294
Merge pull request #5389 from kamadorueda/master 
add pos to EvalState::forceValue
 2021-10-15 00:17:11 -05:00
Kevin Amado 1bdeef8395
add pos to EvalState::forceValue 
- This way we improve error messages
  on infinite recursion
- Demo:
  ```nix
  let
    x = builtins.fetchMercurial x;
  in
  x
  ```
- Before:
  ```bash
  $ nix-instantiate --show-trace --strict
  error: infinite recursion encountered
  ```
- After:
  ```bash
  nix-instantiate --show-trace --strict
  error: infinite recursion encountered

       at /data/github/kamadorueda/test/default.nix:2:7:

            1| let
            2|   x = builtins.fetchMercurial x;
             |       ^
            3| in
  ```

Mentions: #3505
 2021-10-14 23:23:05 -05:00
yvt a9d9e55551 Add another path where a Rosetta 2 configuration file is possibly located 2021-10-15 09:48:15 +09:00
regnat b598e5c47c Fix the min bound for the structured-attrs test 
The min bound written corresponds to the date of the commit that
introduced the change, but it only got merged on master some weeks
later. Since the version is essentially the commit date, that means that
there’s a whole range of commits on master (including the current
`nixUnstable`) that have a higher version but don’t contain the required
change.
 2021-10-14 16:00:59 +02:00
regnat 3a2fc9ce1d Fix the isDaemonNewer check 
- Don’t hardcode the “newer” version
- Remove an ill-placed `return`
 2021-10-14 16:00:45 +02:00
kvtb eae29b0385
fix build with gcc11 2021-10-13 18:03:33 +00:00
Eelco Dolstra 4c0cde95ad Update release notes 2021-10-13 11:39:54 +02:00
Eelco Dolstra 624dfde3df
Merge pull request #5362 from Artturin/nixunpack 
nix develop: add --unpack
 2021-10-13 11:39:08 +02:00
Eelco Dolstra 06fff5686c
Merge pull request #5379 from abathur/fix_volume_doc_fn 
darwin-install: fix incorrect fn name
 2021-10-13 11:12:00 +02:00
Eelco Dolstra 2f3c79c241 Mention compression-level in the release notes 2021-10-13 11:11:26 +02:00
Eelco Dolstra 0fac86fd6f Style tweaks 2021-10-13 11:00:10 +02:00
Eelco Dolstra abd685d373 Merge branch 'feature/comp-level' of https://github.com/tomberek/nix 2021-10-13 10:45:44 +02:00
Travis A. Everett 8a3b8d0b33 darwin-install: fix incorrect fn name 2021-10-12 18:17:27 -05:00
Eelco Dolstra 3e0c6aac9a
Merge pull request #5375 from edolstra/repl-ctrl-c 
nix repl: Fix plugin-files warning
 2021-10-12 17:11:39 +02:00
Eelco Dolstra 5176b072ed Cleanup 2021-10-12 16:43:00 +02:00
Eelco Dolstra 3a778ea8a0 Merge branch 'nix-repl-download-interruption' of https://github.com/Ma27/nix 2021-10-12 16:34:38 +02:00
Eelco Dolstra f6cdae5181 nix repl: Don't write to std::cout directly 
Writing to std::cout doesn't play nice with ProgressBar.
 2021-10-12 15:36:45 +02:00
Eelco Dolstra 9ebe02a81e nix repl: Don't build in a child process 
Fixes #5356. This is a bit risky due to interrupts, but we have to
deal with those anyway (#5353).
 2021-10-12 15:27:02 +02:00
Tom Bereknyei 03bb8f84e0 Add compression level for NARs 
Based off on @dtzWill's #2276
 2021-10-12 02:14:36 -04:00
Eelco Dolstra 102d3d71c0
Merge pull request #5361 from trofi/static-logging 
mk/libraries.mk: fix trace-ld and trace-ar expansions
 2021-10-11 12:58:35 +02:00
Eelco Dolstra 22b67a1b63
Merge pull request #5369 from NixOS/fix-invalid-rethrows 
(partially) Revert "Don't copy in rethrow"
 2021-10-11 12:53:59 +02:00
regnat 7466048d39 (partially) Revert "Don't copy in rethrow" 
This reverts some parts of commit
8430a8f086 which was trying to rethrow
some exceptions while we weren’t in the context of a `catch` block,
causing some weird “terminate called without an active exception”
errors.

Fix #5368
 2021-10-11 10:51:22 +02:00
John Chapman 4cff413054 Clarify that not all nix packages will use the default build phases 2021-10-09 12:03:34 +11:00
Artturin e399c6ab7f nix develop: add --unpack 2021-10-09 01:19:50 +03:00
Sergei Trofimovich f147f42f46 mk/libraries.mk: fix trace-ld and trace-ar expansions 
Noticed this minor logging deficiency when debugged --disable-shared
build:

  LD
  AR
  LD
  CXX    src/libstore/local-store.o

After the change build is logged as expected:

  LD     src/libmain/libnixmain.a
  LD     src/libfetchers/libnixfetchers.a
  AR     src/libmain/libnixmain.a
  CXX    src/libstore/local-store.o
 2021-10-08 22:59:42 +01:00
Eelco Dolstra 01e9f046a8
Update release script 2021-10-08 15:01:03 +02:00