NixOS/nix
NixOS/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2024-09-20 11:11:03 -04:00
Code Activity
17047 commits 178 branches 170 tags 104 MiB
Commit graph

17047 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Ericson cde0fae7d9
Merge pull request #10502 from obsidiansystems/local-overlay-doc-improvements 
Improve `local-overlay` docs in a few ways
 2024-04-17 15:52:14 -04:00
Alyssa Ross 0774e8ba33
Fix exportReferencesGraph when given store subpath 
With Nix 2.3, it was possible to pass a subpath of a store path to
exportReferencesGraph:

	with import <nixpkgs> {};

	let
	  hello = writeShellScriptBin "hello" ''
	    echo ${toString builtins.currentTime}
	  '';
	in

	writeClosure [ "${hello}/bin/hello" ]

This regressed with Nix 2.4, with a very confusing error message, that
presumably indicates it was unintentional:

	error: path '/nix/store/3gl7kgjr4pwf03f0x70dgx9ln3bhl7zc-hello/bin/hello' is not in the Nix store
 2024-04-17 21:51:59 +02:00
John Ericson 21d9412ddc Improve local-overlay docs in a few ways 
In response to https://discourse.nixos.org/t/super-colliding-nix-stores/28462/24
 2024-04-17 15:28:19 -04:00
Eelco Dolstra 582c7f32e8
Merge pull request #10548 from a-kenji/wiki/link 
docs: fix wiki link
 2024-04-17 21:04:54 +02:00
a-kenji 5fd28eeba4 docs: fix wiki link 
Link to the official wiki.
 2024-04-17 19:34:22 +02:00
John Ericson ac253fb99e
Merge pull request #8901 from nix-windows/mingw 
Build a minimized Nix with MinGW
 2024-04-17 12:52:47 -04:00
John Ericson 1063aa502a Relax store path canonicalization 2024-04-17 12:26:10 -04:00
John Ericson b529d91902 Prefix -DNIX_ paths to be windows-complient for windows 
This is a hacky solution, but it will do for now.
 2024-04-17 12:26:10 -04:00
John Ericson 98691b46e3 Get rid of shellCrossSystems 
We don't need it now that our (minimized) Windows build of Nix succeeds!
 2024-04-17 12:26:10 -04:00
John Ericson 8433027e35 Build a minimized Nix with MinGW 
At this point many features are stripped out, but this works:

- Can run libnix{util,store,expr} unit tests
- Can run some Nix commands

Co-Authored-By volth <volth@volth.com>
Co-Authored-By Brian McKenna <brian@brianmckenna.org>
 2024-04-17 12:26:10 -04:00
John Ericson 2248a3f545 Create no-op Window pathlocks implementation 
This keeps the call sites simple, eventually this should be filled in.
 2024-04-17 11:48:14 -04:00
John Ericson 05b9dac754
Fix friend struct/class mismatch warning 2024-04-17 15:47:07 +00:00
Eelco Dolstra c40e2afd33
Merge pull request #10530 from hercules-ci/solve-make-warnings 
local.mk: Solve warnings
 2024-04-17 16:51:56 +02:00
Robert Hensing 062d3b339b
Merge pull request #10533 from jlesquembre/jl/c-api_labeler 
Auto label C API PRs
 2024-04-17 16:50:21 +02:00
Eelco Dolstra 4638ddd855
Merge pull request #10322 from edolstra/finish-value 
Ensure immutability of non-thunk values
 2024-04-17 16:42:17 +02:00
José Luis Lafuente d42a2643b0
Auto label C API PRs 2024-04-17 16:20:37 +02:00
Eelco Dolstra 6a3ecdaa39 Merge remote-tracking branch 'origin/master' into finish-value 2024-04-17 16:02:44 +02:00
Robert Hensing 7a1135901d local.mk: Solve warnings 
local.mk:5: warning: overriding recipe for target 'outputs/dev/include/nix/nix_api_expr.h'
local.mk:5: warning: ignoring old recipe for target 'outputs/dev/include/nix/nix_api_expr.h'
local.mk:5: warning: overriding recipe for target 'outputs/dev/include/nix/nix_api_external.h'
local.mk:5: warning: ignoring old recipe for target 'outputs/dev/include/nix/nix_api_external.h'
local.mk:5: warning: overriding recipe for target 'outputs/dev/include/nix/nix_api_value.h'
local.mk:5: warning: ignoring old recipe for target 'outputs/dev/include/nix/nix_api_value.h'
local.mk:5: warning: overriding recipe for target 'outputs/dev/include/nix/nix_api_store.h'
local.mk:5: warning: ignoring old recipe for target 'outputs/dev/include/nix/nix_api_store.h'
local.mk:5: warning: overriding recipe for target 'outputs/dev/include/nix/nix_api_util.h'
local.mk:5: warning: ignoring old recipe for target 'outputs/dev/include/nix/nix_api_util.h'
 2024-04-17 15:37:14 +02:00
Eelco Dolstra d53ad516e8
Merge pull request #10517 from edolstra/path-display 
Add missing setPathDisplay() calls
 2024-04-17 15:36:08 +02:00
