quickdudley/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity
10426 commits 1 branch 4 tags 76 MiB
Commit graph

10426 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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 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
Domen Kožar 69eb65403a
Merge pull request #4963 from matthewbauer/cross-fix 
Restrict jobs built on hydra
 2021-06-30 08:03:07 +02:00
Matthew Bauer 2200f315da Disable -pie on static nix 
This should resolve the failing build.

See https://github.com/NixOS/nixpkgs/pull/128674 for a better fix.
 2021-06-29 21:48:07 -05:00
Matthew Bauer 7351656b82 Only cross compile from x86_64-linux 
This is broken on aarch64-linux / x86_64-darwin, so might as well just disable it for now.
 2021-06-29 21:47:35 -05:00
Eelco Dolstra c92fbdb654
Merge pull request #4960 from NixOS/nix-repl-experimental-features 
Forward the experimental features to the nix repl subprocesses
 2021-06-29 15:10:02 +02:00
regnat 7daf0c6ef1 Forward the experimental features to the nix repl subprocesses 
Pass the current experimental features using `NIX_CONFIG` to the various
Nix subprocesses that `nix repl` invokes.

This is quite a hack, but having `nix repl` call Nix with a subprocess
is a hack already, so I guess that’s fine.
 2021-06-29 14:52:46 +02:00
Eelco Dolstra 5a18e2a533
Merge pull request #4959 from NixOS/override-non-flake-inputs 
Keep the `isFlake` attribute for overriden inputs
 2021-06-29 14:23:50 +02:00
regnat 4cff8188a5 Keep the isFlake attribute for overriden inputs 
When overriding an input that isn’t a flake, mark the override as also not
being a flake.

Fix #3774
 2021-06-29 13:56:48 +02:00
Eelco Dolstra f14c3b6f68
Merge pull request #4944 from hercules-ci/fix-gc-crash 
Fix gc crash
 2021-06-29 13:52:14 +02:00
Domen Kožar 81535022dc
Merge pull request #2667 from matthewbauer/cross-jobs 
Add armv6l-linux & armv7l-linux as cross jobs
 2021-06-29 11:39:49 +02:00
regnat bf7960a4ed develop: Discard the input{Overrides,Updates} when getting bash 
`nix develop` is getting bash from an (assumed existing) `nixpkgs`
flake. However, when doing so, it reuses the `lockFlags` passed to the
current flake, including the `--input-overrides` and `--input-update`
which generally don’t make sense anymore at that point (and trigger a
warning because of that)

Clear these overrides before getting the nixpkgs flake to get rid of the
warning.
 2021-06-29 10:13:42 +02:00
Domen Kožar 9feca5cdf6
github actions: simplify getting the system logic 2021-06-28 23:02:53 +02:00
Matthew Bauer 6c13a3f735 Support binaryTarballCross in gha 2021-06-28 15:08:17 -05:00
Domen Kožar 4d058f49e7
Merge pull request #4954 from domenkozar/bump-nixpkgs 
flake.lock: Update
 2021-06-28 19:33:55 +02:00
Domen Kožar 777c688a98
flake.lock: Update 
Flake input changes:

* Updated 'nixpkgs': 'github:NixOS/nixpkgs/bb8a5e54845012ed1375ffd5f317d2fdf434b20e' -> 'github:NixOS/nixpkgs/f77036342e2b690c61c97202bf48f2ce13acc022'
 2021-06-28 18:42:44 +02:00
Eelco Dolstra c189d80b4a
Merge pull request #4952 from FlorianFranzen/patch-1 
man: fix formatting of nix3-profile-remove
 2021-06-28 17:05:22 +02:00
Florian Franzen decc14d4b7
man: fix formatting of nix3-profile-remove 2021-06-28 16:27:03 +02:00
Eelco Dolstra 6182ae6898
Merge pull request #4942 from NixOS/ca/remove-lock-files 
Eventually delete the CA paths lock files
 2021-06-28 16:12:19 +02:00
Eelco Dolstra f5320299dd
Merge pull request #4937 from NixOS/ca/make-the-tests-useful 
Make the CA tests actually test something
 2021-06-28 16:06:49 +02:00
Matthew Bauer 580583e0b3 Build cross-compilation in gha 2021-06-26 00:14:54 -05:00
Matthew Bauer c906d6530d Support cross-compiling binaryTarball 2021-06-26 00:12:03 -05:00