max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-25 07:16:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
13953 commits 7 branches 0 tags 64 MiB
Commit graph

13953 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eelco Dolstra
d11339948d
Merge pull request #6958 from edolstra/fix-progress-bar-flicker 
Fix progress bar flicker with -L
 2022-08-24 23:15:10 +02:00
Eelco Dolstra
b0488a29dc Branch 2.11 release notes 2022-08-24 22:44:58 +02:00
Eelco Dolstra
d046eb1463 Bump version 2022-08-24 22:42:34 +02:00
Eelco Dolstra
bb411e4ae1 Fix progress bar flicker with -L 
This was caused by -L calling setLogFormat() again, which caused the
creation of a new progress bar without destroying the old one. So we
had two progress bars clobbering each other.

We should change 'logger' to be a smart pointer, but I'll do that in a
future PR.

Fixes #6931.
 2022-08-24 22:36:40 +02:00
Eelco Dolstra
5b8a53fb49
Merge pull request #6956 from edolstra/fix-eval-cache 
Fix evaluation cache
 2022-08-24 21:59:06 +02:00
Eelco Dolstra
a17ce0a8a9 Fix evaluation cache 
98e361ad4c introduced a regression where
previously stored attributes were replaced by placeholders. As a
result, a command like 'nix build nixpkgs#hello' had to be executed at
least twice to get caching.

This code does not seem necessary for suggestions to work.
 2022-08-24 21:19:43 +02:00
Winter
8e5659423e fix(libstore): allow access to trustd on macOS 2022-08-24 13:09:44 -04:00
Eelco Dolstra
04e74f7c8b
Merge pull request #6612 from NixOS/parallel-nix-copy 
Make nix copy parallel again
 2022-08-24 15:31:42 +02:00
Eelco Dolstra
56d97d4b4d Remove redundant Finally 2022-08-24 14:49:58 +02:00
Eelco Dolstra
8d906b1f3b Fix macOS build 2022-08-24 14:11:03 +02:00
Eelco Dolstra
a1e1ec3dad
Merge pull request #6945 from jsoref/nix-setup-tweak 
darwin-install: fix shell hint
 2022-08-24 13:56:26 +02:00
Eelco Dolstra
6528c11024
Merge pull request #6946 from rickynils/fix_serve_protocol_version_check 
Fix a misplaced parenthese in serve protocol check
 2022-08-24 13:09:50 +02:00
Rickard Nilsson
c2d7456926 Fix a misplaced parenthese in serve protocol check 
This issue made it impossible for clients using a serve protocol of
version <= 2.3 to use the `cmdBuildDerivation` command of servers using
a protocol of version >= 2.6. The faulty version check makes the server
send back build outputs that the client is not expecting.
 2022-08-24 01:54:43 +02:00
Josh Soref
4d4f2d10e7
darwin-install: fix shell hint 2022-08-23 19:38:53 -04:00
Eelco Dolstra
4a0c4ca186
Merge pull request #6944 from edolstra/bash-vars 
nix develop: Ignore some more bash special variables
 2022-08-23 20:15:18 +02:00
Eelco Dolstra
0e54fab0dd
Merge pull request #6909 from ncfavier/json-paths 
JSON: print paths as strings without copying them to the store
 2022-08-23 15:19:33 +02:00
Eelco Dolstra
db026103b1 nix develop: Ignore some more bash special variables 
Fixes #6940.
 2022-08-23 14:57:08 +02:00
Eelco Dolstra
b2b607a7a9
Merge pull request #6902 from centromere/optional-nixpkgs 
docker.nix: Provide boolean for whether to bundle nixpkgs
 2022-08-23 14:45:15 +02:00
Eelco Dolstra
db71f5646f
Merge pull request #6887 from winterqt/specify-bashinteractive-outputs 
nix-shell: specify which outputs from bashInteractive to build
 2022-08-23 14:44:23 +02:00
Naïm Favier
ff0b5a778c
Revert to copyStore = true for nix-instantiate and nix-env 2022-08-23 14:40:27 +02:00
Eelco Dolstra
74c088566b
Merge pull request #6907 from fricklerhandwerk/language-properties 
reword description of language properties
 2022-08-23 14:37:53 +02:00
Eelco Dolstra
f0358ed465 Fix a hang in nix-copy-ssh.sh 
This hang for some reason didn't trigger in the Nix build, but did
running 'make installcheck' interactively. What happened:

* Store::addMultipleToStore() calls a SinkToSource object to copy a
  path, which in turn calls LegacySSHStore::narFromPath(), which
  acquires a connection.

* The SinkToSource object is not destroyed after the last bytes has
  been read, so the coroutine's stack is still alive and its
  destructors are not run. So the connection is not released.

* Then when the next path is copied, because max-connections = 1,
  LegacySSHStore::narFromPath() hangs forever waiting for a connection
  to be released.

The fix is to make sure that the source object is destroyed when we're
done with it.
 2022-08-23 14:19:53 +02:00
