NixOS/nix
NixOS/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2024-09-19 10:50:24 -04:00
Code Activity
17975 commits 184 branches 168 tags 102 MiB
Commit graph

17975 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Ericson f1d88e0f27
Merge pull request #11064 from obsidiansystems/header-generater 
Use a meson "generator" to deduplicate `.gen.hh` creation
 2024-07-08 12:03:59 -04:00
John Ericson 1439de874f
Merge pull request #11063 from obsidiansystems/config-expr 
Forgot to include `config-expr.hh` in two places
 2024-07-08 11:27:57 -04:00
John Ericson 6e5cec292b Use a meson "generator" to deduplicate .gen.hh creation 2024-07-08 11:13:11 -04:00
John Ericson c5284a84f3 Forgot to include config-expr.hh in some places 2024-07-08 10:37:34 -04:00
Eelco Dolstra ab0b54b905 Remove the Hydra status check workflow 
I'm sick of receiving an email about this every 30 minutes.
 2024-07-08 14:39:33 +02:00
Robert Hensing cfe3ee3de8
nix-shell: look up shell.nix when argument is a directory (#11057) 
* Refactor: rename runEnv -> isNixShell

* Refactor: rename left -> remainingArgs

* nix-build.cc: Refactor: extract baseDir variable

* nix-build.cc: Refactor: extract sourcePath, resolvedPath variables

* nix-shell: Look for shell.nix when directory is specified

* Add legacy setting: nix-shell-always-looks-for-shell-nix

* rl-next: Add note about shell.nix lookups

* tests/functional/shell.nix: Implement runHook for dummy stdenv
 2024-07-08 14:36:36 +02:00
Ryan Hendrickson 48804cffbf docs: fill out language/types.md#type-path 2024-07-08 00:41:19 -04:00
John Ericson d8850618b6
Merge pull request #11059 from rhendric/rhendric/reference-manual 
docs: merge builtin-constants into builtins
 2024-07-07 21:47:33 -04:00
Ryan Hendrickson 95890b3e1d docs: merge builtin-constants into builtins 2024-07-07 15:57:23 -04:00
Robert Hensing a9592077fb
Merge pull request #11055 from NixOS/packaging-for-nixpkgs 
Indirections for packaging meson-based granular build for Nixpkgs
 2024-07-07 21:33:01 +02:00
Robert Hensing 193dd5d934 Fixup: add missing test file 2024-07-07 14:49:52 +02:00
Robert Hensing 3e424b1040 Merge branch 'nix-shell-lookup-shell-nix' into more-nix-shell 2024-07-07 14:16:15 +02:00
Robert Hensing e1106b45a3 tests/functional/nix-shell.sh: Fix Polo test for VM test 
It is unclear to me why this worked when not in a VM test, but the
explanation would be in the part of nix-shell we're getting rid of
with the devShell attribute.
 2024-07-07 13:03:19 +02:00
Robert Hensing 0f8a655023 tests/functional/shell.nix: Implement runHook for dummy stdenv 2024-07-07 13:02:21 +02:00
Robert Hensing fd4b17ab2c
Merge pull request #11056 from romain-neil/s3-allow-use-of-proxy 
Configure aws s3 lib to use system defined proxy, if existent
 2024-07-07 02:47:24 +02:00
Robert Hensing c4a20a4101 rl-next: Add note about shell.nix lookups 2024-07-07 01:22:00 +02:00
Robert Hensing 2f1fada76b Add legacy setting: nix-shell-always-looks-for-shell-nix 2024-07-07 01:22:00 +02:00
Robert Hensing 73602a7c6f nix-shell: Look for shell.nix when directory is specified 2024-07-07 01:22:00 +02:00
Robert Hensing 63262e78c7 Add opt-out: nix-shell-shebang-arguments-relative-to-script 2024-07-07 00:55:33 +02:00
Robert Hensing 4c59d6e9f5 Merge branch 'nix-shell-lookup-shell-nix' into more-nix-shell 2024-07-07 00:27:07 +02:00
Robert Hensing 6959ac157b rl-next: Add note about shell.nix lookups 2024-07-07 00:25:56 +02:00
Robert Hensing 6c6d5263e2 Add legacy setting: nix-shell-always-looks-for-shell-nix 2024-07-07 00:25:56 +02:00
Robert Hensing f5b59fbc64 Fix and extend nix-shell baseDir test 2024-07-07 00:23:22 +02:00
Robert Hensing d5854f33e2 rl-next: Typo 2024-07-07 00:18:26 +02:00
Robert Hensing 8838f5c746 Merge remote-tracking branch 'matthewbauer/nix-shell-relative-shebang' into more-nix-shell 2024-07-07 00:18:03 +02:00
Robert Hensing afbe7c3d08 rl-next: Enter PR 2024-07-06 23:15:01 +02:00
John Ericson 41b6c735eb
Merge pull request #11054 from NixOS/meson-fixes 
Meson fixes
 2024-07-06 17:11:11 -04:00
Robert Hensing b865625a8e nix-shell: Look for shell.nix when directory is specified 2024-07-06 23:05:34 +02:00
Robert Hensing a22f8b5276 rl-next: Add note about shell.nix lookups 2024-07-06 23:05:34 +02:00
Robert Hensing 32fb127b9c Add legacy setting: nix-shell-always-looks-for-shell-nix 2024-07-06 23:05:34 +02:00
Romain NEIL 514062c227 feat: configure aws s3 lib to use system defined proxy, if existent 2024-07-06 21:46:58 +02:00
Robert Hensing 76245ffbeb nix-build.cc: Refactor: extract sourcePath, resolvedPath variables 2024-07-06 20:55:27 +02:00
Robert Hensing e9479b272f nix-build.cc: Refactor: extract baseDir variable 2024-07-06 20:51:45 +02:00
Robert Hensing 5c367ece89 Refactor: rename left -> remainingArgs 2024-07-06 20:03:30 +02:00
Robert Hensing 13181356fc Refactor: rename runEnv -> isNixShell 2024-07-06 20:01:46 +02:00
Robert Hensing bea54d116e Add resolvePath, filesetToSource indirections for Nixpkgs 2024-07-06 19:49:55 +02:00
Robert Hensing da4c55995b ci.yml: Build non unit-tested components in meson_build 2024-07-06 19:15:53 +02:00
Robert Hensing 0729f0a113 packaging: Pass version directly 2024-07-06 17:52:57 +02:00
Robert Hensing efd5f50f5e nix-perl: Add deps, use mkMesonDerivation 2024-07-06 17:52:57 +02:00
Robert Hensing 4c014e238b nix-main: Add openssl 2024-07-06 17:52:57 +02:00
Robert Hensing 4d0c55ae55 api docs: Use mkMesonDerivation 2024-07-06 17:52:57 +02:00
Robert Hensing b7e5446b81 flake.nix: Remove unused binding 2024-07-06 17:52:57 +02:00
Robert Hensing 896eb7a44b
Merge pull request #11034 from obsidiansystems/meson-nix 
Package libnixmain and libnixcmd with Meson
 2024-07-06 01:26:59 +02:00
John Ericson 3acf3fc746 Package libnixmain and libnixcmd with Meson 
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
 2024-07-05 16:40:55 -04:00
Robert Hensing 0b901e10ee
Merge pull request #11050 from hercules-ci/issue-10677 
Explain when `man` is missing
 2024-07-05 22:25:38 +02:00
John Ericson ff9b6d0e1f
Merge pull request #11037 from fricklerhandwerk/document-config-parsing 
use self-descriptive name for config file parser, document
 2024-07-05 15:21:26 -04:00
Eelco Dolstra d5461b9009
Merge pull request #11051 from Mic92/fix-prefetch 
src/nix/prefetch: fix prefetch containing current directory instead o…
 2024-07-05 20:33:05 +02:00
Robert Hensing ddff76f667
Merge pull request #10973 from NixOS/meson-libexpr 
Meson build for libexpr libflake, external C API, unit tests
 2024-07-05 20:27:12 +02:00
Jörg Thalheim 05381c0b30
Update src/nix/prefetch.cc 
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
 2024-07-05 19:45:03 +02:00
Jörg Thalheim 8cea1fbd97 src/nix/prefetch: fix prefetch containing current directory instead of tarball 
When --unpack was used the nix would add the current directory to the
nix store instead of the content of unpacked.
The reason for this is that std::distance already consumes the iterator.
To fix this we re-instantiate the directory iterator in case the
directory only contains a single entry.
 2024-07-05 19:18:49 +02:00