Eelco Dolstra
d74d2fdaa7
Move statusCallbackTrampoline
2023-11-14 13:35:26 +01:00
Eelco Dolstra
21bb180547
Use libgit2 with ssh-exec support
...
See https://github.com/libgit2/libgit2/pull/6617 . This ensures that we
get support for ~/.ssh/config, known_hosts etc.
2023-11-14 13:30:51 +01:00
Théophane Hufschmitt
c889881cbb
Merge pull request #9351 from Trundle/update-chroot-store-comment
...
Update comment to reflect bind mounts are now used for store in chroot
2023-11-14 09:09:27 +01:00
Andreas Stührk
ad99c8950b
Update comment to reflect bind mounts are now used for store in chroot
2023-11-13 23:29:48 +01:00
dependabot[bot]
742a63b98f
build(deps): bump zeebe-io/backport-action from 2.1.0 to 2.1.1
...
Bumps [zeebe-io/backport-action](https://github.com/zeebe-io/backport-action ) from 2.1.0 to 2.1.1.
- [Release notes](https://github.com/zeebe-io/backport-action/releases )
- [Commits](https://github.com/zeebe-io/backport-action/compare/v2.1.0...v2.1.1 )
---
updated-dependencies:
- dependency-name: zeebe-io/backport-action
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-11-13 22:01:50 +00:00
Tom Bereknyei
0be84c83b2
key and cat: no need for progressBar
...
otherwise the output will be invisible in common terminal configurations
2023-11-12 15:40:44 -05:00
Théophane Hufschmitt
2afe2e4fbc
Merge pull request #9333 from DeterminateSystems/option-for-nix-upgrade-url
...
nix upgrade-nix: make the source URL an option
2023-11-12 19:45:30 +01:00
Graham Christensen
fd5a4a8467
nix upgrade-nix: make the source URL an option
...
This new option enables organizations to more easily manage their Nix
fleet's deployment, and ensure a consistent and planned rollout of Nix
upgrades.
2023-11-10 12:12:28 -05:00
John Ericson
458e511dc4
Merge pull request #9294 from obsidiansystems/minimal-git
...
Git object hashing in libutil
2023-11-10 11:24:23 -05:00
John Ericson
20b95d6223
Git object hashing in libutil
...
This is the core functionality but just unit-tested and not yet made
part of the store layer. This is because there is some tech debt around
(a) repeated boilerplate hashing objects (b) better integration of the
new `SourceAccessor` type that needs to be cleaned up first.
Part of RFC 133
Co-Authored-By: Matthew Bauer <mjbauer95@gmail.com>
Co-Authored-By: Carlo Nucera <carlo.nucera@protonmail.com>
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
Co-authored-by: Florian Klink <flokli@flokli.de>
2023-11-10 11:02:44 -05:00
John Ericson
9afa697ab6
Refactor bash test build system a bit
...
The basic idea here is to separate a few intertwined notions:
1. Not all "run bash tests" are "install tests"
2. Not all "run bash tests" use `tests/functional/init.sh`, or any
pre-test initialization at all.
This will used in the next commit when we have a test that check unit
test golden master data.
Also, move our custom `PS4` from the test to the test runner, as it is
part of how we want to display the tests, not the test themselves.
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
2023-11-10 11:02:37 -05:00
John Ericson
3d9d5dc189
Create MemorySink
...
This is for writing to a `MemorySourceAccessor`.
2023-11-10 11:02:37 -05:00
Eelco Dolstra
cf59ea83ec
configure: Check for libgit2
2023-11-10 13:58:59 +01:00
Eelco Dolstra
d1a1888a3e
Merge pull request #9328 from obsidiansystems/editorconfig-perl
...
`.editorconfig`: Also affect Perl FFI `xs` file
2023-11-10 13:45:07 +01:00
John Ericson
1d5a48240c
.editorconfig
: Also affect Perl FFI xs
file
...
This way `perl/lib/Nix/Store.xs` is affected.
2023-11-09 23:11:52 -05:00
Artturin
a903f85f84
nix-env --query
: fix --json
ignoring --drv-path
...
```json
{
"AMB-plugins": {
"drvPath": "/nix/store/l99cb7h2hy8dg005arsjbd9kx0w05d3h-AMB-plugins-0.8.1.drv",
"name": "AMB-plugins-0.8.1",
"outputName": "out",
"outputs": {
"out": null
},
"pname": "AMB-plugins",
"system": "x86_64-linux",
"version": "0.8.1"
},
"ArchiSteamFarm": {
"drvPath": "/nix/store/nhplgyjj34fz6hjmnyih25gxscfh8s7b-ArchiSteamFarm-5.4.12.5.drv",
"name": "ArchiSteamFarm-5.4.12.5",
"outputName": "out",
"outputs": {
"out": null
},
"pname": "ArchiSteamFarm",
"system": "x86_64-linux",
"version": "5.4.12.5"
},
...
```
2023-11-09 22:31:32 +02:00
Eelco Dolstra
98a120b8b8
Merge remote-tracking branch 'origin/master' into libgit2
2023-11-09 16:48:41 +01:00
Robert Hensing
df9bd755a1
Merge pull request #9326 from NixOS/unstable-fetchTree-git
...
Mark `fetchTree` as unstable again
2023-11-09 07:44:48 +01:00
Robert Hensing
12953b942c
Fixup docs
2023-11-09 07:08:56 +01:00
John Ericson
f0adb72c23
Mark fetchTree
as unstable again
...
As discussed in our last meeting, we need a bit more time, but we are
"time boxing" the work left to do to ensure there is not unbounded
delay.
Rather than putting it back underneath `flakes`, though, put it
underneath its own `fetch-tree` experimental feature (which `flakes`
includes/implies). This signals our commitment to the plan to stabilize
it first without waiting to go through the rest of Flakes, and also will
give users a "release candidate" when we get closer to stabilization.
This reverts commit 4112dd1fc9
.
2023-11-08 23:23:56 -05:00
John Ericson
d854e8696b
Specify the size of the experimental feature array in a more robust way
...
See doc comment for details.
2023-11-08 22:58:10 -05:00
John Ericson
c14ba93290
Merge pull request #9317 from tfc/libstore-improvementswq
...
Libstore improvements
2023-11-08 15:36:38 -05:00
Jacek Galowicz
df8bfe84cc
Fix consts and casts
2023-11-08 17:29:55 +01:00
Jacek Galowicz
c581143e0c
Use structured binding for json iteration
2023-11-08 17:29:55 +01:00
Jacek Galowicz
77dceb2844
Drop obsolete assert and cast
2023-11-08 17:29:55 +01:00
Jacek Galowicz
6a47629530
Fix initialization of struct members (wrong order)
2023-11-08 17:29:55 +01:00
John Ericson
d8e3b9aafc
Merge pull request #9313 from NixOS/maintainer-mission
...
maintainers: refine the mission statement phrasing
2023-11-08 10:12:09 -05:00
Felix Uhl
c0c7c4b6cd
Link to shebang interpreter docs from release notes
2023-11-07 22:11:48 +01:00
Robert Hensing
ab69dc4da3
Test parseShebangContent round trip
2023-11-07 13:24:01 -05:00
Robert Hensing
589d338776
parseShebangs: Make strings with backtick sequences representable
2023-11-07 13:24:01 -05:00
Robert Hensing
ffd414eb75
Fix nix shebang interaction with #8131 overhaul completions
2023-11-07 13:24:01 -05:00
Robert Hensing
e91fd837ee
Move shebang docs from rl-next to nix.md
2023-11-07 13:24:01 -05:00
Robert Hensing
51bb69535b
nix/installables.cc: Use getCommandBaseDir() where possible
...
These usages of the working directory are perhaps unlikely to
interact with shebangs, but the code is more consistent this way,
and we're less likely to miss usages that do interact.
2023-11-07 13:24:01 -05:00
Robert Hensing
466271568b
nix: Parse --file relative to shebang script
2023-11-07 13:24:01 -05:00
Robert Hensing
198bc22e3b
nix: Add command baseDir to parse --expr relative to shebang script
2023-11-07 13:24:01 -05:00
Robert Hensing
20ff61ab25
nix: Reserve shebang line syntax and only parse double backtick quotes
...
Being restrictive about syntax leaves opportunity to improve the
syntax and functionality later.
2023-11-07 13:24:01 -05:00
Robert Hensing
cc68ed8ff7
libcmd: lookupFileArg(): add baseDir
...
This will allow a different base directory to be used, matching
a shebang script location instead of the working directory.
2023-11-07 13:24:01 -05:00
Tom Bereknyei
bbeddf0602
fix: refactor parseCmdline interface
2023-11-07 13:24:01 -05:00
Tom Bereknyei
e6ed729243
doc: remove reference to nix-shell
2023-11-07 13:24:01 -05:00
Tom Bereknyei
06f3583b1c
feat: break out of shebang processing for non-comments
2023-11-07 13:24:01 -05:00
Tom Bereknyei
01f61cefcb
Read file incrementally
2023-11-07 13:24:01 -05:00
Tom Bereknyei
bfcbf3b5bf
doc: shebang release notes, docs, tests
...
fix: release notes
2023-11-07 13:24:01 -05:00
Tom Bereknyei
eea5a003d9
fix: test to ensure arguments are passed
2023-11-07 13:24:01 -05:00
Eelco Dolstra
5f9b5758b6
src/libutil/util.hh: Formatting
2023-11-07 13:24:01 -05:00
Tom Bereknyei
74210c12fe
Shellbang support with flakes
...
Enables shebang usage of nix shell. All arguments with `#! nix` get
added to the nix invocation. This implementation does NOT set any
additional arguments other than placing the script path itself as the
first argument such that the interpreter can utilize it.
Example below:
```
#!/usr/bin/env nix
#! nix shell --quiet
#! nix nixpkgs#bash
#! nix nixpkgs#shellcheck
#! nix nixpkgs#hello
#! nix --ignore-environment --command bash
# shellcheck shell=bash
set -eu
shellcheck "$0" || exit 1
function main {
hello
echo 0:"$0" 1:"$1" 2:"$2"
}
"$@"
```
fix: include programName usage
EDIT: For posterity I've changed shellwords to shellwords2 in order
not to interfere with other changes during a rebase.
shellwords2 is removed in a later commit. -- roberth
2023-11-07 13:24:01 -05:00
Eelco Dolstra
ba4e07782c
Merge pull request #9311 from NixOS/dependabot/github_actions/zeebe-io/backport-action-2.1.0
...
build(deps): bump zeebe-io/backport-action from 2.0.0 to 2.1.0
2023-11-07 14:45:11 +01:00
Felix Uhl
1362a0a55a
Fix logic for default XDG_DATA_DIRS value
...
The [POSIX test manpage](https://pubs.opengroup.org/onlinepubs/9699919799/utilities/test.html )
as well as the [fish test manpage](https://fishshell.com/docs/current/cmds/test.html#operators-for-text-strings )
specify that `-z` will be "True if the length of string string is zero;
otherwise, false."
The `-n` was likely a mixup and not caught during testing of
https://github.com/NixOS/nix/pull/8985 due to a lack of missing
conflicting entries in `XDG_DATA_DIRS`.
2023-11-07 03:41:19 +01:00
Valentin Gagarin
b733f4ab29
maintainers: refine the mission statement phrasing
...
setting a direction falls short of what we're already doing: guide contributors.
the direction aspect is still important, as that is the authoritative part. guidance is the supportive part.
2023-11-07 01:12:39 +01:00
Valentin Gagarin
fe62cb79a6
Merge pull request #9309 from iFreilicht/patch-2
...
Add release note on XDG_DATA_DIRS change
2023-11-06 23:55:12 +01:00
dependabot[bot]
9fec62a100
build(deps): bump zeebe-io/backport-action from 2.0.0 to 2.1.0
...
Bumps [zeebe-io/backport-action](https://github.com/zeebe-io/backport-action ) from 2.0.0 to 2.1.0.
- [Release notes](https://github.com/zeebe-io/backport-action/releases )
- [Commits](https://github.com/zeebe-io/backport-action/compare/v2.0.0...v2.1.0 )
---
updated-dependencies:
- dependency-name: zeebe-io/backport-action
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-11-06 22:21:07 +00:00