bb010g/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity
10789 commits 1 branch 5 tags 83 MiB
Commit graph

10789 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eelco Dolstra 9cf991f421
Merge pull request #4998 from edolstra/nix-print-dev-env-json 
nix print-dev-env: Add --json flag
 2021-07-09 13:55:44 +02:00
Eelco Dolstra 86fb01c4be nix print-dev-env: Add --json flag 2021-07-09 12:10:48 +02:00
Eelco Dolstra 223e0569ff
Merge pull request #4997 from edolstra/nix-develop-arrays 
nix develop: Make bash environment parsing more robust
 2021-07-09 11:16:31 +02:00
Eelco Dolstra e50408bd31 nix develop: Add a test for bash functions 2021-07-09 01:18:44 +02:00
Eelco Dolstra 9fc7da1e08 Add test for #4992 2021-07-09 01:18:44 +02:00
Eelco Dolstra 5f6375a816 nix develop: Filter some bash magic variables 2021-07-09 01:18:44 +02:00
Eelco Dolstra b1f1347ade nix develop: Don't parse bash environment with regexes 
Instead have get-env.sh dump the bash environment as JSON. This should
be a lot less error-prone.

Fixes #4992.
 2021-07-09 01:18:37 +02:00
Eelco Dolstra b1cfe8f984 nix develop: Add a test for arrays 2021-07-09 00:32:55 +02:00
Eelco Dolstra d2b8b23ae9
Merge pull request #4995 from NixOS/fetchgit-name-attribute 
Fix the `name` attribute in builtins.fetchGit
 2021-07-09 00:32:13 +02:00
regnat a654c1d81c Restore the possibility to use a name parameter in fetchGit 
Accidentally broken by 7e5c79a2d2
 2021-07-08 14:57:48 +02:00
Eelco Dolstra 8648143120
Merge pull request #4988 from NixOS/fetchgit-name-attribute 
Add a name attribute to the fetchers
 2021-07-08 14:33:49 +02:00
regnat 7e5c79a2d2 Forbid the name attribute for fetchTree 
We need to support it for the “old” fetch* functions for backwards
compatibility, but we don’t need it for fetchTree (as it’s a new
function).
Given that changing the `name` messes-up the content hashing, we can
just forbid passing a custom `name` argument to it
 2021-07-08 13:53:52 +02:00
Eelco Dolstra 2172e60f7a
Merge pull request #4935 from alyssais/host_os 
Apply OS checks to host platform, not build
 2021-07-08 12:40:54 +02:00
Eelco Dolstra 156666de3d
Merge pull request #4969 from serokell/balsoft/fix-nixConfig-flake-registry 
flake.nixConfig: fix flake-registry config settings
 2021-07-08 12:35:08 +02:00
Eelco Dolstra 6060ea1b0e Add tests/dummy 2021-07-07 11:30:35 +02:00
Eelco Dolstra 02dd6bb610 tests/check.sh: Fix a race 
Fixes this random failure:

    error: hash mismatch in fixed-output derivation '/tmp/nix-shell.EUgAVU/nix-test/tests/check/store/sfps3l3c5n7dabpx34kigxnfhmrwk2h6-dummy.drv':
             specified: sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=
                got:    sha256-0qhPS4tlCTfsj3PNi+LHSt1akRumTfJ0WO2CKdqASiY=

which happens because multiple tests were writing to ./dummy.
 2021-07-07 10:48:47 +02:00
Eelco Dolstra 2c853e2a58 Merge branch 'master' of github.com:NixOS/nix 2021-07-07 10:03:04 +02:00
Eelco Dolstra 3b3e6bb1e5 Style tweaks 2021-07-07 10:02:55 +02:00
Eelco Dolstra e37ecd1282 Merge branch 'balsoft/registry' of https://github.com/serokell/nix 2021-07-07 09:57:15 +02:00
regnat 2c8240677e allow fetchFromGitHub to take a name argument 2021-07-06 08:43:19 +02:00
regnat e4b082a52b allow fetchMercurial to take a name argument 2021-07-06 08:43:06 +02:00
regnat a487a652ed allow fetchTarball to take a name argument 2021-07-06 08:42:47 +02:00
regnat 83615fcf8f Allow fetchGit to take a name argument 
Fix #3388
 2021-07-06 08:41:52 +02:00
Eelco Dolstra e700ecb901
Merge pull request #4986 from jkeifer/master 
Fix wrong hash var for aarch64-darwin binary
 2021-07-05 21:51:04 +02:00
