11420 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Eelco Dolstra	b0de24cc89	Merge pull request #5996 from edolstra/remove-nlohmann ... Stop vendoring nlohmann_json	2022-01-26 14:49:34 +01:00
Eelco Dolstra	9691f86ff7	Stop vendoring nlohmann_json	2022-01-26 11:50:53 +01:00
Eelco Dolstra	e9d2ac6d7f	Merge pull request #5995 from NixOS/test-nix-store-ping ... Add some tests for `nix store ping`	2022-01-26 11:50:04 +01:00
regnat	d139474f48	Add some tests for nix store ping ... Always good to have :)	2022-01-26 11:01:25 +01:00
Eelco Dolstra	4f24a33d34	Merge pull request #5991 from edolstra/remote-nix-version ... nix store ping: Report Nix daemon version	2022-01-26 09:59:59 +01:00
Eelco Dolstra	35dbdbedd4	nix store ping: Report Nix daemon version ... Fixes #5952.	2022-01-25 21:15:58 +01:00
Eelco Dolstra	5fa624f59a	Merge pull request #5987 from edolstra/rust-cleanup ... Remove unused Rust stuff	2022-01-25 13:57:22 +01:00
Eelco Dolstra	a04a66c196	Merge pull request #5922 from fzakaria/fzakaria/json-ignore-assertion ... Add try/catch to queryJSON for assertion and errors	2022-01-25 12:44:20 +01:00
Eelco Dolstra	a5bdffaae9	Merge pull request #5966 from SuperSandro2000/patch-2 ... Remove url literal	2022-01-25 11:59:33 +01:00
Eelco Dolstra	fcf3528ad1	Remove unused Rust stuff ... In particular we were still compiling rust-ffi.cc even though we're not using it.	2022-01-25 11:58:00 +01:00
Eelco Dolstra	a9a90b3c1f	Merge pull request #5984 from NixOS/5982-correctly-parse-__curPosFoo ... Fix parsing of variable names that are a suffix of '__curPos'	2022-01-25 11:54:04 +01:00
regnat	f113ea6c73	Fix parsing of variable names that are a suffix of '__curPos' ... Follow-up from #5969 Fix #5982	2022-01-25 10:49:27 +01:00
Farid Zakaria	8ba7a2d3a8	Do not suppress errors in nix-env from feedback by Eelco	2022-01-24 19:12:13 -08:00
Eelco Dolstra	0a70b37b56	flake.nix: Fix indentation	2022-01-25 01:28:44 +01:00
Eelco Dolstra	2e4d5f220e	Bump version	2022-01-25 00:14:59 +01:00
Eelco Dolstra	039c9008b1	Merge pull request #5978 from edolstra/nixpkgs-regression-tests ... Add regression / performance tests against a fixed revision of Nixpkgs	2022-01-25 00:11:38 +01:00
Eelco Dolstra	9faad4c5eb	Move rl-next.md to rl-2.5.md	2022-01-25 00:11:00 +01:00
Eelco Dolstra	9ce2511206	Add regression / performance tests against a fixed revision of Nixpkgs	2022-01-25 00:07:30 +01:00
Eelco Dolstra	716a08827e	Merge pull request #5976 from edolstra/read-invalid-paths ... Allow builtins.{readFile,path} on invalid paths	2022-01-25 00:04:01 +01:00
Eelco Dolstra	8cbbaf23e8	Allow builtins.{readFile,path} on invalid paths ... Stop-gap measure to fix #5975.	2022-01-24 23:02:28 +01:00
Eelco Dolstra	e66550c917	Merge pull request #5969 from edolstra/curpos-fix ... Fix parsing of variable names that are a prefix of '__curPos'	2022-01-24 16:30:13 +01:00
Eelco Dolstra	bed8270c0c	Fix parsing of variable names that are a prefix of '__curPos' ... Fixes $ nix-instantiate --parse -E 'x: with x; _' (x: (with x; __curPos))	2022-01-24 15:18:18 +01:00
Eelco Dolstra	c4fc9b6a8d	ExprConcatStrings::show(): Print values instead of pointers	2022-01-24 15:08:16 +01:00
Eelco Dolstra	3ff6186af1	Add a test for nix-assertion failures in nix-env	2022-01-24 14:49:32 +01:00
Eelco Dolstra	7afbdf2545	hiliteMatches(): Style fixes, pass more stuff by reference	2022-01-24 14:47:34 +01:00
Sandro	72aeae54e5	Remove url literals	2022-01-24 13:28:21 +01:00
Théophane Hufschmitt	4530574363	Merge pull request #5945 from afishhh/master ... Make `nix search` highlight all regexes and matches	2022-01-24 13:02:51 +01:00
Eelco Dolstra	edf0cde1a7	Merge pull request #5960 from zombiezen/patch-1 ... Correct `NIX_BUILD_PATH` default description	2022-01-24 12:46:43 +01:00
Eelco Dolstra	5c3b6fbe00	Merge pull request #5963 from FlorianFranzen/test-flake-git ... tests: skip flake search test if no git is present	2022-01-24 12:45:49 +01:00
Eelco Dolstra	3782017272	Tweak release notes	2022-01-24 12:45:35 +01:00
Eelco Dolstra	8c778e3d9d	Merge pull request #5964 from pennae/fix-bulk-alloc ... allocate a GC root value for the Value cache pointer	2022-01-24 12:43:14 +01:00
Eelco Dolstra	1e2bfd3da5	Merge pull request #5965 from SuperSandro2000/nix-shell-rm ... nix-shell: use clean rm, not any aliases/functions	2022-01-24 12:40:53 +01:00
Eelco Dolstra	076945c808	Merge pull request #5875 from hercules-ci/fix-large-drv-field-stack-overflow ... Fix segfault or stack overflow caused by large derivation fields	2022-01-24 12:05:30 +01:00
regnat	ffb28eaa1e	Add a small documentation for hiliteMatches	2022-01-24 10:07:02 +01:00
Sandro Jäckel	040cb7304a	nix-shell: use clean rm, not any aliases/functions	2022-01-23 04:58:00 +01:00
Rok Garbas	c9a4ddb9c0	Merge pull request #5829 from NixOS/push-docker-image-to-docker-hub ... Push docker image to docker hub for each commit on master	2022-01-22 21:55:18 +01:00
pennae	fd5aa6ee3e	allocate a GC root value for the Value cache pointer ... keeping it as a simple data member means it won't be scanned by the GC, so eventually the GC will collect a cache that is still referenced (resulting in use-after-free of cache elements). fixes #5962	2022-01-22 21:19:56 +01:00
Florian Franzen	12578ba672	tests: skip flake search test if no git is present	2022-01-22 20:13:16 +01:00
Ross Light	7477974b93	Correct NIX_BUILD_PATH default description ... Source: 067076287b/src/nix-build/nix-build.cc (L362-L381)	2022-01-21 18:45:19 -08:00
Fishhh	f82a426502	Add some tests for hiliteMatches in libutil	2022-01-21 20:10:54 +01:00
Fishhh	1e0b7cdc3f	Move hilite_all into libutil and rename it to hiliteMatches ... The signature was also changed so the function now accepts a vector instead of an iterator	2022-01-21 20:10:46 +01:00
Robert Hensing	0407436b0f	derivations.cc: Use larger buffer in printString ... If we want to be careful about hitting the stack protector page, we should use `-fstack-check` instead. Co-authored-by: Eelco Dolstra <edolstra@gmail.com>	2022-01-21 17:25:37 +01:00
Eelco Dolstra	5f08db69d1	Merge pull request #5953 from edolstra/fix-realise-path-errors ... Fix exception handling around realisePath()	2022-01-21 15:59:32 +01:00
Rok Garbas	d463e11760	Adding docs regarding the docker image from master	2022-01-21 14:50:34 +01:00
Rok Garbas	c79087eb2a	also tagging with latest commit with a master tag	2022-01-21 14:40:34 +01:00
Rok Garbas	a078a645da	Merge remote-tracking branch 'origin/master' into push-docker-image-to-docker-hub	2022-01-21 14:31:17 +01:00
Eelco Dolstra	128098040b	Fix exception handling around realisePath() ... This no longer worked correctly because 'path' is uninitialised when an exception occurs, leading to errors like … while importing '' at /nix/store/rrzz5b1pshvzh1437ac9nkl06br81lkv-source/flake.nix:352:13: So move the adding of the error context into realisePath().	2022-01-21 13:53:18 +01:00
Eelco Dolstra	e85cf34ea3	Merge pull request #5949 from obsidiansystems/old-copyClosure ... Add back `copyClosure` for plain `StorePath`s	2022-01-21 11:33:32 +01:00
Eelco Dolstra	accfcfff6b	Merge pull request #5943 from NixOS/3204-fix-build-with-newer-nlohmann-json ... Fix the build with nlohmann/json 3.10.4+	2022-01-21 11:31:39 +01:00
Eelco Dolstra	c7223db871	Merge pull request #5942 from NixOS/5912-quieter-nix-why-depends ... Make `nix why-depends` quieter by default	2022-01-21 10:18:28 +01:00