Compare commits
36
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ea792bcdc8 | ||
|
|
71650c83c6 | ||
|
|
d51deeac1c | ||
|
|
1f8541258c | ||
|
|
3a9753132e | ||
|
|
2324ee4891 | ||
|
|
28c1f8800b | ||
|
|
af775bdcf9 | ||
|
|
8d2be51d19 | ||
|
|
9102508f33 | ||
|
|
a6aaf81103 | ||
|
|
c7a232e200 | ||
|
|
30d14b772f | ||
|
|
fbaee9b8fb | ||
|
|
753730c410 | ||
|
|
c116e6e837 | ||
|
|
3e261410bc | ||
|
|
ffec547ebc | ||
|
|
512afd8b7a | ||
|
|
69505c84e1 | ||
|
|
af5c323e93 | ||
|
|
9053ac0693 | ||
|
|
b39ab10749 | ||
|
|
8787218c7c | ||
|
|
89951cf7fb | ||
|
|
45a28ed36f | ||
|
|
6ec852e7f0 | ||
|
|
7c718646cb | ||
|
|
8d95e1f299 | ||
|
|
6396416dfa | ||
|
|
44f390ed48 | ||
|
|
4ca1a0b864 | ||
|
|
2021b1d8d1 | ||
|
|
b012852cb2 | ||
|
|
074e0678bd | ||
|
|
891390d76f |
No files matched your search
@@ -1,7 +0,0 @@
|
|||||||
**Release Notes**
|
|
||||||
Please include relevant [release notes](https://github.com/NixOS/nix/blob/master/doc/manual/src/release-notes/rl-next.md) as needed.
|
|
||||||
|
|
||||||
|
|
||||||
**Testing**
|
|
||||||
|
|
||||||
If this issue is a regression or something that should block release, please consider including a test either in the [testsuite](https://github.com/NixOS/nix/tree/master/tests) or as a [hydraJob]( https://github.com/NixOS/nix/blob/master/flake.nix#L396) so that it can be part of the [automatic checks](https://hydra.nixos.org/jobset/nix/master).
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
name: Backport
|
|
||||||
on:
|
|
||||||
pull_request_target:
|
|
||||||
types: [closed, labeled]
|
|
||||||
jobs:
|
|
||||||
backport:
|
|
||||||
name: Backport Pull Request
|
|
||||||
if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true && (github.event_name != 'labeled' || startsWith('backport', github.event.label.name))
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v2
|
|
||||||
with:
|
|
||||||
ref: ${{ github.event.pull_request.head.sha }}
|
|
||||||
# required to find all branches
|
|
||||||
fetch-depth: 0
|
|
||||||
- name: Create backport PRs
|
|
||||||
# should be kept in sync with `version`
|
|
||||||
uses: zeebe-io/backport-action@v0.0.7
|
|
||||||
with:
|
|
||||||
# Config README: https://github.com/zeebe-io/backport-action#backport-action
|
|
||||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
github_workspace: ${{ github.workspace }}
|
|
||||||
pull_description: |-
|
|
||||||
Bot-based backport to `${target_branch}`, triggered by a label in #${pull_number}.
|
|
||||||
# should be kept in sync with `uses`
|
|
||||||
version: v0.0.5
|
|
||||||
@@ -1,135 +0,0 @@
|
|||||||
name: "CI"
|
|
||||||
|
|
||||||
on:
|
|
||||||
pull_request:
|
|
||||||
push:
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
|
|
||||||
build:
|
|
||||||
needs: [check_cachix]
|
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
os: [ubuntu-latest, macos-latest]
|
|
||||||
runs-on: ${{ matrix.os }}
|
|
||||||
timeout-minutes: 60
|
|
||||||
outputs:
|
|
||||||
flake-outputs-json: ${{ steps.list-outputs.outputs.json }}
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v2.4.0
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
- uses: cachix/install-nix-action@v16
|
|
||||||
- run: echo CACHIX_NAME="$(echo $GITHUB_REPOSITORY-install-tests | tr "[A-Z]/" "[a-z]-")" >> $GITHUB_ENV
|
|
||||||
- uses: cachix/cachix-action@v10
|
|
||||||
if: needs.check_cachix.outputs.secret == 'true'
|
|
||||||
with:
|
|
||||||
name: '${{ env.CACHIX_NAME }}'
|
|
||||||
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
|
|
||||||
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
|
|
||||||
- run: nix --experimental-features 'nix-command flakes' build -L
|
|
||||||
- name: List all the tests to run
|
|
||||||
id: list-outputs
|
|
||||||
run: scripts/list-tests-flake-outptus-for-gha
|
|
||||||
|
|
||||||
test:
|
|
||||||
needs: [build, check_cachix]
|
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
os: [ubuntu-latest, macos-latest]
|
|
||||||
outputName: ${{ fromJson(needs.build.outputs.flake-outputs-json) }}
|
|
||||||
runs-on: ${{ matrix.os }}
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v2.4.0
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
- uses: cachix/install-nix-action@v16
|
|
||||||
- run: echo CACHIX_NAME="$(echo $GITHUB_REPOSITORY-install-tests | tr "[A-Z]/" "[a-z]-")" >> $GITHUB_ENV
|
|
||||||
- uses: cachix/cachix-action@v10
|
|
||||||
if: needs.check_cachix.outputs.secret == 'true'
|
|
||||||
with:
|
|
||||||
name: '${{ env.CACHIX_NAME }}'
|
|
||||||
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
|
|
||||||
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
|
|
||||||
- run: nix --experimental-features 'nix-command flakes' build .#checks.$(nix eval --raw --impure --expr builtins.currentSystem).${{ matrix.outputName }} -L
|
|
||||||
|
|
||||||
|
|
||||||
check_cachix:
|
|
||||||
name: Cachix secret present for installer tests
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
outputs:
|
|
||||||
secret: ${{ steps.secret.outputs.secret }}
|
|
||||||
steps:
|
|
||||||
- name: Check for Cachix secret
|
|
||||||
id: secret
|
|
||||||
env:
|
|
||||||
_CACHIX_SECRETS: ${{ secrets.CACHIX_SIGNING_KEY }}${{ secrets.CACHIX_AUTH_TOKEN }}
|
|
||||||
run: echo "::set-output name=secret::${{ env._CACHIX_SECRETS != '' }}"
|
|
||||||
|
|
||||||
installer:
|
|
||||||
needs: [test, check_cachix]
|
|
||||||
if: github.event_name == 'push' && needs.check_cachix.outputs.secret == 'true'
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
outputs:
|
|
||||||
installerURL: ${{ steps.prepare-installer.outputs.installerURL }}
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v2.4.0
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
- run: echo CACHIX_NAME="$(echo $GITHUB_REPOSITORY-install-tests | tr "[A-Z]/" "[a-z]-")" >> $GITHUB_ENV
|
|
||||||
- uses: cachix/install-nix-action@v16
|
|
||||||
- uses: cachix/cachix-action@v10
|
|
||||||
with:
|
|
||||||
name: '${{ env.CACHIX_NAME }}'
|
|
||||||
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
|
|
||||||
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
|
|
||||||
- id: prepare-installer
|
|
||||||
run: scripts/prepare-installer-for-github-actions
|
|
||||||
|
|
||||||
installer_test:
|
|
||||||
needs: [installer, check_cachix]
|
|
||||||
if: github.event_name == 'push' && needs.check_cachix.outputs.secret == 'true'
|
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
os: [ubuntu-latest, macos-latest]
|
|
||||||
runs-on: ${{ matrix.os }}
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v2.4.0
|
|
||||||
- run: echo CACHIX_NAME="$(echo $GITHUB_REPOSITORY-install-tests | tr "[A-Z]/" "[a-z]-")" >> $GITHUB_ENV
|
|
||||||
- uses: cachix/install-nix-action@v16
|
|
||||||
with:
|
|
||||||
install_url: '${{needs.installer.outputs.installerURL}}'
|
|
||||||
install_options: "--tarball-url-prefix https://${{ env.CACHIX_NAME }}.cachix.org/serve"
|
|
||||||
- run: nix-instantiate -E 'builtins.currentTime' --eval
|
|
||||||
|
|
||||||
docker_push_image:
|
|
||||||
needs: [check_cachix, build]
|
|
||||||
if: >-
|
|
||||||
github.event_name == 'push' &&
|
|
||||||
github.ref_name == 'master' &&
|
|
||||||
needs.check_cachix.outputs.secret == 'true'
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v2.4.0
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
- uses: cachix/install-nix-action@v16
|
|
||||||
- run: echo CACHIX_NAME="$(echo $GITHUB_REPOSITORY-install-tests | tr "[A-Z]/" "[a-z]-")" >> $GITHUB_ENV
|
|
||||||
- run: echo NIX_VERSION="$(nix-instantiate --eval -E '(import ./default.nix).defaultPackage.${builtins.currentSystem}.version' | tr -d \")" >> $GITHUB_ENV
|
|
||||||
- uses: cachix/cachix-action@v10
|
|
||||||
if: needs.check_cachix.outputs.secret == 'true'
|
|
||||||
with:
|
|
||||||
name: '${{ env.CACHIX_NAME }}'
|
|
||||||
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
|
|
||||||
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
|
|
||||||
- run: nix --experimental-features 'nix-command flakes' build .#dockerImage -L
|
|
||||||
- run: docker load -i ./result/image.tar.gz
|
|
||||||
- run: docker tag nix:$NIX_VERSION nixos/nix:$NIX_VERSION
|
|
||||||
- run: docker tag nix:$NIX_VERSION nixos/nix:master
|
|
||||||
- name: Login to Docker Hub
|
|
||||||
uses: docker/login-action@v1
|
|
||||||
with:
|
|
||||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
|
||||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
|
||||||
- run: docker push nixos/nix:$NIX_VERSION
|
|
||||||
- run: docker push nixos/nix:master
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
name: Hydra status
|
|
||||||
on:
|
|
||||||
schedule:
|
|
||||||
- cron: "12,42 * * * *"
|
|
||||||
workflow_dispatch:
|
|
||||||
jobs:
|
|
||||||
check_hydra_status:
|
|
||||||
name: Check Hydra status
|
|
||||||
if: github.repository_owner == 'NixOS'
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v2.4.0
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
- run: bash scripts/check-hydra-status.sh
|
|
||||||
|
|
||||||
@@ -0,0 +1,69 @@
|
|||||||
|
name: "Test"
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
push:
|
||||||
|
jobs:
|
||||||
|
tests:
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
os: [ubuntu-latest, macos-latest]
|
||||||
|
runs-on: ${{ matrix.os }}
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v2.3.4
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
- uses: cachix/install-nix-action@v13
|
||||||
|
- run: echo CACHIX_NAME="$(echo $GITHUB_REPOSITORY-install-tests | tr "[A-Z]/" "[a-z]-")" >> $GITHUB_ENV
|
||||||
|
- uses: cachix/cachix-action@v10
|
||||||
|
with:
|
||||||
|
name: '${{ env.CACHIX_NAME }}'
|
||||||
|
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
|
||||||
|
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
|
||||||
|
#- run: nix flake check
|
||||||
|
- run: nix-build -A checks.$(if [[ `uname` = Linux ]]; then echo x86_64-linux; else echo x86_64-darwin; fi)
|
||||||
|
check_cachix:
|
||||||
|
name: Cachix secret present for installer tests
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
outputs:
|
||||||
|
secret: ${{ steps.secret.outputs.secret }}
|
||||||
|
steps:
|
||||||
|
- name: Check for Cachix secret
|
||||||
|
id: secret
|
||||||
|
env:
|
||||||
|
_CACHIX_SECRETS: ${{ secrets.CACHIX_SIGNING_KEY }}${{ secrets.CACHIX_AUTH_TOKEN }}
|
||||||
|
run: echo "::set-output name=secret::${{ env._CACHIX_SECRETS != '' }}"
|
||||||
|
installer:
|
||||||
|
needs: [tests, check_cachix]
|
||||||
|
if: github.event_name == 'push' && needs.check_cachix.outputs.secret == 'true'
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
outputs:
|
||||||
|
installerURL: ${{ steps.prepare-installer.outputs.installerURL }}
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v2.3.4
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
- run: echo CACHIX_NAME="$(echo $GITHUB_REPOSITORY-install-tests | tr "[A-Z]/" "[a-z]-")" >> $GITHUB_ENV
|
||||||
|
- uses: cachix/install-nix-action@v13
|
||||||
|
- uses: cachix/cachix-action@v10
|
||||||
|
with:
|
||||||
|
name: '${{ env.CACHIX_NAME }}'
|
||||||
|
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
|
||||||
|
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
|
||||||
|
- id: prepare-installer
|
||||||
|
run: scripts/prepare-installer-for-github-actions
|
||||||
|
installer_test:
|
||||||
|
needs: [installer, check_cachix]
|
||||||
|
if: github.event_name == 'push' && needs.check_cachix.outputs.secret == 'true'
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
os: [ubuntu-latest, macos-latest]
|
||||||
|
runs-on: ${{ matrix.os }}
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v2.3.4
|
||||||
|
- run: echo CACHIX_NAME="$(echo $GITHUB_REPOSITORY-install-tests | tr "[A-Z]/" "[a-z]-")" >> $GITHUB_ENV
|
||||||
|
- uses: cachix/install-nix-action@v13
|
||||||
|
with:
|
||||||
|
install_url: '${{needs.installer.outputs.installerURL}}'
|
||||||
|
install_options: "--tarball-url-prefix https://${{ env.CACHIX_NAME }}.cachix.org/serve"
|
||||||
|
- run: nix-instantiate -E 'builtins.currentTime' --eval
|
||||||
+6
-6
@@ -15,7 +15,6 @@ perl/Makefile.config
|
|||||||
/doc/manual/*.1
|
/doc/manual/*.1
|
||||||
/doc/manual/*.5
|
/doc/manual/*.5
|
||||||
/doc/manual/*.8
|
/doc/manual/*.8
|
||||||
/doc/manual/generated/*
|
|
||||||
/doc/manual/nix.json
|
/doc/manual/nix.json
|
||||||
/doc/manual/conf-file.json
|
/doc/manual/conf-file.json
|
||||||
/doc/manual/builtins.json
|
/doc/manual/builtins.json
|
||||||
@@ -26,6 +25,8 @@ perl/Makefile.config
|
|||||||
|
|
||||||
# /scripts/
|
# /scripts/
|
||||||
/scripts/nix-profile.sh
|
/scripts/nix-profile.sh
|
||||||
|
/scripts/nix-reduce-build
|
||||||
|
/scripts/nix-http-export.cgi
|
||||||
/scripts/nix-profile-daemon.sh
|
/scripts/nix-profile-daemon.sh
|
||||||
|
|
||||||
# /src/libexpr/
|
# /src/libexpr/
|
||||||
@@ -38,7 +39,6 @@ perl/Makefile.config
|
|||||||
|
|
||||||
# /src/libstore/
|
# /src/libstore/
|
||||||
*.gen.*
|
*.gen.*
|
||||||
/src/libstore/tests/libstore-tests
|
|
||||||
|
|
||||||
# /src/libutil/
|
# /src/libutil/
|
||||||
/src/libutil/tests/libutil-tests
|
/src/libutil/tests/libutil-tests
|
||||||
@@ -56,6 +56,9 @@ perl/Makefile.config
|
|||||||
|
|
||||||
/src/nix-prefetch-url/nix-prefetch-url
|
/src/nix-prefetch-url/nix-prefetch-url
|
||||||
|
|
||||||
|
# /src/nix-daemon/
|
||||||
|
/src/nix-daemon/nix-daemon
|
||||||
|
|
||||||
/src/nix-collect-garbage/nix-collect-garbage
|
/src/nix-collect-garbage/nix-collect-garbage
|
||||||
|
|
||||||
# /src/nix-channel/
|
# /src/nix-channel/
|
||||||
@@ -73,6 +76,7 @@ perl/Makefile.config
|
|||||||
# /tests/
|
# /tests/
|
||||||
/tests/test-tmp
|
/tests/test-tmp
|
||||||
/tests/common.sh
|
/tests/common.sh
|
||||||
|
/tests/dummy
|
||||||
/tests/result*
|
/tests/result*
|
||||||
/tests/restricted-innocent
|
/tests/restricted-innocent
|
||||||
/tests/shell
|
/tests/shell
|
||||||
@@ -120,7 +124,3 @@ GTAGS
|
|||||||
compile_commands.json
|
compile_commands.json
|
||||||
|
|
||||||
nix-rust/target
|
nix-rust/target
|
||||||
|
|
||||||
result
|
|
||||||
|
|
||||||
.vscode/
|
|
||||||
@@ -4,7 +4,6 @@ makefiles = \
|
|||||||
src/libutil/local.mk \
|
src/libutil/local.mk \
|
||||||
src/libutil/tests/local.mk \
|
src/libutil/tests/local.mk \
|
||||||
src/libstore/local.mk \
|
src/libstore/local.mk \
|
||||||
src/libstore/tests/local.mk \
|
|
||||||
src/libfetchers/local.mk \
|
src/libfetchers/local.mk \
|
||||||
src/libmain/local.mk \
|
src/libmain/local.mk \
|
||||||
src/libexpr/local.mk \
|
src/libexpr/local.mk \
|
||||||
@@ -13,7 +12,6 @@ makefiles = \
|
|||||||
src/resolve-system-dependencies/local.mk \
|
src/resolve-system-dependencies/local.mk \
|
||||||
scripts/local.mk \
|
scripts/local.mk \
|
||||||
misc/bash/local.mk \
|
misc/bash/local.mk \
|
||||||
misc/fish/local.mk \
|
|
||||||
misc/zsh/local.mk \
|
misc/zsh/local.mk \
|
||||||
misc/systemd/local.mk \
|
misc/systemd/local.mk \
|
||||||
misc/launchd/local.mk \
|
misc/launchd/local.mk \
|
||||||
@@ -34,4 +32,4 @@ endif
|
|||||||
|
|
||||||
include mk/lib.mk
|
include mk/lib.mk
|
||||||
|
|
||||||
GLOBAL_CXXFLAGS += -g -Wall -include config.h -std=c++17 -I src
|
GLOBAL_CXXFLAGS += -g -Wall -include config.h -std=c++17
|
||||||
@@ -1,4 +1,3 @@
|
|||||||
HOST_OS = @host_os@
|
|
||||||
AR = @AR@
|
AR = @AR@
|
||||||
BDW_GC_LIBS = @BDW_GC_LIBS@
|
BDW_GC_LIBS = @BDW_GC_LIBS@
|
||||||
BOOST_LDFLAGS = @BOOST_LDFLAGS@
|
BOOST_LDFLAGS = @BOOST_LDFLAGS@
|
||||||
@@ -16,7 +15,6 @@ LDFLAGS = @LDFLAGS@
|
|||||||
LIBARCHIVE_LIBS = @LIBARCHIVE_LIBS@
|
LIBARCHIVE_LIBS = @LIBARCHIVE_LIBS@
|
||||||
LIBBROTLI_LIBS = @LIBBROTLI_LIBS@
|
LIBBROTLI_LIBS = @LIBBROTLI_LIBS@
|
||||||
LIBCURL_LIBS = @LIBCURL_LIBS@
|
LIBCURL_LIBS = @LIBCURL_LIBS@
|
||||||
LOWDOWN_LIBS = @LOWDOWN_LIBS@
|
|
||||||
OPENSSL_LIBS = @OPENSSL_LIBS@
|
OPENSSL_LIBS = @OPENSSL_LIBS@
|
||||||
LIBSECCOMP_LIBS = @LIBSECCOMP_LIBS@
|
LIBSECCOMP_LIBS = @LIBSECCOMP_LIBS@
|
||||||
PACKAGE_NAME = @PACKAGE_NAME@
|
PACKAGE_NAME = @PACKAGE_NAME@
|
||||||
|
|||||||
Executable
+53
@@ -0,0 +1,53 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
set -x
|
||||||
|
|
||||||
|
callNix () {
|
||||||
|
nix \
|
||||||
|
--experimental-features "nix-command flakes" \
|
||||||
|
--store /tmp/nix \
|
||||||
|
"$@"
|
||||||
|
}
|
||||||
|
|
||||||
|
callBuild () {
|
||||||
|
callNix \
|
||||||
|
eval --impure --file "$THINGTOBENCH" drvPath \
|
||||||
|
"$@"
|
||||||
|
}
|
||||||
|
getCompletions () {
|
||||||
|
NIX_GET_COMPLETIONS=6 callNix build "github:NixOS/nixpkgs?rev=ad0d20345219790533ebe06571f82ed6b034db31#firef" "$@"
|
||||||
|
}
|
||||||
|
runSearch () {
|
||||||
|
callNix search "github:NixOS/nixpkgs?rev=ad0d20345219790533ebe06571f82ed6b034db31" firefox "$@"
|
||||||
|
}
|
||||||
|
|
||||||
|
noCache () {
|
||||||
|
"$@" --option eval-cache false
|
||||||
|
}
|
||||||
|
coldCache () {
|
||||||
|
if [[ -e ~/.cache/nix/eval-cache-v2 || -e ~/.cache/nix/eval-cache-v3 ]]; then
|
||||||
|
echo "Error: The cache should be clean"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
"$@"
|
||||||
|
}
|
||||||
|
|
||||||
|
run_all () {
|
||||||
|
|
||||||
|
mkdir -p "$out"
|
||||||
|
|
||||||
|
NIX_SHOW_STATS=1 NIX_SHOW_STATS_PATH=$out/eval-stats.json bash $0 noCache callBuild
|
||||||
|
|
||||||
|
hyperfine \
|
||||||
|
--warmup 2 \
|
||||||
|
--export-csv "$out/result.csv" \
|
||||||
|
--export-json "$out/result.json" \
|
||||||
|
--export-markdown "$out/result.md" \
|
||||||
|
--style basic \
|
||||||
|
--prepare '' "bash $0 noCache callBuild" \
|
||||||
|
--prepare 'rm -rf ~/.cache/nix/' "bash $0 coldCache callBuild" \
|
||||||
|
--prepare '' "bash $0 callBuild"
|
||||||
|
}
|
||||||
|
|
||||||
|
"$@"
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
diff --git a/pthread_stop_world.c b/pthread_stop_world.c
|
|
||||||
index 4b2c429..1fb4c52 100644
|
|
||||||
--- a/pthread_stop_world.c
|
|
||||||
+++ b/pthread_stop_world.c
|
|
||||||
@@ -673,6 +673,8 @@ GC_INNER void GC_push_all_stacks(void)
|
|
||||||
struct GC_traced_stack_sect_s *traced_stack_sect;
|
|
||||||
pthread_t self = pthread_self();
|
|
||||||
word total_size = 0;
|
|
||||||
+ size_t stack_limit;
|
|
||||||
+ pthread_attr_t pattr;
|
|
||||||
|
|
||||||
if (!EXPECT(GC_thr_initialized, TRUE))
|
|
||||||
GC_thr_init();
|
|
||||||
@@ -722,6 +724,31 @@ GC_INNER void GC_push_all_stacks(void)
|
|
||||||
hi = p->altstack + p->altstack_size;
|
|
||||||
/* FIXME: Need to scan the normal stack too, but how ? */
|
|
||||||
/* FIXME: Assume stack grows down */
|
|
||||||
+ } else {
|
|
||||||
+ if (pthread_getattr_np(p->id, &pattr)) {
|
|
||||||
+ ABORT("GC_push_all_stacks: pthread_getattr_np failed!");
|
|
||||||
+ }
|
|
||||||
+ if (pthread_attr_getstacksize(&pattr, &stack_limit)) {
|
|
||||||
+ ABORT("GC_push_all_stacks: pthread_attr_getstacksize failed!");
|
|
||||||
+ }
|
|
||||||
+ if (pthread_attr_destroy(&pattr)) {
|
|
||||||
+ ABORT("GC_push_all_stacks: pthread_attr_destroy failed!");
|
|
||||||
+ }
|
|
||||||
+ // When a thread goes into a coroutine, we lose its original sp until
|
|
||||||
+ // control flow returns to the thread.
|
|
||||||
+ // While in the coroutine, the sp points outside the thread stack,
|
|
||||||
+ // so we can detect this and push the entire thread stack instead,
|
|
||||||
+ // as an approximation.
|
|
||||||
+ // We assume that the coroutine has similarly added its entire stack.
|
|
||||||
+ // This could be made accurate by cooperating with the application
|
|
||||||
+ // via new functions and/or callbacks.
|
|
||||||
+ #ifndef STACK_GROWS_UP
|
|
||||||
+ if (lo >= hi || lo < hi - stack_limit) { // sp outside stack
|
|
||||||
+ lo = hi - stack_limit;
|
|
||||||
+ }
|
|
||||||
+ #else
|
|
||||||
+ #error "STACK_GROWS_UP not supported in boost_coroutine2 (as of june 2021), so we don't support it in Nix."
|
|
||||||
+ #endif
|
|
||||||
}
|
|
||||||
GC_push_all_stack_sections(lo, hi, traced_stack_sect);
|
|
||||||
# ifdef STACK_GROWS_UP
|
|
||||||
+33
-45
@@ -32,6 +32,14 @@ AC_ARG_WITH(system, AS_HELP_STRING([--with-system=SYSTEM],[Platform identifier (
|
|||||||
system="$machine_name-`echo $host_os | "$SED" -e's/@<:@0-9.@:>@*$//g'`";;
|
system="$machine_name-`echo $host_os | "$SED" -e's/@<:@0-9.@:>@*$//g'`";;
|
||||||
esac])
|
esac])
|
||||||
|
|
||||||
|
sys_name=$(uname -s | tr 'A-Z ' 'a-z_')
|
||||||
|
|
||||||
|
case $sys_name in
|
||||||
|
cygwin*)
|
||||||
|
sys_name=cygwin
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
AC_MSG_RESULT($system)
|
AC_MSG_RESULT($system)
|
||||||
AC_SUBST(system)
|
AC_SUBST(system)
|
||||||
AC_DEFINE_UNQUOTED(SYSTEM, ["$system"], [platform identifier ('cpu-os')])
|
AC_DEFINE_UNQUOTED(SYSTEM, ["$system"], [platform identifier ('cpu-os')])
|
||||||
@@ -55,12 +63,10 @@ AC_SYS_LARGEFILE
|
|||||||
|
|
||||||
# Solaris-specific stuff.
|
# Solaris-specific stuff.
|
||||||
AC_STRUCT_DIRENT_D_TYPE
|
AC_STRUCT_DIRENT_D_TYPE
|
||||||
case "$host_os" in
|
if test "$sys_name" = sunos; then
|
||||||
solaris*)
|
|
||||||
# Solaris requires -lsocket -lnsl for network functions
|
# Solaris requires -lsocket -lnsl for network functions
|
||||||
LDFLAGS="-lsocket -lnsl $LDFLAGS"
|
LIBS="-lsocket -lnsl $LIBS"
|
||||||
;;
|
fi
|
||||||
esac
|
|
||||||
|
|
||||||
|
|
||||||
# Check for pubsetbuf.
|
# Check for pubsetbuf.
|
||||||
@@ -144,7 +150,7 @@ int main() {
|
|||||||
}]])], GCC_ATOMIC_BUILTINS_NEED_LIBATOMIC=no, GCC_ATOMIC_BUILTINS_NEED_LIBATOMIC=yes)
|
}]])], GCC_ATOMIC_BUILTINS_NEED_LIBATOMIC=no, GCC_ATOMIC_BUILTINS_NEED_LIBATOMIC=yes)
|
||||||
AC_MSG_RESULT($GCC_ATOMIC_BUILTINS_NEED_LIBATOMIC)
|
AC_MSG_RESULT($GCC_ATOMIC_BUILTINS_NEED_LIBATOMIC)
|
||||||
if test "x$GCC_ATOMIC_BUILTINS_NEED_LIBATOMIC" = xyes; then
|
if test "x$GCC_ATOMIC_BUILTINS_NEED_LIBATOMIC" = xyes; then
|
||||||
LDFLAGS="-latomic $LDFLAGS"
|
LIBS="-latomic $LIBS"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
PKG_PROG_PKG_CONFIG
|
PKG_PROG_PKG_CONFIG
|
||||||
@@ -188,54 +194,44 @@ PKG_CHECK_MODULES([EDITLINE], [libeditline], [CXXFLAGS="$EDITLINE_CFLAGS $CXXFLA
|
|||||||
[AC_MSG_ERROR([Nix requires libeditline; it was not found via pkg-config, but via its header, but required functions do not work. Maybe it is too old? >= 1.14 is required.])])
|
[AC_MSG_ERROR([Nix requires libeditline; it was not found via pkg-config, but via its header, but required functions do not work. Maybe it is too old? >= 1.14 is required.])])
|
||||||
])
|
])
|
||||||
|
|
||||||
# Look for libsodium.
|
# Look for libsodium, an optional dependency.
|
||||||
PKG_CHECK_MODULES([SODIUM], [libsodium], [CXXFLAGS="$SODIUM_CFLAGS $CXXFLAGS"])
|
PKG_CHECK_MODULES([SODIUM], [libsodium], [CXXFLAGS="$SODIUM_CFLAGS $CXXFLAGS"])
|
||||||
|
|
||||||
# Look for libbrotli{enc,dec}.
|
# Look for libbrotli{enc,dec}.
|
||||||
PKG_CHECK_MODULES([LIBBROTLI], [libbrotlienc libbrotlidec], [CXXFLAGS="$LIBBROTLI_CFLAGS $CXXFLAGS"])
|
PKG_CHECK_MODULES([LIBBROTLI], [libbrotlienc libbrotlidec], [CXXFLAGS="$LIBBROTLI_CFLAGS $CXXFLAGS"])
|
||||||
|
|
||||||
# Look for libcpuid.
|
# Look for libcpuid.
|
||||||
have_libcpuid=
|
|
||||||
if test "$machine_name" = "x86_64"; then
|
if test "$machine_name" = "x86_64"; then
|
||||||
AC_ARG_ENABLE([cpuid],
|
PKG_CHECK_MODULES([LIBCPUID], [libcpuid], [CXXFLAGS="$LIBCPUID_CFLAGS $CXXFLAGS"])
|
||||||
AS_HELP_STRING([--disable-cpuid], [Do not determine microarchitecture levels with libcpuid (relevant to x86_64 only)]))
|
have_libcpuid=1
|
||||||
if test "x$enable_cpuid" != "xno"; then
|
AC_DEFINE([HAVE_LIBCPUID], [1], [Use libcpuid])
|
||||||
PKG_CHECK_MODULES([LIBCPUID], [libcpuid],
|
|
||||||
[CXXFLAGS="$LIBCPUID_CFLAGS $CXXFLAGS"
|
|
||||||
have_libcpuid=1
|
|
||||||
AC_DEFINE([HAVE_LIBCPUID], [1], [Use libcpuid])]
|
|
||||||
)
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
AC_SUBST(HAVE_LIBCPUID, [$have_libcpuid])
|
AC_SUBST(HAVE_LIBCPUID, [$have_libcpuid])
|
||||||
|
|
||||||
|
|
||||||
# Look for libseccomp, required for Linux sandboxing.
|
# Look for libseccomp, required for Linux sandboxing.
|
||||||
case "$host_os" in
|
if test "$sys_name" = linux; then
|
||||||
linux*)
|
AC_ARG_ENABLE([seccomp-sandboxing],
|
||||||
AC_ARG_ENABLE([seccomp-sandboxing],
|
AS_HELP_STRING([--disable-seccomp-sandboxing],[Don't build support for seccomp sandboxing (only recommended if your arch doesn't support libseccomp yet!)
|
||||||
AS_HELP_STRING([--disable-seccomp-sandboxing],[Don't build support for seccomp sandboxing (only recommended if your arch doesn't support libseccomp yet!)
|
]))
|
||||||
]))
|
if test "x$enable_seccomp_sandboxing" != "xno"; then
|
||||||
if test "x$enable_seccomp_sandboxing" != "xno"; then
|
PKG_CHECK_MODULES([LIBSECCOMP], [libseccomp],
|
||||||
PKG_CHECK_MODULES([LIBSECCOMP], [libseccomp],
|
[CXXFLAGS="$LIBSECCOMP_CFLAGS $CXXFLAGS"])
|
||||||
[CXXFLAGS="$LIBSECCOMP_CFLAGS $CXXFLAGS"])
|
have_seccomp=1
|
||||||
have_seccomp=1
|
AC_DEFINE([HAVE_SECCOMP], [1], [Whether seccomp is available and should be used for sandboxing.])
|
||||||
AC_DEFINE([HAVE_SECCOMP], [1], [Whether seccomp is available and should be used for sandboxing.])
|
else
|
||||||
else
|
|
||||||
have_seccomp=
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
have_seccomp=
|
have_seccomp=
|
||||||
;;
|
fi
|
||||||
esac
|
else
|
||||||
|
have_seccomp=
|
||||||
|
fi
|
||||||
AC_SUBST(HAVE_SECCOMP, [$have_seccomp])
|
AC_SUBST(HAVE_SECCOMP, [$have_seccomp])
|
||||||
|
|
||||||
|
|
||||||
# Look for aws-cpp-sdk-s3.
|
# Look for aws-cpp-sdk-s3.
|
||||||
AC_LANG_PUSH(C++)
|
AC_LANG_PUSH(C++)
|
||||||
AC_CHECK_HEADERS([aws/s3/S3Client.h],
|
AC_CHECK_HEADERS([aws/s3/S3Client.h],
|
||||||
[AC_DEFINE([ENABLE_S3], [1], [Whether to enable S3 support via aws-sdk-cpp.]) enable_s3=1],
|
[AC_DEFINE([ENABLE_S3], [1], [Whether to enable S3 support via aws-sdk-cpp.]) enable_s3=1],
|
||||||
[AC_DEFINE([ENABLE_S3], [0], [Whether to enable S3 support via aws-sdk-cpp.]) enable_s3=])
|
[AC_DEFINE([ENABLE_S3], [0], [Whether to enable S3 support via aws-sdk-cpp.]) enable_s3=])
|
||||||
AC_SUBST(ENABLE_S3, [$enable_s3])
|
AC_SUBST(ENABLE_S3, [$enable_s3])
|
||||||
AC_LANG_POP(C++)
|
AC_LANG_POP(C++)
|
||||||
@@ -262,17 +258,11 @@ fi
|
|||||||
PKG_CHECK_MODULES([GTEST], [gtest_main])
|
PKG_CHECK_MODULES([GTEST], [gtest_main])
|
||||||
|
|
||||||
|
|
||||||
# Look for nlohmann/json.
|
|
||||||
PKG_CHECK_MODULES([NLOHMANN_JSON], [nlohmann_json >= 3.9])
|
|
||||||
|
|
||||||
|
|
||||||
# documentation generation switch
|
# documentation generation switch
|
||||||
AC_ARG_ENABLE(doc-gen, AS_HELP_STRING([--disable-doc-gen],[disable documentation generation]),
|
AC_ARG_ENABLE(doc-gen, AS_HELP_STRING([--disable-doc-gen],[disable documentation generation]),
|
||||||
doc_generate=$enableval, doc_generate=yes)
|
doc_generate=$enableval, doc_generate=yes)
|
||||||
AC_SUBST(doc_generate)
|
AC_SUBST(doc_generate)
|
||||||
|
|
||||||
# Look for lowdown library.
|
|
||||||
PKG_CHECK_MODULES([LOWDOWN], [lowdown >= 0.9.0], [CXXFLAGS="$LOWDOWN_CFLAGS $CXXFLAGS"])
|
|
||||||
|
|
||||||
# Setuid installations.
|
# Setuid installations.
|
||||||
AC_CHECK_FUNCS([setresuid setreuid lchown])
|
AC_CHECK_FUNCS([setresuid setreuid lchown])
|
||||||
@@ -284,11 +274,9 @@ AC_CHECK_FUNCS([strsignal posix_fallocate sysconf])
|
|||||||
|
|
||||||
# This is needed if bzip2 is a static library, and the Nix libraries
|
# This is needed if bzip2 is a static library, and the Nix libraries
|
||||||
# are dynamic.
|
# are dynamic.
|
||||||
case "${host_os}" in
|
if test "$(uname)" = "Darwin"; then
|
||||||
darwin*)
|
|
||||||
LDFLAGS="-all_load $LDFLAGS"
|
LDFLAGS="-all_load $LDFLAGS"
|
||||||
;;
|
fi
|
||||||
esac
|
|
||||||
|
|
||||||
|
|
||||||
AC_ARG_WITH(sandbox-shell, AS_HELP_STRING([--with-sandbox-shell=PATH],[path of a statically-linked shell to use as /bin/sh in sandboxes]),
|
AC_ARG_WITH(sandbox-shell, AS_HELP_STRING([--with-sandbox-shell=PATH],[path of a statically-linked shell to use as /bin/sh in sandboxes]),
|
||||||
|
|||||||
+1
-1
@@ -1,3 +1,3 @@
|
|||||||
(import (fetchTarball "https://github.com/edolstra/flake-compat/archive/master.tar.gz") {
|
(import (fetchTarball https://github.com/edolstra/flake-compat/archive/master.tar.gz) {
|
||||||
src = ./.;
|
src = ./.;
|
||||||
}).defaultNix
|
}).defaultNix
|
||||||
@@ -6,11 +6,9 @@ builtins:
|
|||||||
concatStrings (map
|
concatStrings (map
|
||||||
(name:
|
(name:
|
||||||
let builtin = builtins.${name}; in
|
let builtin = builtins.${name}; in
|
||||||
"<dt><code>${name} "
|
" - `builtins.${name}` " + concatStringsSep " " (map (s: "*${s}*") builtin.args)
|
||||||
+ concatStringsSep " " (map (s: "<var>${s}</var>") builtin.args)
|
+ " \n\n"
|
||||||
+ "</code></dt>"
|
+ concatStrings (map (s: " ${s}\n") (splitLines builtin.doc)) + "\n\n"
|
||||||
+ "<dd>\n\n"
|
|
||||||
+ builtin.doc
|
|
||||||
+ "\n\n</dd>"
|
|
||||||
)
|
)
|
||||||
(attrNames builtins))
|
(attrNames builtins))
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
{ command, renderLinks ? false }:
|
command:
|
||||||
|
|
||||||
with builtins;
|
with builtins;
|
||||||
with import ./utils.nix;
|
with import ./utils.nix;
|
||||||
@@ -20,11 +20,7 @@ let
|
|||||||
categories = sort (x: y: x.id < y.id) (unique (map (cmd: cmd.category) (attrValues def.commands)));
|
categories = sort (x: y: x.id < y.id) (unique (map (cmd: cmd.category) (attrValues def.commands)));
|
||||||
listCommands = cmds:
|
listCommands = cmds:
|
||||||
concatStrings (map (name:
|
concatStrings (map (name:
|
||||||
"* "
|
"* [`${command} ${name}`](./${appendName filename name}.md) - ${cmds.${name}.description}\n")
|
||||||
+ (if renderLinks
|
|
||||||
then "[`${command} ${name}`](./${appendName filename name}.md)"
|
|
||||||
else "`${command} ${name}`")
|
|
||||||
+ " - ${cmds.${name}.description}\n")
|
|
||||||
(attrNames cmds));
|
(attrNames cmds));
|
||||||
in
|
in
|
||||||
"where *subcommand* is one of the following:\n\n"
|
"where *subcommand* is one of the following:\n\n"
|
||||||
@@ -93,7 +89,7 @@ let
|
|||||||
in
|
in
|
||||||
|
|
||||||
let
|
let
|
||||||
manpages = processCommand { filename = "nix"; command = "nix"; def = builtins.fromJSON command; };
|
manpages = processCommand { filename = "nix"; command = "nix"; def = command; };
|
||||||
summary = concatStrings (map (manpage: " - [${manpage.command}](command-ref/new-cli/${manpage.name})\n") manpages);
|
summary = concatStrings (map (manpage: " - [${manpage.command}](command-ref/new-cli/${manpage.name})\n") manpages);
|
||||||
in
|
in
|
||||||
(listToAttrs manpages) // { "SUMMARY.md" = summary; }
|
(listToAttrs manpages) // { "SUMMARY.md" = summary; }
|
||||||
@@ -8,19 +8,17 @@ concatStrings (map
|
|||||||
let option = options.${name}; in
|
let option = options.${name}; in
|
||||||
" - `${name}` \n\n"
|
" - `${name}` \n\n"
|
||||||
+ concatStrings (map (s: " ${s}\n") (splitLines option.description)) + "\n\n"
|
+ concatStrings (map (s: " ${s}\n") (splitLines option.description)) + "\n\n"
|
||||||
+ (if option.documentDefault
|
+ " **Default:** " + (
|
||||||
then " **Default:** " + (
|
if option.value == "" || option.value == []
|
||||||
if option.value == "" || option.value == []
|
then "*empty*"
|
||||||
then "*empty*"
|
else if isBool option.value
|
||||||
else if isBool option.value
|
then (if option.value then "`true`" else "`false`")
|
||||||
then (if option.value then "`true`" else "`false`")
|
else
|
||||||
else
|
# n.b. a StringMap value type is specified as a string, but
|
||||||
# n.b. a StringMap value type is specified as a string, but
|
# this shows the value type. The empty stringmap is "null" in
|
||||||
# this shows the value type. The empty stringmap is "null" in
|
# JSON, but that converts to "{ }" here.
|
||||||
# JSON, but that converts to "{ }" here.
|
(if isAttrs option.value then "`\"\"`"
|
||||||
(if isAttrs option.value then "`\"\"`"
|
else "`" + toString option.value + "`")) + "\n\n"
|
||||||
else "`" + toString option.value + "`")) + "\n\n"
|
|
||||||
else " **Default:** *machine-specific*\n")
|
|
||||||
+ (if option.aliases != []
|
+ (if option.aliases != []
|
||||||
then " **Deprecated alias:** " + (concatStringsSep ", " (map (s: "`${s}`") option.aliases)) + "\n\n"
|
then " **Deprecated alias:** " + (concatStringsSep ", " (map (s: "`${s}`") option.aliases)) + "\n\n"
|
||||||
else "")
|
else "")
|
||||||
|
|||||||
File renamed without changes.
+11
-23
@@ -1,5 +1,7 @@
|
|||||||
ifeq ($(doc_generate),yes)
|
ifeq ($(doc_generate),yes)
|
||||||
|
|
||||||
|
MANUAL_SRCS := $(call rwildcard, $(d)/src, *.md)
|
||||||
|
|
||||||
# Generate man pages.
|
# Generate man pages.
|
||||||
man-pages := $(foreach n, \
|
man-pages := $(foreach n, \
|
||||||
nix-env.1 nix-build.1 nix-shell.1 nix-store.1 nix-instantiate.1 \
|
nix-env.1 nix-build.1 nix-shell.1 nix-store.1 nix-instantiate.1 \
|
||||||
@@ -12,13 +14,11 @@ man-pages := $(foreach n, \
|
|||||||
clean-files += $(d)/*.1 $(d)/*.5 $(d)/*.8
|
clean-files += $(d)/*.1 $(d)/*.5 $(d)/*.8
|
||||||
|
|
||||||
# Provide a dummy environment for nix, so that it will not access files outside the macOS sandbox.
|
# Provide a dummy environment for nix, so that it will not access files outside the macOS sandbox.
|
||||||
# Set cores to 0 because otherwise nix show-config resolves the cores based on the current machine
|
|
||||||
dummy-env = env -i \
|
dummy-env = env -i \
|
||||||
HOME=/dummy \
|
HOME=/dummy \
|
||||||
NIX_CONF_DIR=/dummy \
|
NIX_CONF_DIR=/dummy \
|
||||||
NIX_SSL_CERT_FILE=/dummy/no-ca-bundle.crt \
|
NIX_SSL_CERT_FILE=/dummy/no-ca-bundle.crt \
|
||||||
NIX_STATE_DIR=/dummy \
|
NIX_STATE_DIR=/dummy
|
||||||
NIX_CONFIG='cores = 0'
|
|
||||||
|
|
||||||
nix-eval = $(dummy-env) $(bindir)/nix eval --experimental-features nix-command -I nix/corepkgs=corepkgs --store dummy:// --impure --raw
|
nix-eval = $(dummy-env) $(bindir)/nix eval --experimental-features nix-command -I nix/corepkgs=corepkgs --store dummy:// --impure --raw
|
||||||
|
|
||||||
@@ -46,7 +46,7 @@ $(d)/src/SUMMARY.md: $(d)/src/SUMMARY.md.in $(d)/src/command-ref/new-cli
|
|||||||
|
|
||||||
$(d)/src/command-ref/new-cli: $(d)/nix.json $(d)/generate-manpage.nix $(bindir)/nix
|
$(d)/src/command-ref/new-cli: $(d)/nix.json $(d)/generate-manpage.nix $(bindir)/nix
|
||||||
@rm -rf $@
|
@rm -rf $@
|
||||||
$(trace-gen) $(nix-eval) --write-to $@ --expr 'import doc/manual/generate-manpage.nix { command = builtins.readFile $<; renderLinks = true; }'
|
$(trace-gen) $(nix-eval) --write-to $@ --expr 'import doc/manual/generate-manpage.nix (builtins.fromJSON (builtins.readFile $<))'
|
||||||
|
|
||||||
$(d)/src/command-ref/conf-file.md: $(d)/conf-file.json $(d)/generate-options.nix $(d)/src/command-ref/conf-file-prefix.md $(bindir)/nix
|
$(d)/src/command-ref/conf-file.md: $(d)/conf-file.json $(d)/generate-options.nix $(d)/src/command-ref/conf-file-prefix.md $(bindir)/nix
|
||||||
@cat doc/manual/src/command-ref/conf-file-prefix.md > $@.tmp
|
@cat doc/manual/src/command-ref/conf-file-prefix.md > $@.tmp
|
||||||
@@ -64,7 +64,6 @@ $(d)/conf-file.json: $(bindir)/nix
|
|||||||
$(d)/src/expressions/builtins.md: $(d)/builtins.json $(d)/generate-builtins.nix $(d)/src/expressions/builtins-prefix.md $(bindir)/nix
|
$(d)/src/expressions/builtins.md: $(d)/builtins.json $(d)/generate-builtins.nix $(d)/src/expressions/builtins-prefix.md $(bindir)/nix
|
||||||
@cat doc/manual/src/expressions/builtins-prefix.md > $@.tmp
|
@cat doc/manual/src/expressions/builtins-prefix.md > $@.tmp
|
||||||
$(trace-gen) $(nix-eval) --expr 'import doc/manual/generate-builtins.nix (builtins.fromJSON (builtins.readFile $<))' >> $@.tmp
|
$(trace-gen) $(nix-eval) --expr 'import doc/manual/generate-builtins.nix (builtins.fromJSON (builtins.readFile $<))' >> $@.tmp
|
||||||
@cat doc/manual/src/expressions/builtins-suffix.md >> $@.tmp
|
|
||||||
@mv $@.tmp $@
|
@mv $@.tmp $@
|
||||||
|
|
||||||
$(d)/builtins.json: $(bindir)/nix
|
$(d)/builtins.json: $(bindir)/nix
|
||||||
@@ -75,28 +74,17 @@ $(d)/builtins.json: $(bindir)/nix
|
|||||||
install: $(docdir)/manual/index.html
|
install: $(docdir)/manual/index.html
|
||||||
|
|
||||||
# Generate 'nix' manpages.
|
# Generate 'nix' manpages.
|
||||||
install: $(mandir)/man1/nix3-manpages
|
install: $(d)/src/command-ref/new-cli
|
||||||
man: doc/manual/generated/man1/nix3-manpages
|
|
||||||
all: doc/manual/generated/man1/nix3-manpages
|
|
||||||
|
|
||||||
$(mandir)/man1/nix3-manpages: doc/manual/generated/man1/nix3-manpages
|
|
||||||
@mkdir -p $(DESTDIR)$$(dirname $@)
|
|
||||||
$(trace-install) install -m 0644 $$(dirname $<)/* $(DESTDIR)$$(dirname $@)
|
|
||||||
|
|
||||||
doc/manual/generated/man1/nix3-manpages: $(d)/src/command-ref/new-cli
|
|
||||||
@mkdir -p $(DESTDIR)$$(dirname $@)
|
|
||||||
$(trace-gen) for i in doc/manual/src/command-ref/new-cli/*.md; do \
|
$(trace-gen) for i in doc/manual/src/command-ref/new-cli/*.md; do \
|
||||||
name=$$(basename $$i .md); \
|
name=$$(basename $$i .md); \
|
||||||
tmpFile=$$(mktemp); \
|
|
||||||
if [[ $$name = SUMMARY ]]; then continue; fi; \
|
if [[ $$name = SUMMARY ]]; then continue; fi; \
|
||||||
printf "Title: %s\n\n" "$$name" > $$tmpFile; \
|
printf "Title: %s\n\n" "$$name" > $$i.tmp; \
|
||||||
cat $$i >> $$tmpFile; \
|
cat $$i >> $$i.tmp; \
|
||||||
lowdown -sT man -M section=1 $$tmpFile -o $(DESTDIR)$$(dirname $@)/$$name.1; \
|
lowdown -sT man -M section=1 $$i.tmp -o $(mandir)/man1/$$name.1; \
|
||||||
rm $$tmpFile; \
|
|
||||||
done
|
done
|
||||||
@touch $@
|
|
||||||
|
|
||||||
$(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/custom.css $(d)/src/SUMMARY.md $(d)/src/command-ref/new-cli $(d)/src/command-ref/conf-file.md $(d)/src/expressions/builtins.md $(call rwildcard, $(d)/src, *.md)
|
$(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/custom.css $(d)/src/SUMMARY.md $(d)/src/command-ref/new-cli $(d)/src/command-ref/conf-file.md $(d)/src/expressions/builtins.md
|
||||||
$(trace-gen) RUST_LOG=warn mdbook build doc/manual -d $(DESTDIR)$(docdir)/manual
|
$(trace-gen) RUST_LOG=warn mdbook build doc/manual -d $(docdir)/manual
|
||||||
|
@cp doc/manual/highlight.pack.js $(docdir)/manual/highlight.js
|
||||||
|
|
||||||
endif
|
endif
|
||||||
@@ -9,7 +9,6 @@
|
|||||||
- [Prerequisites](installation/prerequisites-source.md)
|
- [Prerequisites](installation/prerequisites-source.md)
|
||||||
- [Obtaining a Source Distribution](installation/obtaining-source.md)
|
- [Obtaining a Source Distribution](installation/obtaining-source.md)
|
||||||
- [Building Nix from Source](installation/building-source.md)
|
- [Building Nix from Source](installation/building-source.md)
|
||||||
- [Using Nix within Docker](installation/installing-docker.md)
|
|
||||||
- [Security](installation/nix-security.md)
|
- [Security](installation/nix-security.md)
|
||||||
- [Single-User Mode](installation/single-user.md)
|
- [Single-User Mode](installation/single-user.md)
|
||||||
- [Multi-User Mode](installation/multi-user.md)
|
- [Multi-User Mode](installation/multi-user.md)
|
||||||
@@ -71,10 +70,6 @@
|
|||||||
- [Hacking](contributing/hacking.md)
|
- [Hacking](contributing/hacking.md)
|
||||||
- [CLI guideline](contributing/cli-guideline.md)
|
- [CLI guideline](contributing/cli-guideline.md)
|
||||||
- [Release Notes](release-notes/release-notes.md)
|
- [Release Notes](release-notes/release-notes.md)
|
||||||
- [Release X.Y (202?-??-??)](release-notes/rl-next.md)
|
|
||||||
- [Release 2.6 (2022-01-24)](release-notes/rl-2.6.md)
|
|
||||||
- [Release 2.5 (2021-12-13)](release-notes/rl-2.5.md)
|
|
||||||
- [Release 2.4 (2021-11-01)](release-notes/rl-2.4.md)
|
|
||||||
- [Release 2.3 (2019-09-04)](release-notes/rl-2.3.md)
|
- [Release 2.3 (2019-09-04)](release-notes/rl-2.3.md)
|
||||||
- [Release 2.2 (2019-01-11)](release-notes/rl-2.2.md)
|
- [Release 2.2 (2019-01-11)](release-notes/rl-2.2.md)
|
||||||
- [Release 2.1 (2018-09-02)](release-notes/rl-2.1.md)
|
- [Release 2.1 (2018-09-02)](release-notes/rl-2.1.md)
|
||||||
|
|||||||
@@ -53,8 +53,8 @@ example, the following command allows you to build a derivation for
|
|||||||
$ uname
|
$ uname
|
||||||
Linux
|
Linux
|
||||||
|
|
||||||
$ nix build --impure \
|
$ nix build \
|
||||||
--expr '(with import <nixpkgs> { system = "x86_64-darwin"; }; runCommand "foo" {} "uname > $out")' \
|
'(with import <nixpkgs> { system = "x86_64-darwin"; }; runCommand "foo" {} "uname > $out")' \
|
||||||
--builders 'ssh://mac x86_64-darwin'
|
--builders 'ssh://mac x86_64-darwin'
|
||||||
[1/0/1 built, 0.0 MiB DL] building foo on ssh://mac
|
[1/0/1 built, 0.0 MiB DL] building foo on ssh://mac
|
||||||
|
|
||||||
|
|||||||
@@ -16,9 +16,8 @@ By default Nix reads settings from the following places:
|
|||||||
will be loaded in reverse order.
|
will be loaded in reverse order.
|
||||||
|
|
||||||
Otherwise it will look for `nix/nix.conf` files in `XDG_CONFIG_DIRS`
|
Otherwise it will look for `nix/nix.conf` files in `XDG_CONFIG_DIRS`
|
||||||
and `XDG_CONFIG_HOME`. If unset, `XDG_CONFIG_DIRS` defaults to
|
and `XDG_CONFIG_HOME`. If these are unset, it will look in
|
||||||
`/etc/xdg`, and `XDG_CONFIG_HOME` defaults to `$HOME/.config`
|
`$HOME/.config/nix.conf`.
|
||||||
as per [XDG Base Directory Specification](https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html).
|
|
||||||
|
|
||||||
- If `NIX_CONFIG` is set, its contents is treated as the contents of
|
- If `NIX_CONFIG` is set, its contents is treated as the contents of
|
||||||
a configuration file.
|
a configuration file.
|
||||||
|
|||||||
@@ -10,39 +10,35 @@ Most Nix commands interpret the following environment variables:
|
|||||||
A colon-separated list of directories used to look up Nix
|
A colon-separated list of directories used to look up Nix
|
||||||
expressions enclosed in angle brackets (i.e., `<path>`). For
|
expressions enclosed in angle brackets (i.e., `<path>`). For
|
||||||
instance, the value
|
instance, the value
|
||||||
|
|
||||||
/home/eelco/Dev:/etc/nixos
|
/home/eelco/Dev:/etc/nixos
|
||||||
|
|
||||||
will cause Nix to look for paths relative to `/home/eelco/Dev` and
|
will cause Nix to look for paths relative to `/home/eelco/Dev` and
|
||||||
`/etc/nixos`, in this order. It is also possible to match paths
|
`/etc/nixos`, in this order. It is also possible to match paths
|
||||||
against a prefix. For example, the value
|
against a prefix. For example, the value
|
||||||
|
|
||||||
nixpkgs=/home/eelco/Dev/nixpkgs-branch:/etc/nixos
|
nixpkgs=/home/eelco/Dev/nixpkgs-branch:/etc/nixos
|
||||||
|
|
||||||
will cause Nix to search for `<nixpkgs/path>` in
|
will cause Nix to search for `<nixpkgs/path>` in
|
||||||
`/home/eelco/Dev/nixpkgs-branch/path` and `/etc/nixos/nixpkgs/path`.
|
`/home/eelco/Dev/nixpkgs-branch/path` and `/etc/nixos/nixpkgs/path`.
|
||||||
|
|
||||||
If a path in the Nix search path starts with `http://` or
|
If a path in the Nix search path starts with `http://` or
|
||||||
`https://`, it is interpreted as the URL of a tarball that will be
|
`https://`, it is interpreted as the URL of a tarball that will be
|
||||||
downloaded and unpacked to a temporary location. The tarball must
|
downloaded and unpacked to a temporary location. The tarball must
|
||||||
consist of a single top-level directory. For example, setting
|
consist of a single top-level directory. For example, setting
|
||||||
`NIX_PATH` to
|
`NIX_PATH` to
|
||||||
|
|
||||||
nixpkgs=https://github.com/NixOS/nixpkgs/archive/master.tar.gz
|
nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixos-15.09.tar.gz
|
||||||
|
|
||||||
tells Nix to download and use the current contents of the
|
tells Nix to download the latest revision in the Nixpkgs/NixOS 15.09
|
||||||
`master` branch in the `nixpkgs` repository.
|
channel.
|
||||||
|
|
||||||
The URLs of the tarballs from the official nixos.org channels (see
|
A following shorthand can be used to refer to the official channels:
|
||||||
[the manual for `nix-channel`](nix-channel.md)) can be abbreviated
|
|
||||||
as `channel:<channel-name>`. For instance, the following two
|
nixpkgs=channel:nixos-15.09
|
||||||
values of `NIX_PATH` are equivalent:
|
|
||||||
|
The search path can be extended using the `-I` option, which takes
|
||||||
nixpkgs=channel:nixos-21.05
|
precedence over `NIX_PATH`.
|
||||||
nixpkgs=https://nixos.org/channels/nixos-21.05/nixexprs.tar.xz
|
|
||||||
|
|
||||||
The Nix search path can also be extended using the `-I` option to
|
|
||||||
many Nix commands, which takes precedence over `NIX_PATH`.
|
|
||||||
|
|
||||||
- `NIX_IGNORE_SYMLINK_STORE`\
|
- `NIX_IGNORE_SYMLINK_STORE`\
|
||||||
Normally, the Nix store directory (typically `/nix/store`) is not
|
Normally, the Nix store directory (typically `/nix/store`) is not
|
||||||
@@ -54,7 +50,7 @@ Most Nix commands interpret the following environment variables:
|
|||||||
builds are deployed to machines where `/nix/store` resolves
|
builds are deployed to machines where `/nix/store` resolves
|
||||||
differently. If you are sure that you’re not going to do that, you
|
differently. If you are sure that you’re not going to do that, you
|
||||||
can set `NIX_IGNORE_SYMLINK_STORE` to `1`.
|
can set `NIX_IGNORE_SYMLINK_STORE` to `1`.
|
||||||
|
|
||||||
Note that if you’re symlinking the Nix store so that you can put it
|
Note that if you’re symlinking the Nix store so that you can put it
|
||||||
on another file system than the root file system, on Linux you’re
|
on another file system than the root file system, on Linux you’re
|
||||||
better off using `bind` mount points, e.g.,
|
better off using `bind` mount points, e.g.,
|
||||||
@@ -63,7 +59,7 @@ Most Nix commands interpret the following environment variables:
|
|||||||
$ mkdir /nix
|
$ mkdir /nix
|
||||||
$ mount -o bind /mnt/otherdisk/nix /nix
|
$ mount -o bind /mnt/otherdisk/nix /nix
|
||||||
```
|
```
|
||||||
|
|
||||||
Consult the mount 8 manual page for details.
|
Consult the mount 8 manual page for details.
|
||||||
|
|
||||||
- `NIX_STORE_DIR`\
|
- `NIX_STORE_DIR`\
|
||||||
|
|||||||
@@ -238,16 +238,7 @@ a number of possible ways:
|
|||||||
|
|
||||||
## Examples
|
## Examples
|
||||||
|
|
||||||
To install a package using a specific attribute path from the active Nix expression:
|
To install a specific version of `gcc` from the active Nix expression:
|
||||||
|
|
||||||
```console
|
|
||||||
$ nix-env -iA gcc40mips
|
|
||||||
installing `gcc-4.0.2'
|
|
||||||
$ nix-env -iA xorg.xorgserver
|
|
||||||
installing `xorg-server-1.2.0'
|
|
||||||
```
|
|
||||||
|
|
||||||
To install a specific version of `gcc` using the derivation name:
|
|
||||||
|
|
||||||
```console
|
```console
|
||||||
$ nix-env --install gcc-3.3.2
|
$ nix-env --install gcc-3.3.2
|
||||||
@@ -255,9 +246,6 @@ installing `gcc-3.3.2'
|
|||||||
uninstalling `gcc-3.1'
|
uninstalling `gcc-3.1'
|
||||||
```
|
```
|
||||||
|
|
||||||
Using attribute path for selecting a package is preferred,
|
|
||||||
as it is much faster and there will not be multiple matches.
|
|
||||||
|
|
||||||
Note the previously installed version is removed, since
|
Note the previously installed version is removed, since
|
||||||
`--preserve-installed` was not specified.
|
`--preserve-installed` was not specified.
|
||||||
|
|
||||||
@@ -268,6 +256,13 @@ $ nix-env --install gcc
|
|||||||
installing `gcc-3.3.2'
|
installing `gcc-3.3.2'
|
||||||
```
|
```
|
||||||
|
|
||||||
|
To install using a specific attribute:
|
||||||
|
|
||||||
|
```console
|
||||||
|
$ nix-env -i -A gcc40mips
|
||||||
|
$ nix-env -i -A xorg.xorgserver
|
||||||
|
```
|
||||||
|
|
||||||
To install all derivations in the Nix expression `foo.nix`:
|
To install all derivations in the Nix expression `foo.nix`:
|
||||||
|
|
||||||
```console
|
```console
|
||||||
@@ -379,29 +374,22 @@ For the other flags, see `--install`.
|
|||||||
## Examples
|
## Examples
|
||||||
|
|
||||||
```console
|
```console
|
||||||
$ nix-env --upgrade -A nixpkgs.gcc
|
$ nix-env --upgrade gcc
|
||||||
upgrading `gcc-3.3.1' to `gcc-3.4'
|
upgrading `gcc-3.3.1' to `gcc-3.4'
|
||||||
```
|
```
|
||||||
|
|
||||||
When there are no updates available, nothing will happen:
|
|
||||||
|
|
||||||
```console
|
```console
|
||||||
$ nix-env --upgrade -A nixpkgs.pan
|
$ nix-env -u gcc-3.3.2 --always (switch to a specific version)
|
||||||
```
|
|
||||||
|
|
||||||
Using `-A` is preferred when possible, as it is faster and unambiguous but
|
|
||||||
it is also possible to upgrade to a specific version by matching the derivation name:
|
|
||||||
|
|
||||||
```console
|
|
||||||
$ nix-env -u gcc-3.3.2 --always
|
|
||||||
upgrading `gcc-3.4' to `gcc-3.3.2'
|
upgrading `gcc-3.4' to `gcc-3.3.2'
|
||||||
```
|
```
|
||||||
|
|
||||||
To try to upgrade everything
|
```console
|
||||||
(matching packages based on the part of the derivation name without version):
|
$ nix-env --upgrade pan
|
||||||
|
(no upgrades available, so nothing happens)
|
||||||
|
```
|
||||||
|
|
||||||
```console
|
```console
|
||||||
$ nix-env -u
|
$ nix-env -u (try to upgrade everything)
|
||||||
upgrading `hello-2.1.2' to `hello-2.1.3'
|
upgrading `hello-2.1.2' to `hello-2.1.3'
|
||||||
upgrading `mozilla-1.2' to `mozilla-1.4'
|
upgrading `mozilla-1.2' to `mozilla-1.4'
|
||||||
```
|
```
|
||||||
@@ -413,7 +401,7 @@ of a derivation `x` by looking at their respective `name` attributes.
|
|||||||
The names (e.g., `gcc-3.3.1` are split into two parts: the package name
|
The names (e.g., `gcc-3.3.1` are split into two parts: the package name
|
||||||
(`gcc`), and the version (`3.3.1`). The version part starts after the
|
(`gcc`), and the version (`3.3.1`). The version part starts after the
|
||||||
first dash not followed by a letter. `x` is considered an upgrade of `y`
|
first dash not followed by a letter. `x` is considered an upgrade of `y`
|
||||||
if their package names match, and the version of `y` is higher than that
|
if their package names match, and the version of `y` is higher that that
|
||||||
of `x`.
|
of `x`.
|
||||||
|
|
||||||
The versions are compared by splitting them into contiguous components
|
The versions are compared by splitting them into contiguous components
|
||||||
|
|||||||
@@ -11,8 +11,8 @@
|
|||||||
[`--command` *cmd*]
|
[`--command` *cmd*]
|
||||||
[`--run` *cmd*]
|
[`--run` *cmd*]
|
||||||
[`--exclude` *regexp*]
|
[`--exclude` *regexp*]
|
||||||
[`--pure`]
|
[--pure]
|
||||||
[`--keep` *name*]
|
[--keep *name*]
|
||||||
{{`--packages` | `-p`} {*packages* | *expressions*} … | [*path*]}
|
{{`--packages` | `-p`} {*packages* | *expressions*} … | [*path*]}
|
||||||
|
|
||||||
# Description
|
# Description
|
||||||
@@ -101,8 +101,7 @@ The following common options are supported:
|
|||||||
|
|
||||||
- `NIX_BUILD_SHELL`\
|
- `NIX_BUILD_SHELL`\
|
||||||
Shell used to start the interactive environment. Defaults to the
|
Shell used to start the interactive environment. Defaults to the
|
||||||
`bash` found in `<nixpkgs>`, falling back to the `bash` found in
|
`bash` found in `PATH`.
|
||||||
`PATH` if not found.
|
|
||||||
|
|
||||||
# Examples
|
# Examples
|
||||||
|
|
||||||
@@ -111,19 +110,13 @@ shell in which to build it:
|
|||||||
|
|
||||||
```console
|
```console
|
||||||
$ nix-shell '<nixpkgs>' -A pan
|
$ nix-shell '<nixpkgs>' -A pan
|
||||||
[nix-shell]$ eval ${unpackPhase:-unpackPhase}
|
[nix-shell]$ unpackPhase
|
||||||
[nix-shell]$ cd pan-*
|
[nix-shell]$ cd pan-*
|
||||||
[nix-shell]$ eval ${configurePhase:-configurePhase}
|
[nix-shell]$ configurePhase
|
||||||
[nix-shell]$ eval ${buildPhase:-buildPhase}
|
[nix-shell]$ buildPhase
|
||||||
[nix-shell]$ ./pan/gui/pan
|
[nix-shell]$ ./pan/gui/pan
|
||||||
```
|
```
|
||||||
|
|
||||||
The reason we use form `eval ${configurePhase:-configurePhase}` here is because
|
|
||||||
those packages that override these phases do so by exporting the overridden
|
|
||||||
values in the environment variable of the same name.
|
|
||||||
Here bash is being told to either evaluate the contents of 'configurePhase',
|
|
||||||
if it exists as a variable, otherwise evaluate the configurePhase function.
|
|
||||||
|
|
||||||
To clear the environment first, and do some additional automatic
|
To clear the environment first, and do some additional automatic
|
||||||
initialisation of the interactive shell:
|
initialisation of the interactive shell:
|
||||||
|
|
||||||
|
|||||||
@@ -125,7 +125,7 @@ Special exit codes:
|
|||||||
|
|
||||||
- `104`\
|
- `104`\
|
||||||
Not deterministic, the build succeeded in check mode but the
|
Not deterministic, the build succeeded in check mode but the
|
||||||
resulting output is not binary reproducible.
|
resulting output is not binary reproducable.
|
||||||
|
|
||||||
With the `--keep-going` flag it's possible for multiple failures to
|
With the `--keep-going` flag it's possible for multiple failures to
|
||||||
occur, in this case the 1xx status codes are or combined using binary
|
occur, in this case the 1xx status codes are or combined using binary
|
||||||
@@ -321,8 +321,8 @@ symlink.
|
|||||||
This query has one option:
|
This query has one option:
|
||||||
|
|
||||||
- `--include-outputs`
|
- `--include-outputs`
|
||||||
Also include the existing output paths of store derivations,
|
Also include the output path of store derivations, and their
|
||||||
and their closures.
|
closures.
|
||||||
|
|
||||||
This query can be used to implement various kinds of deployment. A
|
This query can be used to implement various kinds of deployment. A
|
||||||
*source deployment* is obtained by distributing the closure of a
|
*source deployment* is obtained by distributing the closure of a
|
||||||
|
|||||||
@@ -162,11 +162,11 @@ Most Nix commands accept the following command-line options:
|
|||||||
}: ...
|
}: ...
|
||||||
```
|
```
|
||||||
|
|
||||||
So if you call this Nix expression (e.g., when you do `nix-env -iA
|
So if you call this Nix expression (e.g., when you do `nix-env -i
|
||||||
pkgname`), the function will be called automatically using the
|
pkgname`), the function will be called automatically using the
|
||||||
value [`builtins.currentSystem`](../expressions/builtins.md) for
|
value [`builtins.currentSystem`](../expressions/builtins.md) for
|
||||||
the `system` argument. You can override this using `--arg`, e.g.,
|
the `system` argument. You can override this using `--arg`, e.g.,
|
||||||
`nix-env -iA pkgname --arg system \"i686-freebsd\"`. (Note that
|
`nix-env -i pkgname --arg system \"i686-freebsd\"`. (Note that
|
||||||
since the argument is a Nix string literal, you have to escape the
|
since the argument is a Nix string literal, you have to escape the
|
||||||
quotes.)
|
quotes.)
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
## Goals
|
## Goals
|
||||||
|
|
||||||
Purpose of this document is to provide a clear direction to **help design
|
Purpose of this document is to provide a clear direction to **help design
|
||||||
delightful command line** experience. This document contains guidelines to
|
delightful command line** experience. This document contain guidelines to
|
||||||
follow to ensure a consistent and approachable user experience.
|
follow to ensure a consistent and approachable user experience.
|
||||||
|
|
||||||
## Overview
|
## Overview
|
||||||
@@ -103,7 +103,7 @@ impacted the most by bad user experience.
|
|||||||
# Help is essential
|
# Help is essential
|
||||||
|
|
||||||
Help should be built into your command line so that new users can gradually
|
Help should be built into your command line so that new users can gradually
|
||||||
discover new features when they need them.
|
discover new features when they need them.
|
||||||
|
|
||||||
## Looking for help
|
## Looking for help
|
||||||
|
|
||||||
@@ -115,7 +115,7 @@ The rules are:
|
|||||||
|
|
||||||
- Help is shown by using `--help` or `help` command (eg `nix` `--``help` or
|
- Help is shown by using `--help` or `help` command (eg `nix` `--``help` or
|
||||||
`nix help`).
|
`nix help`).
|
||||||
- For non-COMMANDs (eg. `nix` `--``help` and `nix store` `--``help`) we **show
|
- For non-COMMANDs (eg. `nix` `--``help` and `nix store` `--``help`) we **show
|
||||||
a summary** of most common use cases. Summary is presented on the STDOUT
|
a summary** of most common use cases. Summary is presented on the STDOUT
|
||||||
without any use of PAGER.
|
without any use of PAGER.
|
||||||
- For COMMANDs (eg. `nix init` `--``help` or `nix help init`) we display the
|
- For COMMANDs (eg. `nix init` `--``help` or `nix help init`) we display the
|
||||||
@@ -176,7 +176,7 @@ $ nix init --template=template#pyton
|
|||||||
------------------------------------------------------------------------
|
------------------------------------------------------------------------
|
||||||
Initializing Nix project at `/path/to/here`.
|
Initializing Nix project at `/path/to/here`.
|
||||||
Select a template for you new project:
|
Select a template for you new project:
|
||||||
|> template#python
|
|> template#pyton
|
||||||
template#python-pip
|
template#python-pip
|
||||||
template#python-poetry
|
template#python-poetry
|
||||||
```
|
```
|
||||||
@@ -230,17 +230,17 @@ Now **Learn** part of the output is where you educate users. You should only
|
|||||||
show it when you know that a build will take some time and not annoy users of
|
show it when you know that a build will take some time and not annoy users of
|
||||||
the builds that take only few seconds.
|
the builds that take only few seconds.
|
||||||
|
|
||||||
Every feature like this should go through an intensive review and testing to
|
Every feature like this should go though a intensive review and testing to
|
||||||
collect as much feedback as possible and to fine tune every little detail. If
|
collect as much a feedback as possible and to fine tune every little detail. If
|
||||||
done right this can be an awesome features beginners and advance users will
|
done right this can be an awesome features beginners and advance users will
|
||||||
love, but if not done perfectly it will annoy users and leave bad impression.
|
love, but if not done perfectly it will annoy users and leave bad impression.
|
||||||
|
|
||||||
# Input
|
# Input
|
||||||
|
|
||||||
Input to a command is provided via `ARGUMENTS` and `OPTIONS`.
|
Input to a command is provided via `ARGUMENTS` and `OPTIONS`.
|
||||||
|
|
||||||
`ARGUMENTS` represent a required input for a function. When choosing to use
|
`ARGUMENTS` represent a required input for a function. When choosing to use
|
||||||
`ARGUMENTS` over `OPTIONS` please be aware of the downsides that come with it:
|
`ARGUMENT` over function please be aware of the downsides that come with it:
|
||||||
|
|
||||||
- User will need to remember the order of `ARGUMENTS`. This is not a problem if
|
- User will need to remember the order of `ARGUMENTS`. This is not a problem if
|
||||||
there is only one `ARGUMENT`.
|
there is only one `ARGUMENT`.
|
||||||
@@ -253,7 +253,7 @@ developer consider the downsides and choose wisely.
|
|||||||
|
|
||||||
## Naming the `OPTIONS`
|
## Naming the `OPTIONS`
|
||||||
|
|
||||||
The only naming convention - apart from the ones mentioned in Naming the
|
Then only naming convention - apart from the ones mentioned in Naming the
|
||||||
`COMMANDS` section is how flags are named.
|
`COMMANDS` section is how flags are named.
|
||||||
|
|
||||||
Flags are a type of `OPTION` that represent an option that can be turned ON of
|
Flags are a type of `OPTION` that represent an option that can be turned ON of
|
||||||
@@ -271,12 +271,12 @@ to improve the discoverability of possible input. A new user will most likely
|
|||||||
not know which `ARGUMENTS` and `OPTIONS` are required or which values are
|
not know which `ARGUMENTS` and `OPTIONS` are required or which values are
|
||||||
possible for those options.
|
possible for those options.
|
||||||
|
|
||||||
In case the user does not provide the input or they provide wrong input,
|
In cases, the user might not provide the input or they provide wrong input,
|
||||||
rather than show the error, prompt a user with an option to find and select
|
rather then show the error, prompt a user with an option to find and select
|
||||||
correct input (see examples).
|
correct input (see examples).
|
||||||
|
|
||||||
Prompting is of course not required when TTY is not attached to STDIN. This
|
Prompting is of course not required when TTY is not attached to STDIN. This
|
||||||
would mean that scripts won't need to handle prompt, but rather handle errors.
|
would mean that scripts wont need to handle prompt, but rather handle errors.
|
||||||
|
|
||||||
A place to use prompt and provide user with interactive select
|
A place to use prompt and provide user with interactive select
|
||||||
|
|
||||||
@@ -300,9 +300,9 @@ going to happen.
|
|||||||
```shell
|
```shell
|
||||||
$ nix build --option substitutors https://cache.example.org
|
$ nix build --option substitutors https://cache.example.org
|
||||||
------------------------------------------------------------------------
|
------------------------------------------------------------------------
|
||||||
Warning! A security related question needs to be answered.
|
Warning! A security related question need to be answered.
|
||||||
------------------------------------------------------------------------
|
------------------------------------------------------------------------
|
||||||
The following substitutors will be used to in `my-project`:
|
The following substitutors will be used to in `my-project`:
|
||||||
- https://cache.example.org
|
- https://cache.example.org
|
||||||
|
|
||||||
Do you allow `my-project` to use above mentioned substitutors?
|
Do you allow `my-project` to use above mentioned substitutors?
|
||||||
@@ -311,14 +311,14 @@ $ nix build --option substitutors https://cache.example.org
|
|||||||
|
|
||||||
# Output
|
# Output
|
||||||
|
|
||||||
Terminal output can be quite limiting in many ways. Which should force us to
|
Terminal output can be quite limiting in many ways. Which should forces us to
|
||||||
think about the experience even more. As with every design the output is a
|
think about the experience even more. As with every design the output is a
|
||||||
compromise between being terse and being verbose, between showing help to
|
compromise between being terse and being verbose, between showing help to
|
||||||
beginners and annoying advance users. For this it is important that we know
|
beginners and annoying advance users. For this it is important that we know
|
||||||
what are the priorities.
|
what are the priorities.
|
||||||
|
|
||||||
Nix command line should be first and foremost written with beginners in mind.
|
Nix command line should be first and foremost written with beginners in mind.
|
||||||
But users won't stay beginners for long and what was once useful might quickly
|
But users wont stay beginners for long and what was once useful might quickly
|
||||||
become annoying. There is no golden rule that we can give in this guideline
|
become annoying. There is no golden rule that we can give in this guideline
|
||||||
that would make it easier how to draw a line and find best compromise.
|
that would make it easier how to draw a line and find best compromise.
|
||||||
|
|
||||||
@@ -342,7 +342,7 @@ also allowing them to redirect content to a file. For example:
|
|||||||
```shell
|
```shell
|
||||||
$ nix build > build.txt
|
$ nix build > build.txt
|
||||||
------------------------------------------------------------------------
|
------------------------------------------------------------------------
|
||||||
Error! Attribute `bin` missing at (1:94) from string.
|
Error! Atrribute `bin` missing at (1:94) from string.
|
||||||
------------------------------------------------------------------------
|
------------------------------------------------------------------------
|
||||||
|
|
||||||
1| with import <nixpkgs> { }; (pkgs.runCommandCC or pkgs.runCommand) "shell" { buildInputs = [ (surge.bin) ]; } ""
|
1| with import <nixpkgs> { }; (pkgs.runCommandCC or pkgs.runCommand) "shell" { buildInputs = [ (surge.bin) ]; } ""
|
||||||
@@ -408,7 +408,7 @@ Above command clearly states that command successfully completed. And in case
|
|||||||
of `nix build`, which is a command that might take some time to complete, it is
|
of `nix build`, which is a command that might take some time to complete, it is
|
||||||
equally important to also show that a command started.
|
equally important to also show that a command started.
|
||||||
|
|
||||||
## Text alignment
|
## Text alignment
|
||||||
|
|
||||||
Text alignment is the number one design element that will present all of the
|
Text alignment is the number one design element that will present all of the
|
||||||
Nix commands as a family and not as separate tools glued together.
|
Nix commands as a family and not as separate tools glued together.
|
||||||
@@ -419,7 +419,7 @@ The format we should follow is:
|
|||||||
$ nix COMMAND
|
$ nix COMMAND
|
||||||
VERB_1 NOUN and other words
|
VERB_1 NOUN and other words
|
||||||
VERB__1 NOUN and other words
|
VERB__1 NOUN and other words
|
||||||
|> Some details
|
|> Some details
|
||||||
```
|
```
|
||||||
|
|
||||||
Few rules that we can extract from above example:
|
Few rules that we can extract from above example:
|
||||||
@@ -444,13 +444,13 @@ is not even notable, therefore relying on it wouldn’t make much sense.
|
|||||||
|
|
||||||
**The bright text is much better supported** across terminals and color
|
**The bright text is much better supported** across terminals and color
|
||||||
schemes. Most of the time the difference is perceived as if the bright text
|
schemes. Most of the time the difference is perceived as if the bright text
|
||||||
would be bold.
|
would be bold.
|
||||||
|
|
||||||
## Colors
|
## Colors
|
||||||
|
|
||||||
Humans are already conditioned by society to attach certain meaning to certain
|
Humans are already conditioned by society to attach certain meaning to certain
|
||||||
colors. While the meaning is not universal, a simple collection of colors is
|
colors. While the meaning is not universal, a simple collection of colors is
|
||||||
used to represent basic emotions.
|
used to represent basic emotions.
|
||||||
|
|
||||||
Colors that can be used in output
|
Colors that can be used in output
|
||||||
|
|
||||||
@@ -508,7 +508,7 @@ can, with a few key strokes, be changed into and advance introspection tool.
|
|||||||
|
|
||||||
### Progress
|
### Progress
|
||||||
|
|
||||||
For longer running commands we should provide and overview the progress.
|
For longer running commands we should provide and overview of the progress.
|
||||||
This is shown best in `nix build` example:
|
This is shown best in `nix build` example:
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
@@ -553,9 +553,9 @@ going to happen.
|
|||||||
```shell
|
```shell
|
||||||
$ nix build --option substitutors https://cache.example.org
|
$ nix build --option substitutors https://cache.example.org
|
||||||
------------------------------------------------------------------------
|
------------------------------------------------------------------------
|
||||||
Warning! A security related question needs to be answered.
|
Warning! A security related question need to be answered.
|
||||||
------------------------------------------------------------------------
|
------------------------------------------------------------------------
|
||||||
The following substitutors will be used to in `my-project`:
|
The following substitutors will be used to in `my-project`:
|
||||||
- https://cache.example.org
|
- https://cache.example.org
|
||||||
|
|
||||||
Do you allow `my-project` to use above mentioned substitutors?
|
Do you allow `my-project` to use above mentioned substitutors?
|
||||||
@@ -566,7 +566,7 @@ $ nix build --option substitutors https://cache.example.org
|
|||||||
|
|
||||||
There are many ways that you can control verbosity.
|
There are many ways that you can control verbosity.
|
||||||
|
|
||||||
Verbosity levels are:
|
Verbosity levels are:
|
||||||
|
|
||||||
- `ERROR` (level 0)
|
- `ERROR` (level 0)
|
||||||
- `WARN` (level 1)
|
- `WARN` (level 1)
|
||||||
@@ -586,4 +586,4 @@ There are also two shortcuts, `--debug` to run in `DEBUG` verbosity level and
|
|||||||
|
|
||||||
# Appendix 1: Commands naming exceptions
|
# Appendix 1: Commands naming exceptions
|
||||||
|
|
||||||
`nix init` and `nix repl` are well established
|
`nix init` and `nix repl` are well established
|
||||||
@@ -35,25 +35,6 @@ variables are set up so that those dependencies can be found:
|
|||||||
$ nix-shell
|
$ nix-shell
|
||||||
```
|
```
|
||||||
|
|
||||||
or if you have a flake-enabled nix:
|
|
||||||
|
|
||||||
```console
|
|
||||||
$ nix develop
|
|
||||||
```
|
|
||||||
|
|
||||||
To get a shell with a different compilation environment (e.g. stdenv,
|
|
||||||
gccStdenv, clangStdenv, clang11Stdenv):
|
|
||||||
|
|
||||||
```console
|
|
||||||
$ nix-shell -A devShells.x86_64-linux.clang11StdenvPackages
|
|
||||||
```
|
|
||||||
|
|
||||||
or if you have a flake-enabled nix:
|
|
||||||
|
|
||||||
```console
|
|
||||||
$ nix develop .#clang11StdenvPackages
|
|
||||||
```
|
|
||||||
|
|
||||||
To build Nix itself in this shell:
|
To build Nix itself in this shell:
|
||||||
|
|
||||||
```console
|
```console
|
||||||
|
|||||||
@@ -237,7 +237,7 @@ Derivations can declare some infrequently used optional attributes.
|
|||||||
- `preferLocalBuild`\
|
- `preferLocalBuild`\
|
||||||
If this attribute is set to `true` and [distributed building is
|
If this attribute is set to `true` and [distributed building is
|
||||||
enabled](../advanced-topics/distributed-builds.md), then, if
|
enabled](../advanced-topics/distributed-builds.md), then, if
|
||||||
possible, the derivation will be built locally instead of forwarded
|
possible, the derivaton will be built locally instead of forwarded
|
||||||
to a remote machine. This is appropriate for trivial builders
|
to a remote machine. This is appropriate for trivial builders
|
||||||
where the cost of doing a download or remote build would exceed
|
where the cost of doing a download or remote build would exceed
|
||||||
the cost of building locally.
|
the cost of building locally.
|
||||||
|
|||||||
@@ -9,8 +9,7 @@ scope. Instead, you can access them through the `builtins` built-in
|
|||||||
value, which is a set that contains all built-in functions and values.
|
value, which is a set that contains all built-in functions and values.
|
||||||
For instance, `derivation` is also available as `builtins.derivation`.
|
For instance, `derivation` is also available as `builtins.derivation`.
|
||||||
|
|
||||||
<dl>
|
- `derivation` *attrs*; `builtins.derivation` *attrs*\
|
||||||
<dt><code>derivation <var>attrs</var></code>;
|
|
||||||
<code>builtins.derivation <var>attrs</var></code></dt>
|
`derivation` is described in [its own section](derivations.md).
|
||||||
<dd><p><var>derivation</var> is described in
|
|
||||||
<a href="derivations.md">its own section</a>.</p></dd>
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
</dl>
|
|
||||||
@@ -26,7 +26,7 @@ elements (referenced from the figure by number):
|
|||||||
called with three arguments: `stdenv`, `fetchurl`, and `perl`. They
|
called with three arguments: `stdenv`, `fetchurl`, and `perl`. They
|
||||||
are needed to build Hello, but we don't know how to build them here;
|
are needed to build Hello, but we don't know how to build them here;
|
||||||
that's why they are function arguments. `stdenv` is a package that
|
that's why they are function arguments. `stdenv` is a package that
|
||||||
is used by almost all Nix Packages; it provides a
|
is used by almost all Nix Packages packages; it provides a
|
||||||
“standard” environment consisting of the things you would expect
|
“standard” environment consisting of the things you would expect
|
||||||
in a basic Unix environment: a C/C++ compiler (GCC, to be precise),
|
in a basic Unix environment: a C/C++ compiler (GCC, to be precise),
|
||||||
the Bash shell, fundamental Unix tools such as `cp`, `grep`, `tar`,
|
the Bash shell, fundamental Unix tools such as `cp`, `grep`, `tar`,
|
||||||
|
|||||||
@@ -284,10 +284,6 @@ The points of interest are:
|
|||||||
function is called with the `localServer` argument set to `true` but
|
function is called with the `localServer` argument set to `true` but
|
||||||
the `db4` argument set to `null`, then the evaluation fails.
|
the `db4` argument set to `null`, then the evaluation fails.
|
||||||
|
|
||||||
Note that `->` is the [logical
|
|
||||||
implication](https://en.wikipedia.org/wiki/Truth_table#Logical_implication)
|
|
||||||
Boolean operation.
|
|
||||||
|
|
||||||
2. This is a more subtle condition: if Subversion is built with Apache
|
2. This is a more subtle condition: if Subversion is built with Apache
|
||||||
(`httpServer`) support, then the Expat library (an XML library) used
|
(`httpServer`) support, then the Expat library (an XML library) used
|
||||||
by Subversion should be same as the one used by Apache. This is
|
by Subversion should be same as the one used by Apache. This is
|
||||||
|
|||||||
@@ -17,12 +17,12 @@ order of precedence (from strongest to weakest binding).
|
|||||||
| String Concatenation | *string1* `+` *string2* | left | String concatenation. | 7 |
|
| String Concatenation | *string1* `+` *string2* | left | String concatenation. | 7 |
|
||||||
| Not | `!` *e* | none | Boolean negation. | 8 |
|
| Not | `!` *e* | none | Boolean negation. | 8 |
|
||||||
| Update | *e1* `//` *e2* | right | Return a set consisting of the attributes in *e1* and *e2* (with the latter taking precedence over the former in case of equally named attributes). | 9 |
|
| Update | *e1* `//` *e2* | right | Return a set consisting of the attributes in *e1* and *e2* (with the latter taking precedence over the former in case of equally named attributes). | 9 |
|
||||||
| Less Than | *e1* `<` *e2*, | none | Arithmetic/lexicographic comparison. | 10 |
|
| Less Than | *e1* `<` *e2*, | none | Arithmetic comparison. | 10 |
|
||||||
| Less Than or Equal To | *e1* `<=` *e2* | none | Arithmetic/lexicographic comparison. | 10 |
|
| Less Than or Equal To | *e1* `<=` *e2* | none | Arithmetic comparison. | 10 |
|
||||||
| Greater Than | *e1* `>` *e2* | none | Arithmetic/lexicographic comparison. | 10 |
|
| Greater Than | *e1* `>` *e2* | none | Arithmetic comparison. | 10 |
|
||||||
| Greater Than or Equal To | *e1* `>=` *e2* | none | Arithmetic/lexicographic comparison. | 10 |
|
| Greater Than or Equal To | *e1* `>=` *e2* | none | Arithmetic comparison. | 10 |
|
||||||
| Equality | *e1* `==` *e2* | none | Equality. | 11 |
|
| Equality | *e1* `==` *e2* | none | Equality. | 11 |
|
||||||
| Inequality | *e1* `!=` *e2* | none | Inequality. | 11 |
|
| Inequality | *e1* `!=` *e2* | none | Inequality. | 11 |
|
||||||
| Logical AND | *e1* `&&` *e2* | left | Logical AND. | 12 |
|
| Logical AND | *e1* `&&` *e2* | left | Logical AND. | 12 |
|
||||||
| Logical OR | *e1* <code>||</code> *e2* | left | Logical OR. | 13 |
|
| Logical OR | *e1* `\|\|` *e2* | left | Logical OR. | 13 |
|
||||||
| Logical Implication | *e1* `->` *e2* | none | Logical implication (equivalent to <code>!e1 || e2</code>). | 14 |
|
| Logical Implication | *e1* `->` *e2* | none | Logical implication (equivalent to `!e1 \|\| e2`). | 14 |
|
||||||
@@ -64,7 +64,7 @@ Nix has the following basic data types:
|
|||||||
the start of each line. To be precise, it strips from each line a
|
the start of each line. To be precise, it strips from each line a
|
||||||
number of spaces equal to the minimal indentation of the string as a
|
number of spaces equal to the minimal indentation of the string as a
|
||||||
whole (disregarding the indentation of empty lines). For instance,
|
whole (disregarding the indentation of empty lines). For instance,
|
||||||
the first and second line are indented two spaces, while the third
|
the first and second line are indented two space, while the third
|
||||||
line is indented four spaces. Thus, two spaces are stripped from
|
line is indented four spaces. Thus, two spaces are stripped from
|
||||||
each line, so the resulting string is
|
each line, so the resulting string is
|
||||||
|
|
||||||
@@ -139,13 +139,6 @@ Nix has the following basic data types:
|
|||||||
environment variable `NIX_PATH` will be searched for the given file
|
environment variable `NIX_PATH` will be searched for the given file
|
||||||
or directory name.
|
or directory name.
|
||||||
|
|
||||||
Antiquotation is supported in any paths except those in angle brackets.
|
|
||||||
`./${foo}-${bar}.nix` is a more convenient way of writing
|
|
||||||
`./. + "/" + foo + "-" + bar + ".nix"` or `./. + "/${foo}-${bar}.nix"`. At
|
|
||||||
least one slash must appear *before* any antiquotations for this to be
|
|
||||||
recognized as a path. `a.${foo}/b.${bar}` is a syntactically valid division
|
|
||||||
operation. `./a.${foo}/b.${bar}` is a path.
|
|
||||||
|
|
||||||
- *Booleans* with values `true` and `false`.
|
- *Booleans* with values `true` and `false`.
|
||||||
|
|
||||||
- The null value, denoted as `null`.
|
- The null value, denoted as `null`.
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# Building and Testing
|
# Building and Testing
|
||||||
|
|
||||||
You can now try to build Hello. Of course, you could do `nix-env -f . -iA
|
You can now try to build Hello. Of course, you could do `nix-env -i
|
||||||
hello`, but you may not want to install a possibly broken package just
|
hello`, but you may not want to install a possibly broken package just
|
||||||
yet. The best way to test the package is by using the command
|
yet. The best way to test the package is by using the command
|
||||||
`nix-build`, which builds a Nix expression and creates a symlink named
|
`nix-build`, which builds a Nix expression and creates a symlink named
|
||||||
|
|||||||
@@ -47,7 +47,7 @@
|
|||||||
the store object at `P` contains the path `Q` somewhere. The
|
the store object at `P` contains the path `Q` somewhere. The
|
||||||
*references* of a store path are the set of store paths to which it
|
*references* of a store path are the set of store paths to which it
|
||||||
has a reference.
|
has a reference.
|
||||||
|
|
||||||
A derivation can reference other derivations and sources (but not
|
A derivation can reference other derivations and sources (but not
|
||||||
output paths), whereas an output path only references other output
|
output paths), whereas an output path only references other output
|
||||||
paths.
|
paths.
|
||||||
@@ -66,7 +66,7 @@
|
|||||||
is necessary to deploy whole closures, since otherwise at runtime
|
is necessary to deploy whole closures, since otherwise at runtime
|
||||||
files could be missing. The command `nix-store -qR` prints out
|
files could be missing. The command `nix-store -qR` prints out
|
||||||
closures of store paths.
|
closures of store paths.
|
||||||
|
|
||||||
As an example, if the store object at path `P` contains a reference
|
As an example, if the store object at path `P` contains a reference
|
||||||
to path `Q`, then `Q` is in the closure of `P`. Further, if `Q`
|
to path `Q`, then `Q` is in the closure of `P`. Further, if `Q`
|
||||||
references `R` then `R` is also in the closure of `P`.
|
references `R` then `R` is also in the closure of `P`.
|
||||||
@@ -98,7 +98,3 @@
|
|||||||
store. It can contain regular files, directories and symbolic
|
store. It can contain regular files, directories and symbolic
|
||||||
links. NARs are generated and unpacked using `nix-store --dump`
|
links. NARs are generated and unpacked using `nix-store --dump`
|
||||||
and `nix-store --restore`.
|
and `nix-store --restore`.
|
||||||
- `∅` \
|
|
||||||
The empty set symbol. In the context of profile history, this denotes a package is not present in a particular version of the profile.
|
|
||||||
- `ε` \
|
|
||||||
The epsilon symbol. In the context of a package, this means the version is empty. More precisely, the derivation does not have a version attribute.
|
|
||||||
@@ -1,9 +1,9 @@
|
|||||||
# Building Nix from Source
|
# Building Nix from Source
|
||||||
|
|
||||||
After cloning Nix's Git repository, issue the following commands:
|
After unpacking or checking out the Nix sources, issue the following
|
||||||
|
commands:
|
||||||
|
|
||||||
```console
|
```console
|
||||||
$ ./bootstrap.sh
|
|
||||||
$ ./configure options...
|
$ ./configure options...
|
||||||
$ make
|
$ make
|
||||||
$ make install
|
$ make install
|
||||||
@@ -11,6 +11,13 @@ $ make install
|
|||||||
|
|
||||||
Nix requires GNU Make so you may need to invoke `gmake` instead.
|
Nix requires GNU Make so you may need to invoke `gmake` instead.
|
||||||
|
|
||||||
|
When building from the Git repository, these should be preceded by the
|
||||||
|
command:
|
||||||
|
|
||||||
|
```console
|
||||||
|
$ ./bootstrap.sh
|
||||||
|
```
|
||||||
|
|
||||||
The installation path can be specified by passing the `--prefix=prefix`
|
The installation path can be specified by passing the `--prefix=prefix`
|
||||||
to `configure`. The default installation directory is `/usr/local`. You
|
to `configure`. The default installation directory is `/usr/local`. You
|
||||||
can change this to any location you like. You must have write permission
|
can change this to any location you like. You must have write permission
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ export NIX_SSL_CERT_FILE=/etc/ssl/my-certificate-bundle.crt
|
|||||||
> **Note**
|
> **Note**
|
||||||
>
|
>
|
||||||
> You must not add the export and then do the install, as the Nix
|
> You must not add the export and then do the install, as the Nix
|
||||||
> installer will detect the presence of Nix configuration, and abort.
|
> installer will detect the presense of Nix configuration, and abort.
|
||||||
|
|
||||||
## `NIX_SSL_CERT_FILE` with macOS and the Nix daemon
|
## `NIX_SSL_CERT_FILE` with macOS and the Nix daemon
|
||||||
|
|
||||||
|
|||||||
@@ -119,30 +119,6 @@ this to run the installer, but it may help if you run into trouble:
|
|||||||
- update `/etc/synthetic.conf` to direct macOS to create a "synthetic"
|
- update `/etc/synthetic.conf` to direct macOS to create a "synthetic"
|
||||||
empty root directory to mount your volume
|
empty root directory to mount your volume
|
||||||
- specify mount options for the volume in `/etc/fstab`
|
- specify mount options for the volume in `/etc/fstab`
|
||||||
- `rw`: read-write
|
|
||||||
- `noauto`: prevent the system from auto-mounting the volume (so the
|
|
||||||
LaunchDaemon mentioned below can control mounting it, and to avoid
|
|
||||||
masking problems with that mounting service).
|
|
||||||
- `nobrowse`: prevent the Nix Store volume from showing up on your
|
|
||||||
desktop; also keeps Spotlight from spending resources to index
|
|
||||||
this volume
|
|
||||||
<!-- TODO:
|
|
||||||
- `suid`: honor setuid? surely not? ...
|
|
||||||
- `owners`: honor file ownership on the volume
|
|
||||||
|
|
||||||
For now I'll avoid pretending to understand suid/owners more
|
|
||||||
than I do. There've been some vague reports of file-ownership
|
|
||||||
and permission issues, particularly in cloud/VM/headless setups.
|
|
||||||
My pet theory is that this has something to do with these setups
|
|
||||||
not having a token that gets delegated to initial/admin accounts
|
|
||||||
on macOS. See scripts/create-darwin-volume.sh for a little more.
|
|
||||||
|
|
||||||
In any case, by Dec 4 2021, it _seems_ like some combination of
|
|
||||||
suid, owners, and calling diskutil enableOwnership have stopped
|
|
||||||
new reports from coming in. But I hesitate to celebrate because we
|
|
||||||
haven't really named and catalogued the behavior, understood what
|
|
||||||
we're fixing, and validated that all 3 components are essential.
|
|
||||||
-->
|
|
||||||
- if you have FileVault enabled
|
- if you have FileVault enabled
|
||||||
- generate an encryption password
|
- generate an encryption password
|
||||||
- put it in your system Keychain
|
- put it in your system Keychain
|
||||||
|
|||||||
@@ -1,59 +0,0 @@
|
|||||||
# Using Nix within Docker
|
|
||||||
|
|
||||||
To run the latest stable release of Nix with Docker run the following command:
|
|
||||||
|
|
||||||
```console
|
|
||||||
$ docker run -ti nixos/nix
|
|
||||||
Unable to find image 'nixos/nix:latest' locally
|
|
||||||
latest: Pulling from nixos/nix
|
|
||||||
5843afab3874: Pull complete
|
|
||||||
b52bf13f109c: Pull complete
|
|
||||||
1e2415612aa3: Pull complete
|
|
||||||
Digest: sha256:27f6e7f60227e959ee7ece361f75d4844a40e1cc6878b6868fe30140420031ff
|
|
||||||
Status: Downloaded newer image for nixos/nix:latest
|
|
||||||
35ca4ada6e96:/# nix --version
|
|
||||||
nix (Nix) 2.3.12
|
|
||||||
35ca4ada6e96:/# exit
|
|
||||||
```
|
|
||||||
|
|
||||||
# What is included in Nix's Docker image?
|
|
||||||
|
|
||||||
The official Docker image is created using `pkgs.dockerTools.buildLayeredImage`
|
|
||||||
(and not with `Dockerfile` as it is usual with Docker images). You can still
|
|
||||||
base your custom Docker image on it as you would do with any other Docker
|
|
||||||
image.
|
|
||||||
|
|
||||||
The Docker image is also not based on any other image and includes minimal set
|
|
||||||
of runtime dependencies that are required to use Nix:
|
|
||||||
|
|
||||||
- pkgs.nix
|
|
||||||
- pkgs.bashInteractive
|
|
||||||
- pkgs.coreutils-full
|
|
||||||
- pkgs.gnutar
|
|
||||||
- pkgs.gzip
|
|
||||||
- pkgs.gnugrep
|
|
||||||
- pkgs.which
|
|
||||||
- pkgs.curl
|
|
||||||
- pkgs.less
|
|
||||||
- pkgs.wget
|
|
||||||
- pkgs.man
|
|
||||||
- pkgs.cacert.out
|
|
||||||
- pkgs.findutils
|
|
||||||
|
|
||||||
# Docker image with the latest development version of Nix
|
|
||||||
|
|
||||||
To get the latest image that was built by [Hydra](https://hydra.nixos.org) run
|
|
||||||
the following command:
|
|
||||||
|
|
||||||
```console
|
|
||||||
$ curl -L https://hydra.nixos.org/job/nix/master/dockerImage.x86_64-linux/latest/download/1 | docker load
|
|
||||||
$ docker run -ti nix:2.5pre20211105
|
|
||||||
```
|
|
||||||
|
|
||||||
You can also build a Docker image from source yourself:
|
|
||||||
|
|
||||||
```console
|
|
||||||
$ nix build ./\#hydraJobs.dockerImage.x86_64-linux
|
|
||||||
$ docker load -i ./result/image.tar.gz
|
|
||||||
$ docker run -ti nix:2.5pre20211105
|
|
||||||
```
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
# Installing Nix from Source
|
# Installing Nix from Source
|
||||||
|
|
||||||
If no binary package is available or if you want to hack on Nix, you
|
If no binary package is available, you can download and compile a source
|
||||||
can build Nix from its Git repository.
|
distribution.
|
||||||
@@ -1,9 +1,14 @@
|
|||||||
# Obtaining the Source
|
# Obtaining a Source Distribution
|
||||||
|
|
||||||
The most recent sources of Nix can be obtained from its [Git
|
The source tarball of the most recent stable release can be downloaded
|
||||||
repository](https://github.com/NixOS/nix). For example, the following
|
from the [Nix homepage](http://nixos.org/nix/download.html). You can
|
||||||
command will check out the latest revision into a directory called
|
also grab the [most recent development
|
||||||
`nix`:
|
release](http://hydra.nixos.org/job/nix/master/release/latest-finished#tabs-constituents).
|
||||||
|
|
||||||
|
Alternatively, the most recent sources of Nix can be obtained from its
|
||||||
|
[Git repository](https://github.com/NixOS/nix). For example, the
|
||||||
|
following command will check out the latest revision into a directory
|
||||||
|
called `nix`:
|
||||||
|
|
||||||
```console
|
```console
|
||||||
$ git clone https://github.com/NixOS/nix
|
$ git clone https://github.com/NixOS/nix
|
||||||
|
|||||||
@@ -2,8 +2,9 @@
|
|||||||
|
|
||||||
- GNU Autoconf (<https://www.gnu.org/software/autoconf/>) and the
|
- GNU Autoconf (<https://www.gnu.org/software/autoconf/>) and the
|
||||||
autoconf-archive macro collection
|
autoconf-archive macro collection
|
||||||
(<https://www.gnu.org/software/autoconf-archive/>). These are
|
(<https://www.gnu.org/software/autoconf-archive/>). These are only
|
||||||
needed to run the bootstrap script.
|
needed to run the bootstrap script, and are not necessary if your
|
||||||
|
source distribution came with a pre-built `./configure` script.
|
||||||
|
|
||||||
- GNU Make.
|
- GNU Make.
|
||||||
|
|
||||||
@@ -25,6 +26,15 @@
|
|||||||
available for download from the official repository
|
available for download from the official repository
|
||||||
<https://github.com/google/brotli>.
|
<https://github.com/google/brotli>.
|
||||||
|
|
||||||
|
- The bzip2 compressor program and the `libbz2` library. Thus you must
|
||||||
|
have bzip2 installed, including development headers and libraries.
|
||||||
|
If your distribution does not provide these, you can obtain bzip2
|
||||||
|
from
|
||||||
|
<https://sourceware.org/bzip2/>.
|
||||||
|
|
||||||
|
- `liblzma`, which is provided by XZ Utils. If your distribution does
|
||||||
|
not provide this, you can get it from <https://tukaani.org/xz/>.
|
||||||
|
|
||||||
- cURL and its library. If your distribution does not provide it, you
|
- cURL and its library. If your distribution does not provide it, you
|
||||||
can get it from <https://curl.haxx.se/>.
|
can get it from <https://curl.haxx.se/>.
|
||||||
|
|
||||||
@@ -44,11 +54,6 @@
|
|||||||
obtained from the its repository
|
obtained from the its repository
|
||||||
<https://github.com/troglobit/editline>.
|
<https://github.com/troglobit/editline>.
|
||||||
|
|
||||||
- The `libsodium` library for verifying cryptographic signatures
|
|
||||||
of contents fetched from binary caches.
|
|
||||||
It can be obtained from the official web site
|
|
||||||
<https://libsodium.org>.
|
|
||||||
|
|
||||||
- Recent versions of Bison and Flex to build the parser. (This is
|
- Recent versions of Bison and Flex to build the parser. (This is
|
||||||
because Nix needs GLR support in Bison and reentrancy support in
|
because Nix needs GLR support in Bison and reentrancy support in
|
||||||
Flex.) For Bison, you need version 2.6, which can be obtained from
|
Flex.) For Bison, you need version 2.6, which can be obtained from
|
||||||
@@ -56,18 +61,11 @@
|
|||||||
you need version 2.5.35, which is available on
|
you need version 2.5.35, which is available on
|
||||||
[SourceForge](http://lex.sourceforge.net/). Slightly older versions
|
[SourceForge](http://lex.sourceforge.net/). Slightly older versions
|
||||||
may also work, but ancient versions like the ubiquitous 2.5.4a
|
may also work, but ancient versions like the ubiquitous 2.5.4a
|
||||||
won't.
|
won't. Note that these are only required if you modify the parser or
|
||||||
|
when you are building from the Git repository.
|
||||||
|
|
||||||
- The `libseccomp` is used to provide syscall filtering on Linux. This
|
- The `libseccomp` is used to provide syscall filtering on Linux. This
|
||||||
is an optional dependency and can be disabled passing a
|
is an optional dependency and can be disabled passing a
|
||||||
`--disable-seccomp-sandboxing` option to the `configure` script (Not
|
`--disable-seccomp-sandboxing` option to the `configure` script (Not
|
||||||
recommended unless your system doesn't support `libseccomp`). To get
|
recommended unless your system doesn't support `libseccomp`). To get
|
||||||
the library, visit <https://github.com/seccomp/libseccomp>.
|
the library, visit <https://github.com/seccomp/libseccomp>.
|
||||||
|
|
||||||
- On 64-bit x86 machines only, `libcpuid` library
|
|
||||||
is used to determine which microarchitecture levels are supported
|
|
||||||
(e.g., as whether to have `x86_64-v2-linux` among additional system types).
|
|
||||||
The library is available from its homepage
|
|
||||||
<http://libcpuid.sourceforge.net>.
|
|
||||||
This is an optional dependency and can be disabled
|
|
||||||
by providing a `--disable-cpuid` to the `configure` script.
|
|
||||||
@@ -4,4 +4,4 @@ Nix is currently supported on the following platforms:
|
|||||||
|
|
||||||
- Linux (i686, x86\_64, aarch64).
|
- Linux (i686, x86\_64, aarch64).
|
||||||
|
|
||||||
- macOS (x86\_64, aarch64).
|
- macOS (x86\_64).
|
||||||
@@ -76,7 +76,7 @@ there after an upgrade. This means that you can _roll back_ to the
|
|||||||
old version:
|
old version:
|
||||||
|
|
||||||
```console
|
```console
|
||||||
$ nix-env --upgrade -A nixpkgs.some-package
|
$ nix-env --upgrade some-packages
|
||||||
$ nix-env --rollback
|
$ nix-env --rollback
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -122,12 +122,12 @@ Nix expressions generally describe how to build a package from
|
|||||||
source, so an installation action like
|
source, so an installation action like
|
||||||
|
|
||||||
```console
|
```console
|
||||||
$ nix-env --install -A nixpkgs.firefox
|
$ nix-env --install firefox
|
||||||
```
|
```
|
||||||
|
|
||||||
_could_ cause quite a bit of build activity, as not only Firefox but
|
_could_ cause quite a bit of build activity, as not only Firefox but
|
||||||
also all its dependencies (all the way up to the C library and the
|
also all its dependencies (all the way up to the C library and the
|
||||||
compiler) would have to be built, at least if they are not already in the
|
compiler) would have to built, at least if they are not already in the
|
||||||
Nix store. This is a _source deployment model_. For most users,
|
Nix store. This is a _source deployment model_. For most users,
|
||||||
building from source is not very pleasant as it takes far too long.
|
building from source is not very pleasant as it takes far too long.
|
||||||
However, Nix can automatically skip building from source and instead
|
However, Nix can automatically skip building from source and instead
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ collection; you could write your own Nix expressions based on Nixpkgs,
|
|||||||
or completely new ones.)
|
or completely new ones.)
|
||||||
|
|
||||||
You can manually download the latest version of Nixpkgs from
|
You can manually download the latest version of Nixpkgs from
|
||||||
<https://github.com/NixOS/nixpkgs>. However, it’s much more
|
<http://nixos.org/nixpkgs/download.html>. However, it’s much more
|
||||||
convenient to use the Nixpkgs [*channel*](channels.md), since it makes
|
convenient to use the Nixpkgs [*channel*](channels.md), since it makes
|
||||||
it easy to stay up to date with new versions of Nixpkgs. Nixpkgs is
|
it easy to stay up to date with new versions of Nixpkgs. Nixpkgs is
|
||||||
automatically added to your list of “subscribed” channels when you
|
automatically added to your list of “subscribed” channels when you
|
||||||
@@ -40,52 +40,48 @@ $ nix-channel --update
|
|||||||
>
|
>
|
||||||
> On NixOS, you’re automatically subscribed to a NixOS channel
|
> On NixOS, you’re automatically subscribed to a NixOS channel
|
||||||
> corresponding to your NixOS major release (e.g.
|
> corresponding to your NixOS major release (e.g.
|
||||||
> <http://nixos.org/channels/nixos-21.11>). A NixOS channel is identical
|
> <http://nixos.org/channels/nixos-14.12>). A NixOS channel is identical
|
||||||
> to the Nixpkgs channel, except that it contains only Linux binaries
|
> to the Nixpkgs channel, except that it contains only Linux binaries
|
||||||
> and is updated only if a set of regression tests succeed.
|
> and is updated only if a set of regression tests succeed.
|
||||||
|
|
||||||
You can view the set of available packages in Nixpkgs:
|
You can view the set of available packages in Nixpkgs:
|
||||||
|
|
||||||
```console
|
```console
|
||||||
$ nix-env -qaP
|
$ nix-env -qa
|
||||||
nixpkgs.aterm aterm-2.2
|
aterm-2.2
|
||||||
nixpkgs.bash bash-3.0
|
bash-3.0
|
||||||
nixpkgs.binutils binutils-2.15
|
binutils-2.15
|
||||||
nixpkgs.bison bison-1.875d
|
bison-1.875d
|
||||||
nixpkgs.blackdown blackdown-1.4.2
|
blackdown-1.4.2
|
||||||
nixpkgs.bzip2 bzip2-1.0.2
|
bzip2-1.0.2
|
||||||
…
|
…
|
||||||
```
|
```
|
||||||
|
|
||||||
The flag `-q` specifies a query operation, `-a` means that you want
|
The flag `-q` specifies a query operation, and `-a` means that you want
|
||||||
to show the “available” (i.e., installable) packages, as opposed to the
|
to show the “available” (i.e., installable) packages, as opposed to the
|
||||||
installed packages, and `-P` prints the attribute paths that can be used
|
installed packages. If you downloaded Nixpkgs yourself, or if you
|
||||||
to unambiguously select a package for installation (listed in the first column).
|
checked it out from GitHub, then you need to pass the path to your
|
||||||
If you downloaded Nixpkgs yourself, or if you checked it out from GitHub,
|
Nixpkgs tree using the `-f` flag:
|
||||||
then you need to pass the path to your Nixpkgs tree using the `-f` flag:
|
|
||||||
|
|
||||||
```console
|
```console
|
||||||
$ nix-env -qaPf /path/to/nixpkgs
|
$ nix-env -qaf /path/to/nixpkgs
|
||||||
aterm aterm-2.2
|
|
||||||
bash bash-3.0
|
|
||||||
…
|
|
||||||
```
|
```
|
||||||
|
|
||||||
where */path/to/nixpkgs* is where you’ve unpacked or checked out
|
where */path/to/nixpkgs* is where you’ve unpacked or checked out
|
||||||
Nixpkgs.
|
Nixpkgs.
|
||||||
|
|
||||||
You can filter the packages by name:
|
You can select specific packages by name:
|
||||||
|
|
||||||
```console
|
```console
|
||||||
$ nix-env -qaP firefox
|
$ nix-env -qa firefox
|
||||||
nixpkgs.firefox-esr firefox-91.3.0esr
|
firefox-34.0.5
|
||||||
nixpkgs.firefox firefox-94.0.1
|
firefox-with-plugins-34.0.5
|
||||||
```
|
```
|
||||||
|
|
||||||
and using regular expressions:
|
and using regular expressions:
|
||||||
|
|
||||||
```console
|
```console
|
||||||
$ nix-env -qaP 'firefox.*'
|
$ nix-env -qa 'firefox.*'
|
||||||
```
|
```
|
||||||
|
|
||||||
It is also possible to see the *status* of available packages, i.e.,
|
It is also possible to see the *status* of available packages, i.e.,
|
||||||
@@ -93,11 +89,11 @@ whether they are installed into the user environment and/or present in
|
|||||||
the system:
|
the system:
|
||||||
|
|
||||||
```console
|
```console
|
||||||
$ nix-env -qaPs
|
$ nix-env -qas
|
||||||
…
|
…
|
||||||
-PS nixpkgs.bash bash-3.0
|
-PS bash-3.0
|
||||||
--S nixpkgs.binutils binutils-2.15
|
--S binutils-2.15
|
||||||
IPS nixpkgs.bison bison-1.875d
|
IPS bison-1.875d
|
||||||
…
|
…
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -110,13 +106,13 @@ which is Nix’s mechanism for doing binary deployment. It just means that
|
|||||||
Nix knows that it can fetch a pre-built package from somewhere
|
Nix knows that it can fetch a pre-built package from somewhere
|
||||||
(typically a network server) instead of building it locally.
|
(typically a network server) instead of building it locally.
|
||||||
|
|
||||||
You can install a package using `nix-env -iA`. For instance,
|
You can install a package using `nix-env -i`. For instance,
|
||||||
|
|
||||||
```console
|
```console
|
||||||
$ nix-env -iA nixpkgs.subversion
|
$ nix-env -i subversion
|
||||||
```
|
```
|
||||||
|
|
||||||
will install the package called `subversion` from `nixpkgs` channel (which is, of course, the
|
will install the package called `subversion` (which is, of course, the
|
||||||
[Subversion version management system](http://subversion.tigris.org/)).
|
[Subversion version management system](http://subversion.tigris.org/)).
|
||||||
|
|
||||||
> **Note**
|
> **Note**
|
||||||
@@ -126,7 +122,7 @@ will install the package called `subversion` from `nixpkgs` channel (which is, o
|
|||||||
> binary cache <https://cache.nixos.org>; it contains binaries for most
|
> binary cache <https://cache.nixos.org>; it contains binaries for most
|
||||||
> packages in Nixpkgs. Only if no binary is available in the binary
|
> packages in Nixpkgs. Only if no binary is available in the binary
|
||||||
> cache, Nix will build the package from source. So if `nix-env
|
> cache, Nix will build the package from source. So if `nix-env
|
||||||
> -iA nixpkgs.subversion` results in Nix building stuff from source, then either
|
> -i subversion` results in Nix building stuff from source, then either
|
||||||
> the package is not built for your platform by the Nixpkgs build
|
> the package is not built for your platform by the Nixpkgs build
|
||||||
> servers, or your version of Nixpkgs is too old or too new. For
|
> servers, or your version of Nixpkgs is too old or too new. For
|
||||||
> instance, if you have a very recent checkout of Nixpkgs, then the
|
> instance, if you have a very recent checkout of Nixpkgs, then the
|
||||||
@@ -137,10 +133,7 @@ will install the package called `subversion` from `nixpkgs` channel (which is, o
|
|||||||
> using a Git checkout of the Nixpkgs tree), you will get binaries for
|
> using a Git checkout of the Nixpkgs tree), you will get binaries for
|
||||||
> most packages.
|
> most packages.
|
||||||
|
|
||||||
Naturally, packages can also be uninstalled. Unlike when installing, you will
|
Naturally, packages can also be uninstalled:
|
||||||
need to use the derivation name (though the version part can be omitted),
|
|
||||||
instead of the attribute path, as `nix-env` does not record which attribute
|
|
||||||
was used for installing:
|
|
||||||
|
|
||||||
```console
|
```console
|
||||||
$ nix-env -e subversion
|
$ nix-env -e subversion
|
||||||
@@ -150,7 +143,7 @@ Upgrading to a new version is just as easy. If you have a new release of
|
|||||||
Nix Packages, you can do:
|
Nix Packages, you can do:
|
||||||
|
|
||||||
```console
|
```console
|
||||||
$ nix-env -uA nixpkgs.subversion
|
$ nix-env -u subversion
|
||||||
```
|
```
|
||||||
|
|
||||||
This will *only* upgrade Subversion if there is a “newer” version in the
|
This will *only* upgrade Subversion if there is a “newer” version in the
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ The daemon that handles binary cache requests via HTTP, `nix-serve`, is
|
|||||||
not part of the Nix distribution, but you can install it from Nixpkgs:
|
not part of the Nix distribution, but you can install it from Nixpkgs:
|
||||||
|
|
||||||
```console
|
```console
|
||||||
$ nix-env -iA nixpkgs.nix-serve
|
$ nix-env -i nix-serve
|
||||||
```
|
```
|
||||||
|
|
||||||
You can then start the server, listening for HTTP connections on
|
You can then start the server, listening for HTTP connections on
|
||||||
@@ -35,7 +35,7 @@ On the client side, you can tell Nix to use your binary cache using
|
|||||||
`--option extra-binary-caches`, e.g.:
|
`--option extra-binary-caches`, e.g.:
|
||||||
|
|
||||||
```console
|
```console
|
||||||
$ nix-env -iA nixpkgs.firefox --option extra-binary-caches http://avalon:8080/
|
$ nix-env -i firefox --option extra-binary-caches http://avalon:8080/
|
||||||
```
|
```
|
||||||
|
|
||||||
The option `extra-binary-caches` tells Nix to use this binary cache in
|
The option `extra-binary-caches` tells Nix to use this binary cache in
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ collector as follows:
|
|||||||
$ nix-store --gc
|
$ nix-store --gc
|
||||||
```
|
```
|
||||||
|
|
||||||
The behaviour of the garbage collector is affected by the
|
The behaviour of the gargage collector is affected by the
|
||||||
`keep-derivations` (default: true) and `keep-outputs` (default: false)
|
`keep-derivations` (default: true) and `keep-outputs` (default: false)
|
||||||
options in the Nix configuration file. The defaults will ensure that all
|
options in the Nix configuration file. The defaults will ensure that all
|
||||||
derivations that are build-time dependencies of garbage collector roots
|
derivations that are build-time dependencies of garbage collector roots
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ just Subversion 1.1.2 (arrows in the figure indicate symlinks). This
|
|||||||
would be what we would obtain if we had done
|
would be what we would obtain if we had done
|
||||||
|
|
||||||
```console
|
```console
|
||||||
$ nix-env -iA nixpkgs.subversion
|
$ nix-env -i subversion
|
||||||
```
|
```
|
||||||
|
|
||||||
on a set of Nix expressions that contained Subversion 1.1.2.
|
on a set of Nix expressions that contained Subversion 1.1.2.
|
||||||
@@ -54,7 +54,7 @@ environment is generated based on the current one. For instance,
|
|||||||
generation 43 was created from generation 42 when we did
|
generation 43 was created from generation 42 when we did
|
||||||
|
|
||||||
```console
|
```console
|
||||||
$ nix-env -iA nixpkgs.subversion nixpkgs.firefox
|
$ nix-env -i subversion firefox
|
||||||
```
|
```
|
||||||
|
|
||||||
on a set of Nix expressions that contained Firefox and a new version of
|
on a set of Nix expressions that contained Firefox and a new version of
|
||||||
@@ -127,7 +127,7 @@ All `nix-env` operations work on the profile pointed to by
|
|||||||
(abbreviation `-p`):
|
(abbreviation `-p`):
|
||||||
|
|
||||||
```console
|
```console
|
||||||
$ nix-env -p /nix/var/nix/profiles/other-profile -iA nixpkgs.subversion
|
$ nix-env -p /nix/var/nix/profiles/other-profile -i subversion
|
||||||
```
|
```
|
||||||
|
|
||||||
This will *not* change the `~/.nix-profile` symlink.
|
This will *not* change the `~/.nix-profile` symlink.
|
||||||
@@ -6,7 +6,7 @@ automatically fetching any store paths in Firefox’s closure if they are
|
|||||||
available on the server `avalon`:
|
available on the server `avalon`:
|
||||||
|
|
||||||
```console
|
```console
|
||||||
$ nix-env -iA nixpkgs.firefox --substituters ssh://alice@avalon
|
$ nix-env -i firefox --substituters ssh://alice@avalon
|
||||||
```
|
```
|
||||||
|
|
||||||
This works similar to the binary cache substituter that Nix usually
|
This works similar to the binary cache substituter that Nix usually
|
||||||
|
|||||||
@@ -19,19 +19,19 @@ to subsequent chapters.
|
|||||||
channel:
|
channel:
|
||||||
|
|
||||||
```console
|
```console
|
||||||
$ nix-env -qaP
|
$ nix-env -qa
|
||||||
nixpkgs.docbook_xml_dtd_43 docbook-xml-4.3
|
docbook-xml-4.3
|
||||||
nixpkgs.docbook_xml_dtd_45 docbook-xml-4.5
|
docbook-xml-4.5
|
||||||
nixpkgs.firefox firefox-33.0.2
|
firefox-33.0.2
|
||||||
nixpkgs.hello hello-2.9
|
hello-2.9
|
||||||
nixpkgs.libxslt libxslt-1.1.28
|
libxslt-1.1.28
|
||||||
…
|
…
|
||||||
```
|
```
|
||||||
|
|
||||||
1. Install some packages from the channel:
|
1. Install some packages from the channel:
|
||||||
|
|
||||||
```console
|
```console
|
||||||
$ nix-env -iA nixpkgs.hello
|
$ nix-env -i hello
|
||||||
```
|
```
|
||||||
|
|
||||||
This should download pre-built packages; it should not build them
|
This should download pre-built packages; it should not build them
|
||||||
|
|||||||
@@ -1,542 +1,8 @@
|
|||||||
# Release 2.4 (2021-11-01)
|
# Release 2.4 (202X-XX-XX)
|
||||||
|
|
||||||
This is the first release in more than two years and is the result of
|
- It is now an error to modify the `plugin-files` setting via a
|
||||||
more than 2800 commits from 195 contributors since release 2.3.
|
command-line flag that appears after the first non-flag argument
|
||||||
|
to any command, including a subcommand to `nix`. For example,
|
||||||
## Highlights
|
`nix-instantiate default.nix --plugin-files ""` must now become
|
||||||
|
`nix-instantiate --plugin-files "" default.nix`.
|
||||||
* Nix's **error messages** have been improved a lot. For instance,
|
- Plugins that add new `nix` subcommands are now actually respected.
|
||||||
evaluation errors now point out the location of the error:
|
|
||||||
|
|
||||||
```
|
|
||||||
$ nix build
|
|
||||||
error: undefined variable 'bzip3'
|
|
||||||
|
|
||||||
at /nix/store/449lv242z0zsgwv95a8124xi11sp419f-source/flake.nix:88:13:
|
|
||||||
|
|
||||||
87| [ curl
|
|
||||||
88| bzip3 xz brotli editline
|
|
||||||
| ^
|
|
||||||
89| openssl sqlite
|
|
||||||
```
|
|
||||||
|
|
||||||
* The **`nix` command** has seen a lot of work and is now almost at
|
|
||||||
feature parity with the old command-line interface (the `nix-*`
|
|
||||||
commands). It aims to be [more modern, consistent and pleasant to
|
|
||||||
use](../contributing/cli-guideline.md) than the old CLI. It is still
|
|
||||||
marked as experimental but its interface should not change much
|
|
||||||
anymore in future releases.
|
|
||||||
|
|
||||||
* **Flakes** are a new format to package Nix-based projects in a more
|
|
||||||
discoverable, composable, consistent and reproducible way. A flake
|
|
||||||
is just a repository or tarball containing a file named `flake.nix`
|
|
||||||
that specifies dependencies on other flakes and returns any Nix
|
|
||||||
assets such as packages, Nixpkgs overlays, NixOS modules or CI
|
|
||||||
tests. The new `nix` CLI is primarily based around flakes; for
|
|
||||||
example, a command like `nix run nixpkgs#hello` runs the `hello`
|
|
||||||
application from the `nixpkgs` flake.
|
|
||||||
|
|
||||||
Flakes are currently marked as experimental. For an introduction,
|
|
||||||
see [this blog
|
|
||||||
post](https://www.tweag.io/blog/2020-05-25-flakes/). For detailed
|
|
||||||
information about flake syntax and semantics, see the [`nix flake`
|
|
||||||
manual page](../command-ref/new-cli/nix3-flake.md).
|
|
||||||
|
|
||||||
* Nix's store can now be **content-addressed**, meaning that the hash
|
|
||||||
component of a store path is the hash of the path's
|
|
||||||
contents. Previously Nix could only build **input-addressed** store
|
|
||||||
paths, where the hash is computed from the derivation dependency
|
|
||||||
graph. Content-addressing allows deduplication, early cutoff in
|
|
||||||
build systems, and unprivileged closure copying. This is still [an
|
|
||||||
experimental
|
|
||||||
feature](https://discourse.nixos.org/t/content-addressed-nix-call-for-testers/12881).
|
|
||||||
|
|
||||||
* The Nix manual has been converted into Markdown, making it easier to
|
|
||||||
contribute. In addition, every `nix` subcommand now has a manual
|
|
||||||
page, documenting every option.
|
|
||||||
|
|
||||||
* A new setting that allows **experimental features** to be enabled
|
|
||||||
selectively. This allows us to merge unstable features into Nix more
|
|
||||||
quickly and do more frequent releases.
|
|
||||||
|
|
||||||
## Other features
|
|
||||||
|
|
||||||
* There are many new `nix` subcommands:
|
|
||||||
|
|
||||||
- `nix develop` is intended to replace `nix-shell`. It has a number
|
|
||||||
of new features:
|
|
||||||
|
|
||||||
* It automatically sets the output environment variables (such as
|
|
||||||
`$out`) to writable locations (such as `./outputs/out`).
|
|
||||||
|
|
||||||
* It can store the environment in a profile. This is useful for
|
|
||||||
offline work.
|
|
||||||
|
|
||||||
* It can run specific phases directly. For instance, `nix develop
|
|
||||||
--build` runs `buildPhase`.
|
|
||||||
|
|
||||||
- It allows dependencies in the Nix store to be "redirected" to
|
|
||||||
arbitrary directories using the `--redirect` flag. This is
|
|
||||||
useful if you want to hack on a package *and* some of its
|
|
||||||
dependencies at the same time.
|
|
||||||
|
|
||||||
- `nix print-dev-env` prints the environment variables and bash
|
|
||||||
functions defined by a derivation. This is useful for users of
|
|
||||||
other shells than bash (especially with `--json`).
|
|
||||||
|
|
||||||
- `nix shell` was previously named `nix run` and is intended to
|
|
||||||
replace `nix-shell -p`, but without the `stdenv` overhead. It
|
|
||||||
simply starts a shell where some packages have been added to
|
|
||||||
`$PATH`.
|
|
||||||
|
|
||||||
- `nix run` (not to be confused with the old subcommand that has
|
|
||||||
been renamed to `nix shell`) runs an "app", a flake output that
|
|
||||||
specifies a command to run, or an eponymous program from a
|
|
||||||
package. For example, `nix run nixpkgs#hello` runs the `hello`
|
|
||||||
program from the `hello` package in `nixpkgs`.
|
|
||||||
|
|
||||||
- `nix flake` is the container for flake-related operations, such as
|
|
||||||
creating a new flake, querying the contents of a flake or updating
|
|
||||||
flake lock files.
|
|
||||||
|
|
||||||
- `nix registry` allows you to query and update the flake registry,
|
|
||||||
which maps identifiers such as `nixpkgs` to concrete flake URLs.
|
|
||||||
|
|
||||||
- `nix profile` is intended to replace `nix-env`. Its main advantage
|
|
||||||
is that it keeps track of the provenance of installed packages
|
|
||||||
(e.g. exactly which flake version a package came from). It also
|
|
||||||
has some helpful subcommands:
|
|
||||||
|
|
||||||
* `nix profile history` shows what packages were added, upgraded
|
|
||||||
or removed between each version of a profile.
|
|
||||||
|
|
||||||
* `nix profile diff-closures` shows the changes between the
|
|
||||||
closures of each version of a profile. This allows you to
|
|
||||||
discover the addition or removal of dependencies or size
|
|
||||||
changes.
|
|
||||||
|
|
||||||
**Warning**: after a profile has been updated using `nix profile`,
|
|
||||||
it is no longer usable with `nix-env`.
|
|
||||||
|
|
||||||
- `nix store diff-closures` shows the differences between the
|
|
||||||
closures of two store paths in terms of the versions and sizes of
|
|
||||||
dependencies in the closures.
|
|
||||||
|
|
||||||
- `nix store make-content-addressable` rewrites an arbitrary closure
|
|
||||||
to make it content-addressed. Such paths can be copied into other
|
|
||||||
stores without requiring signatures.
|
|
||||||
|
|
||||||
- `nix bundle` uses the [`nix-bundle`
|
|
||||||
program](https://github.com/matthewbauer/nix-bundle) to convert a
|
|
||||||
closure into a self-extracting executable.
|
|
||||||
|
|
||||||
- Various other replacements for the old CLI, e.g. `nix store gc`,
|
|
||||||
`nix store delete`, `nix store repair`, `nix nar dump-path`, `nix
|
|
||||||
store prefetch-file`, `nix store prefetch-tarball`, `nix key` and
|
|
||||||
`nix daemon`.
|
|
||||||
|
|
||||||
* Nix now has an **evaluation cache** for flake outputs. For example,
|
|
||||||
a second invocation of the command `nix run nixpkgs#firefox` will
|
|
||||||
not need to evaluate the `firefox` attribute because it's already in
|
|
||||||
the evaluation cache. This is made possible by the hermetic
|
|
||||||
evaluation model of flakes.
|
|
||||||
|
|
||||||
* The new `--offline` flag disables substituters and causes all
|
|
||||||
locally cached tarballs and repositories to be considered
|
|
||||||
up-to-date.
|
|
||||||
|
|
||||||
* The new `--refresh` flag causes all locally cached tarballs and
|
|
||||||
repositories to be considered out-of-date.
|
|
||||||
|
|
||||||
* Many `nix` subcommands now have a `--json` option to produce
|
|
||||||
machine-readable output.
|
|
||||||
|
|
||||||
* `nix repl` has a new `:doc` command to show documentation about
|
|
||||||
builtin functions (e.g. `:doc builtins.map`).
|
|
||||||
|
|
||||||
* Binary cache stores now have an option `index-debug-info` to create
|
|
||||||
an index of DWARF debuginfo files for use by
|
|
||||||
[`dwarffs`](https://github.com/edolstra/dwarffs).
|
|
||||||
|
|
||||||
* To support flakes, Nix now has an extensible mechanism for fetching
|
|
||||||
source trees. Currently it has the following backends:
|
|
||||||
|
|
||||||
* Git repositories
|
|
||||||
|
|
||||||
* Mercurial repositories
|
|
||||||
|
|
||||||
* GitHub and GitLab repositories (an optimisation for faster
|
|
||||||
fetching than Git)
|
|
||||||
|
|
||||||
* Tarballs
|
|
||||||
|
|
||||||
* Arbitrary directories
|
|
||||||
|
|
||||||
The fetcher infrastructure is exposed via flake input specifications
|
|
||||||
and via the `fetchTree` built-in.
|
|
||||||
|
|
||||||
* **Languages changes**: the only new language feature is that you can
|
|
||||||
now have antiquotations in paths, e.g. `./${foo}` instead of `./. +
|
|
||||||
foo`.
|
|
||||||
|
|
||||||
* **New built-in functions**:
|
|
||||||
|
|
||||||
- `builtins.fetchTree` allows fetching a source tree using any
|
|
||||||
backends supported by the fetcher infrastructure. It subsumes the
|
|
||||||
functionality of existing built-ins like `fetchGit`,
|
|
||||||
`fetchMercurial` and `fetchTarball`.
|
|
||||||
|
|
||||||
- `builtins.getFlake` fetches a flake and returns its output
|
|
||||||
attributes. This function should not be used inside flakes! Use
|
|
||||||
flake inputs instead.
|
|
||||||
|
|
||||||
- `builtins.floor` and `builtins.ceil` round a floating-point number
|
|
||||||
down and up, respectively.
|
|
||||||
|
|
||||||
* Experimental support for recursive Nix. This means that Nix
|
|
||||||
derivations can now call Nix to build other derivations. This is not
|
|
||||||
in a stable state yet and not well
|
|
||||||
[documented](https://github.com/NixOS/nix/commit/c4d7c76b641d82b2696fef73ce0ac160043c18da).
|
|
||||||
|
|
||||||
* The new experimental feature `no-url-literals` disables URL
|
|
||||||
literals. This helps to implement [RFC
|
|
||||||
45](https://github.com/NixOS/rfcs/pull/45).
|
|
||||||
|
|
||||||
* Nix now uses `libarchive` to decompress and unpack tarballs and zip
|
|
||||||
files, so `tar` is no longer required.
|
|
||||||
|
|
||||||
* The priority of substituters can now be overridden using the
|
|
||||||
`priority` substituter setting (e.g. `--substituters
|
|
||||||
'http://cache.nixos.org?priority=100 daemon?priority=10'`).
|
|
||||||
|
|
||||||
* `nix edit` now supports non-derivation attributes, e.g. `nix edit
|
|
||||||
.#nixosConfigurations.bla`.
|
|
||||||
|
|
||||||
* The `nix` command now provides command line completion for `bash`,
|
|
||||||
`zsh` and `fish`. Since the support for getting completions is built
|
|
||||||
into `nix`, it's easy to add support for other shells.
|
|
||||||
|
|
||||||
* The new `--log-format` flag selects what Nix's output looks like. It
|
|
||||||
defaults to a terse progress indicator. There is a new
|
|
||||||
`internal-json` output format for use by other programs.
|
|
||||||
|
|
||||||
* `nix eval` has a new `--apply` flag that applies a function to the
|
|
||||||
evaluation result.
|
|
||||||
|
|
||||||
* `nix eval` has a new `--write-to` flag that allows it to write a
|
|
||||||
nested attribute set of string leaves to a corresponding directory
|
|
||||||
tree.
|
|
||||||
|
|
||||||
* Memory improvements: many operations that add paths to the store or
|
|
||||||
copy paths between stores now run in constant memory.
|
|
||||||
|
|
||||||
* Many `nix` commands now support the flag `--derivation` to operate
|
|
||||||
on a `.drv` file itself instead of its outputs.
|
|
||||||
|
|
||||||
* There is a new store called `dummy://` that does not support
|
|
||||||
building or adding paths. This is useful if you want to use the Nix
|
|
||||||
evaluator but don't have a Nix store.
|
|
||||||
|
|
||||||
* The `ssh-ng://` store now allows substituting paths on the remote,
|
|
||||||
as `ssh://` already did.
|
|
||||||
|
|
||||||
* When auto-calling a function with an ellipsis, all arguments are now
|
|
||||||
passed.
|
|
||||||
|
|
||||||
* New `nix-shell` features:
|
|
||||||
|
|
||||||
- It preserves the `PS1` environment variable if
|
|
||||||
`NIX_SHELL_PRESERVE_PROMPT` is set.
|
|
||||||
|
|
||||||
- With `-p`, it passes any `--arg`s as Nixpkgs arguments.
|
|
||||||
|
|
||||||
- Support for structured attributes.
|
|
||||||
|
|
||||||
* `nix-prefetch-url` has a new `--executable` flag.
|
|
||||||
|
|
||||||
* On `x86_64` systems, [`x86_64` microarchitecture
|
|
||||||
levels](https://lwn.net/Articles/844831/) are mapped to additional
|
|
||||||
system types (e.g. `x86_64-v1-linux`).
|
|
||||||
|
|
||||||
* The new `--eval-store` flag allows you to use a different store for
|
|
||||||
evaluation than for building or storing the build result. This is
|
|
||||||
primarily useful when you want to query whether something exists in
|
|
||||||
a read-only store, such as a binary cache:
|
|
||||||
|
|
||||||
```
|
|
||||||
# nix path-info --json --store https://cache.nixos.org \
|
|
||||||
--eval-store auto nixpkgs#hello
|
|
||||||
```
|
|
||||||
|
|
||||||
(Here `auto` indicates the local store.)
|
|
||||||
|
|
||||||
* The Nix daemon has a new low-latency mechanism for copying
|
|
||||||
closures. This is useful when building on remote stores such as
|
|
||||||
`ssh-ng://`.
|
|
||||||
|
|
||||||
* Plugins can now register `nix` subcommands.
|
|
||||||
|
|
||||||
* The `--indirect` flag to `nix-store --add-root` has become a no-op.
|
|
||||||
`--add-root` will always generate indirect GC roots from now on.
|
|
||||||
|
|
||||||
## Incompatible changes
|
|
||||||
|
|
||||||
* The `nix` command is now marked as an experimental feature. This
|
|
||||||
means that you need to add
|
|
||||||
|
|
||||||
```
|
|
||||||
experimental-features = nix-command
|
|
||||||
```
|
|
||||||
|
|
||||||
to your `nix.conf` if you want to use it, or pass
|
|
||||||
`--extra-experimental-features nix-command` on the command line.
|
|
||||||
|
|
||||||
* The `nix` command no longer has a syntax for referring to packages
|
|
||||||
in a channel. This means that the following no longer works:
|
|
||||||
|
|
||||||
```console
|
|
||||||
nix build nixpkgs.hello # Nix 2.3
|
|
||||||
```
|
|
||||||
|
|
||||||
Instead, you can either use the `#` syntax to select a package from
|
|
||||||
a flake, e.g.
|
|
||||||
|
|
||||||
```console
|
|
||||||
nix build nixpkgs#hello
|
|
||||||
```
|
|
||||||
|
|
||||||
Or, if you want to use the `nixpkgs` channel in the `NIX_PATH`
|
|
||||||
environment variable:
|
|
||||||
|
|
||||||
```console
|
|
||||||
nix build -f '<nixpkgs>' hello
|
|
||||||
```
|
|
||||||
|
|
||||||
* The old `nix run` has been renamed to `nix shell`, while there is a
|
|
||||||
new `nix run` that runs a default command. So instead of
|
|
||||||
|
|
||||||
```console
|
|
||||||
nix run nixpkgs.hello -c hello # Nix 2.3
|
|
||||||
```
|
|
||||||
|
|
||||||
you should use
|
|
||||||
|
|
||||||
```console
|
|
||||||
nix shell nixpkgs#hello -c hello
|
|
||||||
```
|
|
||||||
|
|
||||||
or just
|
|
||||||
|
|
||||||
```console
|
|
||||||
nix run nixpkgs#hello
|
|
||||||
```
|
|
||||||
|
|
||||||
if the command you want to run has the same name as the package.
|
|
||||||
|
|
||||||
* It is now an error to modify the `plugin-files` setting via a
|
|
||||||
command-line flag that appears after the first non-flag argument to
|
|
||||||
any command, including a subcommand to `nix`. For example,
|
|
||||||
`nix-instantiate default.nix --plugin-files ""` must now become
|
|
||||||
`nix-instantiate --plugin-files "" default.nix`.
|
|
||||||
|
|
||||||
* We no longer release source tarballs. If you want to build from
|
|
||||||
source, please build from the tags in the Git repository.
|
|
||||||
|
|
||||||
## Contributors
|
|
||||||
|
|
||||||
This release has contributions from
|
|
||||||
Adam Höse,
|
|
||||||
Albert Safin,
|
|
||||||
Alex Kovar,
|
|
||||||
Alex Zero,
|
|
||||||
Alexander Bantyev,
|
|
||||||
Alexandre Esteves,
|
|
||||||
Alyssa Ross,
|
|
||||||
Anatole Lucet,
|
|
||||||
Anders Kaseorg,
|
|
||||||
Andreas Rammhold,
|
|
||||||
Antoine Eiche,
|
|
||||||
Antoine Martin,
|
|
||||||
Arnout Engelen,
|
|
||||||
Arthur Gautier,
|
|
||||||
aszlig,
|
|
||||||
Ben Burdette,
|
|
||||||
Benjamin Hipple,
|
|
||||||
Bernardo Meurer,
|
|
||||||
Björn Gohla,
|
|
||||||
Bjørn Forsman,
|
|
||||||
Bob van der Linden,
|
|
||||||
Brian Leung,
|
|
||||||
Brian McKenna,
|
|
||||||
Brian Wignall,
|
|
||||||
Bruce Toll,
|
|
||||||
Bryan Richter,
|
|
||||||
Calle Rosenquist,
|
|
||||||
Calvin Loncaric,
|
|
||||||
Carlo Nucera,
|
|
||||||
Carlos D'Agostino,
|
|
||||||
Chaz Schlarp,
|
|
||||||
Christian Höppner,
|
|
||||||
Christian Kampka,
|
|
||||||
Chua Hou,
|
|
||||||
Chuck,
|
|
||||||
Cole Helbling,
|
|
||||||
Daiderd Jordan,
|
|
||||||
Dan Callahan,
|
|
||||||
Dani,
|
|
||||||
Daniel Fitzpatrick,
|
|
||||||
Danila Fedorin,
|
|
||||||
Daniël de Kok,
|
|
||||||
Danny Bautista,
|
|
||||||
DavHau,
|
|
||||||
David McFarland,
|
|
||||||
Dima,
|
|
||||||
Domen Kožar,
|
|
||||||
Dominik Schrempf,
|
|
||||||
Dominique Martinet,
|
|
||||||
dramforever,
|
|
||||||
Dustin DeWeese,
|
|
||||||
edef,
|
|
||||||
Eelco Dolstra,
|
|
||||||
Ellie Hermaszewska,
|
|
||||||
Emilio Karakey,
|
|
||||||
Emily,
|
|
||||||
Eric Culp,
|
|
||||||
Ersin Akinci,
|
|
||||||
Fabian Möller,
|
|
||||||
Farid Zakaria,
|
|
||||||
Federico Pellegrin,
|
|
||||||
Finn Behrens,
|
|
||||||
Florian Franzen,
|
|
||||||
Félix Baylac-Jacqué,
|
|
||||||
Gabriella Gonzalez,
|
|
||||||
Geoff Reedy,
|
|
||||||
Georges Dubus,
|
|
||||||
Graham Christensen,
|
|
||||||
Greg Hale,
|
|
||||||
Greg Price,
|
|
||||||
Gregor Kleen,
|
|
||||||
Gregory Hale,
|
|
||||||
Griffin Smith,
|
|
||||||
Guillaume Bouchard,
|
|
||||||
Harald van Dijk,
|
|
||||||
illustris,
|
|
||||||
Ivan Zvonimir Horvat,
|
|
||||||
Jade,
|
|
||||||
Jake Waksbaum,
|
|
||||||
jakobrs,
|
|
||||||
James Ottaway,
|
|
||||||
Jan Tojnar,
|
|
||||||
Janne Heß,
|
|
||||||
Jaroslavas Pocepko,
|
|
||||||
Jarrett Keifer,
|
|
||||||
Jeremy Schlatter,
|
|
||||||
Joachim Breitner,
|
|
||||||
Joe Pea,
|
|
||||||
John Ericson,
|
|
||||||
Jonathan Ringer,
|
|
||||||
Josef Kemetmüller,
|
|
||||||
Joseph Lucas,
|
|
||||||
Jude Taylor,
|
|
||||||
Julian Stecklina,
|
|
||||||
Julien Tanguy,
|
|
||||||
Jörg Thalheim,
|
|
||||||
Kai Wohlfahrt,
|
|
||||||
keke,
|
|
||||||
Keshav Kini,
|
|
||||||
Kevin Quick,
|
|
||||||
Kevin Stock,
|
|
||||||
Kjetil Orbekk,
|
|
||||||
Krzysztof Gogolewski,
|
|
||||||
kvtb,
|
|
||||||
Lars Mühmel,
|
|
||||||
Leonhard Markert,
|
|
||||||
Lily Ballard,
|
|
||||||
Linus Heckemann,
|
|
||||||
Lorenzo Manacorda,
|
|
||||||
Lucas Desgouilles,
|
|
||||||
Lucas Franceschino,
|
|
||||||
Lucas Hoffmann,
|
|
||||||
Luke Granger-Brown,
|
|
||||||
Madeline Haraj,
|
|
||||||
Marwan Aljubeh,
|
|
||||||
Mat Marini,
|
|
||||||
Mateusz Piotrowski,
|
|
||||||
Matthew Bauer,
|
|
||||||
Matthew Kenigsberg,
|
|
||||||
Mauricio Scheffer,
|
|
||||||
Maximilian Bosch,
|
|
||||||
Michael Adler,
|
|
||||||
Michael Bishop,
|
|
||||||
Michael Fellinger,
|
|
||||||
Michael Forney,
|
|
||||||
Michael Reilly,
|
|
||||||
mlatus,
|
|
||||||
Mykola Orliuk,
|
|
||||||
Nathan van Doorn,
|
|
||||||
Naïm Favier,
|
|
||||||
ng0,
|
|
||||||
Nick Van den Broeck,
|
|
||||||
Nicolas Stig124 Formichella,
|
|
||||||
Niels Egberts,
|
|
||||||
Niklas Hambüchen,
|
|
||||||
Nikola Knezevic,
|
|
||||||
oxalica,
|
|
||||||
p01arst0rm,
|
|
||||||
Pamplemousse,
|
|
||||||
Patrick Hilhorst,
|
|
||||||
Paul Opiyo,
|
|
||||||
Pavol Rusnak,
|
|
||||||
Peter Kolloch,
|
|
||||||
Philipp Bartsch,
|
|
||||||
Philipp Middendorf,
|
|
||||||
Piotr Szubiakowski,
|
|
||||||
Profpatsch,
|
|
||||||
Puck Meerburg,
|
|
||||||
Ricardo M. Correia,
|
|
||||||
Rickard Nilsson,
|
|
||||||
Robert Hensing,
|
|
||||||
Robin Gloster,
|
|
||||||
Rodrigo,
|
|
||||||
Rok Garbas,
|
|
||||||
Ronnie Ebrin,
|
|
||||||
Rovanion Luckey,
|
|
||||||
Ryan Burns,
|
|
||||||
Ryan Mulligan,
|
|
||||||
Ryne Everett,
|
|
||||||
Sam Doshi,
|
|
||||||
Sam Lidder,
|
|
||||||
Samir Talwar,
|
|
||||||
Samuel Dionne-Riel,
|
|
||||||
Sebastian Ullrich,
|
|
||||||
Sergei Trofimovich,
|
|
||||||
Sevan Janiyan,
|
|
||||||
Shao Cheng,
|
|
||||||
Shea Levy,
|
|
||||||
Silvan Mosberger,
|
|
||||||
Stefan Frijters,
|
|
||||||
Stefan Jaax,
|
|
||||||
sternenseemann,
|
|
||||||
Steven Shaw,
|
|
||||||
Stéphan Kochen,
|
|
||||||
SuperSandro2000,
|
|
||||||
Suraj Barkale,
|
|
||||||
Taeer Bar-Yam,
|
|
||||||
Thomas Churchman,
|
|
||||||
Théophane Hufschmitt,
|
|
||||||
Timothy DeHerrera,
|
|
||||||
Timothy Klim,
|
|
||||||
Tobias Möst,
|
|
||||||
Tobias Pflug,
|
|
||||||
Tom Bereknyei,
|
|
||||||
Travis A. Everett,
|
|
||||||
Ujjwal Jain,
|
|
||||||
Vladimír Čunát,
|
|
||||||
Wil Taylor,
|
|
||||||
Will Dietz,
|
|
||||||
Yaroslav Bolyukin,
|
|
||||||
Yestin L. Harrison,
|
|
||||||
YI,
|
|
||||||
Yorick van Pelt,
|
|
||||||
Yuriy Taraday and
|
|
||||||
zimbatm.
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
# Release 2.5 (2021-12-13)
|
|
||||||
|
|
||||||
* The garbage collector no longer blocks new builds, so the message
|
|
||||||
`waiting for the big garbage collector lock...` is a thing of the
|
|
||||||
past.
|
|
||||||
|
|
||||||
* Binary cache stores now have a setting `compression-level`.
|
|
||||||
|
|
||||||
* `nix develop` now has a flag `--unpack` to run `unpackPhase`.
|
|
||||||
|
|
||||||
* Lists can now be compared lexicographically using the `<` operator.
|
|
||||||
|
|
||||||
* New built-in function: `builtins.groupBy`, with the same functionality as
|
|
||||||
Nixpkgs' `lib.groupBy`, but faster.
|
|
||||||
|
|
||||||
* `nix repl` now has a `:log` command.
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
# Release 2.6 (2022-01-24)
|
|
||||||
|
|
||||||
* The Nix CLI now searches for a `flake.nix` up until the root of the current
|
|
||||||
Git repository or a filesystem boundary rather than just in the current
|
|
||||||
directory.
|
|
||||||
* The TOML parser used by `builtins.fromTOML` has been replaced by [a
|
|
||||||
more compliant one](https://github.com/ToruNiina/toml11).
|
|
||||||
* Added `:st`/`:show-trace` commands to `nix repl`, which are used to
|
|
||||||
set or toggle display of error traces.
|
|
||||||
* New builtin function `builtins.zipAttrsWith` with the same
|
|
||||||
functionality as `lib.zipAttrsWith` from Nixpkgs, but much more
|
|
||||||
efficient.
|
|
||||||
* New command `nix store copy-log` to copy build logs from one store
|
|
||||||
to another.
|
|
||||||
* The `commit-lockfile-summary` option can be set to a non-empty
|
|
||||||
string to override the commit summary used when commiting an updated
|
|
||||||
lockfile. This may be used in conjunction with the `nixConfig`
|
|
||||||
attribute in `flake.nix` to better conform to repository
|
|
||||||
conventions.
|
|
||||||
* `docker run -ti nixos/nix:master` will place you in the Docker
|
|
||||||
container with the latest version of Nix from the `master` branch.
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
# Release X.Y (202?-??-??)
|
|
||||||
|
|
||||||
* `nix bundle` breaking API change now supports bundlers of the form
|
|
||||||
`bundler.<system>.<name>= derivation: another-derivation;`. This supports
|
|
||||||
additional functionality to inspect evaluation information during bundling. A
|
|
||||||
new [repository](https://github.com/NixOS/bundlers) has various bundlers
|
|
||||||
implemented.
|
|
||||||
|
|
||||||
* `nix store ping` now reports the version of the remote Nix daemon.
|
|
||||||
|
|
||||||
* `nix flake {init,new}` now display information about which files have been
|
|
||||||
created.
|
|
||||||
|
|
||||||
* Templates can now define a `welcomeText` attribute, which is printed out by
|
|
||||||
`nix flake {init,new} --template <template>`.
|
|
||||||
-264
@@ -1,264 +0,0 @@
|
|||||||
{ pkgs ? import <nixpkgs> { }
|
|
||||||
, lib ? pkgs.lib
|
|
||||||
, name ? "nix"
|
|
||||||
, tag ? "latest"
|
|
||||||
, channelName ? "nixpkgs"
|
|
||||||
, channelURL ? "https://nixos.org/channels/nixpkgs-unstable"
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
defaultPkgs = with pkgs; [
|
|
||||||
nix
|
|
||||||
bashInteractive
|
|
||||||
coreutils-full
|
|
||||||
gnutar
|
|
||||||
gzip
|
|
||||||
gnugrep
|
|
||||||
which
|
|
||||||
curl
|
|
||||||
less
|
|
||||||
wget
|
|
||||||
man
|
|
||||||
cacert.out
|
|
||||||
findutils
|
|
||||||
iana-etc
|
|
||||||
git
|
|
||||||
];
|
|
||||||
|
|
||||||
users = {
|
|
||||||
|
|
||||||
root = {
|
|
||||||
uid = 0;
|
|
||||||
shell = "/bin/bash";
|
|
||||||
home = "/root";
|
|
||||||
gid = 0;
|
|
||||||
};
|
|
||||||
|
|
||||||
} // lib.listToAttrs (
|
|
||||||
map
|
|
||||||
(
|
|
||||||
n: {
|
|
||||||
name = "nixbld${toString n}";
|
|
||||||
value = {
|
|
||||||
uid = 30000 + n;
|
|
||||||
gid = 30000;
|
|
||||||
groups = [ "nixbld" ];
|
|
||||||
description = "Nix build user ${toString n}";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
)
|
|
||||||
(lib.lists.range 1 32)
|
|
||||||
);
|
|
||||||
|
|
||||||
groups = {
|
|
||||||
root.gid = 0;
|
|
||||||
nixbld.gid = 30000;
|
|
||||||
};
|
|
||||||
|
|
||||||
userToPasswd = (
|
|
||||||
k:
|
|
||||||
{ uid
|
|
||||||
, gid ? 65534
|
|
||||||
, home ? "/var/empty"
|
|
||||||
, description ? ""
|
|
||||||
, shell ? "/bin/false"
|
|
||||||
, groups ? [ ]
|
|
||||||
}: "${k}:x:${toString uid}:${toString gid}:${description}:${home}:${shell}"
|
|
||||||
);
|
|
||||||
passwdContents = (
|
|
||||||
lib.concatStringsSep "\n"
|
|
||||||
(lib.attrValues (lib.mapAttrs userToPasswd users))
|
|
||||||
);
|
|
||||||
|
|
||||||
userToShadow = k: { ... }: "${k}:!:1::::::";
|
|
||||||
shadowContents = (
|
|
||||||
lib.concatStringsSep "\n"
|
|
||||||
(lib.attrValues (lib.mapAttrs userToShadow users))
|
|
||||||
);
|
|
||||||
|
|
||||||
# Map groups to members
|
|
||||||
# {
|
|
||||||
# group = [ "user1" "user2" ];
|
|
||||||
# }
|
|
||||||
groupMemberMap = (
|
|
||||||
let
|
|
||||||
# Create a flat list of user/group mappings
|
|
||||||
mappings = (
|
|
||||||
builtins.foldl'
|
|
||||||
(
|
|
||||||
acc: user:
|
|
||||||
let
|
|
||||||
groups = users.${user}.groups or [ ];
|
|
||||||
in
|
|
||||||
acc ++ map
|
|
||||||
(group: {
|
|
||||||
inherit user group;
|
|
||||||
})
|
|
||||||
groups
|
|
||||||
)
|
|
||||||
[ ]
|
|
||||||
(lib.attrNames users)
|
|
||||||
);
|
|
||||||
in
|
|
||||||
(
|
|
||||||
builtins.foldl'
|
|
||||||
(
|
|
||||||
acc: v: acc // {
|
|
||||||
${v.group} = acc.${v.group} or [ ] ++ [ v.user ];
|
|
||||||
}
|
|
||||||
)
|
|
||||||
{ }
|
|
||||||
mappings)
|
|
||||||
);
|
|
||||||
|
|
||||||
groupToGroup = k: { gid }:
|
|
||||||
let
|
|
||||||
members = groupMemberMap.${k} or [ ];
|
|
||||||
in
|
|
||||||
"${k}:x:${toString gid}:${lib.concatStringsSep "," members}";
|
|
||||||
groupContents = (
|
|
||||||
lib.concatStringsSep "\n"
|
|
||||||
(lib.attrValues (lib.mapAttrs groupToGroup groups))
|
|
||||||
);
|
|
||||||
|
|
||||||
nixConf = {
|
|
||||||
sandbox = "false";
|
|
||||||
build-users-group = "nixbld";
|
|
||||||
trusted-public-keys = "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=";
|
|
||||||
};
|
|
||||||
nixConfContents = (lib.concatStringsSep "\n" (lib.mapAttrsFlatten (n: v: "${n} = ${v}") nixConf)) + "\n";
|
|
||||||
|
|
||||||
baseSystem =
|
|
||||||
let
|
|
||||||
nixpkgs = pkgs.path;
|
|
||||||
channel = pkgs.runCommand "channel-nixos" { } ''
|
|
||||||
mkdir $out
|
|
||||||
ln -s ${nixpkgs} $out/nixpkgs
|
|
||||||
echo "[]" > $out/manifest.nix
|
|
||||||
'';
|
|
||||||
rootEnv = pkgs.buildPackages.buildEnv {
|
|
||||||
name = "root-profile-env";
|
|
||||||
paths = defaultPkgs;
|
|
||||||
};
|
|
||||||
manifest = pkgs.buildPackages.runCommand "manifest.nix" { } ''
|
|
||||||
cat > $out <<EOF
|
|
||||||
[
|
|
||||||
${lib.concatStringsSep "\n" (builtins.map (drv: let
|
|
||||||
outputs = drv.outputsToInstall or [ "out" ];
|
|
||||||
in ''
|
|
||||||
{
|
|
||||||
${lib.concatStringsSep "\n" (builtins.map (output: ''
|
|
||||||
${output} = { outPath = "${lib.getOutput output drv}"; };
|
|
||||||
'') outputs)}
|
|
||||||
outputs = [ ${lib.concatStringsSep " " (builtins.map (x: "\"${x}\"") outputs)} ];
|
|
||||||
name = "${drv.name}";
|
|
||||||
outPath = "${drv}";
|
|
||||||
system = "${drv.system}";
|
|
||||||
type = "derivation";
|
|
||||||
meta = { };
|
|
||||||
}
|
|
||||||
'') defaultPkgs)}
|
|
||||||
]
|
|
||||||
EOF
|
|
||||||
'';
|
|
||||||
profile = pkgs.buildPackages.runCommand "user-environment" { } ''
|
|
||||||
mkdir $out
|
|
||||||
cp -a ${rootEnv}/* $out/
|
|
||||||
ln -s ${manifest} $out/manifest.nix
|
|
||||||
'';
|
|
||||||
in
|
|
||||||
pkgs.runCommand "base-system"
|
|
||||||
{
|
|
||||||
inherit passwdContents groupContents shadowContents nixConfContents;
|
|
||||||
passAsFile = [
|
|
||||||
"passwdContents"
|
|
||||||
"groupContents"
|
|
||||||
"shadowContents"
|
|
||||||
"nixConfContents"
|
|
||||||
];
|
|
||||||
allowSubstitutes = false;
|
|
||||||
preferLocalBuild = true;
|
|
||||||
} ''
|
|
||||||
env
|
|
||||||
set -x
|
|
||||||
mkdir -p $out/etc
|
|
||||||
|
|
||||||
mkdir -p $out/etc/ssl/certs
|
|
||||||
ln -s /nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt $out/etc/ssl/certs
|
|
||||||
|
|
||||||
cat $passwdContentsPath > $out/etc/passwd
|
|
||||||
echo "" >> $out/etc/passwd
|
|
||||||
|
|
||||||
cat $groupContentsPath > $out/etc/group
|
|
||||||
echo "" >> $out/etc/group
|
|
||||||
|
|
||||||
cat $shadowContentsPath > $out/etc/shadow
|
|
||||||
echo "" >> $out/etc/shadow
|
|
||||||
|
|
||||||
mkdir -p $out/usr
|
|
||||||
ln -s /nix/var/nix/profiles/share $out/usr/
|
|
||||||
|
|
||||||
mkdir -p $out/nix/var/nix/gcroots
|
|
||||||
|
|
||||||
mkdir $out/tmp
|
|
||||||
|
|
||||||
mkdir -p $out/var/tmp
|
|
||||||
|
|
||||||
mkdir -p $out/etc/nix
|
|
||||||
cat $nixConfContentsPath > $out/etc/nix/nix.conf
|
|
||||||
|
|
||||||
mkdir -p $out/root
|
|
||||||
mkdir -p $out/nix/var/nix/profiles/per-user/root
|
|
||||||
|
|
||||||
ln -s ${profile} $out/nix/var/nix/profiles/default-1-link
|
|
||||||
ln -s $out/nix/var/nix/profiles/default-1-link $out/nix/var/nix/profiles/default
|
|
||||||
ln -s /nix/var/nix/profiles/default $out/root/.nix-profile
|
|
||||||
|
|
||||||
ln -s ${channel} $out/nix/var/nix/profiles/per-user/root/channels-1-link
|
|
||||||
ln -s $out/nix/var/nix/profiles/per-user/root/channels-1-link $out/nix/var/nix/profiles/per-user/root/channels
|
|
||||||
|
|
||||||
mkdir -p $out/root/.nix-defexpr
|
|
||||||
ln -s $out/nix/var/nix/profiles/per-user/root/channels $out/root/.nix-defexpr/channels
|
|
||||||
echo "${channelURL} ${channelName}" > $out/root/.nix-channels
|
|
||||||
|
|
||||||
mkdir -p $out/bin $out/usr/bin
|
|
||||||
ln -s ${pkgs.coreutils}/bin/env $out/usr/bin/env
|
|
||||||
ln -s ${pkgs.bashInteractive}/bin/bash $out/bin/sh
|
|
||||||
'';
|
|
||||||
|
|
||||||
in
|
|
||||||
pkgs.dockerTools.buildLayeredImageWithNixDb {
|
|
||||||
|
|
||||||
inherit name tag;
|
|
||||||
|
|
||||||
contents = [ baseSystem ];
|
|
||||||
|
|
||||||
extraCommands = ''
|
|
||||||
rm -rf nix-support
|
|
||||||
ln -s /nix/var/nix/profiles nix/var/nix/gcroots/profiles
|
|
||||||
'';
|
|
||||||
fakeRootCommands = ''
|
|
||||||
chmod 1777 tmp
|
|
||||||
chmod 1777 var/tmp
|
|
||||||
'';
|
|
||||||
|
|
||||||
config = {
|
|
||||||
Cmd = [ "/root/.nix-profile/bin/bash" ];
|
|
||||||
Env = [
|
|
||||||
"USER=root"
|
|
||||||
"PATH=${lib.concatStringsSep ":" [
|
|
||||||
"/root/.nix-profile/bin"
|
|
||||||
"/nix/var/nix/profiles/default/bin"
|
|
||||||
"/nix/var/nix/profiles/default/sbin"
|
|
||||||
]}"
|
|
||||||
"MANPATH=${lib.concatStringsSep ":" [
|
|
||||||
"/root/.nix-profile/share/man"
|
|
||||||
"/nix/var/nix/profiles/default/share/man"
|
|
||||||
]}"
|
|
||||||
"SSL_CERT_FILE=/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt"
|
|
||||||
"GIT_SSL_CAINFO=/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt"
|
|
||||||
"NIX_SSL_CERT_FILE=/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt"
|
|
||||||
"NIX_PATH=/nix/var/nix/profiles/per-user/root/channels:/root/.nix-defexpr/channels"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
|
||||||
Generated
+8
-23
@@ -3,26 +3,27 @@
|
|||||||
"lowdown-src": {
|
"lowdown-src": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1633514407,
|
"lastModified": 1617481909,
|
||||||
"narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=",
|
"narHash": "sha256-SqnfOFuLuVRRNeVJr1yeEPJue/qWoCp5N6o5Kr///p4=",
|
||||||
"owner": "kristapsdz",
|
"owner": "kristapsdz",
|
||||||
"repo": "lowdown",
|
"repo": "lowdown",
|
||||||
"rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8",
|
"rev": "148f9b2f586c41b7e36e73009db43ea68c7a1a4d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "kristapsdz",
|
"owner": "kristapsdz",
|
||||||
|
"ref": "VERSION_0_8_4",
|
||||||
"repo": "lowdown",
|
"repo": "lowdown",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1632864508,
|
"lastModified": 1622593737,
|
||||||
"narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=",
|
"narHash": "sha256-9loxFJg85AbzJrSkU4pE/divZ1+zOxDy2FSjlrufCB8=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "82891b5e2c2359d7e58d08849e4c89511ab94234",
|
"rev": "bb8a5e54845012ed1375ffd5f317d2fdf434b20e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -31,26 +32,10 @@
|
|||||||
"type": "indirect"
|
"type": "indirect"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-regression": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1643052045,
|
|
||||||
"narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"id": "nixpkgs",
|
|
||||||
"rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
|
|
||||||
"type": "indirect"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"lowdown-src": "lowdown-src",
|
"lowdown-src": "lowdown-src",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs"
|
||||||
"nixpkgs-regression": "nixpkgs-regression"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -2,10 +2,9 @@
|
|||||||
description = "The purely functional package manager";
|
description = "The purely functional package manager";
|
||||||
|
|
||||||
inputs.nixpkgs.url = "nixpkgs/nixos-21.05-small";
|
inputs.nixpkgs.url = "nixpkgs/nixos-21.05-small";
|
||||||
inputs.nixpkgs-regression.url = "nixpkgs/215d4d0fd80ca5163643b03a33fde804a29cc1e2";
|
inputs.lowdown-src = { url = "github:kristapsdz/lowdown/VERSION_0_8_4"; flake = false; };
|
||||||
inputs.lowdown-src = { url = "github:kristapsdz/lowdown"; flake = false; };
|
|
||||||
|
|
||||||
outputs = { self, nixpkgs, nixpkgs-regression, lowdown-src }:
|
outputs = { self, nixpkgs, lowdown-src }:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
@@ -21,38 +20,15 @@
|
|||||||
linuxSystems = linux64BitSystems ++ [ "i686-linux" ];
|
linuxSystems = linux64BitSystems ++ [ "i686-linux" ];
|
||||||
systems = linuxSystems ++ [ "x86_64-darwin" "aarch64-darwin" ];
|
systems = linuxSystems ++ [ "x86_64-darwin" "aarch64-darwin" ];
|
||||||
|
|
||||||
crossSystems = [ "armv6l-linux" "armv7l-linux" ];
|
|
||||||
|
|
||||||
stdenvs = [ "gccStdenv" "clangStdenv" "clang11Stdenv" "stdenv" ];
|
|
||||||
|
|
||||||
forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f system);
|
forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f system);
|
||||||
forAllSystemsAndStdenvs = f: forAllSystems (system:
|
|
||||||
nixpkgs.lib.listToAttrs
|
|
||||||
(map
|
|
||||||
(n:
|
|
||||||
nixpkgs.lib.nameValuePair "${n}Packages" (
|
|
||||||
f system n
|
|
||||||
)) stdenvs
|
|
||||||
)
|
|
||||||
);
|
|
||||||
|
|
||||||
forAllStdenvs = stdenvs: f: nixpkgs.lib.genAttrs stdenvs (stdenv: f stdenv);
|
|
||||||
|
|
||||||
# Memoize nixpkgs for different platforms for efficiency.
|
# Memoize nixpkgs for different platforms for efficiency.
|
||||||
nixpkgsFor =
|
nixpkgsFor = forAllSystems (system:
|
||||||
let stdenvsPackages = forAllSystemsAndStdenvs
|
import nixpkgs {
|
||||||
(system: stdenv:
|
inherit system;
|
||||||
import nixpkgs {
|
overlays = [ self.overlay ];
|
||||||
inherit system;
|
}
|
||||||
overlays = [
|
);
|
||||||
(overlayFor (p: p.${stdenv}))
|
|
||||||
];
|
|
||||||
}
|
|
||||||
);
|
|
||||||
in
|
|
||||||
# Add the `stdenvPackages` at toplevel, both because these are the ones
|
|
||||||
# we want most of the time and for backwards compatibility
|
|
||||||
forAllSystems (system: stdenvsPackages.${system} // stdenvsPackages.${system}.stdenvPackages);
|
|
||||||
|
|
||||||
commonDeps = pkgs: with pkgs; rec {
|
commonDeps = pkgs: with pkgs; rec {
|
||||||
# Use "busybox-sandbox-shell" if present,
|
# Use "busybox-sandbox-shell" if present,
|
||||||
@@ -83,7 +59,6 @@
|
|||||||
|
|
||||||
configureFlags =
|
configureFlags =
|
||||||
lib.optionals stdenv.isLinux [
|
lib.optionals stdenv.isLinux [
|
||||||
"--with-boost=${boost}/lib"
|
|
||||||
"--with-sandbox-shell=${sh}/bin/busybox"
|
"--with-sandbox-shell=${sh}/bin/busybox"
|
||||||
"LDFLAGS=-fuse-ld=gold"
|
"LDFLAGS=-fuse-ld=gold"
|
||||||
];
|
];
|
||||||
@@ -93,18 +68,18 @@
|
|||||||
[
|
[
|
||||||
buildPackages.bison
|
buildPackages.bison
|
||||||
buildPackages.flex
|
buildPackages.flex
|
||||||
(lib.getBin buildPackages.lowdown-nix)
|
(lib.getBin buildPackages.lowdown)
|
||||||
buildPackages.mdbook
|
buildPackages.mdbook
|
||||||
buildPackages.autoconf-archive
|
buildPackages.autoconf-archive
|
||||||
buildPackages.autoreconfHook
|
buildPackages.autoreconfHook
|
||||||
buildPackages.pkg-config
|
buildPackages.pkgconfig
|
||||||
|
|
||||||
# Tests
|
# Tests
|
||||||
buildPackages.git
|
buildPackages.git
|
||||||
buildPackages.mercurial # FIXME: remove? only needed for tests
|
buildPackages.mercurial
|
||||||
buildPackages.jq
|
buildPackages.jq
|
||||||
]
|
]
|
||||||
++ lib.optionals stdenv.hostPlatform.isLinux [(buildPackages.util-linuxMinimal or buildPackages.utillinuxMinimal)];
|
++ lib.optionals stdenv.isLinux [(pkgs.util-linuxMinimal or pkgs.utillinuxMinimal)];
|
||||||
|
|
||||||
buildDeps =
|
buildDeps =
|
||||||
[ curl
|
[ curl
|
||||||
@@ -112,12 +87,13 @@
|
|||||||
openssl sqlite
|
openssl sqlite
|
||||||
libarchive
|
libarchive
|
||||||
boost
|
boost
|
||||||
lowdown-nix
|
nlohmann_json
|
||||||
gtest
|
lowdown
|
||||||
|
gmock
|
||||||
]
|
]
|
||||||
++ lib.optionals stdenv.isLinux [libseccomp]
|
++ lib.optionals stdenv.isLinux [libseccomp]
|
||||||
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
|
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
|
||||||
++ lib.optional stdenv.hostPlatform.isx86_64 libcpuid;
|
++ lib.optional stdenv.isx86_64 libcpuid;
|
||||||
|
|
||||||
awsDeps = lib.optional (stdenv.isLinux || stdenv.isDarwin)
|
awsDeps = lib.optional (stdenv.isLinux || stdenv.isDarwin)
|
||||||
(aws-sdk-cpp.override {
|
(aws-sdk-cpp.override {
|
||||||
@@ -126,14 +102,7 @@
|
|||||||
});
|
});
|
||||||
|
|
||||||
propagatedDeps =
|
propagatedDeps =
|
||||||
[ ((boehmgc.override {
|
[ (boehmgc.override { enableLargeConfig = true; })
|
||||||
enableLargeConfig = true;
|
|
||||||
}).overrideAttrs(o: {
|
|
||||||
patches = (o.patches or []) ++ [
|
|
||||||
./boehmgc-coroutine-sp-fallback.diff
|
|
||||||
];
|
|
||||||
}))
|
|
||||||
nlohmann_json
|
|
||||||
];
|
];
|
||||||
|
|
||||||
perlDeps =
|
perlDeps =
|
||||||
@@ -142,15 +111,16 @@
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
installScriptFor = systems:
|
installScriptFor = systems:
|
||||||
with nixpkgsFor.x86_64-linux;
|
with nixpkgsFor.x86_64-linux;
|
||||||
runCommand "installer-script"
|
runCommand "installer-script"
|
||||||
{ buildInputs = [ nix ];
|
{ buildInputs = [ nix ];
|
||||||
}
|
}
|
||||||
''
|
''
|
||||||
mkdir -p $out/nix-support
|
mkdir -p $out/nix-support
|
||||||
|
|
||||||
# Converts /nix/store/50p3qk8k...-nix-2.4pre20201102_550e11f/bin/nix to 50p3qk8k.../bin/nix.
|
# Converts /nix/store/50p3qk8kka9dl6wyq40vydq945k0j3kv-nix-2.4pre20201102_550e11f/bin/nix
|
||||||
|
# To 50p3qk8kka9dl6wyq40vydq945k0j3kv/bin/nix
|
||||||
tarballPath() {
|
tarballPath() {
|
||||||
# Remove the store prefix
|
# Remove the store prefix
|
||||||
local path=''${1#${builtins.storeDir}/}
|
local path=''${1#${builtins.storeDir}/}
|
||||||
@@ -163,11 +133,10 @@
|
|||||||
|
|
||||||
substitute ${./scripts/install.in} $out/install \
|
substitute ${./scripts/install.in} $out/install \
|
||||||
${pkgs.lib.concatMapStrings
|
${pkgs.lib.concatMapStrings
|
||||||
(system: let
|
(system:
|
||||||
tarball = if builtins.elem system crossSystems then self.hydraJobs.binaryTarballCross.x86_64-linux.${system} else self.hydraJobs.binaryTarball.${system};
|
'' \
|
||||||
in '' \
|
--replace '@tarballHash_${system}@' $(nix --experimental-features nix-command hash-file --base16 --type sha256 ${self.hydraJobs.binaryTarball.${system}}/*.tar.xz) \
|
||||||
--replace '@tarballHash_${system}@' $(nix --experimental-features nix-command hash-file --base16 --type sha256 ${tarball}/*.tar.xz) \
|
--replace '@tarballPath_${system}@' $(tarballPath ${self.hydraJobs.binaryTarball.${system}}/*.tar.xz) \
|
||||||
--replace '@tarballPath_${system}@' $(tarballPath ${tarball}/*.tar.xz) \
|
|
||||||
''
|
''
|
||||||
)
|
)
|
||||||
systems
|
systems
|
||||||
@@ -176,15 +145,13 @@
|
|||||||
echo "file installer $out/install" >> $out/nix-support/hydra-build-products
|
echo "file installer $out/install" >> $out/nix-support/hydra-build-products
|
||||||
'';
|
'';
|
||||||
|
|
||||||
testNixVersions = pkgs: client: daemon: with commonDeps pkgs; with pkgs.lib; pkgs.stdenv.mkDerivation {
|
testNixVersions = pkgs: client: daemon: with commonDeps pkgs; pkgs.stdenv.mkDerivation {
|
||||||
NIX_DAEMON_PACKAGE = daemon;
|
NIX_DAEMON_PACKAGE = daemon;
|
||||||
NIX_CLIENT_PACKAGE = client;
|
NIX_CLIENT_PACKAGE = client;
|
||||||
name =
|
# Must keep this name short as OSX has a rather strict limit on the
|
||||||
"nix-tests"
|
# socket path length, and this name appears in the path of the
|
||||||
+ optionalString
|
# nix-daemon socket used in the tests
|
||||||
(versionAtLeast daemon.version "2.4pre20211005" &&
|
name = "nix-tests";
|
||||||
versionAtLeast client.version "2.4pre20211005")
|
|
||||||
"-${client.version}-against-${daemon.version}";
|
|
||||||
inherit version;
|
inherit version;
|
||||||
|
|
||||||
src = self;
|
src = self;
|
||||||
@@ -203,213 +170,138 @@
|
|||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p $out
|
mkdir -p $out
|
||||||
'';
|
'';
|
||||||
|
installCheckPhase = "make installcheck";
|
||||||
|
|
||||||
installCheckPhase = "make installcheck -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
binaryTarball = buildPackages: nix: pkgs:
|
|
||||||
let
|
|
||||||
inherit (pkgs) cacert;
|
|
||||||
installerClosureInfo = buildPackages.closureInfo { rootPaths = [ nix cacert ]; };
|
|
||||||
in
|
|
||||||
|
|
||||||
buildPackages.runCommand "nix-binary-tarball-${version}"
|
|
||||||
{ #nativeBuildInputs = lib.optional (system != "aarch64-linux") shellcheck;
|
|
||||||
meta.description = "Distribution-independent Nix bootstrap binaries for ${pkgs.system}";
|
|
||||||
}
|
|
||||||
''
|
|
||||||
cp ${installerClosureInfo}/registration $TMPDIR/reginfo
|
|
||||||
cp ${./scripts/create-darwin-volume.sh} $TMPDIR/create-darwin-volume.sh
|
|
||||||
substitute ${./scripts/install-nix-from-closure.sh} $TMPDIR/install \
|
|
||||||
--subst-var-by nix ${nix} \
|
|
||||||
--subst-var-by cacert ${cacert}
|
|
||||||
|
|
||||||
substitute ${./scripts/install-darwin-multi-user.sh} $TMPDIR/install-darwin-multi-user.sh \
|
|
||||||
--subst-var-by nix ${nix} \
|
|
||||||
--subst-var-by cacert ${cacert}
|
|
||||||
substitute ${./scripts/install-systemd-multi-user.sh} $TMPDIR/install-systemd-multi-user.sh \
|
|
||||||
--subst-var-by nix ${nix} \
|
|
||||||
--subst-var-by cacert ${cacert}
|
|
||||||
substitute ${./scripts/install-multi-user.sh} $TMPDIR/install-multi-user \
|
|
||||||
--subst-var-by nix ${nix} \
|
|
||||||
--subst-var-by cacert ${cacert}
|
|
||||||
|
|
||||||
if type -p shellcheck; then
|
|
||||||
# SC1090: Don't worry about not being able to find
|
|
||||||
# $nix/etc/profile.d/nix.sh
|
|
||||||
shellcheck --exclude SC1090 $TMPDIR/install
|
|
||||||
shellcheck $TMPDIR/create-darwin-volume.sh
|
|
||||||
shellcheck $TMPDIR/install-darwin-multi-user.sh
|
|
||||||
shellcheck $TMPDIR/install-systemd-multi-user.sh
|
|
||||||
|
|
||||||
# SC1091: Don't panic about not being able to source
|
|
||||||
# /etc/profile
|
|
||||||
# SC2002: Ignore "useless cat" "error", when loading
|
|
||||||
# .reginfo, as the cat is a much cleaner
|
|
||||||
# implementation, even though it is "useless"
|
|
||||||
# SC2116: Allow ROOT_HOME=$(echo ~root) for resolving
|
|
||||||
# root's home directory
|
|
||||||
shellcheck --external-sources \
|
|
||||||
--exclude SC1091,SC2002,SC2116 $TMPDIR/install-multi-user
|
|
||||||
fi
|
|
||||||
|
|
||||||
chmod +x $TMPDIR/install
|
|
||||||
chmod +x $TMPDIR/create-darwin-volume.sh
|
|
||||||
chmod +x $TMPDIR/install-darwin-multi-user.sh
|
|
||||||
chmod +x $TMPDIR/install-systemd-multi-user.sh
|
|
||||||
chmod +x $TMPDIR/install-multi-user
|
|
||||||
dir=nix-${version}-${pkgs.system}
|
|
||||||
fn=$out/$dir.tar.xz
|
|
||||||
mkdir -p $out/nix-support
|
|
||||||
echo "file binary-dist $fn" >> $out/nix-support/hydra-build-products
|
|
||||||
tar cvfJ $fn \
|
|
||||||
--owner=0 --group=0 --mode=u+rw,uga+r \
|
|
||||||
--absolute-names \
|
|
||||||
--hard-dereference \
|
|
||||||
--transform "s,$TMPDIR/install,$dir/install," \
|
|
||||||
--transform "s,$TMPDIR/create-darwin-volume.sh,$dir/create-darwin-volume.sh," \
|
|
||||||
--transform "s,$TMPDIR/reginfo,$dir/.reginfo," \
|
|
||||||
--transform "s,$NIX_STORE,$dir/store,S" \
|
|
||||||
$TMPDIR/install \
|
|
||||||
$TMPDIR/create-darwin-volume.sh \
|
|
||||||
$TMPDIR/install-darwin-multi-user.sh \
|
|
||||||
$TMPDIR/install-systemd-multi-user.sh \
|
|
||||||
$TMPDIR/install-multi-user \
|
|
||||||
$TMPDIR/reginfo \
|
|
||||||
$(cat ${installerClosureInfo}/store-paths)
|
|
||||||
'';
|
|
||||||
|
|
||||||
overlayFor = getStdenv: final: prev:
|
|
||||||
let currentStdenv = getStdenv final; in
|
|
||||||
{
|
|
||||||
nixStable = prev.nix;
|
|
||||||
|
|
||||||
# Forward from the previous stage as we don’t want it to pick the lowdown override
|
|
||||||
nixUnstable = prev.nixUnstable;
|
|
||||||
|
|
||||||
nix = with final; with commonDeps pkgs; currentStdenv.mkDerivation {
|
|
||||||
name = "nix-${version}";
|
|
||||||
inherit version;
|
|
||||||
|
|
||||||
src = self;
|
|
||||||
|
|
||||||
VERSION_SUFFIX = versionSuffix;
|
|
||||||
|
|
||||||
outputs = [ "out" "dev" "doc" ];
|
|
||||||
|
|
||||||
nativeBuildInputs = nativeBuildDeps;
|
|
||||||
buildInputs = buildDeps ++ awsDeps;
|
|
||||||
|
|
||||||
propagatedBuildInputs = propagatedDeps;
|
|
||||||
|
|
||||||
disallowedReferences = [ boost ];
|
|
||||||
|
|
||||||
preConfigure =
|
|
||||||
''
|
|
||||||
# Copy libboost_context so we don't get all of Boost in our closure.
|
|
||||||
# https://github.com/NixOS/nixpkgs/issues/45462
|
|
||||||
mkdir -p $out/lib
|
|
||||||
cp -pd ${boost}/lib/{libboost_context*,libboost_thread*,libboost_system*} $out/lib
|
|
||||||
rm -f $out/lib/*.a
|
|
||||||
${lib.optionalString currentStdenv.isLinux ''
|
|
||||||
chmod u+w $out/lib/*.so.*
|
|
||||||
patchelf --set-rpath $out/lib:${currentStdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.*
|
|
||||||
''}
|
|
||||||
${lib.optionalString currentStdenv.isDarwin ''
|
|
||||||
for LIB in $out/lib/*.dylib; do
|
|
||||||
chmod u+w $LIB
|
|
||||||
install_name_tool -id $LIB $LIB
|
|
||||||
done
|
|
||||||
install_name_tool -change ${boost}/lib/libboost_system.dylib $out/lib/libboost_system.dylib $out/lib/libboost_thread.dylib
|
|
||||||
''}
|
|
||||||
'';
|
|
||||||
|
|
||||||
configureFlags = configureFlags ++
|
|
||||||
[ "--sysconfdir=/etc" ];
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
makeFlags = "profiledir=$(out)/etc/profile.d PRECOMPILE_HEADERS=1";
|
|
||||||
|
|
||||||
doCheck = true;
|
|
||||||
|
|
||||||
installFlags = "sysconfdir=$(out)/etc";
|
|
||||||
|
|
||||||
postInstall = ''
|
|
||||||
mkdir -p $doc/nix-support
|
|
||||||
echo "doc manual $doc/share/doc/nix/manual" >> $doc/nix-support/hydra-build-products
|
|
||||||
${lib.optionalString currentStdenv.isDarwin ''
|
|
||||||
install_name_tool \
|
|
||||||
-change ${boost}/lib/libboost_context.dylib \
|
|
||||||
$out/lib/libboost_context.dylib \
|
|
||||||
$out/lib/libnixutil.dylib
|
|
||||||
''}
|
|
||||||
'';
|
|
||||||
|
|
||||||
doInstallCheck = true;
|
|
||||||
installCheckFlags = "sysconfdir=$(out)/etc";
|
|
||||||
|
|
||||||
separateDebugInfo = true;
|
|
||||||
|
|
||||||
strictDeps = true;
|
|
||||||
|
|
||||||
passthru.perl-bindings = with final; currentStdenv.mkDerivation {
|
|
||||||
name = "nix-perl-${version}";
|
|
||||||
|
|
||||||
src = self;
|
|
||||||
|
|
||||||
nativeBuildInputs =
|
|
||||||
[ buildPackages.autoconf-archive
|
|
||||||
buildPackages.autoreconfHook
|
|
||||||
buildPackages.pkg-config
|
|
||||||
];
|
|
||||||
|
|
||||||
buildInputs =
|
|
||||||
[ nix
|
|
||||||
curl
|
|
||||||
bzip2
|
|
||||||
xz
|
|
||||||
pkgs.perl
|
|
||||||
boost
|
|
||||||
]
|
|
||||||
++ lib.optional (currentStdenv.isLinux || currentStdenv.isDarwin) libsodium
|
|
||||||
++ lib.optional currentStdenv.isDarwin darwin.apple_sdk.frameworks.Security;
|
|
||||||
|
|
||||||
configureFlags = ''
|
|
||||||
--with-dbi=${perlPackages.DBI}/${pkgs.perl.libPrefix}
|
|
||||||
--with-dbd-sqlite=${perlPackages.DBDSQLite}/${pkgs.perl.libPrefix}
|
|
||||||
'';
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
postUnpack = "sourceRoot=$sourceRoot/perl";
|
|
||||||
};
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
lowdown-nix = with final; currentStdenv.mkDerivation rec {
|
|
||||||
name = "lowdown-0.9.0";
|
|
||||||
|
|
||||||
src = lowdown-src;
|
|
||||||
|
|
||||||
outputs = [ "out" "bin" "dev" ];
|
|
||||||
|
|
||||||
nativeBuildInputs = [ buildPackages.which ];
|
|
||||||
|
|
||||||
configurePhase = ''
|
|
||||||
${if (currentStdenv.isDarwin && currentStdenv.isAarch64) then "echo \"HAVE_SANDBOX_INIT=false\" > configure.local" else ""}
|
|
||||||
./configure \
|
|
||||||
PREFIX=${placeholder "dev"} \
|
|
||||||
BINDIR=${placeholder "bin"}/bin
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
in {
|
in {
|
||||||
|
|
||||||
# A Nixpkgs overlay that overrides the 'nix' and
|
# A Nixpkgs overlay that overrides the 'nix' and
|
||||||
# 'nix.perl-bindings' packages.
|
# 'nix.perl-bindings' packages.
|
||||||
overlay = overlayFor (p: p.stdenv);
|
overlay = final: prev: {
|
||||||
|
|
||||||
|
# An older version of Nix to test against when using the daemon.
|
||||||
|
# Currently using `nixUnstable` as the stable one doesn't respect
|
||||||
|
# `NIX_DAEMON_SOCKET_PATH` which is needed for the tests.
|
||||||
|
nixStable = prev.nix;
|
||||||
|
|
||||||
|
nix = with final; with commonDeps pkgs; stdenv.mkDerivation {
|
||||||
|
name = "nix-${version}";
|
||||||
|
inherit version;
|
||||||
|
|
||||||
|
src = self;
|
||||||
|
|
||||||
|
VERSION_SUFFIX = versionSuffix;
|
||||||
|
|
||||||
|
outputs = [ "out" "dev" "doc" ];
|
||||||
|
|
||||||
|
nativeBuildInputs = nativeBuildDeps;
|
||||||
|
buildInputs = buildDeps ++ awsDeps;
|
||||||
|
|
||||||
|
propagatedBuildInputs = propagatedDeps;
|
||||||
|
|
||||||
|
preConfigure =
|
||||||
|
''
|
||||||
|
# Copy libboost_context so we don't get all of Boost in our closure.
|
||||||
|
# https://github.com/NixOS/nixpkgs/issues/45462
|
||||||
|
mkdir -p $out/lib
|
||||||
|
cp -pd ${boost}/lib/{libboost_context*,libboost_thread*,libboost_system*} $out/lib
|
||||||
|
rm -f $out/lib/*.a
|
||||||
|
${lib.optionalString stdenv.isLinux ''
|
||||||
|
chmod u+w $out/lib/*.so.*
|
||||||
|
patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.*
|
||||||
|
''}
|
||||||
|
'';
|
||||||
|
|
||||||
|
configureFlags = configureFlags ++
|
||||||
|
[ "--sysconfdir=/etc" ];
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
makeFlags = "profiledir=$(out)/etc/profile.d PRECOMPILE_HEADERS=1";
|
||||||
|
|
||||||
|
doCheck = true;
|
||||||
|
|
||||||
|
installFlags = "sysconfdir=$(out)/etc";
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
mkdir -p $doc/nix-support
|
||||||
|
echo "doc manual $doc/share/doc/nix/manual" >> $doc/nix-support/hydra-build-products
|
||||||
|
'';
|
||||||
|
|
||||||
|
doInstallCheck = false;
|
||||||
|
installCheckFlags = "sysconfdir=$(out)/etc";
|
||||||
|
|
||||||
|
separateDebugInfo = true;
|
||||||
|
|
||||||
|
strictDeps = true;
|
||||||
|
|
||||||
|
passthru.perl-bindings = with final; stdenv.mkDerivation {
|
||||||
|
name = "nix-perl-${version}";
|
||||||
|
|
||||||
|
src = self;
|
||||||
|
|
||||||
|
nativeBuildInputs =
|
||||||
|
[ buildPackages.autoconf-archive
|
||||||
|
buildPackages.autoreconfHook
|
||||||
|
buildPackages.pkgconfig
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs =
|
||||||
|
[ nix
|
||||||
|
curl
|
||||||
|
bzip2
|
||||||
|
xz
|
||||||
|
pkgs.perl
|
||||||
|
boost
|
||||||
|
nlohmann_json
|
||||||
|
]
|
||||||
|
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium;
|
||||||
|
|
||||||
|
configureFlags = ''
|
||||||
|
--with-dbi=${perlPackages.DBI}/${pkgs.perl.libPrefix}
|
||||||
|
--with-dbd-sqlite=${perlPackages.DBDSQLite}/${pkgs.perl.libPrefix}
|
||||||
|
'';
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
postUnpack = "sourceRoot=$sourceRoot/perl";
|
||||||
|
};
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
lowdown = with final; stdenv.mkDerivation rec {
|
||||||
|
name = "lowdown-0.8.4";
|
||||||
|
|
||||||
|
/*
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://kristaps.bsd.lv/lowdown/snapshots/${name}.tar.gz";
|
||||||
|
hash = "sha512-U9WeGoInT9vrawwa57t6u9dEdRge4/P+0wLxmQyOL9nhzOEUU2FRz2Be9H0dCjYE7p2v3vCXIYk40M+jjULATw==";
|
||||||
|
};
|
||||||
|
*/
|
||||||
|
|
||||||
|
src = lowdown-src;
|
||||||
|
|
||||||
|
outputs = [ "out" "bin" "dev" ];
|
||||||
|
|
||||||
|
nativeBuildInputs = [ which ];
|
||||||
|
|
||||||
|
configurePhase = ''
|
||||||
|
${if (stdenv.isDarwin && stdenv.isAarch64) then "echo \"HAVE_SANDBOX_INIT=false\" > configure.local" else ""}
|
||||||
|
./configure \
|
||||||
|
PREFIX=${placeholder "dev"} \
|
||||||
|
BINDIR=${placeholder "bin"}/bin
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
nix-benchmarks = prev.runCommandNoCC "nix-benchmarks" {
|
||||||
|
buildInputs = [ final.nix prev.hyperfine ];
|
||||||
|
THINGTOBENCH = ./thingToBench.nix;
|
||||||
|
NIX_PATH="nixpkgs=${prev.path}";
|
||||||
|
} ''
|
||||||
|
bash ${./benchmark.sh} run_all
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
hydraJobs = {
|
hydraJobs = {
|
||||||
|
|
||||||
@@ -418,36 +310,92 @@
|
|||||||
|
|
||||||
buildStatic = nixpkgs.lib.genAttrs linux64BitSystems (system: self.packages.${system}.nix-static);
|
buildStatic = nixpkgs.lib.genAttrs linux64BitSystems (system: self.packages.${system}.nix-static);
|
||||||
|
|
||||||
buildCross = nixpkgs.lib.genAttrs crossSystems (crossSystem:
|
|
||||||
nixpkgs.lib.genAttrs ["x86_64-linux"] (system: self.packages.${system}."nix-${crossSystem}"));
|
|
||||||
|
|
||||||
# Perl bindings for various platforms.
|
# Perl bindings for various platforms.
|
||||||
perlBindings = nixpkgs.lib.genAttrs systems (system: self.packages.${system}.nix.perl-bindings);
|
perlBindings = nixpkgs.lib.genAttrs systems (system: self.packages.${system}.nix.perl-bindings);
|
||||||
|
|
||||||
# Binary tarball for various platforms, containing a Nix store
|
# Binary tarball for various platforms, containing a Nix store
|
||||||
# with the closure of 'nix' package, and the second half of
|
# with the closure of 'nix' package, and the second half of
|
||||||
# the installation script.
|
# the installation script.
|
||||||
binaryTarball = nixpkgs.lib.genAttrs systems (system: binaryTarball nixpkgsFor.${system} nixpkgsFor.${system}.nix nixpkgsFor.${system});
|
binaryTarball = nixpkgs.lib.genAttrs systems (system:
|
||||||
|
|
||||||
binaryTarballCross = nixpkgs.lib.genAttrs ["x86_64-linux"] (system: builtins.listToAttrs (map (crossSystem: {
|
with nixpkgsFor.${system};
|
||||||
name = crossSystem;
|
|
||||||
value = let
|
let
|
||||||
nixpkgsCross = import nixpkgs {
|
installerClosureInfo = closureInfo { rootPaths = [ nix cacert ]; };
|
||||||
inherit system crossSystem;
|
in
|
||||||
overlays = [ self.overlay ];
|
|
||||||
};
|
runCommand "nix-binary-tarball-${version}"
|
||||||
in binaryTarball nixpkgsFor.${system} self.packages.${system}."nix-${crossSystem}" nixpkgsCross;
|
{ #nativeBuildInputs = lib.optional (system != "aarch64-linux") shellcheck;
|
||||||
}) crossSystems));
|
meta.description = "Distribution-independent Nix bootstrap binaries for ${system}";
|
||||||
|
}
|
||||||
|
''
|
||||||
|
cp ${installerClosureInfo}/registration $TMPDIR/reginfo
|
||||||
|
cp ${./scripts/create-darwin-volume.sh} $TMPDIR/create-darwin-volume.sh
|
||||||
|
substitute ${./scripts/install-nix-from-closure.sh} $TMPDIR/install \
|
||||||
|
--subst-var-by nix ${nix} \
|
||||||
|
--subst-var-by cacert ${cacert}
|
||||||
|
|
||||||
|
substitute ${./scripts/install-darwin-multi-user.sh} $TMPDIR/install-darwin-multi-user.sh \
|
||||||
|
--subst-var-by nix ${nix} \
|
||||||
|
--subst-var-by cacert ${cacert}
|
||||||
|
substitute ${./scripts/install-systemd-multi-user.sh} $TMPDIR/install-systemd-multi-user.sh \
|
||||||
|
--subst-var-by nix ${nix} \
|
||||||
|
--subst-var-by cacert ${cacert}
|
||||||
|
substitute ${./scripts/install-multi-user.sh} $TMPDIR/install-multi-user \
|
||||||
|
--subst-var-by nix ${nix} \
|
||||||
|
--subst-var-by cacert ${cacert}
|
||||||
|
|
||||||
|
if type -p shellcheck; then
|
||||||
|
# SC1090: Don't worry about not being able to find
|
||||||
|
# $nix/etc/profile.d/nix.sh
|
||||||
|
shellcheck --exclude SC1090 $TMPDIR/install
|
||||||
|
shellcheck $TMPDIR/create-darwin-volume.sh
|
||||||
|
shellcheck $TMPDIR/install-darwin-multi-user.sh
|
||||||
|
shellcheck $TMPDIR/install-systemd-multi-user.sh
|
||||||
|
|
||||||
|
# SC1091: Don't panic about not being able to source
|
||||||
|
# /etc/profile
|
||||||
|
# SC2002: Ignore "useless cat" "error", when loading
|
||||||
|
# .reginfo, as the cat is a much cleaner
|
||||||
|
# implementation, even though it is "useless"
|
||||||
|
# SC2116: Allow ROOT_HOME=$(echo ~root) for resolving
|
||||||
|
# root's home directory
|
||||||
|
shellcheck --external-sources \
|
||||||
|
--exclude SC1091,SC2002,SC2116 $TMPDIR/install-multi-user
|
||||||
|
fi
|
||||||
|
|
||||||
|
chmod +x $TMPDIR/install
|
||||||
|
chmod +x $TMPDIR/create-darwin-volume.sh
|
||||||
|
chmod +x $TMPDIR/install-darwin-multi-user.sh
|
||||||
|
chmod +x $TMPDIR/install-systemd-multi-user.sh
|
||||||
|
chmod +x $TMPDIR/install-multi-user
|
||||||
|
dir=nix-${version}-${system}
|
||||||
|
fn=$out/$dir.tar.xz
|
||||||
|
mkdir -p $out/nix-support
|
||||||
|
echo "file binary-dist $fn" >> $out/nix-support/hydra-build-products
|
||||||
|
tar cvfJ $fn \
|
||||||
|
--owner=0 --group=0 --mode=u+rw,uga+r \
|
||||||
|
--absolute-names \
|
||||||
|
--hard-dereference \
|
||||||
|
--transform "s,$TMPDIR/install,$dir/install," \
|
||||||
|
--transform "s,$TMPDIR/create-darwin-volume.sh,$dir/create-darwin-volume.sh," \
|
||||||
|
--transform "s,$TMPDIR/reginfo,$dir/.reginfo," \
|
||||||
|
--transform "s,$NIX_STORE,$dir/store,S" \
|
||||||
|
$TMPDIR/install \
|
||||||
|
$TMPDIR/create-darwin-volume.sh \
|
||||||
|
$TMPDIR/install-darwin-multi-user.sh \
|
||||||
|
$TMPDIR/install-systemd-multi-user.sh \
|
||||||
|
$TMPDIR/install-multi-user \
|
||||||
|
$TMPDIR/reginfo \
|
||||||
|
$(cat ${installerClosureInfo}/store-paths)
|
||||||
|
'');
|
||||||
|
|
||||||
# The first half of the installation script. This is uploaded
|
# The first half of the installation script. This is uploaded
|
||||||
# to https://nixos.org/nix/install. It downloads the binary
|
# to https://nixos.org/nix/install. It downloads the binary
|
||||||
# tarball for the user's system and calls the second half of the
|
# tarball for the user's system and calls the second half of the
|
||||||
# installation script.
|
# installation script.
|
||||||
installerScript = installScriptFor [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" "armv6l-linux" "armv7l-linux" ];
|
installerScript = installScriptFor [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||||
installerScriptForGHA = installScriptFor [ "x86_64-linux" "x86_64-darwin" "armv6l-linux" "armv7l-linux"];
|
installerScriptForGHA = installScriptFor [ "x86_64-linux" "x86_64-darwin" ];
|
||||||
|
|
||||||
# docker image with Nix inside
|
|
||||||
dockerImage = nixpkgs.lib.genAttrs linux64BitSystems (system: self.packages.${system}.dockerImage);
|
|
||||||
|
|
||||||
# Line coverage analysis.
|
# Line coverage analysis.
|
||||||
coverage =
|
coverage =
|
||||||
@@ -489,24 +437,12 @@
|
|||||||
inherit (self) overlay;
|
inherit (self) overlay;
|
||||||
};
|
};
|
||||||
|
|
||||||
tests.nssPreload = (import ./tests/nss-preload.nix rec {
|
|
||||||
system = "x86_64-linux";
|
|
||||||
inherit nixpkgs;
|
|
||||||
inherit (self) overlay;
|
|
||||||
});
|
|
||||||
|
|
||||||
tests.githubFlakes = (import ./tests/github-flakes.nix rec {
|
tests.githubFlakes = (import ./tests/github-flakes.nix rec {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
inherit nixpkgs;
|
inherit nixpkgs;
|
||||||
inherit (self) overlay;
|
inherit (self) overlay;
|
||||||
});
|
});
|
||||||
|
|
||||||
tests.sourcehutFlakes = (import ./tests/sourcehut-flakes.nix rec {
|
|
||||||
system = "x86_64-linux";
|
|
||||||
inherit nixpkgs;
|
|
||||||
inherit (self) overlay;
|
|
||||||
});
|
|
||||||
|
|
||||||
tests.setuid = nixpkgs.lib.genAttrs
|
tests.setuid = nixpkgs.lib.genAttrs
|
||||||
["i686-linux" "x86_64-linux"]
|
["i686-linux" "x86_64-linux"]
|
||||||
(system:
|
(system:
|
||||||
@@ -515,53 +451,49 @@
|
|||||||
inherit (self) overlay;
|
inherit (self) overlay;
|
||||||
});
|
});
|
||||||
|
|
||||||
# Make sure that nix-env still produces the exact same result
|
/*
|
||||||
# on a particular version of Nixpkgs.
|
# Check whether we can still evaluate all of Nixpkgs.
|
||||||
tests.evalNixpkgs =
|
tests.evalNixpkgs =
|
||||||
|
import (nixpkgs + "/pkgs/top-level/make-tarball.nix") {
|
||||||
|
# FIXME: fix pkgs/top-level/make-tarball.nix in NixOS to not require a revCount.
|
||||||
|
inherit nixpkgs;
|
||||||
|
pkgs = nixpkgsFor.x86_64-linux;
|
||||||
|
officialRelease = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
# Check whether we can still evaluate NixOS.
|
||||||
|
tests.evalNixOS =
|
||||||
with nixpkgsFor.x86_64-linux;
|
with nixpkgsFor.x86_64-linux;
|
||||||
runCommand "eval-nixos" { buildInputs = [ nix ]; }
|
runCommand "eval-nixos" { buildInputs = [ nix ]; }
|
||||||
''
|
''
|
||||||
type -p nix-env
|
export NIX_STATE_DIR=$TMPDIR
|
||||||
# Note: we're filtering out nixos-install-tools because https://github.com/NixOS/nixpkgs/pull/153594#issuecomment-1020530593.
|
|
||||||
time nix-env --store dummy:// -f ${nixpkgs-regression} -qaP --drv-path | sort | grep -v nixos-install-tools > packages
|
nix-instantiate ${nixpkgs}/nixos/release-combined.nix -A tested --dry-run \
|
||||||
[[ $(sha1sum < packages | cut -c1-40) = ff451c521e61e4fe72bdbe2d0ca5d1809affa733 ]]
|
--arg nixpkgs '{ outPath = ${nixpkgs}; revCount = 123; shortRev = "abcdefgh"; }'
|
||||||
mkdir $out
|
|
||||||
|
touch $out
|
||||||
'';
|
'';
|
||||||
|
*/
|
||||||
metrics.nixpkgs = import "${nixpkgs-regression}/pkgs/top-level/metrics.nix" {
|
|
||||||
pkgs = nixpkgsFor.x86_64-linux;
|
|
||||||
nixpkgs = nixpkgs-regression;
|
|
||||||
};
|
|
||||||
|
|
||||||
installTestsAgainstSelf = forAllSystems (system:
|
|
||||||
let pkgs = nixpkgsFor.${system}; in
|
|
||||||
testNixVersions pkgs pkgs.nix pkgs.pkgs.nix
|
|
||||||
);
|
|
||||||
installTestsAgainstCurrentUnstable = forAllSystems (system:
|
|
||||||
let pkgs = nixpkgsFor.${system}; in
|
|
||||||
# FIXME: temporarily disable this on macOS because of #3605.
|
|
||||||
if system == "x86_64-linux"
|
|
||||||
then testNixVersions pkgs pkgs.nix pkgs.nixUnstable
|
|
||||||
else pkgs.writeText "dummy" "dummy"
|
|
||||||
);
|
|
||||||
# Disabled because the latest stable version doesn't handle
|
|
||||||
# `NIX_DAEMON_SOCKET_PATH` which is required for the tests to work
|
|
||||||
# againstLatestStable = testNixVersions pkgs pkgs.nix pkgs.nixStable;
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
checks = forAllSystems (system: {
|
checks = forAllSystems (system: {
|
||||||
binaryTarball = self.hydraJobs.binaryTarball.${system};
|
binaryTarball = self.hydraJobs.binaryTarball.${system};
|
||||||
perlBindings = self.hydraJobs.perlBindings.${system};
|
perlBindings = self.hydraJobs.perlBindings.${system};
|
||||||
installTestsAgainstCurrentUnstable = self.hydraJobs.installTestsAgainstCurrentUnstable.${system};
|
installTests =
|
||||||
installTestsAgainstSelf = self.hydraJobs.installTestsAgainstSelf.${system};
|
let pkgs = nixpkgsFor.${system}; in
|
||||||
} // (nixpkgs.lib.optionalAttrs (builtins.elem system linux64BitSystems)) {
|
pkgs.runCommand "install-tests" {
|
||||||
dockerImage = self.hydraJobs.dockerImage.${system};
|
againstSelf = testNixVersions pkgs pkgs.nix pkgs.pkgs.nix;
|
||||||
|
againstCurrentUnstable = testNixVersions pkgs pkgs.nix pkgs.nixUnstable;
|
||||||
|
# Disabled because the latest stable version doesn't handle
|
||||||
|
# `NIX_DAEMON_SOCKET_PATH` which is required for the tests to work
|
||||||
|
# againstLatestStable = testNixVersions pkgs pkgs.nix pkgs.nixStable;
|
||||||
|
} "touch $out";
|
||||||
});
|
});
|
||||||
|
|
||||||
packages = forAllSystems (system: {
|
packages = forAllSystems (system: {
|
||||||
inherit (nixpkgsFor.${system}) nix;
|
inherit (nixpkgsFor.${system}) nix nix-benchmarks;
|
||||||
} // (nixpkgs.lib.optionalAttrs (builtins.elem system linux64BitSystems) {
|
} // nixpkgs.lib.optionalAttrs (builtins.elem system linux64BitSystems) {
|
||||||
nix-static = let
|
nix-static = let
|
||||||
nixpkgs = nixpkgsFor.${system}.pkgsStatic;
|
nixpkgs = nixpkgsFor.${system}.pkgsStatic;
|
||||||
in with commonDeps nixpkgs; nixpkgs.stdenv.mkDerivation {
|
in with commonDeps nixpkgs; nixpkgs.stdenv.mkDerivation {
|
||||||
@@ -599,77 +531,16 @@
|
|||||||
stripAllList = ["bin"];
|
stripAllList = ["bin"];
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
|
||||||
hardeningDisable = [ "pie" ];
|
|
||||||
};
|
};
|
||||||
dockerImage =
|
});
|
||||||
let
|
|
||||||
pkgs = nixpkgsFor.${system};
|
|
||||||
image = import ./docker.nix { inherit pkgs; tag = version; };
|
|
||||||
in
|
|
||||||
pkgs.runCommand
|
|
||||||
"docker-image-tarball-${version}"
|
|
||||||
{ meta.description = "Docker image with Nix for ${system}"; }
|
|
||||||
''
|
|
||||||
mkdir -p $out/nix-support
|
|
||||||
image=$out/image.tar.gz
|
|
||||||
ln -s ${image} $image
|
|
||||||
echo "file binary-dist $image" >> $out/nix-support/hydra-build-products
|
|
||||||
'';
|
|
||||||
} // builtins.listToAttrs (map (crossSystem: {
|
|
||||||
name = "nix-${crossSystem}";
|
|
||||||
value = let
|
|
||||||
nixpkgsCross = import nixpkgs {
|
|
||||||
inherit system crossSystem;
|
|
||||||
overlays = [ self.overlay ];
|
|
||||||
};
|
|
||||||
in with commonDeps nixpkgsCross; nixpkgsCross.stdenv.mkDerivation {
|
|
||||||
name = "nix-${version}";
|
|
||||||
|
|
||||||
src = self;
|
|
||||||
|
|
||||||
VERSION_SUFFIX = versionSuffix;
|
|
||||||
|
|
||||||
outputs = [ "out" "dev" "doc" ];
|
|
||||||
|
|
||||||
nativeBuildInputs = nativeBuildDeps;
|
|
||||||
buildInputs = buildDeps ++ propagatedDeps;
|
|
||||||
|
|
||||||
configureFlags = [ "--sysconfdir=/etc" "--disable-doc-gen" ];
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
makeFlags = "profiledir=$(out)/etc/profile.d";
|
|
||||||
|
|
||||||
doCheck = true;
|
|
||||||
|
|
||||||
installFlags = "sysconfdir=$(out)/etc";
|
|
||||||
|
|
||||||
postInstall = ''
|
|
||||||
mkdir -p $doc/nix-support
|
|
||||||
echo "doc manual $doc/share/doc/nix/manual" >> $doc/nix-support/hydra-build-products
|
|
||||||
mkdir -p $out/nix-support
|
|
||||||
echo "file binary-dist $out/bin/nix" >> $out/nix-support/hydra-build-products
|
|
||||||
'';
|
|
||||||
|
|
||||||
doInstallCheck = true;
|
|
||||||
installCheckFlags = "sysconfdir=$(out)/etc";
|
|
||||||
};
|
|
||||||
}) crossSystems)) // (builtins.listToAttrs (map (stdenvName:
|
|
||||||
nixpkgsFor.${system}.lib.nameValuePair
|
|
||||||
"nix-${stdenvName}"
|
|
||||||
nixpkgsFor.${system}."${stdenvName}Packages".nix
|
|
||||||
) stdenvs)));
|
|
||||||
|
|
||||||
defaultPackage = forAllSystems (system: self.packages.${system}.nix);
|
defaultPackage = forAllSystems (system: self.packages.${system}.nix);
|
||||||
|
|
||||||
devShell = forAllSystems (system: self.devShells.${system}.stdenvPackages);
|
devShell = forAllSystems (system:
|
||||||
|
|
||||||
devShells = forAllSystemsAndStdenvs (system: stdenv:
|
|
||||||
with nixpkgsFor.${system};
|
with nixpkgsFor.${system};
|
||||||
with commonDeps pkgs;
|
with commonDeps pkgs;
|
||||||
|
|
||||||
nixpkgsFor.${system}.${stdenv}.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "nix";
|
name = "nix";
|
||||||
|
|
||||||
outputs = [ "out" "dev" "doc" ];
|
outputs = [ "out" "dev" "doc" ];
|
||||||
@@ -688,9 +559,6 @@
|
|||||||
PATH=$prefix/bin:$PATH
|
PATH=$prefix/bin:$PATH
|
||||||
unset PYTHONPATH
|
unset PYTHONPATH
|
||||||
export MANPATH=$out/share/man:$MANPATH
|
export MANPATH=$out/share/man:$MANPATH
|
||||||
|
|
||||||
# Make bash completion work.
|
|
||||||
XDG_DATA_DIRS+=:$out/share
|
|
||||||
'';
|
'';
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
+35
-105
@@ -19,8 +19,6 @@ my $nixpkgsDir = "/home/eelco/Dev/nixpkgs-pristine";
|
|||||||
|
|
||||||
my $TMPDIR = $ENV{'TMPDIR'} // "/tmp";
|
my $TMPDIR = $ENV{'TMPDIR'} // "/tmp";
|
||||||
|
|
||||||
my $isLatest = ($ENV{'IS_LATEST'} // "") eq "1";
|
|
||||||
|
|
||||||
# FIXME: cut&paste from nixos-channel-scripts.
|
# FIXME: cut&paste from nixos-channel-scripts.
|
||||||
sub fetch {
|
sub fetch {
|
||||||
my ($url, $type) = @_;
|
my ($url, $type) = @_;
|
||||||
@@ -37,29 +35,22 @@ sub fetch {
|
|||||||
my $evalUrl = "https://hydra.nixos.org/eval/$evalId";
|
my $evalUrl = "https://hydra.nixos.org/eval/$evalId";
|
||||||
my $evalInfo = decode_json(fetch($evalUrl, 'application/json'));
|
my $evalInfo = decode_json(fetch($evalUrl, 'application/json'));
|
||||||
#print Dumper($evalInfo);
|
#print Dumper($evalInfo);
|
||||||
my $flakeUrl = $evalInfo->{flake} or die;
|
|
||||||
my $flakeInfo = decode_json(`nix flake metadata --json "$flakeUrl"` or die);
|
|
||||||
my $nixRev = $flakeInfo->{revision} or die;
|
|
||||||
|
|
||||||
my $buildInfo = decode_json(fetch("$evalUrl/job/build.x86_64-linux", 'application/json'));
|
my $nixRev = $evalInfo->{jobsetevalinputs}->{nix}->{revision} or die;
|
||||||
#print Dumper($buildInfo);
|
|
||||||
|
|
||||||
my $releaseName = $buildInfo->{nixname};
|
my $tarballInfo = decode_json(fetch("$evalUrl/job/tarball", 'application/json'));
|
||||||
|
|
||||||
|
my $releaseName = $tarballInfo->{releasename};
|
||||||
$releaseName =~ /nix-(.*)$/ or die;
|
$releaseName =~ /nix-(.*)$/ or die;
|
||||||
my $version = $1;
|
my $version = $1;
|
||||||
|
|
||||||
print STDERR "Flake URL is $flakeUrl, Nix revision is $nixRev, version is $version\n";
|
print STDERR "Nix revision is $nixRev, version is $version\n";
|
||||||
|
|
||||||
my $releaseDir = "nix/$releaseName";
|
my $releaseDir = "nix/$releaseName";
|
||||||
|
|
||||||
my $tmpDir = "$TMPDIR/nix-release/$releaseName";
|
my $tmpDir = "$TMPDIR/nix-release/$releaseName";
|
||||||
File::Path::make_path($tmpDir);
|
File::Path::make_path($tmpDir);
|
||||||
|
|
||||||
my $narCache = "$TMPDIR/nar-cache";
|
|
||||||
File::Path::make_path($narCache);
|
|
||||||
|
|
||||||
my $binaryCache = "https://cache.nixos.org/?local-nar-cache=$narCache";
|
|
||||||
|
|
||||||
# S3 setup.
|
# S3 setup.
|
||||||
my $aws_access_key_id = $ENV{'AWS_ACCESS_KEY_ID'} or die "No AWS_ACCESS_KEY_ID given.";
|
my $aws_access_key_id = $ENV{'AWS_ACCESS_KEY_ID'} or die "No AWS_ACCESS_KEY_ID given.";
|
||||||
my $aws_secret_access_key = $ENV{'AWS_SECRET_ACCESS_KEY'} or die "No AWS_SECRET_ACCESS_KEY given.";
|
my $aws_secret_access_key = $ENV{'AWS_SECRET_ACCESS_KEY'} or die "No AWS_SECRET_ACCESS_KEY given.";
|
||||||
@@ -85,7 +76,6 @@ sub downloadFile {
|
|||||||
my ($jobName, $productNr, $dstName) = @_;
|
my ($jobName, $productNr, $dstName) = @_;
|
||||||
|
|
||||||
my $buildInfo = decode_json(fetch("$evalUrl/job/$jobName", 'application/json'));
|
my $buildInfo = decode_json(fetch("$evalUrl/job/$jobName", 'application/json'));
|
||||||
#print STDERR "$jobName: ", Dumper($buildInfo), "\n";
|
|
||||||
|
|
||||||
my $srcFile = $buildInfo->{buildproducts}->{$productNr}->{path} or die "job '$jobName' lacks product $productNr\n";
|
my $srcFile = $buildInfo->{buildproducts}->{$productNr}->{path} or die "job '$jobName' lacks product $productNr\n";
|
||||||
$dstName //= basename($srcFile);
|
$dstName //= basename($srcFile);
|
||||||
@@ -93,27 +83,19 @@ sub downloadFile {
|
|||||||
|
|
||||||
if (!-e $tmpFile) {
|
if (!-e $tmpFile) {
|
||||||
print STDERR "downloading $srcFile to $tmpFile...\n";
|
print STDERR "downloading $srcFile to $tmpFile...\n";
|
||||||
|
system("NIX_REMOTE=https://cache.nixos.org/ nix cat-store '$srcFile' > '$tmpFile'") == 0
|
||||||
my $fileInfo = decode_json(`NIX_REMOTE=$binaryCache nix store ls --json '$srcFile'`);
|
|
||||||
|
|
||||||
$srcFile = $fileInfo->{target} if $fileInfo->{type} eq 'symlink';
|
|
||||||
|
|
||||||
#print STDERR $srcFile, " ", Dumper($fileInfo), "\n";
|
|
||||||
|
|
||||||
system("NIX_REMOTE=$binaryCache nix store cat '$srcFile' > '$tmpFile'.tmp") == 0
|
|
||||||
or die "unable to fetch $srcFile\n";
|
or die "unable to fetch $srcFile\n";
|
||||||
rename("$tmpFile.tmp", $tmpFile) or die;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
my $sha256_expected = $buildInfo->{buildproducts}->{$productNr}->{sha256hash};
|
my $sha256_expected = $buildInfo->{buildproducts}->{$productNr}->{sha256hash} or die;
|
||||||
my $sha256_actual = `nix hash file --base16 --type sha256 '$tmpFile'`;
|
my $sha256_actual = `nix hash-file --base16 --type sha256 '$tmpFile'`;
|
||||||
chomp $sha256_actual;
|
chomp $sha256_actual;
|
||||||
if (defined($sha256_expected) && $sha256_expected ne $sha256_actual) {
|
if ($sha256_expected ne $sha256_actual) {
|
||||||
print STDERR "file $tmpFile is corrupt, got $sha256_actual, expected $sha256_expected\n";
|
print STDERR "file $tmpFile is corrupt, got $sha256_actual, expected $sha256_expected\n";
|
||||||
exit 1;
|
exit 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
write_file("$tmpFile.sha256", $sha256_actual);
|
write_file("$tmpFile.sha256", $sha256_expected);
|
||||||
|
|
||||||
if (! -e "$tmpFile.asc") {
|
if (! -e "$tmpFile.asc") {
|
||||||
system("gpg2 --detach-sign --armor $tmpFile") == 0 or die "unable to sign $tmpFile\n";
|
system("gpg2 --detach-sign --armor $tmpFile") == 0 or die "unable to sign $tmpFile\n";
|
||||||
@@ -122,69 +104,14 @@ sub downloadFile {
|
|||||||
return $sha256_expected;
|
return $sha256_expected;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
downloadFile("tarball", "2"); # .tar.bz2
|
||||||
|
my $tarballHash = downloadFile("tarball", "3"); # .tar.xz
|
||||||
downloadFile("binaryTarball.i686-linux", "1");
|
downloadFile("binaryTarball.i686-linux", "1");
|
||||||
downloadFile("binaryTarball.x86_64-linux", "1");
|
downloadFile("binaryTarball.x86_64-linux", "1");
|
||||||
downloadFile("binaryTarball.aarch64-linux", "1");
|
downloadFile("binaryTarball.aarch64-linux", "1");
|
||||||
downloadFile("binaryTarball.x86_64-darwin", "1");
|
downloadFile("binaryTarball.x86_64-darwin", "1");
|
||||||
downloadFile("binaryTarball.aarch64-darwin", "1");
|
|
||||||
downloadFile("binaryTarballCross.x86_64-linux.armv6l-linux", "1");
|
|
||||||
downloadFile("binaryTarballCross.x86_64-linux.armv7l-linux", "1");
|
|
||||||
downloadFile("installerScript", "1");
|
downloadFile("installerScript", "1");
|
||||||
|
|
||||||
# Upload docker images to dockerhub.
|
|
||||||
my $dockerManifest = "";
|
|
||||||
my $dockerManifestLatest = "";
|
|
||||||
|
|
||||||
for my $platforms (["x86_64-linux", "amd64"], ["aarch64-linux", "arm64"]) {
|
|
||||||
my $system = $platforms->[0];
|
|
||||||
my $dockerPlatform = $platforms->[1];
|
|
||||||
my $fn = "nix-$version-docker-image-$dockerPlatform.tar.gz";
|
|
||||||
downloadFile("dockerImage.$system", "1", $fn);
|
|
||||||
|
|
||||||
print STDERR "loading docker image for $dockerPlatform...\n";
|
|
||||||
system("docker load -i $tmpDir/$fn") == 0 or die;
|
|
||||||
|
|
||||||
my $tag = "nixos/nix:$version-$dockerPlatform";
|
|
||||||
my $latestTag = "nixos/nix:latest-$dockerPlatform";
|
|
||||||
|
|
||||||
print STDERR "tagging $version docker image for $dockerPlatform...\n";
|
|
||||||
system("docker tag nix:$version $tag") == 0 or die;
|
|
||||||
|
|
||||||
if ($isLatest) {
|
|
||||||
print STDERR "tagging latest docker image for $dockerPlatform...\n";
|
|
||||||
system("docker tag nix:$version $latestTag") == 0 or die;
|
|
||||||
}
|
|
||||||
|
|
||||||
print STDERR "pushing $version docker image for $dockerPlatform...\n";
|
|
||||||
system("docker push -q $tag") == 0 or die;
|
|
||||||
|
|
||||||
if ($isLatest) {
|
|
||||||
print STDERR "pushing latest docker image for $dockerPlatform...\n";
|
|
||||||
system("docker push -q $latestTag") == 0 or die;
|
|
||||||
}
|
|
||||||
|
|
||||||
$dockerManifest .= " --amend $tag";
|
|
||||||
$dockerManifestLatest .= " --amend $latestTag"
|
|
||||||
}
|
|
||||||
|
|
||||||
print STDERR "creating multi-platform docker manifest...\n";
|
|
||||||
system("docker manifest rm nixos/nix:$version");
|
|
||||||
system("docker manifest create nixos/nix:$version $dockerManifest") == 0 or die;
|
|
||||||
if ($isLatest) {
|
|
||||||
print STDERR "creating latest multi-platform docker manifest...\n";
|
|
||||||
system("docker manifest rm nixos/nix:latest");
|
|
||||||
system("docker manifest create nixos/nix:latest $dockerManifestLatest") == 0 or die;
|
|
||||||
}
|
|
||||||
|
|
||||||
print STDERR "pushing multi-platform docker manifest...\n";
|
|
||||||
system("docker manifest push nixos/nix:$version") == 0 or die;
|
|
||||||
|
|
||||||
if ($isLatest) {
|
|
||||||
print STDERR "pushing latest multi-platform docker manifest...\n";
|
|
||||||
system("docker manifest push nixos/nix:latest") == 0 or die;
|
|
||||||
}
|
|
||||||
|
|
||||||
# Upload release files to S3.
|
|
||||||
for my $fn (glob "$tmpDir/*") {
|
for my $fn (glob "$tmpDir/*") {
|
||||||
my $name = basename($fn);
|
my $name = basename($fn);
|
||||||
my $dstKey = "$releaseDir/" . $name;
|
my $dstKey = "$releaseDir/" . $name;
|
||||||
@@ -204,38 +131,41 @@ for my $fn (glob "$tmpDir/*") {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
exit if $version =~ /pre/;
|
||||||
|
|
||||||
# Update nix-fallback-paths.nix.
|
# Update nix-fallback-paths.nix.
|
||||||
if ($isLatest) {
|
system("cd $nixpkgsDir && git pull") == 0 or die;
|
||||||
system("cd $nixpkgsDir && git pull") == 0 or die;
|
|
||||||
|
|
||||||
sub getStorePath {
|
sub getStorePath {
|
||||||
my ($jobName) = @_;
|
my ($jobName) = @_;
|
||||||
my $buildInfo = decode_json(fetch("$evalUrl/job/$jobName", 'application/json'));
|
my $buildInfo = decode_json(fetch("$evalUrl/job/$jobName", 'application/json'));
|
||||||
return $buildInfo->{buildoutputs}->{out}->{path} or die "cannot get store path for '$jobName'";
|
for my $product (values %{$buildInfo->{buildproducts}}) {
|
||||||
|
next unless $product->{type} eq "nix-build";
|
||||||
|
next if $product->{path} =~ /[a-z]+$/;
|
||||||
|
return $product->{path};
|
||||||
}
|
}
|
||||||
|
die;
|
||||||
write_file("$nixpkgsDir/nixos/modules/installer/tools/nix-fallback-paths.nix",
|
|
||||||
"{\n" .
|
|
||||||
" x86_64-linux = \"" . getStorePath("build.x86_64-linux") . "\";\n" .
|
|
||||||
" i686-linux = \"" . getStorePath("build.i686-linux") . "\";\n" .
|
|
||||||
" aarch64-linux = \"" . getStorePath("build.aarch64-linux") . "\";\n" .
|
|
||||||
" x86_64-darwin = \"" . getStorePath("build.x86_64-darwin") . "\";\n" .
|
|
||||||
" aarch64-darwin = \"" . getStorePath("build.aarch64-darwin") . "\";\n" .
|
|
||||||
"}\n");
|
|
||||||
|
|
||||||
system("cd $nixpkgsDir && git commit -a -m 'nix-fallback-paths.nix: Update to $version'") == 0 or die;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
write_file("$nixpkgsDir/nixos/modules/installer/tools/nix-fallback-paths.nix",
|
||||||
|
"{\n" .
|
||||||
|
" x86_64-linux = \"" . getStorePath("build.x86_64-linux") . "\";\n" .
|
||||||
|
" i686-linux = \"" . getStorePath("build.i686-linux") . "\";\n" .
|
||||||
|
" aarch64-linux = \"" . getStorePath("build.aarch64-linux") . "\";\n" .
|
||||||
|
" x86_64-darwin = \"" . getStorePath("build.x86_64-darwin") . "\";\n" .
|
||||||
|
"}\n");
|
||||||
|
|
||||||
|
system("cd $nixpkgsDir && git commit -a -m 'nix-fallback-paths.nix: Update to $version'") == 0 or die;
|
||||||
|
|
||||||
# Update the "latest" symlink.
|
# Update the "latest" symlink.
|
||||||
$channelsBucket->add_key(
|
$channelsBucket->add_key(
|
||||||
"nix-latest/install", "",
|
"nix-latest/install", "",
|
||||||
{ "x-amz-website-redirect-location" => "https://releases.nixos.org/$releaseDir/install" })
|
{ "x-amz-website-redirect-location" => "https://releases.nixos.org/$releaseDir/install" })
|
||||||
or die $channelsBucket->err . ": " . $channelsBucket->errstr
|
or die $channelsBucket->err . ": " . $channelsBucket->errstr;
|
||||||
if $isLatest;
|
|
||||||
|
|
||||||
# Tag the release in Git.
|
# Tag the release in Git.
|
||||||
chdir("/home/eelco/Dev/nix-pristine") or die;
|
chdir("/home/eelco/Dev/nix-pristine") or die;
|
||||||
system("git remote update origin") == 0 or die;
|
system("git remote update origin") == 0 or die;
|
||||||
system("git tag --force --sign $version $nixRev -m 'Tagging release $version'") == 0 or die;
|
system("git tag --force --sign $version $nixRev -m 'Tagging release $version'") == 0 or die;
|
||||||
system("git push --tags") == 0 or die;
|
system("git push --tags") == 0 or die;
|
||||||
system("git push --force-with-lease origin $nixRev:refs/heads/latest-release") == 0 or die if $isLatest;
|
system("git push --force-with-lease origin $nixRev:refs/heads/latest-release") == 0 or die;
|
||||||
@@ -7,15 +7,13 @@ function _complete_nix {
|
|||||||
local completion=${line%% *}
|
local completion=${line%% *}
|
||||||
if [[ -z $have_type ]]; then
|
if [[ -z $have_type ]]; then
|
||||||
have_type=1
|
have_type=1
|
||||||
if [[ $completion == filenames ]]; then
|
if [[ $completion = filenames ]]; then
|
||||||
compopt -o filenames
|
compopt -o filenames
|
||||||
elif [[ $completion == attrs ]]; then
|
|
||||||
compopt -o nospace
|
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
COMPREPLY+=("$completion")
|
COMPREPLY+=("$completion")
|
||||||
fi
|
fi
|
||||||
done < <(NIX_GET_COMPLETIONS=$cword "${words[@]/#\~/$HOME}" 2>/dev/null)
|
done < <(NIX_GET_COMPLETIONS=$cword "${words[@]}")
|
||||||
__ltrim_colon_completions "$cur"
|
__ltrim_colon_completions "$cur"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,36 +0,0 @@
|
|||||||
function _nix_complete
|
|
||||||
# Get the current command up to a cursor.
|
|
||||||
# - Behaves correctly even with pipes and nested in commands like env.
|
|
||||||
# - TODO: Returns the command verbatim (does not interpolate variables).
|
|
||||||
# That might not be optimal for arguments like -f.
|
|
||||||
set -l nix_args (commandline --current-process --tokenize --cut-at-cursor)
|
|
||||||
# --cut-at-cursor with --tokenize removes the current token so we need to add it separately.
|
|
||||||
# https://github.com/fish-shell/fish-shell/issues/7375
|
|
||||||
# Can be an empty string.
|
|
||||||
set -l current_token (commandline --current-token --cut-at-cursor)
|
|
||||||
|
|
||||||
# Nix wants the index of the argv item to complete but the $nix_args variable
|
|
||||||
# also contains the program name (argv[0]) so we would need to subtract 1.
|
|
||||||
# But the variable also misses the current token so it cancels out.
|
|
||||||
set -l nix_arg_to_complete (count $nix_args)
|
|
||||||
|
|
||||||
env NIX_GET_COMPLETIONS=$nix_arg_to_complete $nix_args $current_token
|
|
||||||
end
|
|
||||||
|
|
||||||
function _nix_accepts_files
|
|
||||||
set -l response (_nix_complete)
|
|
||||||
test $response[1] = 'filenames'
|
|
||||||
end
|
|
||||||
|
|
||||||
function _nix
|
|
||||||
set -l response (_nix_complete)
|
|
||||||
# Skip the first line since it handled by _nix_accepts_files.
|
|
||||||
# Tail lines each contain a command followed by a tab character and, optionally, a description.
|
|
||||||
# This is also the format fish expects.
|
|
||||||
string collect -- $response[2..-1]
|
|
||||||
end
|
|
||||||
|
|
||||||
# Disable file path completion if paths do not belong in the current context.
|
|
||||||
complete --command nix --condition 'not _nix_accepts_files' --no-files
|
|
||||||
|
|
||||||
complete --command nix --arguments '(_nix)'
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
$(eval $(call install-file-as, $(d)/completion.fish, $(datarootdir)/fish/vendor_completions.d/nix.fish, 0644))
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
ifdef HOST_DARWIN
|
ifeq ($(OS), Darwin)
|
||||||
|
|
||||||
$(eval $(call install-data-in, $(d)/org.nixos.nix-daemon.plist, $(prefix)/Library/LaunchDaemons))
|
$(eval $(call install-data-in, $(d)/org.nixos.nix-daemon.plist, $(prefix)/Library/LaunchDaemons))
|
||||||
|
|
||||||
|
|||||||
@@ -25,10 +25,5 @@
|
|||||||
<string>/var/log/nix-daemon.log</string>
|
<string>/var/log/nix-daemon.log</string>
|
||||||
<key>StandardOutPath</key>
|
<key>StandardOutPath</key>
|
||||||
<string>/dev/null</string>
|
<string>/dev/null</string>
|
||||||
<key>SoftResourceLimits</key>
|
|
||||||
<dict>
|
|
||||||
<key>NumberOfFiles</key>
|
|
||||||
<integer>4096</integer>
|
|
||||||
</dict>
|
|
||||||
</dict>
|
</dict>
|
||||||
</plist>
|
</plist>
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
ifdef HOST_LINUX
|
ifeq ($(OS), Linux)
|
||||||
|
|
||||||
$(foreach n, nix-daemon.socket nix-daemon.service, $(eval $(call install-file-in, $(d)/$(n), $(prefix)/lib/systemd/system, 0644)))
|
$(foreach n, nix-daemon.socket nix-daemon.service, $(eval $(call install-file-in, $(d)/$(n), $(prefix)/lib/systemd/system, 0644)))
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
ifdef HOST_LINUX
|
ifeq ($(OS), Linux)
|
||||||
|
|
||||||
$(foreach n, nix-daemon.conf, $(eval $(call install-file-in, $(d)/$(n), $(sysconfdir)/init, 0644)))
|
$(foreach n, nix-daemon.conf, $(eval $(call install-file-in, $(d)/$(n), $(sysconfdir)/init, 0644)))
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,8 @@
|
|||||||
#compdef nix
|
|
||||||
|
|
||||||
function _nix() {
|
function _nix() {
|
||||||
local ifs_bk="$IFS"
|
local ifs_bk="$IFS"
|
||||||
local input=("${(Q)words[@]}")
|
local input=("${(Q)words[@]}")
|
||||||
IFS=$'\n'
|
IFS=$'\n'
|
||||||
local res=($(NIX_GET_COMPLETIONS=$((CURRENT - 1)) "$input[@]" 2>/dev/null))
|
local res=($(NIX_GET_COMPLETIONS=$((CURRENT - 1)) "$input[@]"))
|
||||||
IFS="$ifs_bk"
|
IFS="$ifs_bk"
|
||||||
local tpe="${${res[1]}%%> *}"
|
local tpe="${${res[1]}%%> *}"
|
||||||
local -a suggestions
|
local -a suggestions
|
||||||
@@ -20,4 +18,4 @@ function _nix() {
|
|||||||
_describe 'nix' suggestions
|
_describe 'nix' suggestions
|
||||||
}
|
}
|
||||||
|
|
||||||
_nix "$@"
|
compdef _nix nix
|
||||||
@@ -10,25 +10,8 @@ bin-scripts :=
|
|||||||
noinst-scripts :=
|
noinst-scripts :=
|
||||||
man-pages :=
|
man-pages :=
|
||||||
install-tests :=
|
install-tests :=
|
||||||
|
OS = $(shell uname -s)
|
||||||
|
|
||||||
ifdef HOST_OS
|
|
||||||
HOST_KERNEL = $(firstword $(subst -, ,$(HOST_OS)))
|
|
||||||
ifeq ($(HOST_KERNEL), cygwin)
|
|
||||||
HOST_CYGWIN = 1
|
|
||||||
endif
|
|
||||||
ifeq ($(patsubst darwin%,,$(HOST_KERNEL)),)
|
|
||||||
HOST_DARWIN = 1
|
|
||||||
endif
|
|
||||||
ifeq ($(patsubst freebsd%,,$(HOST_KERNEL)),)
|
|
||||||
HOST_FREEBSD = 1
|
|
||||||
endif
|
|
||||||
ifeq ($(HOST_KERNEL), linux)
|
|
||||||
HOST_LINUX = 1
|
|
||||||
endif
|
|
||||||
ifeq ($(patsubst solaris%,,$(HOST_KERNEL)),)
|
|
||||||
HOST_SOLARIS = 1
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
# Hack to define a literal space.
|
# Hack to define a literal space.
|
||||||
space :=
|
space :=
|
||||||
@@ -67,16 +50,16 @@ endif
|
|||||||
BUILD_SHARED_LIBS ?= 1
|
BUILD_SHARED_LIBS ?= 1
|
||||||
|
|
||||||
ifeq ($(BUILD_SHARED_LIBS), 1)
|
ifeq ($(BUILD_SHARED_LIBS), 1)
|
||||||
ifdef HOST_CYGWIN
|
ifeq (CYGWIN,$(findstring CYGWIN,$(OS)))
|
||||||
GLOBAL_CFLAGS += -U__STRICT_ANSI__ -D_GNU_SOURCE
|
GLOBAL_CFLAGS += -U__STRICT_ANSI__ -D_GNU_SOURCE
|
||||||
GLOBAL_CXXFLAGS += -U__STRICT_ANSI__ -D_GNU_SOURCE
|
GLOBAL_CXXFLAGS += -U__STRICT_ANSI__ -D_GNU_SOURCE
|
||||||
else
|
else
|
||||||
GLOBAL_CFLAGS += -fPIC
|
GLOBAL_CFLAGS += -fPIC
|
||||||
GLOBAL_CXXFLAGS += -fPIC
|
GLOBAL_CXXFLAGS += -fPIC
|
||||||
endif
|
endif
|
||||||
ifndef HOST_DARWIN
|
ifneq ($(OS), Darwin)
|
||||||
ifndef HOST_SOLARIS
|
ifneq ($(OS), SunOS)
|
||||||
ifndef HOST_FREEBSD
|
ifneq ($(OS), FreeBSD)
|
||||||
GLOBAL_LDFLAGS += -Wl,--no-copy-dt-needed-entries
|
GLOBAL_LDFLAGS += -Wl,--no-copy-dt-needed-entries
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|||||||
+11
-11
@@ -1,9 +1,9 @@
|
|||||||
libs-list :=
|
libs-list :=
|
||||||
|
|
||||||
ifdef HOST_DARWIN
|
ifeq ($(OS), Darwin)
|
||||||
SO_EXT = dylib
|
SO_EXT = dylib
|
||||||
else
|
else
|
||||||
ifdef HOST_CYGWIN
|
ifeq (CYGWIN,$(findstring CYGWIN,$(OS)))
|
||||||
SO_EXT = dll
|
SO_EXT = dll
|
||||||
else
|
else
|
||||||
SO_EXT = so
|
SO_EXT = so
|
||||||
@@ -59,7 +59,7 @@ define build-library
|
|||||||
$(1)_OBJS := $$(addprefix $(buildprefix), $$(addsuffix .o, $$(basename $$(_srcs))))
|
$(1)_OBJS := $$(addprefix $(buildprefix), $$(addsuffix .o, $$(basename $$(_srcs))))
|
||||||
_libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_PATH))
|
_libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_PATH))
|
||||||
|
|
||||||
ifdef HOST_CYGWIN
|
ifeq (CYGWIN,$(findstring CYGWIN,$(OS)))
|
||||||
$(1)_INSTALL_DIR ?= $$(bindir)
|
$(1)_INSTALL_DIR ?= $$(bindir)
|
||||||
else
|
else
|
||||||
$(1)_INSTALL_DIR ?= $$(libdir)
|
$(1)_INSTALL_DIR ?= $$(libdir)
|
||||||
@@ -73,18 +73,18 @@ define build-library
|
|||||||
ifeq ($(BUILD_SHARED_LIBS), 1)
|
ifeq ($(BUILD_SHARED_LIBS), 1)
|
||||||
|
|
||||||
ifdef $(1)_ALLOW_UNDEFINED
|
ifdef $(1)_ALLOW_UNDEFINED
|
||||||
ifdef HOST_DARWIN
|
ifeq ($(OS), Darwin)
|
||||||
$(1)_LDFLAGS += -undefined suppress -flat_namespace
|
$(1)_LDFLAGS += -undefined suppress -flat_namespace
|
||||||
endif
|
endif
|
||||||
else
|
else
|
||||||
ifndef HOST_DARWIN
|
ifneq ($(OS), Darwin)
|
||||||
ifndef HOST_CYGWIN
|
ifneq (CYGWIN,$(findstring CYGWIN,$(OS)))
|
||||||
$(1)_LDFLAGS += -Wl,-z,defs
|
$(1)_LDFLAGS += -Wl,-z,defs
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifndef HOST_DARWIN
|
ifneq ($(OS), Darwin)
|
||||||
$(1)_LDFLAGS += -Wl,-soname=$$($(1)_NAME).$(SO_EXT)
|
$(1)_LDFLAGS += -Wl,-soname=$$($(1)_NAME).$(SO_EXT)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@@ -93,7 +93,7 @@ define build-library
|
|||||||
$$($(1)_PATH): $$($(1)_OBJS) $$(_libs) | $$(_d)/
|
$$($(1)_PATH): $$($(1)_OBJS) $$(_libs) | $$(_d)/
|
||||||
$$(trace-ld) $(CXX) -o $$(abspath $$@) -shared $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) $$($(1)_LDFLAGS_UNINSTALLED)
|
$$(trace-ld) $(CXX) -o $$(abspath $$@) -shared $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) $$($(1)_LDFLAGS_UNINSTALLED)
|
||||||
|
|
||||||
ifndef HOST_DARWIN
|
ifneq ($(OS), Darwin)
|
||||||
$(1)_LDFLAGS_USE += -Wl,-rpath,$$(abspath $$(_d))
|
$(1)_LDFLAGS_USE += -Wl,-rpath,$$(abspath $$(_d))
|
||||||
endif
|
endif
|
||||||
$(1)_LDFLAGS_USE += -L$$(_d) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME)))
|
$(1)_LDFLAGS_USE += -L$$(_d) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME)))
|
||||||
@@ -108,7 +108,7 @@ define build-library
|
|||||||
$$(trace-ld) $(CXX) -o $$@ -shared $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED))
|
$$(trace-ld) $(CXX) -o $$@ -shared $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED))
|
||||||
|
|
||||||
$(1)_LDFLAGS_USE_INSTALLED += -L$$(DESTDIR)$$($(1)_INSTALL_DIR) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME)))
|
$(1)_LDFLAGS_USE_INSTALLED += -L$$(DESTDIR)$$($(1)_INSTALL_DIR) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME)))
|
||||||
ifndef HOST_DARWIN
|
ifneq ($(OS), Darwin)
|
||||||
ifeq ($(SET_RPATH_TO_LIBS), 1)
|
ifeq ($(SET_RPATH_TO_LIBS), 1)
|
||||||
$(1)_LDFLAGS_USE_INSTALLED += -Wl,-rpath,$$($(1)_INSTALL_DIR)
|
$(1)_LDFLAGS_USE_INSTALLED += -Wl,-rpath,$$($(1)_INSTALL_DIR)
|
||||||
else
|
else
|
||||||
@@ -125,8 +125,8 @@ define build-library
|
|||||||
$(1)_PATH := $$(_d)/$$($(1)_NAME).a
|
$(1)_PATH := $$(_d)/$$($(1)_NAME).a
|
||||||
|
|
||||||
$$($(1)_PATH): $$($(1)_OBJS) | $$(_d)/
|
$$($(1)_PATH): $$($(1)_OBJS) | $$(_d)/
|
||||||
$$(trace-ld) $(LD) -Ur -o $$(_d)/$$($(1)_NAME).o $$?
|
$(trace-ld) $(LD) -Ur -o $$(_d)/$$($(1)_NAME).o $$?
|
||||||
$$(trace-ar) $(AR) crs $$@ $$(_d)/$$($(1)_NAME).o
|
$(trace-ar) $(AR) crs $$@ $$(_d)/$$($(1)_NAME).o
|
||||||
|
|
||||||
$(1)_LDFLAGS_USE += $$($(1)_PATH) $$($(1)_LDFLAGS)
|
$(1)_LDFLAGS_USE += $$($(1)_PATH) $$($(1)_LDFLAGS)
|
||||||
|
|
||||||
|
|||||||
+3
-12
@@ -7,8 +7,6 @@ green=""
|
|||||||
yellow=""
|
yellow=""
|
||||||
normal=""
|
normal=""
|
||||||
|
|
||||||
TESTS_TIMER_LOG=${TESTS_TIMER_LOG:-/dev/null}
|
|
||||||
|
|
||||||
post_run_msg="ran test $1..."
|
post_run_msg="ran test $1..."
|
||||||
if [ -t 1 ]; then
|
if [ -t 1 ]; then
|
||||||
red="[31;1m"
|
red="[31;1m"
|
||||||
@@ -17,21 +15,14 @@ if [ -t 1 ]; then
|
|||||||
normal="[m"
|
normal="[m"
|
||||||
fi
|
fi
|
||||||
(cd tests && env ${TESTS_ENVIRONMENT} init.sh 2>/dev/null > /dev/null)
|
(cd tests && env ${TESTS_ENVIRONMENT} init.sh 2>/dev/null > /dev/null)
|
||||||
|
|
||||||
start_time=$(date -u +%s)
|
|
||||||
echo "$(date -u +%s) $1 start" >> "$TESTS_TIMER_LOG"
|
|
||||||
log="$(cd $(dirname $1) && env ${TESTS_ENVIRONMENT} $(basename $1) 2>&1)"
|
log="$(cd $(dirname $1) && env ${TESTS_ENVIRONMENT} $(basename $1) 2>&1)"
|
||||||
status=$?
|
status=$?
|
||||||
echo "$(date -u +%s) $1 stop" >> "$TESTS_TIMER_LOG"
|
|
||||||
stop_time=$(date -u +%s)
|
|
||||||
elapsed_time=$(($stop_time-$start_time))
|
|
||||||
|
|
||||||
if [ $status -eq 0 ]; then
|
if [ $status -eq 0 ]; then
|
||||||
echo "$post_run_msg [${green}PASS$normal] in ${elapsed_time}s"
|
echo "$post_run_msg [${green}PASS$normal]"
|
||||||
elif [ $status -eq 99 ]; then
|
elif [ $status -eq 99 ]; then
|
||||||
echo "$post_run_msg [${yellow}SKIP$normal] after ${elapsed_time}s"
|
echo "$post_run_msg [${yellow}SKIP$normal]"
|
||||||
else
|
else
|
||||||
echo "$post_run_msg [${red}FAIL$normal] in ${elapsed_time}s"
|
echo "$post_run_msg [${red}FAIL$normal]"
|
||||||
echo "$log" | sed 's/^/ /'
|
echo "$log" | sed 's/^/ /'
|
||||||
exit "$status"
|
exit "$status"
|
||||||
fi
|
fi
|
||||||
@@ -13,7 +13,3 @@ define run-install-test
|
|||||||
endef
|
endef
|
||||||
|
|
||||||
.PHONY: check installcheck
|
.PHONY: check installcheck
|
||||||
|
|
||||||
print-top-help += \
|
|
||||||
echo " check: Run unit tests"; \
|
|
||||||
echo " installcheck: Run functional tests";
|
|
||||||
Generated
+399
@@ -0,0 +1,399 @@
|
|||||||
|
# This file is automatically @generated by Cargo.
|
||||||
|
# It is not intended for manual editing.
|
||||||
|
[[package]]
|
||||||
|
name = "assert_matches"
|
||||||
|
version = "1.3.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "autocfg"
|
||||||
|
version = "0.1.7"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "bit-set"
|
||||||
|
version = "0.5.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
dependencies = [
|
||||||
|
"bit-vec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "bit-vec"
|
||||||
|
version = "0.5.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "bitflags"
|
||||||
|
version = "1.2.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "byteorder"
|
||||||
|
version = "1.3.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "c2-chacha"
|
||||||
|
version = "0.2.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
dependencies = [
|
||||||
|
"ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "cfg-if"
|
||||||
|
version = "0.1.10"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "cloudabi"
|
||||||
|
version = "0.0.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "fnv"
|
||||||
|
version = "1.0.6"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "fuchsia-cprng"
|
||||||
|
version = "0.1.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "getrandom"
|
||||||
|
version = "0.1.13"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
dependencies = [
|
||||||
|
"cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "hex"
|
||||||
|
version = "0.3.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "lazy_static"
|
||||||
|
version = "1.4.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "libc"
|
||||||
|
version = "0.2.66"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "nix-rust"
|
||||||
|
version = "0.1.0"
|
||||||
|
dependencies = [
|
||||||
|
"assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"proptest 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "num-traits"
|
||||||
|
version = "0.2.10"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
dependencies = [
|
||||||
|
"autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "ppv-lite86"
|
||||||
|
version = "0.2.6"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "proptest"
|
||||||
|
version = "0.9.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
dependencies = [
|
||||||
|
"bit-set 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"rusty-fork 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "quick-error"
|
||||||
|
version = "1.2.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rand"
|
||||||
|
version = "0.6.5"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
dependencies = [
|
||||||
|
"autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rand"
|
||||||
|
version = "0.7.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
dependencies = [
|
||||||
|
"getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rand_chacha"
|
||||||
|
version = "0.1.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
dependencies = [
|
||||||
|
"autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rand_chacha"
|
||||||
|
version = "0.2.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
dependencies = [
|
||||||
|
"c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rand_core"
|
||||||
|
version = "0.3.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
dependencies = [
|
||||||
|
"rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rand_core"
|
||||||
|
version = "0.4.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rand_core"
|
||||||
|
version = "0.5.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
dependencies = [
|
||||||
|
"getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rand_hc"
|
||||||
|
version = "0.1.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
dependencies = [
|
||||||
|
"rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rand_hc"
|
||||||
|
version = "0.2.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
dependencies = [
|
||||||
|
"rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rand_isaac"
|
||||||
|
version = "0.1.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
dependencies = [
|
||||||
|
"rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rand_jitter"
|
||||||
|
version = "0.1.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
dependencies = [
|
||||||
|
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rand_os"
|
||||||
|
version = "0.1.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
dependencies = [
|
||||||
|
"cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rand_pcg"
|
||||||
|
version = "0.1.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
dependencies = [
|
||||||
|
"autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rand_xorshift"
|
||||||
|
version = "0.1.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
dependencies = [
|
||||||
|
"rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rdrand"
|
||||||
|
version = "0.4.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
dependencies = [
|
||||||
|
"rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "redox_syscall"
|
||||||
|
version = "0.1.56"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "regex-syntax"
|
||||||
|
version = "0.6.12"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "remove_dir_all"
|
||||||
|
version = "0.5.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
dependencies = [
|
||||||
|
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rusty-fork"
|
||||||
|
version = "0.2.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
dependencies = [
|
||||||
|
"fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"wait-timeout 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "tempfile"
|
||||||
|
version = "3.1.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
dependencies = [
|
||||||
|
"cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "wait-timeout"
|
||||||
|
version = "0.2.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
dependencies = [
|
||||||
|
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "wasi"
|
||||||
|
version = "0.7.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "winapi"
|
||||||
|
version = "0.3.8"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
dependencies = [
|
||||||
|
"winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "winapi-i686-pc-windows-gnu"
|
||||||
|
version = "0.4.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "winapi-x86_64-pc-windows-gnu"
|
||||||
|
version = "0.4.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
|
||||||
|
[metadata]
|
||||||
|
"checksum assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7deb0a829ca7bcfaf5da70b073a8d128619259a7be8216a355e23f00763059e5"
|
||||||
|
"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
|
||||||
|
"checksum bit-set 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e84c238982c4b1e1ee668d136c510c67a13465279c0cb367ea6baf6310620a80"
|
||||||
|
"checksum bit-vec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f59bbe95d4e52a6398ec21238d31577f2b28a9d86807f06ca59d191d8440d0bb"
|
||||||
|
"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
|
||||||
|
"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
|
||||||
|
"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
|
||||||
|
"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
|
||||||
|
"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
|
||||||
|
"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
|
||||||
|
"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
|
||||||
|
"checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407"
|
||||||
|
"checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
|
||||||
|
"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
||||||
|
"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
|
||||||
|
"checksum num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c81ffc11c212fa327657cb19dd85eb7419e163b5b076bede2bdb5c974c07e4"
|
||||||
|
"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
|
||||||
|
"checksum proptest 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cf147e022eacf0c8a054ab864914a7602618adba841d800a9a9868a5237a529f"
|
||||||
|
"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
|
||||||
|
"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
|
||||||
|
"checksum rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412"
|
||||||
|
"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
|
||||||
|
"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
|
||||||
|
"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
|
||||||
|
"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
|
||||||
|
"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
|
||||||
|
"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
|
||||||
|
"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
|
||||||
|
"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
|
||||||
|
"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
|
||||||
|
"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
|
||||||
|
"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
|
||||||
|
"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
|
||||||
|
"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
|
||||||
|
"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
|
||||||
|
"checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716"
|
||||||
|
"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
|
||||||
|
"checksum rusty-fork 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3dd93264e10c577503e926bd1430193eeb5d21b059148910082245309b424fae"
|
||||||
|
"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
|
||||||
|
"checksum wait-timeout 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6"
|
||||||
|
"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d"
|
||||||
|
"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
|
||||||
|
"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
|
||||||
|
"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
[package]
|
||||||
|
name = "nix-rust"
|
||||||
|
version = "0.1.0"
|
||||||
|
authors = ["Eelco Dolstra <edolstra@gmail.com>"]
|
||||||
|
edition = "2018"
|
||||||
|
|
||||||
|
[lib]
|
||||||
|
name = "nixrust"
|
||||||
|
crate-type = ["cdylib"]
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
libc = "0.2"
|
||||||
|
#futures-preview = { version = "=0.3.0-alpha.19" }
|
||||||
|
#hyper = "0.13.0-alpha.4"
|
||||||
|
#http = "0.1"
|
||||||
|
#tokio = { version = "0.2.0-alpha.6", default-features = false, features = ["rt-full"] }
|
||||||
|
lazy_static = "1.4"
|
||||||
|
#byteorder = "1.3"
|
||||||
|
|
||||||
|
[dev-dependencies]
|
||||||
|
hex = "0.3"
|
||||||
|
assert_matches = "1.3"
|
||||||
|
proptest = "0.9"
|
||||||
@@ -0,0 +1,48 @@
|
|||||||
|
ifeq ($(OPTIMIZE), 1)
|
||||||
|
RUST_MODE = --release
|
||||||
|
RUST_DIR = release
|
||||||
|
else
|
||||||
|
RUST_MODE =
|
||||||
|
RUST_DIR = debug
|
||||||
|
endif
|
||||||
|
|
||||||
|
libnixrust_PATH := $(d)/target/$(RUST_DIR)/libnixrust.$(SO_EXT)
|
||||||
|
libnixrust_INSTALL_PATH := $(libdir)/libnixrust.$(SO_EXT)
|
||||||
|
libnixrust_LDFLAGS_USE := -L$(d)/target/$(RUST_DIR) -lnixrust
|
||||||
|
libnixrust_LDFLAGS_USE_INSTALLED := -L$(libdir) -lnixrust
|
||||||
|
|
||||||
|
ifeq ($(OS), Linux)
|
||||||
|
libnixrust_LDFLAGS_USE += -ldl
|
||||||
|
libnixrust_LDFLAGS_USE_INSTALLED += -ldl
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ($(OS), Darwin)
|
||||||
|
libnixrust_BUILD_FLAGS = NIX_LDFLAGS="-undefined dynamic_lookup"
|
||||||
|
else
|
||||||
|
libnixrust_LDFLAGS_USE += -Wl,-rpath,$(abspath $(d)/target/$(RUST_DIR))
|
||||||
|
libnixrust_LDFLAGS_USE_INSTALLED += -Wl,-rpath,$(libdir)
|
||||||
|
endif
|
||||||
|
|
||||||
|
$(libnixrust_PATH): $(call rwildcard, $(d)/src, *.rs) $(d)/Cargo.toml
|
||||||
|
$(trace-gen) cd nix-rust && CARGO_HOME=$$(if [[ -d vendor ]]; then echo vendor; fi) \
|
||||||
|
$(libnixrust_BUILD_FLAGS) \
|
||||||
|
cargo build $(RUST_MODE) $$(if [[ -d vendor ]]; then echo --offline; fi) \
|
||||||
|
&& touch target/$(RUST_DIR)/libnixrust.$(SO_EXT)
|
||||||
|
|
||||||
|
$(libnixrust_INSTALL_PATH): $(libnixrust_PATH)
|
||||||
|
$(target-gen) cp $^ $@
|
||||||
|
ifeq ($(OS), Darwin)
|
||||||
|
install_name_tool -id $@ $@
|
||||||
|
endif
|
||||||
|
|
||||||
|
clean: clean-rust
|
||||||
|
|
||||||
|
clean-rust:
|
||||||
|
$(suppress) rm -rfv nix-rust/target
|
||||||
|
|
||||||
|
ifneq ($(OS), Darwin)
|
||||||
|
check: rust-tests
|
||||||
|
|
||||||
|
rust-tests:
|
||||||
|
$(trace-test) cd nix-rust && CARGO_HOME=$$(if [[ -d vendor ]]; then echo vendor; fi) cargo test --release $$(if [[ -d vendor ]]; then echo --offline; fi)
|
||||||
|
endif
|
||||||
@@ -0,0 +1,77 @@
|
|||||||
|
use super::{error, store::path, store::StorePath, util};
|
||||||
|
|
||||||
|
#[no_mangle]
|
||||||
|
pub unsafe extern "C" fn ffi_String_new(s: &str, out: *mut String) {
|
||||||
|
// FIXME: check whether 's' is valid UTF-8?
|
||||||
|
out.write(s.to_string())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[no_mangle]
|
||||||
|
pub unsafe extern "C" fn ffi_String_drop(self_: *mut String) {
|
||||||
|
std::ptr::drop_in_place(self_);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[no_mangle]
|
||||||
|
pub extern "C" fn ffi_StorePath_new(
|
||||||
|
path: &str,
|
||||||
|
store_dir: &str,
|
||||||
|
) -> Result<StorePath, error::CppException> {
|
||||||
|
StorePath::new(std::path::Path::new(path), std::path::Path::new(store_dir))
|
||||||
|
.map_err(|err| err.into())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[no_mangle]
|
||||||
|
pub extern "C" fn ffi_StorePath_new2(
|
||||||
|
hash: &[u8; crate::store::path::STORE_PATH_HASH_BYTES],
|
||||||
|
name: &str,
|
||||||
|
) -> Result<StorePath, error::CppException> {
|
||||||
|
StorePath::from_parts(*hash, name).map_err(|err| err.into())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[no_mangle]
|
||||||
|
pub extern "C" fn ffi_StorePath_fromBaseName(
|
||||||
|
base_name: &str,
|
||||||
|
) -> Result<StorePath, error::CppException> {
|
||||||
|
StorePath::new_from_base_name(base_name).map_err(|err| err.into())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[no_mangle]
|
||||||
|
pub unsafe extern "C" fn ffi_StorePath_drop(self_: *mut StorePath) {
|
||||||
|
std::ptr::drop_in_place(self_);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[no_mangle]
|
||||||
|
pub extern "C" fn ffi_StorePath_to_string(self_: &StorePath) -> Vec<u8> {
|
||||||
|
let mut buf = vec![0; path::STORE_PATH_HASH_CHARS + 1 + self_.name.name().len()];
|
||||||
|
util::base32::encode_into(self_.hash.hash(), &mut buf[0..path::STORE_PATH_HASH_CHARS]);
|
||||||
|
buf[path::STORE_PATH_HASH_CHARS] = b'-';
|
||||||
|
buf[path::STORE_PATH_HASH_CHARS + 1..].clone_from_slice(self_.name.name().as_bytes());
|
||||||
|
buf
|
||||||
|
}
|
||||||
|
|
||||||
|
#[no_mangle]
|
||||||
|
pub extern "C" fn ffi_StorePath_less_than(a: &StorePath, b: &StorePath) -> bool {
|
||||||
|
a < b
|
||||||
|
}
|
||||||
|
|
||||||
|
#[no_mangle]
|
||||||
|
pub extern "C" fn ffi_StorePath_eq(a: &StorePath, b: &StorePath) -> bool {
|
||||||
|
a == b
|
||||||
|
}
|
||||||
|
|
||||||
|
#[no_mangle]
|
||||||
|
pub extern "C" fn ffi_StorePath_clone(self_: &StorePath) -> StorePath {
|
||||||
|
self_.clone()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[no_mangle]
|
||||||
|
pub extern "C" fn ffi_StorePath_name(self_: &StorePath) -> &str {
|
||||||
|
self_.name.name()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[no_mangle]
|
||||||
|
pub extern "C" fn ffi_StorePath_hash_data(
|
||||||
|
self_: &StorePath,
|
||||||
|
) -> &[u8; crate::store::path::STORE_PATH_HASH_BYTES] {
|
||||||
|
self_.hash.hash()
|
||||||
|
}
|
||||||
@@ -0,0 +1,118 @@
|
|||||||
|
use std::fmt;
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub enum Error {
|
||||||
|
InvalidPath(crate::store::StorePath),
|
||||||
|
BadStorePath(std::path::PathBuf),
|
||||||
|
NotInStore(std::path::PathBuf),
|
||||||
|
BadNarInfo,
|
||||||
|
BadBase32,
|
||||||
|
StorePathNameEmpty,
|
||||||
|
StorePathNameTooLong,
|
||||||
|
BadStorePathName,
|
||||||
|
NarSizeFieldTooBig,
|
||||||
|
BadNarString,
|
||||||
|
BadNarPadding,
|
||||||
|
BadNarVersionMagic,
|
||||||
|
MissingNarOpenTag,
|
||||||
|
MissingNarCloseTag,
|
||||||
|
MissingNarField,
|
||||||
|
BadNarField(String),
|
||||||
|
BadExecutableField,
|
||||||
|
IOError(std::io::Error),
|
||||||
|
#[cfg(unused)]
|
||||||
|
HttpError(hyper::error::Error),
|
||||||
|
Misc(String),
|
||||||
|
#[cfg(not(test))]
|
||||||
|
Foreign(CppException),
|
||||||
|
BadTarFileMemberName(String),
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<std::io::Error> for Error {
|
||||||
|
fn from(err: std::io::Error) -> Self {
|
||||||
|
Error::IOError(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(unused)]
|
||||||
|
impl From<hyper::error::Error> for Error {
|
||||||
|
fn from(err: hyper::error::Error) -> Self {
|
||||||
|
Error::HttpError(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl fmt::Display for Error {
|
||||||
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||||
|
match self {
|
||||||
|
Error::InvalidPath(_) => write!(f, "invalid path"),
|
||||||
|
Error::BadNarInfo => write!(f, ".narinfo file is corrupt"),
|
||||||
|
Error::BadStorePath(path) => write!(f, "path '{}' is not a store path", path.display()),
|
||||||
|
Error::NotInStore(path) => {
|
||||||
|
write!(f, "path '{}' is not in the Nix store", path.display())
|
||||||
|
}
|
||||||
|
Error::BadBase32 => write!(f, "invalid base32 string"),
|
||||||
|
Error::StorePathNameEmpty => write!(f, "store path name is empty"),
|
||||||
|
Error::StorePathNameTooLong => {
|
||||||
|
write!(f, "store path name is longer than 211 characters")
|
||||||
|
}
|
||||||
|
Error::BadStorePathName => write!(f, "store path name contains forbidden character"),
|
||||||
|
Error::NarSizeFieldTooBig => write!(f, "size field in NAR is too big"),
|
||||||
|
Error::BadNarString => write!(f, "NAR string is not valid UTF-8"),
|
||||||
|
Error::BadNarPadding => write!(f, "NAR padding is not zero"),
|
||||||
|
Error::BadNarVersionMagic => write!(f, "unsupported NAR version"),
|
||||||
|
Error::MissingNarOpenTag => write!(f, "NAR open tag is missing"),
|
||||||
|
Error::MissingNarCloseTag => write!(f, "NAR close tag is missing"),
|
||||||
|
Error::MissingNarField => write!(f, "expected NAR field is missing"),
|
||||||
|
Error::BadNarField(s) => write!(f, "unrecognized NAR field '{}'", s),
|
||||||
|
Error::BadExecutableField => write!(f, "bad 'executable' field in NAR"),
|
||||||
|
Error::IOError(err) => write!(f, "I/O error: {}", err),
|
||||||
|
#[cfg(unused)]
|
||||||
|
Error::HttpError(err) => write!(f, "HTTP error: {}", err),
|
||||||
|
#[cfg(not(test))]
|
||||||
|
Error::Foreign(_) => write!(f, "<C++ exception>"), // FIXME
|
||||||
|
Error::Misc(s) => write!(f, "{}", s),
|
||||||
|
Error::BadTarFileMemberName(s) => {
|
||||||
|
write!(f, "tar archive contains illegal file name '{}'", s)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(not(test))]
|
||||||
|
impl From<Error> for CppException {
|
||||||
|
fn from(err: Error) -> Self {
|
||||||
|
match err {
|
||||||
|
Error::Foreign(ex) => ex,
|
||||||
|
_ => CppException::new(&err.to_string()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(not(test))]
|
||||||
|
#[repr(C)]
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub struct CppException(*const libc::c_void); // == std::exception_ptr*
|
||||||
|
|
||||||
|
#[cfg(not(test))]
|
||||||
|
impl CppException {
|
||||||
|
fn new(s: &str) -> Self {
|
||||||
|
Self(unsafe { make_error(s) })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(not(test))]
|
||||||
|
impl Drop for CppException {
|
||||||
|
fn drop(&mut self) {
|
||||||
|
unsafe {
|
||||||
|
destroy_error(self.0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(not(test))]
|
||||||
|
extern "C" {
|
||||||
|
#[allow(improper_ctypes)] // YOLO
|
||||||
|
fn make_error(s: &str) -> *const libc::c_void;
|
||||||
|
|
||||||
|
fn destroy_error(exc: *const libc::c_void);
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
#[allow(improper_ctypes_definitions)]
|
||||||
|
#[cfg(not(test))]
|
||||||
|
mod c;
|
||||||
|
mod error;
|
||||||
|
#[cfg(unused)]
|
||||||
|
mod nar;
|
||||||
|
mod store;
|
||||||
|
mod util;
|
||||||
|
|
||||||
|
pub use error::Error;
|
||||||
@@ -0,0 +1,126 @@
|
|||||||
|
use crate::Error;
|
||||||
|
use byteorder::{LittleEndian, ReadBytesExt};
|
||||||
|
use std::convert::TryFrom;
|
||||||
|
use std::io::Read;
|
||||||
|
|
||||||
|
pub fn parse<R: Read>(input: &mut R) -> Result<(), Error> {
|
||||||
|
if String::read(input)? != NAR_VERSION_MAGIC {
|
||||||
|
return Err(Error::BadNarVersionMagic);
|
||||||
|
}
|
||||||
|
|
||||||
|
parse_file(input)
|
||||||
|
}
|
||||||
|
|
||||||
|
const NAR_VERSION_MAGIC: &str = "nix-archive-1";
|
||||||
|
|
||||||
|
fn parse_file<R: Read>(input: &mut R) -> Result<(), Error> {
|
||||||
|
if String::read(input)? != "(" {
|
||||||
|
return Err(Error::MissingNarOpenTag);
|
||||||
|
}
|
||||||
|
|
||||||
|
if String::read(input)? != "type" {
|
||||||
|
return Err(Error::MissingNarField);
|
||||||
|
}
|
||||||
|
|
||||||
|
match String::read(input)?.as_ref() {
|
||||||
|
"regular" => {
|
||||||
|
let mut _executable = false;
|
||||||
|
let mut tag = String::read(input)?;
|
||||||
|
if tag == "executable" {
|
||||||
|
_executable = true;
|
||||||
|
if String::read(input)? != "" {
|
||||||
|
return Err(Error::BadExecutableField);
|
||||||
|
}
|
||||||
|
tag = String::read(input)?;
|
||||||
|
}
|
||||||
|
if tag != "contents" {
|
||||||
|
return Err(Error::MissingNarField);
|
||||||
|
}
|
||||||
|
let _contents = Vec::<u8>::read(input)?;
|
||||||
|
if String::read(input)? != ")" {
|
||||||
|
return Err(Error::MissingNarCloseTag);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
"directory" => loop {
|
||||||
|
match String::read(input)?.as_ref() {
|
||||||
|
"entry" => {
|
||||||
|
if String::read(input)? != "(" {
|
||||||
|
return Err(Error::MissingNarOpenTag);
|
||||||
|
}
|
||||||
|
if String::read(input)? != "name" {
|
||||||
|
return Err(Error::MissingNarField);
|
||||||
|
}
|
||||||
|
let _name = String::read(input)?;
|
||||||
|
if String::read(input)? != "node" {
|
||||||
|
return Err(Error::MissingNarField);
|
||||||
|
}
|
||||||
|
parse_file(input)?;
|
||||||
|
let tag = String::read(input)?;
|
||||||
|
if tag != ")" {
|
||||||
|
return Err(Error::MissingNarCloseTag);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
")" => break,
|
||||||
|
s => return Err(Error::BadNarField(s.into())),
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"symlink" => {
|
||||||
|
if String::read(input)? != "target" {
|
||||||
|
return Err(Error::MissingNarField);
|
||||||
|
}
|
||||||
|
let _target = String::read(input)?;
|
||||||
|
if String::read(input)? != ")" {
|
||||||
|
return Err(Error::MissingNarCloseTag);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
s => return Err(Error::BadNarField(s.into())),
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
trait Deserialize: Sized {
|
||||||
|
fn read<R: Read>(input: &mut R) -> Result<Self, Error>;
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Deserialize for String {
|
||||||
|
fn read<R: Read>(input: &mut R) -> Result<Self, Error> {
|
||||||
|
let buf = Deserialize::read(input)?;
|
||||||
|
Ok(String::from_utf8(buf).map_err(|_| Error::BadNarString)?)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Deserialize for Vec<u8> {
|
||||||
|
fn read<R: Read>(input: &mut R) -> Result<Self, Error> {
|
||||||
|
let n: usize = Deserialize::read(input)?;
|
||||||
|
let mut buf = vec![0; n];
|
||||||
|
input.read_exact(&mut buf)?;
|
||||||
|
skip_padding(input, n)?;
|
||||||
|
Ok(buf)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn skip_padding<R: Read>(input: &mut R, len: usize) -> Result<(), Error> {
|
||||||
|
if len % 8 != 0 {
|
||||||
|
let mut buf = [0; 8];
|
||||||
|
let buf = &mut buf[0..8 - (len % 8)];
|
||||||
|
input.read_exact(buf)?;
|
||||||
|
if !buf.iter().all(|b| *b == 0) {
|
||||||
|
return Err(Error::BadNarPadding);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Deserialize for u64 {
|
||||||
|
fn read<R: Read>(input: &mut R) -> Result<Self, Error> {
|
||||||
|
Ok(input.read_u64::<LittleEndian>()?)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Deserialize for usize {
|
||||||
|
fn read<R: Read>(input: &mut R) -> Result<Self, Error> {
|
||||||
|
let n: u64 = Deserialize::read(input)?;
|
||||||
|
Ok(usize::try_from(n).map_err(|_| Error::NarSizeFieldTooBig)?)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,48 @@
|
|||||||
|
use super::{PathInfo, Store, StorePath};
|
||||||
|
use crate::Error;
|
||||||
|
use hyper::client::Client;
|
||||||
|
|
||||||
|
pub struct BinaryCacheStore {
|
||||||
|
base_uri: String,
|
||||||
|
client: Client<hyper::client::HttpConnector, hyper::Body>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl BinaryCacheStore {
|
||||||
|
pub fn new(base_uri: String) -> Self {
|
||||||
|
Self {
|
||||||
|
base_uri,
|
||||||
|
client: Client::new(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Store for BinaryCacheStore {
|
||||||
|
fn query_path_info(
|
||||||
|
&self,
|
||||||
|
path: &StorePath,
|
||||||
|
) -> std::pin::Pin<Box<dyn std::future::Future<Output = Result<PathInfo, Error>> + Send>> {
|
||||||
|
let uri = format!("{}/{}.narinfo", self.base_uri.clone(), path.hash);
|
||||||
|
let path = path.clone();
|
||||||
|
let client = self.client.clone();
|
||||||
|
let store_dir = self.store_dir().to_string();
|
||||||
|
|
||||||
|
Box::pin(async move {
|
||||||
|
let response = client.get(uri.parse::<hyper::Uri>().unwrap()).await?;
|
||||||
|
|
||||||
|
if response.status() == hyper::StatusCode::NOT_FOUND
|
||||||
|
|| response.status() == hyper::StatusCode::FORBIDDEN
|
||||||
|
{
|
||||||
|
return Err(Error::InvalidPath(path));
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut body = response.into_body();
|
||||||
|
|
||||||
|
let mut bytes = Vec::new();
|
||||||
|
while let Some(next) = body.next().await {
|
||||||
|
bytes.extend(next?);
|
||||||
|
}
|
||||||
|
|
||||||
|
PathInfo::parse_nar_info(std::str::from_utf8(&bytes).unwrap(), &store_dir)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
pub mod path;
|
||||||
|
|
||||||
|
#[cfg(unused)]
|
||||||
|
mod binary_cache_store;
|
||||||
|
#[cfg(unused)]
|
||||||
|
mod path_info;
|
||||||
|
#[cfg(unused)]
|
||||||
|
mod store;
|
||||||
|
|
||||||
|
pub use path::{StorePath, StorePathHash, StorePathName};
|
||||||
|
|
||||||
|
#[cfg(unused)]
|
||||||
|
pub use binary_cache_store::BinaryCacheStore;
|
||||||
|
#[cfg(unused)]
|
||||||
|
pub use path_info::PathInfo;
|
||||||
|
#[cfg(unused)]
|
||||||
|
pub use store::Store;
|
||||||
@@ -0,0 +1,224 @@
|
|||||||
|
use crate::error::Error;
|
||||||
|
use crate::util::base32;
|
||||||
|
use std::fmt;
|
||||||
|
use std::path::Path;
|
||||||
|
|
||||||
|
#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Debug)]
|
||||||
|
pub struct StorePath {
|
||||||
|
pub hash: StorePathHash,
|
||||||
|
pub name: StorePathName,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub const STORE_PATH_HASH_BYTES: usize = 20;
|
||||||
|
pub const STORE_PATH_HASH_CHARS: usize = 32;
|
||||||
|
|
||||||
|
impl StorePath {
|
||||||
|
pub fn new(path: &Path, store_dir: &Path) -> Result<Self, Error> {
|
||||||
|
if path.parent() != Some(store_dir) {
|
||||||
|
return Err(Error::NotInStore(path.into()));
|
||||||
|
}
|
||||||
|
Self::new_from_base_name(
|
||||||
|
path.file_name()
|
||||||
|
.ok_or_else(|| Error::BadStorePath(path.into()))?
|
||||||
|
.to_str()
|
||||||
|
.ok_or_else(|| Error::BadStorePath(path.into()))?,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn from_parts(hash: [u8; STORE_PATH_HASH_BYTES], name: &str) -> Result<Self, Error> {
|
||||||
|
Ok(StorePath {
|
||||||
|
hash: StorePathHash(hash),
|
||||||
|
name: StorePathName::new(name)?,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn new_from_base_name(base_name: &str) -> Result<Self, Error> {
|
||||||
|
if base_name.len() < STORE_PATH_HASH_CHARS + 1
|
||||||
|
|| base_name.as_bytes()[STORE_PATH_HASH_CHARS] != b'-'
|
||||||
|
{
|
||||||
|
return Err(Error::BadStorePath(base_name.into()));
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(StorePath {
|
||||||
|
hash: StorePathHash::new(&base_name[0..STORE_PATH_HASH_CHARS])?,
|
||||||
|
name: StorePathName::new(&base_name[STORE_PATH_HASH_CHARS + 1..])?,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl fmt::Display for StorePath {
|
||||||
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||||
|
write!(f, "{}-{}", self.hash, self.name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, PartialEq, Eq, Debug)]
|
||||||
|
pub struct StorePathHash([u8; STORE_PATH_HASH_BYTES]);
|
||||||
|
|
||||||
|
impl StorePathHash {
|
||||||
|
pub fn new(s: &str) -> Result<Self, Error> {
|
||||||
|
assert_eq!(s.len(), STORE_PATH_HASH_CHARS);
|
||||||
|
let v = base32::decode(s)?;
|
||||||
|
assert_eq!(v.len(), STORE_PATH_HASH_BYTES);
|
||||||
|
let mut bytes: [u8; 20] = Default::default();
|
||||||
|
bytes.copy_from_slice(&v[0..STORE_PATH_HASH_BYTES]);
|
||||||
|
Ok(Self(bytes))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn hash(&self) -> &[u8; STORE_PATH_HASH_BYTES] {
|
||||||
|
&self.0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl fmt::Display for StorePathHash {
|
||||||
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||||
|
let mut buf = vec![0; STORE_PATH_HASH_CHARS];
|
||||||
|
base32::encode_into(&self.0, &mut buf);
|
||||||
|
f.write_str(std::str::from_utf8(&buf).unwrap())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Ord for StorePathHash {
|
||||||
|
fn cmp(&self, other: &Self) -> std::cmp::Ordering {
|
||||||
|
// Historically we've sorted store paths by their base32
|
||||||
|
// serialization, but our base32 encodes bytes in reverse
|
||||||
|
// order. So compare them in reverse order as well.
|
||||||
|
self.0.iter().rev().cmp(other.0.iter().rev())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl PartialOrd for StorePathHash {
|
||||||
|
fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
|
||||||
|
Some(self.cmp(other))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Debug)]
|
||||||
|
pub struct StorePathName(String);
|
||||||
|
|
||||||
|
impl StorePathName {
|
||||||
|
pub fn new(s: &str) -> Result<Self, Error> {
|
||||||
|
if s.is_empty() {
|
||||||
|
return Err(Error::StorePathNameEmpty);
|
||||||
|
}
|
||||||
|
|
||||||
|
if s.len() > 211 {
|
||||||
|
return Err(Error::StorePathNameTooLong);
|
||||||
|
}
|
||||||
|
|
||||||
|
let is_good_path_name = s.chars().all(|c| {
|
||||||
|
c.is_ascii_alphabetic()
|
||||||
|
|| c.is_ascii_digit()
|
||||||
|
|| c == '+'
|
||||||
|
|| c == '-'
|
||||||
|
|| c == '.'
|
||||||
|
|| c == '_'
|
||||||
|
|| c == '?'
|
||||||
|
|| c == '='
|
||||||
|
});
|
||||||
|
if s.starts_with('.') || !is_good_path_name {
|
||||||
|
return Err(Error::BadStorePathName);
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(Self(s.to_string()))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn name(&self) -> &str {
|
||||||
|
&self.0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl fmt::Display for StorePathName {
|
||||||
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||||
|
f.write_str(&self.0)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
use assert_matches::assert_matches;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_parse() {
|
||||||
|
let s = "7h7qgvs4kgzsn8a6rb273saxyqh4jxlz-konsole-18.12.3";
|
||||||
|
let p = StorePath::new_from_base_name(&s).unwrap();
|
||||||
|
assert_eq!(p.name.0, "konsole-18.12.3");
|
||||||
|
assert_eq!(
|
||||||
|
p.hash.0,
|
||||||
|
[
|
||||||
|
0x9f, 0x76, 0x49, 0x20, 0xf6, 0x5d, 0xe9, 0x71, 0xc4, 0xca, 0x46, 0x21, 0xab, 0xff,
|
||||||
|
0x9b, 0x44, 0xef, 0x87, 0x0f, 0x3c
|
||||||
|
]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_no_name() {
|
||||||
|
let s = "7h7qgvs4kgzsn8a6rb273saxyqh4jxlz-";
|
||||||
|
assert_matches!(
|
||||||
|
StorePath::new_from_base_name(&s),
|
||||||
|
Err(Error::StorePathNameEmpty)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_no_dash() {
|
||||||
|
let s = "7h7qgvs4kgzsn8a6rb273saxyqh4jxlz";
|
||||||
|
assert_matches!(
|
||||||
|
StorePath::new_from_base_name(&s),
|
||||||
|
Err(Error::BadStorePath(_))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_short_hash() {
|
||||||
|
let s = "7h7qgvs4kgzsn8a6rb273saxyqh4jxl-konsole-18.12.3";
|
||||||
|
assert_matches!(
|
||||||
|
StorePath::new_from_base_name(&s),
|
||||||
|
Err(Error::BadStorePath(_))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_invalid_hash() {
|
||||||
|
let s = "7h7qgvs4kgzsn8e6rb273saxyqh4jxlz-konsole-18.12.3";
|
||||||
|
assert_matches!(StorePath::new_from_base_name(&s), Err(Error::BadBase32));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_long_name() {
|
||||||
|
let s = "7h7qgvs4kgzsn8a6rb273saxyqh4jxlz-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
|
||||||
|
assert_matches!(StorePath::new_from_base_name(&s), Ok(_));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_too_long_name() {
|
||||||
|
let s = "7h7qgvs4kgzsn8a6rb273saxyqh4jxlz-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
|
||||||
|
assert_matches!(
|
||||||
|
StorePath::new_from_base_name(&s),
|
||||||
|
Err(Error::StorePathNameTooLong)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_bad_name() {
|
||||||
|
let s = "7h7qgvs4kgzsn8a6rb273saxyqh4jxlz-foo bar";
|
||||||
|
assert_matches!(
|
||||||
|
StorePath::new_from_base_name(&s),
|
||||||
|
Err(Error::BadStorePathName)
|
||||||
|
);
|
||||||
|
|
||||||
|
let s = "7h7qgvs4kgzsn8a6rb273saxyqh4jxlz-kónsole";
|
||||||
|
assert_matches!(
|
||||||
|
StorePath::new_from_base_name(&s),
|
||||||
|
Err(Error::BadStorePathName)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_roundtrip() {
|
||||||
|
let s = "7h7qgvs4kgzsn8a6rb273saxyqh4jxlz-konsole-18.12.3";
|
||||||
|
assert_eq!(StorePath::new_from_base_name(&s).unwrap().to_string(), s);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,70 @@
|
|||||||
|
use crate::store::StorePath;
|
||||||
|
use crate::Error;
|
||||||
|
use std::collections::BTreeSet;
|
||||||
|
|
||||||
|
#[derive(Clone, Debug)]
|
||||||
|
pub struct PathInfo {
|
||||||
|
pub path: StorePath,
|
||||||
|
pub references: BTreeSet<StorePath>,
|
||||||
|
pub nar_size: u64,
|
||||||
|
pub deriver: Option<StorePath>,
|
||||||
|
|
||||||
|
// Additional binary cache info.
|
||||||
|
pub url: Option<String>,
|
||||||
|
pub compression: Option<String>,
|
||||||
|
pub file_size: Option<u64>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl PathInfo {
|
||||||
|
pub fn parse_nar_info(nar_info: &str, store_dir: &str) -> Result<Self, Error> {
|
||||||
|
let mut path = None;
|
||||||
|
let mut references = BTreeSet::new();
|
||||||
|
let mut nar_size = None;
|
||||||
|
let mut deriver = None;
|
||||||
|
let mut url = None;
|
||||||
|
let mut compression = None;
|
||||||
|
let mut file_size = None;
|
||||||
|
|
||||||
|
for line in nar_info.lines() {
|
||||||
|
let colon = line.find(':').ok_or(Error::BadNarInfo)?;
|
||||||
|
|
||||||
|
let (name, value) = line.split_at(colon);
|
||||||
|
|
||||||
|
if !value.starts_with(": ") {
|
||||||
|
return Err(Error::BadNarInfo);
|
||||||
|
}
|
||||||
|
|
||||||
|
let value = &value[2..];
|
||||||
|
|
||||||
|
if name == "StorePath" {
|
||||||
|
path = Some(StorePath::new(std::path::Path::new(value), store_dir)?);
|
||||||
|
} else if name == "NarSize" {
|
||||||
|
nar_size = Some(u64::from_str_radix(value, 10).map_err(|_| Error::BadNarInfo)?);
|
||||||
|
} else if name == "References" {
|
||||||
|
if !value.is_empty() {
|
||||||
|
for r in value.split(' ') {
|
||||||
|
references.insert(StorePath::new_from_base_name(r)?);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if name == "Deriver" {
|
||||||
|
deriver = Some(StorePath::new_from_base_name(value)?);
|
||||||
|
} else if name == "URL" {
|
||||||
|
url = Some(value.into());
|
||||||
|
} else if name == "Compression" {
|
||||||
|
compression = Some(value.into());
|
||||||
|
} else if name == "FileSize" {
|
||||||
|
file_size = Some(u64::from_str_radix(value, 10).map_err(|_| Error::BadNarInfo)?);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(PathInfo {
|
||||||
|
path: path.ok_or(Error::BadNarInfo)?,
|
||||||
|
references,
|
||||||
|
nar_size: nar_size.ok_or(Error::BadNarInfo)?,
|
||||||
|
deriver,
|
||||||
|
url: Some(url.ok_or(Error::BadNarInfo)?),
|
||||||
|
compression,
|
||||||
|
file_size,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
use super::{PathInfo, StorePath};
|
||||||
|
use crate::Error;
|
||||||
|
use std::collections::{BTreeMap, BTreeSet};
|
||||||
|
use std::path::Path;
|
||||||
|
|
||||||
|
pub trait Store: Send + Sync {
|
||||||
|
fn store_dir(&self) -> &str {
|
||||||
|
"/nix/store"
|
||||||
|
}
|
||||||
|
|
||||||
|
fn query_path_info(
|
||||||
|
&self,
|
||||||
|
store_path: &StorePath,
|
||||||
|
) -> std::pin::Pin<Box<dyn std::future::Future<Output = Result<PathInfo, Error>> + Send>>;
|
||||||
|
}
|
||||||
|
|
||||||
|
impl dyn Store {
|
||||||
|
pub fn parse_store_path(&self, path: &Path) -> Result<StorePath, Error> {
|
||||||
|
StorePath::new(path, self.store_dir())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn compute_path_closure(
|
||||||
|
&self,
|
||||||
|
roots: BTreeSet<StorePath>,
|
||||||
|
) -> Result<BTreeMap<StorePath, PathInfo>, Error> {
|
||||||
|
let mut done = BTreeSet::new();
|
||||||
|
let mut result = BTreeMap::new();
|
||||||
|
let mut pending = vec![];
|
||||||
|
|
||||||
|
for root in roots {
|
||||||
|
pending.push(self.query_path_info(&root));
|
||||||
|
done.insert(root);
|
||||||
|
}
|
||||||
|
|
||||||
|
while !pending.is_empty() {
|
||||||
|
let (info, _, remaining) = futures::future::select_all(pending).await;
|
||||||
|
pending = remaining;
|
||||||
|
|
||||||
|
let info = info?;
|
||||||
|
|
||||||
|
for path in &info.references {
|
||||||
|
if !done.contains(path) {
|
||||||
|
pending.push(self.query_path_info(&path));
|
||||||
|
done.insert(path.clone());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
result.insert(info.path.clone(), info);
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(result)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,160 @@
|
|||||||
|
use crate::error::Error;
|
||||||
|
use lazy_static::lazy_static;
|
||||||
|
|
||||||
|
pub fn encoded_len(input_len: usize) -> usize {
|
||||||
|
if input_len == 0 {
|
||||||
|
0
|
||||||
|
} else {
|
||||||
|
(input_len * 8 - 1) / 5 + 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn decoded_len(input_len: usize) -> usize {
|
||||||
|
input_len * 5 / 8
|
||||||
|
}
|
||||||
|
|
||||||
|
static BASE32_CHARS: &[u8; 32] = &b"0123456789abcdfghijklmnpqrsvwxyz";
|
||||||
|
|
||||||
|
lazy_static! {
|
||||||
|
static ref BASE32_CHARS_REVERSE: Box<[u8; 256]> = {
|
||||||
|
let mut xs = [0xffu8; 256];
|
||||||
|
for (n, c) in BASE32_CHARS.iter().enumerate() {
|
||||||
|
xs[*c as usize] = n as u8;
|
||||||
|
}
|
||||||
|
Box::new(xs)
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn encode(input: &[u8]) -> String {
|
||||||
|
let mut buf = vec![0; encoded_len(input.len())];
|
||||||
|
encode_into(input, &mut buf);
|
||||||
|
std::str::from_utf8(&buf).unwrap().to_string()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn encode_into(input: &[u8], output: &mut [u8]) {
|
||||||
|
let len = encoded_len(input.len());
|
||||||
|
assert_eq!(len, output.len());
|
||||||
|
|
||||||
|
let mut nr_bits_left: usize = 0;
|
||||||
|
let mut bits_left: u16 = 0;
|
||||||
|
let mut pos = len;
|
||||||
|
|
||||||
|
for b in input {
|
||||||
|
bits_left |= (*b as u16) << nr_bits_left;
|
||||||
|
nr_bits_left += 8;
|
||||||
|
while nr_bits_left > 5 {
|
||||||
|
output[pos - 1] = BASE32_CHARS[(bits_left & 0x1f) as usize];
|
||||||
|
pos -= 1;
|
||||||
|
bits_left >>= 5;
|
||||||
|
nr_bits_left -= 5;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if nr_bits_left > 0 {
|
||||||
|
output[pos - 1] = BASE32_CHARS[(bits_left & 0x1f) as usize];
|
||||||
|
pos -= 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
assert_eq!(pos, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn decode(input: &str) -> Result<Vec<u8>, crate::Error> {
|
||||||
|
let mut res = Vec::with_capacity(decoded_len(input.len()));
|
||||||
|
|
||||||
|
let mut nr_bits_left: usize = 0;
|
||||||
|
let mut bits_left: u16 = 0;
|
||||||
|
|
||||||
|
for c in input.chars().rev() {
|
||||||
|
let b = BASE32_CHARS_REVERSE[c as usize];
|
||||||
|
if b == 0xff {
|
||||||
|
return Err(Error::BadBase32);
|
||||||
|
}
|
||||||
|
bits_left |= (b as u16) << nr_bits_left;
|
||||||
|
nr_bits_left += 5;
|
||||||
|
if nr_bits_left >= 8 {
|
||||||
|
res.push((bits_left & 0xff) as u8);
|
||||||
|
bits_left >>= 8;
|
||||||
|
nr_bits_left -= 8;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if nr_bits_left > 0 && bits_left != 0 {
|
||||||
|
return Err(Error::BadBase32);
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(res)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
use assert_matches::assert_matches;
|
||||||
|
use hex;
|
||||||
|
use proptest::proptest;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_encode() {
|
||||||
|
assert_eq!(encode(&[]), "");
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
encode(&hex::decode("0839703786356bca59b0f4a32987eb2e6de43ae8").unwrap()),
|
||||||
|
"x0xf8v9fxf3jk8zln1cwlsrmhqvp0f88"
|
||||||
|
);
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
encode(
|
||||||
|
&hex::decode("ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad")
|
||||||
|
.unwrap()
|
||||||
|
),
|
||||||
|
"1b8m03r63zqhnjf7l5wnldhh7c134ap5vpj0850ymkq1iyzicy5s"
|
||||||
|
);
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
encode(
|
||||||
|
&hex::decode("ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f")
|
||||||
|
.unwrap()
|
||||||
|
),
|
||||||
|
"2gs8k559z4rlahfx0y688s49m2vvszylcikrfinm30ly9rak69236nkam5ydvly1ai7xac99vxfc4ii84hawjbk876blyk1jfhkbbyx"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_decode() {
|
||||||
|
assert_eq!(hex::encode(decode("").unwrap()), "");
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
hex::encode(decode("x0xf8v9fxf3jk8zln1cwlsrmhqvp0f88").unwrap()),
|
||||||
|
"0839703786356bca59b0f4a32987eb2e6de43ae8"
|
||||||
|
);
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
hex::encode(decode("1b8m03r63zqhnjf7l5wnldhh7c134ap5vpj0850ymkq1iyzicy5s").unwrap()),
|
||||||
|
"ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad"
|
||||||
|
);
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
hex::encode(decode("2gs8k559z4rlahfx0y688s49m2vvszylcikrfinm30ly9rak69236nkam5ydvly1ai7xac99vxfc4ii84hawjbk876blyk1jfhkbbyx").unwrap()),
|
||||||
|
"ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f"
|
||||||
|
);
|
||||||
|
|
||||||
|
assert_matches!(
|
||||||
|
decode("xoxf8v9fxf3jk8zln1cwlsrmhqvp0f88"),
|
||||||
|
Err(Error::BadBase32)
|
||||||
|
);
|
||||||
|
assert_matches!(
|
||||||
|
decode("2b8m03r63zqhnjf7l5wnldhh7c134ap5vpj0850ymkq1iyzicy5s"),
|
||||||
|
Err(Error::BadBase32)
|
||||||
|
);
|
||||||
|
assert_matches!(decode("2"), Err(Error::BadBase32));
|
||||||
|
assert_matches!(decode("2gs"), Err(Error::BadBase32));
|
||||||
|
assert_matches!(decode("2gs8"), Err(Error::BadBase32));
|
||||||
|
}
|
||||||
|
|
||||||
|
proptest! {
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn roundtrip(s: Vec<u8>) {
|
||||||
|
assert_eq!(s, decode(&encode(&s)).unwrap());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
pub mod base32;
|
||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
makefiles = local.mk
|
makefiles = local.mk
|
||||||
|
|
||||||
GLOBAL_CXXFLAGS += -g -Wall -std=c++17 -I ../src
|
GLOBAL_CXXFLAGS += -g -Wall -std=c++17
|
||||||
|
|
||||||
-include Makefile.config
|
-include Makefile.config
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
HOST_OS = @host_os@
|
|
||||||
CC = @CC@
|
CC = @CC@
|
||||||
CFLAGS = @CFLAGS@
|
CFLAGS = @CFLAGS@
|
||||||
CXX = @CXX@
|
CXX = @CXX@
|
||||||
|
|||||||
+1
-3
@@ -7,8 +7,6 @@ CXXFLAGS=
|
|||||||
AC_PROG_CC
|
AC_PROG_CC
|
||||||
AC_PROG_CXX
|
AC_PROG_CXX
|
||||||
|
|
||||||
AC_CANONICAL_HOST
|
|
||||||
|
|
||||||
# Use 64-bit file system calls so that we can support files > 2 GiB.
|
# Use 64-bit file system calls so that we can support files > 2 GiB.
|
||||||
AC_SYS_LARGEFILE
|
AC_SYS_LARGEFILE
|
||||||
|
|
||||||
@@ -41,7 +39,7 @@ perlarchname=$($perl -e 'use Config; print $Config{archname};')
|
|||||||
AC_SUBST(perllibdir, [${libdir}/perl5/site_perl/$perlversion/$perlarchname])
|
AC_SUBST(perllibdir, [${libdir}/perl5/site_perl/$perlversion/$perlarchname])
|
||||||
AC_MSG_RESULT($perllibdir)
|
AC_MSG_RESULT($perllibdir)
|
||||||
|
|
||||||
# Look for libsodium.
|
# Look for libsodium, an optional dependency.
|
||||||
PKG_CHECK_MODULES([SODIUM], [libsodium], [CXXFLAGS="$SODIUM_CFLAGS $CXXFLAGS"])
|
PKG_CHECK_MODULES([SODIUM], [libsodium], [CXXFLAGS="$SODIUM_CFLAGS $CXXFLAGS"])
|
||||||
|
|
||||||
# Check for the required Perl dependencies (DBI and DBD::SQLite).
|
# Check for the required Perl dependencies (DBI and DBD::SQLite).
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
package Nix::Config;
|
package Nix::Config;
|
||||||
|
|
||||||
use MIME::Base64;
|
use MIME::Base64;
|
||||||
use Nix::Store;
|
|
||||||
|
|
||||||
$version = "@PACKAGE_VERSION@";
|
$version = "@PACKAGE_VERSION@";
|
||||||
|
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ our @EXPORT = qw(
|
|||||||
derivationFromPath
|
derivationFromPath
|
||||||
addTempRoot
|
addTempRoot
|
||||||
getBinDir getStoreDir
|
getBinDir getStoreDir
|
||||||
queryRawRealisation
|
|
||||||
);
|
);
|
||||||
|
|
||||||
our $VERSION = '0.15';
|
our $VERSION = '0.15';
|
||||||
|
|||||||
@@ -15,7 +15,6 @@
|
|||||||
#include "crypto.hh"
|
#include "crypto.hh"
|
||||||
|
|
||||||
#include <sodium.h>
|
#include <sodium.h>
|
||||||
#include <nlohmann/json.hpp>
|
|
||||||
|
|
||||||
|
|
||||||
using namespace nix;
|
using namespace nix;
|
||||||
@@ -121,18 +120,6 @@ SV * queryPathInfo(char * path, int base32)
|
|||||||
croak("%s", e.what());
|
croak("%s", e.what());
|
||||||
}
|
}
|
||||||
|
|
||||||
SV * queryRawRealisation(char * outputId)
|
|
||||||
PPCODE:
|
|
||||||
try {
|
|
||||||
auto realisation = store()->queryRealisation(DrvOutput::parse(outputId));
|
|
||||||
if (realisation)
|
|
||||||
XPUSHs(sv_2mortal(newSVpv(realisation->toJSON().dump().c_str(), 0)));
|
|
||||||
else
|
|
||||||
XPUSHs(sv_2mortal(newSVpv("", 0)));
|
|
||||||
} catch (Error & e) {
|
|
||||||
croak("%s", e.what());
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
SV * queryPathFromHashPart(char * hashPart)
|
SV * queryPathFromHashPart(char * hashPart)
|
||||||
PPCODE:
|
PPCODE:
|
||||||
|
|||||||
+1
-1
@@ -28,7 +28,7 @@ Store_CXXFLAGS = \
|
|||||||
|
|
||||||
Store_LDFLAGS := $(SODIUM_LIBS) $(NIX_LIBS)
|
Store_LDFLAGS := $(SODIUM_LIBS) $(NIX_LIBS)
|
||||||
|
|
||||||
ifdef HOST_CYGWIN
|
ifeq (CYGWIN,$(findstring CYGWIN,$(OS)))
|
||||||
archlib = $(shell perl -E 'use Config; print $$Config{archlib};')
|
archlib = $(shell perl -E 'use Config; print $$Config{archlib};')
|
||||||
libperl = $(shell perl -E 'use Config; print $$Config{libperl};')
|
libperl = $(shell perl -E 'use Config; print $$Config{libperl};')
|
||||||
Store_LDFLAGS += $(shell find ${archlib} -name ${libperl})
|
Store_LDFLAGS += $(shell find ${archlib} -name ${libperl})
|
||||||
|
|||||||
@@ -1,33 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
set -euo pipefail
|
|
||||||
# set -x
|
|
||||||
|
|
||||||
|
|
||||||
# mapfile BUILDS_FOR_LATEST_EVAL < <(
|
|
||||||
# curl -H 'Accept: application/json' https://hydra.nixos.org/jobset/nix/master/evals | \
|
|
||||||
# jq -r '.evals[0].builds[] | @sh')
|
|
||||||
BUILDS_FOR_LATEST_EVAL=$(
|
|
||||||
curl -sS -H 'Accept: application/json' https://hydra.nixos.org/jobset/nix/master/evals | \
|
|
||||||
jq -r '.evals[0].builds[]')
|
|
||||||
|
|
||||||
someBuildFailed=0
|
|
||||||
|
|
||||||
for buildId in $BUILDS_FOR_LATEST_EVAL; do
|
|
||||||
buildInfo=$(curl -sS -H 'Accept: application/json' "https://hydra.nixos.org/build/$buildId")
|
|
||||||
|
|
||||||
finished=$(echo "$buildInfo" | jq -r '.finished')
|
|
||||||
|
|
||||||
if [[ $finished = 0 ]]; then
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
|
|
||||||
buildStatus=$(echo "$buildInfo" | jq -r '.buildstatus')
|
|
||||||
|
|
||||||
if [[ $buildStatus != 0 ]]; then
|
|
||||||
someBuildFailed=1
|
|
||||||
echo "Job “$(echo "$buildInfo" | jq -r '.job')” failed on hydra: $buildInfo"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
exit "$someBuildFailed"
|
|
||||||
@@ -440,22 +440,7 @@ add_nix_vol_fstab_line() {
|
|||||||
# shellcheck disable=SC1003,SC2026
|
# shellcheck disable=SC1003,SC2026
|
||||||
local escaped_mountpoint="${NIX_ROOT/ /'\\\'040}"
|
local escaped_mountpoint="${NIX_ROOT/ /'\\\'040}"
|
||||||
shift
|
shift
|
||||||
|
EDITOR="/usr/bin/ex" _sudo "to add nix to fstab" "$@" <<EOF
|
||||||
# wrap `ex` to work around a problem with vim plugins breaking exit codes;
|
|
||||||
# (see https://github.com/NixOS/nix/issues/5468)
|
|
||||||
# we'd prefer EDITOR="/usr/bin/ex --noplugin" but vifs doesn't word-split
|
|
||||||
# the EDITOR env.
|
|
||||||
#
|
|
||||||
# TODO: at some point we should switch to `--clean`, but it wasn't added
|
|
||||||
# until https://github.com/vim/vim/releases/tag/v8.0.1554 while the macOS
|
|
||||||
# minver 10.12.6 seems to have released with vim 7.4
|
|
||||||
cat > "$SCRATCH/ex_cleanroom_wrapper" <<EOF
|
|
||||||
#!/bin/sh
|
|
||||||
/usr/bin/ex --noplugin "\$@"
|
|
||||||
EOF
|
|
||||||
chmod 755 "$SCRATCH/ex_cleanroom_wrapper"
|
|
||||||
|
|
||||||
EDITOR="$SCRATCH/ex_cleanroom_wrapper" _sudo "to add nix to fstab" "$@" <<EOF
|
|
||||||
:a
|
:a
|
||||||
UUID=$uuid $escaped_mountpoint apfs rw,noauto,nobrowse,suid,owners
|
UUID=$uuid $escaped_mountpoint apfs rw,noauto,nobrowse,suid,owners
|
||||||
.
|
.
|
||||||
@@ -646,7 +631,7 @@ EOF
|
|||||||
# technically /etc/synthetic.d/nix is supported in Big Sur+
|
# technically /etc/synthetic.d/nix is supported in Big Sur+
|
||||||
# but handling both takes even more code...
|
# but handling both takes even more code...
|
||||||
_sudo "to add Nix to /etc/synthetic.conf" \
|
_sudo "to add Nix to /etc/synthetic.conf" \
|
||||||
/usr/bin/ex --noplugin /etc/synthetic.conf <<EOF
|
/usr/bin/ex /etc/synthetic.conf <<EOF
|
||||||
:a
|
:a
|
||||||
${NIX_ROOT:1}
|
${NIX_ROOT:1}
|
||||||
.
|
.
|
||||||
@@ -730,8 +715,7 @@ create_volume() {
|
|||||||
# 6) getting special w/ awk may be fragile, but doing it to:
|
# 6) getting special w/ awk may be fragile, but doing it to:
|
||||||
# - save time over running slow diskutil commands
|
# - save time over running slow diskutil commands
|
||||||
# - skirt risk we grab wrong volume if multiple match
|
# - skirt risk we grab wrong volume if multiple match
|
||||||
_sudo "to create a new APFS volume '$NIX_VOLUME_LABEL' on $NIX_VOLUME_USE_DISK" \
|
/usr/sbin/diskutil apfs addVolume "$NIX_VOLUME_USE_DISK" "$NIX_VOLUME_FS" "$NIX_VOLUME_LABEL" -nomount | /usr/bin/awk '/Created new APFS Volume/ {print $5}'
|
||||||
/usr/sbin/diskutil apfs addVolume "$NIX_VOLUME_USE_DISK" "$NIX_VOLUME_FS" "$NIX_VOLUME_LABEL" -nomount | /usr/bin/awk '/Created new APFS Volume/ {print $5}'
|
|
||||||
}
|
}
|
||||||
|
|
||||||
volume_uuid_from_special() {
|
volume_uuid_from_special() {
|
||||||
@@ -754,12 +738,10 @@ await_volume() {
|
|||||||
setup_volume() {
|
setup_volume() {
|
||||||
local use_special use_uuid profile_packages
|
local use_special use_uuid profile_packages
|
||||||
task "Creating a Nix volume" >&2
|
task "Creating a Nix volume" >&2
|
||||||
|
# DOING: I'm tempted to wrap this call in a grep to get the new disk special without doing anything too complex, but this sudo wrapper *is* a little complex, so it'll be a PITA unless maybe we can skip sudo on this. Let's just try it without.
|
||||||
|
|
||||||
use_special="${NIX_VOLUME_USE_SPECIAL:-$(create_volume)}"
|
use_special="${NIX_VOLUME_USE_SPECIAL:-$(create_volume)}"
|
||||||
|
|
||||||
_sudo "to ensure the Nix volume is not mounted" \
|
|
||||||
/usr/sbin/diskutil unmount force "$use_special" || true # might not be mounted
|
|
||||||
|
|
||||||
use_uuid=${NIX_VOLUME_USE_UUID:-$(volume_uuid_from_special "$use_special")}
|
use_uuid=${NIX_VOLUME_USE_UUID:-$(volume_uuid_from_special "$use_special")}
|
||||||
|
|
||||||
setup_fstab "$use_uuid"
|
setup_fstab "$use_uuid"
|
||||||
@@ -777,11 +759,6 @@ setup_volume() {
|
|||||||
|
|
||||||
await_volume
|
await_volume
|
||||||
|
|
||||||
if [ "$(/usr/sbin/diskutil info -plist "$NIX_ROOT" | xmllint --xpath "(/plist/dict/key[text()='GlobalPermissionsEnabled'])/following-sibling::*[1]" -)" = "<false/>" ]; then
|
|
||||||
_sudo "to set enableOwnership (enabling users to own files)" \
|
|
||||||
/usr/sbin/diskutil enableOwnership "$NIX_ROOT"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# TODO: below is a vague kludge for now; I just don't know
|
# TODO: below is a vague kludge for now; I just don't know
|
||||||
# what if any safe action there is to take here. Also, the
|
# what if any safe action there is to take here. Also, the
|
||||||
# reminder isn't very helpful.
|
# reminder isn't very helpful.
|
||||||
@@ -809,7 +786,7 @@ setup_volume_daemon() {
|
|||||||
local volume_uuid="$2"
|
local volume_uuid="$2"
|
||||||
if ! test_voldaemon; then
|
if ! test_voldaemon; then
|
||||||
task "Configuring LaunchDaemon to mount '$NIX_VOLUME_LABEL'" >&2
|
task "Configuring LaunchDaemon to mount '$NIX_VOLUME_LABEL'" >&2
|
||||||
_sudo "to install the Nix volume mounter" /usr/bin/ex --noplugin "$NIX_VOLUME_MOUNTD_DEST" <<EOF
|
_sudo "to install the Nix volume mounter" /usr/bin/ex "$NIX_VOLUME_MOUNTD_DEST" <<EOF
|
||||||
:a
|
:a
|
||||||
$(generate_mount_daemon "$cmd_type" "$volume_uuid")
|
$(generate_mount_daemon "$cmd_type" "$volume_uuid")
|
||||||
.
|
.
|
||||||
|
|||||||
@@ -13,22 +13,11 @@ NIX_BUILD_USER_NAME_TEMPLATE="_nixbld%d"
|
|||||||
read_only_root() {
|
read_only_root() {
|
||||||
# this touch command ~should~ always produce an error
|
# this touch command ~should~ always produce an error
|
||||||
# as of this change I confirmed /usr/bin/touch emits:
|
# as of this change I confirmed /usr/bin/touch emits:
|
||||||
# "touch: /: Operation not permitted" Monterey
|
|
||||||
# "touch: /: Read-only file system" Catalina+ and Big Sur
|
# "touch: /: Read-only file system" Catalina+ and Big Sur
|
||||||
# "touch: /: Permission denied" Mojave
|
# "touch: /: Permission denied" Mojave
|
||||||
# (not matching prefix for compat w/ coreutils touch in case using
|
# (not matching prefix for compat w/ coreutils touch in case using
|
||||||
# an explicit path causes problems; its prefix differs)
|
# an explicit path causes problems; its prefix differs)
|
||||||
case "$(/usr/bin/touch / 2>&1)" in
|
[[ "$(/usr/bin/touch / 2>&1)" = *"Read-only file system" ]]
|
||||||
*"Read-only file system") # Catalina, Big Sur
|
|
||||||
return 0
|
|
||||||
;;
|
|
||||||
*"Operation not permitted") # Monterey
|
|
||||||
return 0
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
return 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# Avoiding the slow semantic way to get this information (~330ms vs ~8ms)
|
# Avoiding the slow semantic way to get this information (~330ms vs ~8ms)
|
||||||
# unless using touch causes problems. Just in case, that approach is:
|
# unless using touch causes problems. Just in case, that approach is:
|
||||||
@@ -78,7 +67,7 @@ poly_service_installed_check() {
|
|||||||
poly_service_uninstall_directions() {
|
poly_service_uninstall_directions() {
|
||||||
echo "$1. Remove macOS-specific components:"
|
echo "$1. Remove macOS-specific components:"
|
||||||
if should_create_volume && test_nix_volume_mountd_installed; then
|
if should_create_volume && test_nix_volume_mountd_installed; then
|
||||||
nix_volume_mountd_uninstall_directions
|
darwin_volume_uninstall_directions
|
||||||
fi
|
fi
|
||||||
if test_nix_daemon_installed; then
|
if test_nix_daemon_installed; then
|
||||||
nix_daemon_uninstall_directions
|
nix_daemon_uninstall_directions
|
||||||
@@ -217,8 +206,4 @@ poly_prepare_to_install() {
|
|||||||
EOF
|
EOF
|
||||||
setup_darwin_volume
|
setup_darwin_volume
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$(/usr/sbin/diskutil info -plist /nix | xmllint --xpath "(/plist/dict/key[text()='GlobalPermissionsEnabled'])/following-sibling::*[1]" -)" = "<false/>" ]; then
|
|
||||||
failure "This script needs a /nix volume with global permissions! This may require running sudo /usr/sbin/diskutil enableOwnership /nix."
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
@@ -33,7 +33,7 @@ NIX_BUILD_USER_NAME_TEMPLATE="nixbld%d"
|
|||||||
readonly NIX_ROOT="/nix"
|
readonly NIX_ROOT="/nix"
|
||||||
readonly NIX_EXTRA_CONF=${NIX_EXTRA_CONF:-}
|
readonly NIX_EXTRA_CONF=${NIX_EXTRA_CONF:-}
|
||||||
|
|
||||||
readonly PROFILE_TARGETS=("/etc/bashrc" "/etc/profile.d/nix.sh" "/etc/zshrc" "/etc/bash.bashrc" "/etc/zsh/zshrc")
|
readonly PROFILE_TARGETS=("/etc/bashrc" "/etc/profile.d/nix.sh" "/etc/zshenv" "/etc/bash.bashrc" "/etc/zsh/zshenv")
|
||||||
readonly PROFILE_BACKUP_SUFFIX=".backup-before-nix"
|
readonly PROFILE_BACKUP_SUFFIX=".backup-before-nix"
|
||||||
readonly PROFILE_NIX_FILE="$NIX_ROOT/var/nix/profiles/default/etc/profile.d/nix-daemon.sh"
|
readonly PROFILE_NIX_FILE="$NIX_ROOT/var/nix/profiles/default/etc/profile.d/nix-daemon.sh"
|
||||||
|
|
||||||
@@ -377,11 +377,6 @@ cure_artifacts() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
validate_starting_assumptions() {
|
validate_starting_assumptions() {
|
||||||
task "Checking for artifacts of previous installs"
|
|
||||||
cat <<EOF
|
|
||||||
Before I try to install, I'll check for signs Nix already is or has
|
|
||||||
been installed on this system.
|
|
||||||
EOF
|
|
||||||
if type nix-env 2> /dev/null >&2; then
|
if type nix-env 2> /dev/null >&2; then
|
||||||
warning <<EOF
|
warning <<EOF
|
||||||
Nix already appears to be installed. This installer may run into issues.
|
Nix already appears to be installed. This installer may run into issues.
|
||||||
@@ -391,34 +386,20 @@ $(uninstall_directions)
|
|||||||
EOF
|
EOF
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# TODO: I think it would be good for this step to accumulate more
|
|
||||||
# knowledge of older obsolete artifacts, if there are any.
|
|
||||||
# We could issue a "reminder" here that the user might want
|
|
||||||
# to clean them up?
|
|
||||||
|
|
||||||
for profile_target in "${PROFILE_TARGETS[@]}"; do
|
for profile_target in "${PROFILE_TARGETS[@]}"; do
|
||||||
# TODO: I think it would be good to accumulate a list of all
|
|
||||||
# of the copies so that people don't hit this 2 or 3x in
|
|
||||||
# a row for different files.
|
|
||||||
if [ -e "$profile_target$PROFILE_BACKUP_SUFFIX" ]; then
|
if [ -e "$profile_target$PROFILE_BACKUP_SUFFIX" ]; then
|
||||||
# this backup process first released in Nix 2.1
|
|
||||||
failure <<EOF
|
failure <<EOF
|
||||||
I back up shell profile/rc scripts before I add Nix to them.
|
When this script runs, it backs up the current $profile_target to
|
||||||
I need to back up $profile_target to $profile_target$PROFILE_BACKUP_SUFFIX,
|
$profile_target$PROFILE_BACKUP_SUFFIX. This backup file already exists, though.
|
||||||
but the latter already exists.
|
|
||||||
|
|
||||||
Here's how to clean up the old backup file:
|
Please follow these instructions to clean up the old backup file:
|
||||||
|
|
||||||
1. Back up (copy) $profile_target and $profile_target$PROFILE_BACKUP_SUFFIX
|
1. Copy $profile_target and $profile_target$PROFILE_BACKUP_SUFFIX to another place, just
|
||||||
to another location, just in case.
|
in case.
|
||||||
|
|
||||||
2. Ensure $profile_target$PROFILE_BACKUP_SUFFIX does not have anything
|
2. Take care to make sure that $profile_target$PROFILE_BACKUP_SUFFIX doesn't look like
|
||||||
Nix-related in it. If it does, something is probably quite
|
it has anything nix-related in it. If it does, something is probably
|
||||||
wrong. Please open an issue or get in touch immediately.
|
quite wrong. Please open an issue or get in touch immediately.
|
||||||
|
|
||||||
3. Once you confirm $profile_target is backed up and
|
|
||||||
$profile_target$PROFILE_BACKUP_SUFFIX doesn't mention Nix, run:
|
|
||||||
mv $profile_target$PROFILE_BACKUP_SUFFIX $profile_target
|
|
||||||
EOF
|
EOF
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
@@ -576,40 +557,21 @@ create_directories() {
|
|||||||
# since this bit is cross-platform:
|
# since this bit is cross-platform:
|
||||||
# - first try with `command -vp` to try and find
|
# - first try with `command -vp` to try and find
|
||||||
# chown in the usual places
|
# chown in the usual places
|
||||||
# * to work around some sort of deficiency in
|
|
||||||
# `command -p` in macOS bash 3.2, we also add
|
|
||||||
# PATH="$(getconf PATH 2>/dev/null)". As long as
|
|
||||||
# getconf is found, this should set a sane PATH
|
|
||||||
# which `command -p` in bash 3.2 appears to use.
|
|
||||||
# A bash with a properly-working `command -p`
|
|
||||||
# should ignore this hard-set PATH in favor of
|
|
||||||
# whatever it obtains internally. See
|
|
||||||
# github.com/NixOS/nix/issues/5768
|
|
||||||
# - fall back on `command -v` which would find
|
# - fall back on `command -v` which would find
|
||||||
# any chown on path
|
# any chown on path
|
||||||
# if we don't find one, the command is already
|
# if we don't find one, the command is already
|
||||||
# hiding behind || true, and the general state
|
# hiding behind || true, and the general state
|
||||||
# should be one the user can repair once they
|
# should be one the user can repair once they
|
||||||
# figure out where chown is...
|
# figure out where chown is...
|
||||||
local get_chr_own="$(PATH="$(getconf PATH 2>/dev/null)" command -vp chown)"
|
local get_chr_own="$(command -vp chown)"
|
||||||
if [[ -z "$get_chr_own" ]]; then
|
if [[ -z "$get_chr_own" ]]; then
|
||||||
get_chr_own="$(command -v chown)"
|
get_chr_own="$(command -v chown)"
|
||||||
fi
|
fi
|
||||||
|
_sudo "to take root ownership of existing Nix store files" \
|
||||||
if [[ -z "$get_chr_own" ]]; then
|
"$get_chr_own" -R "root:$NIX_BUILD_GROUP_NAME" "$NIX_ROOT" || true
|
||||||
reminder <<EOF
|
|
||||||
I wanted to take root ownership of existing Nix store files,
|
|
||||||
but I couldn't locate 'chown'. (You may need to fix your PATH.)
|
|
||||||
To manually change file ownership, you can run:
|
|
||||||
sudo chown -R 'root:$NIX_BUILD_GROUP_NAME' '$NIX_ROOT'
|
|
||||||
EOF
|
|
||||||
else
|
|
||||||
_sudo "to take root ownership of existing Nix store files" \
|
|
||||||
"$get_chr_own" -R "root:$NIX_BUILD_GROUP_NAME" "$NIX_ROOT" || true
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
_sudo "to make the basic directory structure of Nix (part 1)" \
|
_sudo "to make the basic directory structure of Nix (part 1)" \
|
||||||
install -dv -m 0755 /nix /nix/var /nix/var/log /nix/var/log/nix /nix/var/log/nix/drvs /nix/var/nix{,/db,/gcroots,/profiles,/temproots,/userpool,/daemon-socket} /nix/var/nix/{gcroots,profiles}/per-user
|
install -dv -m 0755 /nix /nix/var /nix/var/log /nix/var/log/nix /nix/var/log/nix/drvs /nix/var/nix{,/db,/gcroots,/profiles,/temproots,/userpool} /nix/var/nix/{gcroots,profiles}/per-user
|
||||||
|
|
||||||
_sudo "to make the basic directory structure of Nix (part 2)" \
|
_sudo "to make the basic directory structure of Nix (part 2)" \
|
||||||
install -dv -g "$NIX_BUILD_GROUP_NAME" -m 1775 /nix/store
|
install -dv -g "$NIX_BUILD_GROUP_NAME" -m 1775 /nix/store
|
||||||
@@ -637,7 +599,7 @@ manager. This will happen in a few stages:
|
|||||||
1. Make sure your computer doesn't already have Nix. If it does, I
|
1. Make sure your computer doesn't already have Nix. If it does, I
|
||||||
will show you instructions on how to clean up your old install.
|
will show you instructions on how to clean up your old install.
|
||||||
|
|
||||||
2. Show you what I am going to install and where. Then I will ask
|
2. Show you what we are going to install and where. Then we will ask
|
||||||
if you are ready to continue.
|
if you are ready to continue.
|
||||||
|
|
||||||
3. Create the system users and groups that the Nix daemon uses to run
|
3. Create the system users and groups that the Nix daemon uses to run
|
||||||
@@ -652,14 +614,14 @@ manager. This will happen in a few stages:
|
|||||||
|
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
if ui_confirm "Would you like to see a more detailed list of what I will do?"; then
|
if ui_confirm "Would you like to see a more detailed list of what we will do?"; then
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
|
|
||||||
I will:
|
We will:
|
||||||
|
|
||||||
- make sure your computer doesn't already have Nix files
|
- make sure your computer doesn't already have Nix files
|
||||||
(if it does, I will tell you how to clean them up.)
|
(if it does, I will tell you how to clean them up.)
|
||||||
- create local users (see the list above for the users I'll make)
|
- create local users (see the list above for the users we'll make)
|
||||||
- create a local group ($NIX_BUILD_GROUP_NAME)
|
- create a local group ($NIX_BUILD_GROUP_NAME)
|
||||||
- install Nix in to $NIX_ROOT
|
- install Nix in to $NIX_ROOT
|
||||||
- create a configuration file in /etc/nix
|
- create a configuration file in /etc/nix
|
||||||
@@ -694,7 +656,7 @@ run in a headless fashion, like this:
|
|||||||
|
|
||||||
$ curl -L https://nixos.org/nix/install | sh
|
$ curl -L https://nixos.org/nix/install | sh
|
||||||
|
|
||||||
or maybe in a CI pipeline. Because of that, I'm going to skip the
|
or maybe in a CI pipeline. Because of that, we're going to skip the
|
||||||
verbose output in the interest of brevity.
|
verbose output in the interest of brevity.
|
||||||
|
|
||||||
If you would like to
|
If you would like to
|
||||||
@@ -708,7 +670,7 @@ EOF
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
This script is going to call sudo a lot. Every time I do, it'll
|
This script is going to call sudo a lot. Every time we do, it'll
|
||||||
output exactly what it'll do, and why.
|
output exactly what it'll do, and why.
|
||||||
|
|
||||||
Just like this:
|
Just like this:
|
||||||
@@ -720,15 +682,15 @@ EOF
|
|||||||
cat <<EOF
|
cat <<EOF
|
||||||
|
|
||||||
This might look scary, but everything can be undone by running just a
|
This might look scary, but everything can be undone by running just a
|
||||||
few commands. I used to ask you to confirm each time sudo ran, but it
|
few commands. We used to ask you to confirm each time sudo ran, but it
|
||||||
was too many times. Instead, I'll just ask you this one time:
|
was too many times. Instead, I'll just ask you this one time:
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
if ui_confirm "Can I use sudo?"; then
|
if ui_confirm "Can we use sudo?"; then
|
||||||
ok "Yay! Thanks! Let's get going!"
|
ok "Yay! Thanks! Let's get going!"
|
||||||
else
|
else
|
||||||
failure <<EOF
|
failure <<EOF
|
||||||
That is okay, but I can't install.
|
That is okay, but we can't install.
|
||||||
EOF
|
EOF
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
@@ -739,10 +701,7 @@ install_from_extracted_nix() {
|
|||||||
cd "$EXTRACTED_NIX_PATH"
|
cd "$EXTRACTED_NIX_PATH"
|
||||||
|
|
||||||
_sudo "to copy the basic Nix files to the new store at $NIX_ROOT/store" \
|
_sudo "to copy the basic Nix files to the new store at $NIX_ROOT/store" \
|
||||||
cp -RLp ./store/* "$NIX_ROOT/store/"
|
rsync -rlpt --chmod=-w ./store/* "$NIX_ROOT/store/"
|
||||||
|
|
||||||
_sudo "to make the new store non-writable at $NIX_ROOT/store" \
|
|
||||||
chmod -R ugo-w "$NIX_ROOT/store/"
|
|
||||||
|
|
||||||
if [ -d "$NIX_INSTALLED_NIX" ]; then
|
if [ -d "$NIX_INSTALLED_NIX" ]; then
|
||||||
echo " Alright! We have our first nix at $NIX_INSTALLED_NIX"
|
echo " Alright! We have our first nix at $NIX_INSTALLED_NIX"
|
||||||
@@ -847,10 +806,10 @@ main() {
|
|||||||
# can fail faster in this case. Sourcing install-darwin... now runs
|
# can fail faster in this case. Sourcing install-darwin... now runs
|
||||||
# `touch /` to detect Read-only root, but it could update times on
|
# `touch /` to detect Read-only root, but it could update times on
|
||||||
# pre-Catalina macOS if run as root user.
|
# pre-Catalina macOS if run as root user.
|
||||||
if [ "$EUID" -eq 0 ]; then
|
if [ $EUID -eq 0 ]; then
|
||||||
failure <<EOF
|
failure <<EOF
|
||||||
Please do not run this script with root privileges. I will call sudo
|
Please do not run this script with root privileges. We will call sudo
|
||||||
when I need to.
|
when we need to.
|
||||||
EOF
|
EOF
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ fi
|
|||||||
|
|
||||||
# Determine if we could use the multi-user installer or not
|
# Determine if we could use the multi-user installer or not
|
||||||
if [ "$(uname -s)" = "Linux" ]; then
|
if [ "$(uname -s)" = "Linux" ]; then
|
||||||
echo "Note: a multi-user installation is possible. See https://nixos.org/manual/nix/stable/installation/installing-binary.html#multi-user-installation" >&2
|
echo "Note: a multi-user installation is possible. See https://nixos.org/nix/manual/#sect-multi-user-installation" >&2
|
||||||
fi
|
fi
|
||||||
|
|
||||||
case "$(uname -s)" in
|
case "$(uname -s)" in
|
||||||
@@ -98,7 +98,7 @@ while [ $# -gt 0 ]; do
|
|||||||
echo " providing multi-user support and better isolation for local builds."
|
echo " providing multi-user support and better isolation for local builds."
|
||||||
echo " Both for security and reproducibility, this method is recommended if"
|
echo " Both for security and reproducibility, this method is recommended if"
|
||||||
echo " supported on your platform."
|
echo " supported on your platform."
|
||||||
echo " See https://nixos.org/manual/nix/stable/installation/installing-binary.html#multi-user-installation"
|
echo " See https://nixos.org/nix/manual/#sect-multi-user-installation"
|
||||||
echo ""
|
echo ""
|
||||||
echo " --no-daemon: Simple, single-user installation that does not require root and is"
|
echo " --no-daemon: Simple, single-user installation that does not require root and is"
|
||||||
echo " trivial to uninstall."
|
echo " trivial to uninstall."
|
||||||
@@ -106,11 +106,12 @@ while [ $# -gt 0 ]; do
|
|||||||
echo ""
|
echo ""
|
||||||
echo " --no-channel-add: Don't add any channels. nixpkgs-unstable is installed by default."
|
echo " --no-channel-add: Don't add any channels. nixpkgs-unstable is installed by default."
|
||||||
echo ""
|
echo ""
|
||||||
echo " --no-modify-profile: Don't modify the user profile to automatically load nix."
|
echo " --no-modify-profile: Skip channel installation. When not provided nixpkgs-unstable"
|
||||||
|
echo " is installed by default."
|
||||||
echo ""
|
echo ""
|
||||||
echo " --daemon-user-count: Number of build users to create. Defaults to 32."
|
echo " --daemon-user-count: Number of build users to create. Defaults to 32."
|
||||||
echo ""
|
echo ""
|
||||||
echo " --nix-extra-conf-file: Path to nix.conf to prepend when installing /etc/nix/nix.conf"
|
echo " --nix-extra-conf-file: Path to nix.conf to prepend when installing /etc/nix.conf"
|
||||||
echo ""
|
echo ""
|
||||||
if [ -n "${INVOKED_FROM_INSTALL_IN:-}" ]; then
|
if [ -n "${INVOKED_FROM_INSTALL_IN:-}" ]; then
|
||||||
echo " --tarball-url-prefix URL: Base URL to download the Nix tarball from."
|
echo " --tarball-url-prefix URL: Base URL to download the Nix tarball from."
|
||||||
@@ -134,7 +135,7 @@ fi
|
|||||||
|
|
||||||
echo "performing a single-user installation of Nix..." >&2
|
echo "performing a single-user installation of Nix..." >&2
|
||||||
|
|
||||||
if ! [ -e "$dest" ]; then
|
if ! [ -e $dest ]; then
|
||||||
cmd="mkdir -m 0755 $dest && chown $USER $dest"
|
cmd="mkdir -m 0755 $dest && chown $USER $dest"
|
||||||
echo "directory $dest does not exist; creating it by running '$cmd' using sudo" >&2
|
echo "directory $dest does not exist; creating it by running '$cmd' using sudo" >&2
|
||||||
if ! sudo sh -c "$cmd"; then
|
if ! sudo sh -c "$cmd"; then
|
||||||
@@ -143,12 +144,12 @@ if ! [ -e "$dest" ]; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! [ -w "$dest" ]; then
|
if ! [ -w $dest ]; then
|
||||||
echo "$0: directory $dest exists, but is not writable by you. This could indicate that another user has already performed a single-user installation of Nix on this system. If you wish to enable multi-user support see https://nixos.org/manual/nix/stable/installation/multi-user.html. If you wish to continue with a single-user install for $USER please run 'chown -R $USER $dest' as root." >&2
|
echo "$0: directory $dest exists, but is not writable by you. This could indicate that another user has already performed a single-user installation of Nix on this system. If you wish to enable multi-user support see https://nixos.org/nix/manual/#ssec-multi-user. If you wish to continue with a single-user install for $USER please run 'chown -R $USER $dest' as root." >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mkdir -p "$dest/store"
|
mkdir -p $dest/store
|
||||||
|
|
||||||
printf "copying Nix to %s..." "${dest}/store" >&2
|
printf "copying Nix to %s..." "${dest}/store" >&2
|
||||||
# Insert a newline if no progress is shown.
|
# Insert a newline if no progress is shown.
|
||||||
@@ -189,17 +190,17 @@ fi
|
|||||||
|
|
||||||
# Install an SSL certificate bundle.
|
# Install an SSL certificate bundle.
|
||||||
if [ -z "$NIX_SSL_CERT_FILE" ] || ! [ -f "$NIX_SSL_CERT_FILE" ]; then
|
if [ -z "$NIX_SSL_CERT_FILE" ] || ! [ -f "$NIX_SSL_CERT_FILE" ]; then
|
||||||
"$nix/bin/nix-env" -i "$cacert"
|
$nix/bin/nix-env -i "$cacert"
|
||||||
export NIX_SSL_CERT_FILE="$HOME/.nix-profile/etc/ssl/certs/ca-bundle.crt"
|
export NIX_SSL_CERT_FILE="$HOME/.nix-profile/etc/ssl/certs/ca-bundle.crt"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Subscribe the user to the Nixpkgs channel and fetch it.
|
# Subscribe the user to the Nixpkgs channel and fetch it.
|
||||||
if [ -z "$NIX_INSTALLER_NO_CHANNEL_ADD" ]; then
|
if [ -z "$NIX_INSTALLER_NO_CHANNEL_ADD" ]; then
|
||||||
if ! "$nix/bin/nix-channel" --list | grep -q "^nixpkgs "; then
|
if ! $nix/bin/nix-channel --list | grep -q "^nixpkgs "; then
|
||||||
"$nix/bin/nix-channel" --add https://nixos.org/channels/nixpkgs-unstable
|
$nix/bin/nix-channel --add https://nixos.org/channels/nixpkgs-unstable
|
||||||
fi
|
fi
|
||||||
if [ -z "$_NIX_INSTALLER_TEST" ]; then
|
if [ -z "$_NIX_INSTALLER_TEST" ]; then
|
||||||
if ! "$nix/bin/nix-channel" --update nixpkgs; then
|
if ! $nix/bin/nix-channel --update nixpkgs; then
|
||||||
echo "Fetching the nixpkgs channel failed. (Are you offline?)"
|
echo "Fetching the nixpkgs channel failed. (Are you offline?)"
|
||||||
echo "To try again later, run \"nix-channel --update nixpkgs\"."
|
echo "To try again later, run \"nix-channel --update nixpkgs\"."
|
||||||
fi
|
fi
|
||||||
@@ -215,7 +216,7 @@ if [ -z "$NIX_INSTALLER_NO_MODIFY_PROFILE" ]; then
|
|||||||
if [ -w "$fn" ]; then
|
if [ -w "$fn" ]; then
|
||||||
if ! grep -q "$p" "$fn"; then
|
if ! grep -q "$p" "$fn"; then
|
||||||
echo "modifying $fn..." >&2
|
echo "modifying $fn..." >&2
|
||||||
printf '\nif [ -e %s ]; then . %s; fi # added by Nix installer\n' "$p" "$p" >> "$fn"
|
echo -e "\nif [ -e $p ]; then . $p; fi # added by Nix installer" >> "$fn"
|
||||||
fi
|
fi
|
||||||
added=1
|
added=1
|
||||||
break
|
break
|
||||||
@@ -226,7 +227,7 @@ if [ -z "$NIX_INSTALLER_NO_MODIFY_PROFILE" ]; then
|
|||||||
if [ -w "$fn" ]; then
|
if [ -w "$fn" ]; then
|
||||||
if ! grep -q "$p" "$fn"; then
|
if ! grep -q "$p" "$fn"; then
|
||||||
echo "modifying $fn..." >&2
|
echo "modifying $fn..." >&2
|
||||||
printf '\nif [ -e %s ]; then . %s; fi # added by Nix installer\n' "$p" "$p" >> "$fn"
|
echo -e "\nif [ -e $p ]; then . $p; fi # added by Nix installer" >> "$fn"
|
||||||
fi
|
fi
|
||||||
added=1
|
added=1
|
||||||
break
|
break
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ readonly SERVICE_OVERRIDE=${SERVICE_DEST}.d/override.conf
|
|||||||
|
|
||||||
create_systemd_override() {
|
create_systemd_override() {
|
||||||
header "Configuring proxy for the nix-daemon service"
|
header "Configuring proxy for the nix-daemon service"
|
||||||
_sudo "create directory for systemd unit override" mkdir -p "$(dirname "$SERVICE_OVERRIDE")"
|
_sudo "create directory for systemd unit override" mkdir -p "$(dirname $SERVICE_OVERRIDE)"
|
||||||
cat <<EOF | _sudo "create systemd unit override" tee "$SERVICE_OVERRIDE"
|
cat <<EOF | _sudo "create systemd unit override" tee "$SERVICE_OVERRIDE"
|
||||||
[Service]
|
[Service]
|
||||||
$1
|
$1
|
||||||
|
|||||||
+3
-20
@@ -40,23 +40,13 @@ case "$(uname -s).$(uname -m)" in
|
|||||||
path=@tarballPath_aarch64-linux@
|
path=@tarballPath_aarch64-linux@
|
||||||
system=aarch64-linux
|
system=aarch64-linux
|
||||||
;;
|
;;
|
||||||
Linux.armv6l_linux)
|
|
||||||
hash=@tarballHash_armv6l-linux@
|
|
||||||
path=@tarballPath_armv6l-linux@
|
|
||||||
system=armv6l-linux
|
|
||||||
;;
|
|
||||||
Linux.armv7l_linux)
|
|
||||||
hash=@tarballHash_armv7l-linux@
|
|
||||||
path=@tarballPath_armv7l-linux@
|
|
||||||
system=armv7l-linux
|
|
||||||
;;
|
|
||||||
Darwin.x86_64)
|
Darwin.x86_64)
|
||||||
hash=@tarballHash_x86_64-darwin@
|
hash=@tarballHash_x86_64-darwin@
|
||||||
path=@tarballPath_x86_64-darwin@
|
path=@tarballPath_x86_64-darwin@
|
||||||
system=x86_64-darwin
|
system=x86_64-darwin
|
||||||
;;
|
;;
|
||||||
Darwin.arm64|Darwin.aarch64)
|
Darwin.arm64|Darwin.aarch64)
|
||||||
hash=@tarballHash_aarch64-darwin@
|
hash=@binaryTarball_aarch64-darwin@
|
||||||
path=@tarballPath_aarch64-darwin@
|
path=@tarballPath_aarch64-darwin@
|
||||||
system=aarch64-darwin
|
system=aarch64-darwin
|
||||||
;;
|
;;
|
||||||
@@ -76,21 +66,14 @@ fi
|
|||||||
|
|
||||||
tarball=$tmpDir/nix-@nixVersion@-$system.tar.xz
|
tarball=$tmpDir/nix-@nixVersion@-$system.tar.xz
|
||||||
|
|
||||||
|
require_util curl "download the binary tarball"
|
||||||
require_util tar "unpack the binary tarball"
|
require_util tar "unpack the binary tarball"
|
||||||
if [ "$(uname -s)" != "Darwin" ]; then
|
if [ "$(uname -s)" != "Darwin" ]; then
|
||||||
require_util xz "unpack the binary tarball"
|
require_util xz "unpack the binary tarball"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if command -v curl > /dev/null 2>&1; then
|
|
||||||
fetch() { curl -L "$1" -o "$2"; }
|
|
||||||
elif command -v wget > /dev/null 2>&1; then
|
|
||||||
fetch() { wget "$1" -O "$2"; }
|
|
||||||
else
|
|
||||||
oops "you don't have wget or curl installed, which I need to download the binary tarball"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "downloading Nix @nixVersion@ binary tarball for $system from '$url' to '$tmpDir'..."
|
echo "downloading Nix @nixVersion@ binary tarball for $system from '$url' to '$tmpDir'..."
|
||||||
fetch "$url" "$tarball" || oops "failed to download '$url'"
|
curl -L "$url" -o "$tarball" || oops "failed to download '$url'"
|
||||||
|
|
||||||
if command -v sha256sum > /dev/null 2>&1; then
|
if command -v sha256sum > /dev/null 2>&1; then
|
||||||
hash2="$(sha256sum -b "$tarball" | cut -c1-64)"
|
hash2="$(sha256sum -b "$tarball" | cut -c1-64)"
|
||||||
|
|||||||
Loaded 100 of 480 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user