Eelco Dolstra 0a8845720e
Merge pull request #4980 from Ma27/file-attr-completion 
libcmd/installables: implement completion for Nix expressions passed via `-f`
 2021-07-05 21:50:15 +02:00
Maximilian Bosch 3c5f69bb60
completeInstallable: also match for already typed prefixes 2021-07-05 21:37:33 +02:00
Jarrett Keifer c8a80e4dbe
Fix wrong hash var for aarch64-darwin binary 2021-07-05 07:48:53 -07:00
Eelco Dolstra 1f93084149
Merge pull request #4978 from NixOS/scp-uris 
Allow scp-style uris in `fetchgit`
 2021-07-05 14:07:04 +02:00
Eelco Dolstra f1ecd30bd5
Merge pull request #4773 from alyssais/dl 
doc: builtins: use a definition list
 2021-07-05 14:03:15 +02:00
Eelco Dolstra d65342d226
Merge pull request #4873 from jtojnar/fish-completion 
Add a fish completion script
 2021-07-05 14:02:04 +02:00
Eelco Dolstra cee426cc01
Merge pull request #4938 from tomcur/store-uri-parsing 
Improve machine store URI parsing
 2021-07-05 14:00:35 +02:00
Eelco Dolstra 24bc935462 Merge branch 'disable_gc' of https://github.com/Pamplemousse/nix 2021-07-05 13:53:52 +02:00
Eelco Dolstra c053aecff4
Merge pull request #4983 from manveru/fix-devShell-env 
Fix devShell handling of env values including @ and %
 2021-07-05 13:22:32 +02:00
Michael Fellinger 087c5f5325
Fix devShell handling of env values including @ and % 2021-07-05 12:05:06 +02:00
Maximilian Bosch 70cb2ffacc
libcmd/installables: implement completion for Nix expressions passed via -f 2021-07-03 14:19:10 +02:00
Domen Kožar f9d72855ae
Merge pull request #4967 from Pamplemousse/specific_errors 
Prefer to throw specific errors
 2021-07-03 10:34:56 +02:00
regnat ec2c6bd470 Allow scp-style uris in fetchgit 
Fix #5303
 2021-07-02 19:20:07 +02:00
Eelco Dolstra 7a3f43cd58
Merge pull request #4971 from ylh/master 
Respect TERM=dumb more consistently
 2021-07-02 17:50:23 +02:00
Yestin L. Harrison 0fe84bef72 Add $NO_COLOR check to ANSI escape conditions 2021-07-02 09:33:54 -06:00
Eelco Dolstra 44086071e5
Merge pull request #4974 from domenkozar/upload-release-aarch64-darwin 
upload-release.pl: add aarch64-darwin
 2021-07-02 15:32:33 +02:00
Alexander Bantyev d8ad6f1c10
Add tests for --registry and second arg for nix registry pin 2021-07-02 16:10:57 +03:00
Domen Kožar 74838deeb8
upload-release.pl: add aarch64-darwin 2021-07-02 14:12:00 +02:00
Yestin L. Harrison 20cce079f2 Respect TERM=dumb more consistently 2021-07-01 18:19:01 -06:00
Pamplemousse 4a7a8b87cd Prefer to throw specific errors 
Signed-off-by: Pamplemousse <xav.maso@gmail.com>
 2021-07-01 11:09:31 -07:00
Alexander Bantyev e756a59c72
fixup! flake.nixConfig: fix flake-registry config settings 2021-07-01 17:54:22 +03:00
Alexander Bantyev ef1e7ab840
flake.nixConfig: fix flake-registry config settings 
Before this commit, nixConfig.flake-registry didn't have any real effect
on the evaluation, since config was applied after inputs were evaluated.
Change this behavior: apply the config in the beginning of flake::lockFile.
 2021-07-01 00:23:47 +03:00
Alexander Bantyev 811f3e8605
nix registry pin: add a way to pin to a custom locked 2021-06-30 22:16:40 +03:00
Alexander Bantyev 093ed47636
nix registry: add --registry flag 2021-06-30 22:13:32 +03:00
Pamplemousse 5be17a4b96 Allow to compile after ./configure --enable-gc=no 
Signed-off-by: Pamplemousse <xav.maso@gmail.com>
 2021-06-30 09:45:21 -07:00
Eelco Dolstra 139f7af5ec
Merge pull request #4958 from NixOS/nix-develop-remove-override-input-warning 
develop: Discard the input{Overrides,Updates} when getting bash
 2021-06-30 17:57:01 +02:00