Eelco Dolstra
f865048332 Indentation 2022-08-22 15:32:53 +02:00
Eelco Dolstra
4c96761c2b Merge remote-tracking branch 'origin/master' into parallel-nix-copy 2022-08-22 15:29:10 +02:00
Eelco Dolstra
7c3ab57515
Merge pull request #6937 from edolstra/fix-repl 
nix repl: Stop the progress bar
 2022-08-22 15:10:01 +02:00
Naïm Favier
4c2ff4a0f4
JSON: add missing newlines 
after `nix eval --json` and `nix-instantiate --eval --json`.
 2022-08-22 15:07:52 +02:00
Naïm Favier
062e4fcdde
JSON: print paths as strings without copying them to the store 
Makes `printValueAsJSON` not copy paths to the store for `nix eval
--json`, `nix-instantiate --eval --json` and `nix-env --json`.

Fixes https://github.com/NixOS/nix/issues/5612
 2022-08-22 15:01:35 +02:00
Eelco Dolstra
8d84634e26
Merge pull request #6926 from rapenne-s/download_limit 
add a nix.conf option to set a download speed limit
 2022-08-22 14:57:19 +02:00
Eelco Dolstra
590660c1c6
Merge pull request #6932 from jack1142/patch-1 
Fix default profile path for root in nix profile documentation
 2022-08-22 14:55:04 +02:00
Eelco Dolstra
0d2163c6dc nix repl: Stop the progress bar 
The repl was broken since c3769c6846. In
general, the progress bar is incompatible with the repl.
 2022-08-22 14:27:36 +02:00
Eelco Dolstra
9ddef9f0be
Merge pull request #6923 from ncfavier/nix-env-incomplete-json 
Avoid producing incomplete JSON
 2022-08-22 14:15:31 +02:00
Eelco Dolstra
c21b1a7e67
Spelling 2022-08-22 14:14:14 +02:00
Valentin Gagarin
d8e54d19f7 Revert "Merge pull request #6420 from nix-community/doc-what-is-nix" 
This reverts commit 81e101345f, reversing
changes made to 7d1280bbaf.
 2022-08-22 12:52:15 +02:00
Eelco Dolstra
33aca20616
Merge pull request #6916 from edolstra/tmp-slash 
Installer: Don't assume TMPDIR ends in a slash
 2022-08-22 12:47:33 +02:00
Eelco Dolstra
380bf60c2e
Merge pull request #2 from abathur/tmp-slash 
install: only create $TMPDIR if missing
 2022-08-22 12:07:38 +02:00
Solène Rapenne
caad87e6db
Better documentation wording 
Co-authored-by: Anderson Torres <torres.anderson.85@protonmail.com>
 2022-08-20 18:21:36 +02:00
Jakub Kuczys
7d800909e9
Fix default profile path for root in nix profile documentation 2022-08-20 03:48:42 +02:00
Travis A. Everett
0bf52b73f4 install: only create TMPDIR if missing 2022-08-19 15:16:34 -05:00
Solene Rapenne
0d2bf7acf9 add a nix.conf option to set a download speed limit 2022-08-19 12:40:22 +02:00
Eelco Dolstra
d5e979ab87
Merge pull request #6925 from pennae/fod-register-memory 
don't read outputs into memory for output rewriting
 2022-08-19 12:22:34 +02:00
Andrei Boar
50f5b6c733
Update doc/manual/src/command-ref/env-common.md 
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
 2022-08-19 12:28:51 +03:00
pennae
7d934f7880 don't read outputs into memory for output rewriting 
RewritingSink can handle being fed input where a reference crosses a
chunk boundary. we don't need to load the whole source into memory, and
in fact *not* loading the whole source lets nix build FODs that do not
fit into memory (eg fetchurl'ing data files larger than system memory).
 2022-08-19 11:26:26 +02:00
Andrei Boar
82b867d0b5 cover empty string case 2022-08-19 11:51:32 +03:00
Naïm Favier
7535ee345d
nix-env: don't output incomplete JSON 2022-08-19 01:00:10 +02:00
Naïm Favier
8188b1d0ab
json: write null on abnormal placeholder destruction 
Avoids leaving dangling attributes like

    {
        "foo":
    }

in case of exceptions.
 2022-08-19 01:00:10 +02:00
Eelco Dolstra
823e1017d8 Ensure that $TMPDIR exists if defined 2022-08-17 21:47:01 +02:00
Eelco Dolstra
6547dcde2a Use plain mktemp 
This fixes the case where $TMPDIR doesn't end in a slash.
 2022-08-17 21:41:19 +02:00
Eelco Dolstra
7aa36ae796
Merge pull request #6917 from edolstra/no-force 
Don't pass --force to 'git add'
 2022-08-17 17:43:43 +02:00
Eelco Dolstra
c80a74b7d5 Don't pass --force to 'git add' 
Fixes #5810.
 2022-08-17 16:59:02 +02:00
Eelco Dolstra
84cc7ad77c
Merge pull request #6913 from edolstra/lazy-trees-cherrypicks 
lazy-trees cherrypicks
 2022-08-17 12:20:19 +02:00