Eelco Dolstra e0a8d38dad
Merge pull request #10527 from hercules-ci/devShell-api-docs 
devShell: enable API docs
 2024-04-17 15:35:35 +02:00
Eelco Dolstra d4860c8f17
Merge pull request #10528 from NixOS/thufschmitt-patch-1 
Remove the git-submodule test from Github actions
 2024-04-17 15:34:13 +02:00
Robert Hensing db948397ff
Merge pull request #10523 from tweag/jl/c-api_nix_get_string 
C API: nix_get_string now accepts a callback to return the value
 2024-04-17 15:22:06 +02:00
José Luis Lafuente 1f1cd97c71
C API: Add section in Nix manual (#10519) 2024-04-17 15:21:17 +02:00
Théophane Hufschmitt deb71e5044
Merge pull request #10526 from hercules-ci/labeler-contributing 
Auto-label contributor-experience in PRs
 2024-04-17 15:20:49 +02:00
Théophane Hufschmitt a863a75f0b
Remove the giy-submodule test from Github actions 
It causes the CI to time out, so let's just run it on Hydra
 2024-04-17 14:34:53 +02:00
Robert Hensing 45a1142a8e devShell: enable API docs 
Affects both the deps and the configure flags in configurePhase.
 2024-04-17 13:12:46 +02:00
Robert Hensing 94c861bebf labeler.yml: Add contributor-experience 
Not exhaustive perhaps, but a good start.
 2024-04-17 12:50:55 +02:00
José Luis Lafuente c75b143b6c
C API: nix_get_string now accepts a callback to return the value 2024-04-16 22:36:39 +02:00
Eelco Dolstra 74e4bc9b1d
Merge pull request #10486 from tweag/jl/c-api_function-pointer 
C API: Safer function pointer casting
 2024-04-16 18:56:08 +02:00
Eelco Dolstra 75687844e1
Merge pull request #10518 from crayor1/patch-1 
Double word is superfluous
 2024-04-16 18:07:57 +02:00
Eelco Dolstra 84572e7198
Merge pull request #10520 from crayor1/patch-2 
Fix typo in hacking.md
 2024-04-16 17:47:18 +02:00
Eelco Dolstra 28e0f0a04c
Fix another typo 2024-04-16 17:43:17 +02:00
Eelco Dolstra 6892c9803c GitInputScheme: Fix path display for workdirs and submodules 2024-04-16 16:42:47 +02:00
Eelco Dolstra 79363b2273 MountedInputAccessor, FilteringInputAccessor: Respect the path display prefix/suffix 
This was causing Git paths not to be rendered correctly.
 2024-04-16 16:42:41 +02:00
crayor1 548a12c1fe
Fix typo in hacking.md 2024-04-16 15:54:45 +02:00
crayor1 25265a9365
Double word is superfluous 2024-04-16 14:36:41 +02:00
Eelco Dolstra 6df58a0891 MercurialInputScheme: Improve path display 2024-04-16 14:14:50 +02:00
Eelco Dolstra fa01db9626 StorePathAccessor: Fix path display 
Set the prefix to the store path to fix messages like "copying '/' to
the store" to "copying '/nix/store/bla' to the store".
 2024-04-16 14:14:26 +02:00
Théophane Hufschmitt d2a07a96ba
Merge pull request #10467 from edolstra/nix-shell-symlink 
nix shell: Handle output paths that are symlinks
 2024-04-16 12:31:14 +02:00
John Ericson 20f0472149
Merge pull request #10493 from obsidiansystems/cpp-indent-clang-format 
Have `clang-format` indent conditional CPP
 2024-04-15 10:29:04 -04:00
John Ericson 65cc237b3a
Merge pull request #10482 from tweag/fix-symlink-in-sandbox 
Fix the access of symlinks to host files in the sandbox
 2024-04-15 09:29:00 -04:00
John Ericson bcda38c272 Have clang-format indent conditional CPP 
This reflects the style I've been introducing in tandem with Windows
support.

See https://clang.llvm.org/docs/ClangFormatStyleOptions.html#indentppdirectives for this configuration option.
 2024-04-15 08:33:45 -04:00
José Luis Lafuente 774e7213e8
C API: Use nix_get_string_callback typedef 2024-04-15 12:05:57 +02:00
John Ericson 03eb4f7baa
Merge pull request #10503 from haenoe/public-key-json-impl 
`fetchers::PublicKey` json impl
 2024-04-14 18:02:27 -04:00
HaeNoe e3fed2ebcf
update fetchers::PublicKey json (de)serialization 2024-04-14 22:42:48 +02:00
HaeNoe ff4c286e80
add tests for optionalValueAt 2024-04-14 22:36:03 +02:00
HaeNoe bb939d3772
change implementation of optionalValueAt 2024-04-14 22:35:51 +02:00
José Luis Lafuente 76444a3958
C API: proper ifdef endif indentation 2024-04-14 16:18:32 +02:00
Roland Coeurjoly 62ce139e3f No need to undef now that there is no collision 2024-04-13 23:34:01 +02:00
Roland Coeurjoly 40a6a9fdb8 Rename SearchPath to LookupPath and searchPath to lookupPath 2024-04-13 17:35:15 +02:00