-
Notifications
You must be signed in to change notification settings - Fork 2
feat: nix buildpack #206
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
olevski
wants to merge
5
commits into
main
Choose a base branch
from
feat-nix-buildpack
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
feat: nix buildpack #206
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| #!/usr/bin/env bash | ||
| set -euo pipefail | ||
|
|
||
| layers_dir="$1" | ||
|
|
||
| nix_layer="$layers_dir/nix-packages" | ||
| mkdir -p "$nix_layer/nix/store" | ||
|
|
||
| store_path=$(nix build --no-sandbox --no-link --print-out-paths .#) | ||
|
|
||
| echo "---> Store path: $store_path" | ||
|
|
||
| # Copy the entire closure into the layer with real files (no symlinks) | ||
| while IFS= read -r path; do | ||
| echo "---> Copying $path" | ||
| cp -rL "$path" "$nix_layer/nix/store/" | ||
| done < <(nix path-info --no-sandbox --recursive .#) | ||
|
|
||
| cat >"$nix_layer.toml" <<TOML | ||
| [types] | ||
| launch = true | ||
| build = false | ||
| cache = true | ||
| TOML | ||
|
|
||
| mkdir -p "$nix_layer/env.launch" | ||
| printf '%s' "${store_path}/bin" >"$nix_layer/env.launch/PATH.prepend" | ||
| printf '%s' ":" >"$nix_layer/env.launch/PATH.delim" | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| if [[ ! -f flake.nix ]]; then | ||
| echo "Could nout find flake.nix, skipping the nix packages buildpack." | ||
| exit 1 | ||
| fi | ||
| echo "Found flake.nix, will apply the buildpack." | ||
|
|
||
| cat >>"$CNB_BUILD_PLAN_PATH" <<'EOF' | ||
| [[requires]] | ||
| name = "nix" | ||
|
|
||
| [[requires]] | ||
| name = "nix-packages" | ||
|
|
||
| [[provides]] | ||
| name = "nix-packages" | ||
| EOF | ||
|
|
||
| exit 0 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| api = "0.11" | ||
| [buildpack] | ||
| id = "renku/nix-packages" | ||
| version = "0.3.1" | ||
| name = "Nix Packages Buildpack" | ||
|
|
||
| [[targets]] | ||
| os = "linux" | ||
| arch = "amd64" | ||
|
|
||
| [[targets]] | ||
| os = "linux" | ||
| arch = "arm64" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| [buildpack] | ||
| uri = "." |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| #!/usr/bin/env bash | ||
| set -euo pipefail | ||
|
|
||
| plan_path=$CNB_BUILD_PLAN_PATH | ||
| echo "Nix install image extension" | ||
|
|
||
| cat >>"${plan_path}" <<EOL | ||
| [[provides]] | ||
| name = "nix" | ||
| EOL |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| #!/usr/bin/env bash | ||
| set -euo pipefail | ||
|
|
||
| output_dir="$1" | ||
|
|
||
| mkdir -p "$output_dir" | ||
|
|
||
| cat >"$output_dir/build.Dockerfile" <<'EOF' | ||
| ARG base_image | ||
| FROM ${base_image} | ||
| ARG user_id | ||
|
|
||
| USER root | ||
| RUN mkdir -p /nix && chmod 755 /nix | ||
| RUN curl -fsSL https://install.determinate.systems/nix | \ | ||
| sh -s -- install linux \ | ||
| --no-confirm \ | ||
| --init none \ | ||
| --extra-conf "sandbox = false" \ | ||
| ${NIX_VERSION:+--nix-package-url "https://releases.nixos.org/nix/nix-${NIX_VERSION}/nix-${NIX_VERSION}-$(uname -m)-linux.tar.xz"} | ||
| # ENV PATH="/nix/var/nix/profiles/default/bin:\${PATH}" | ||
| ENV PATH="${PATH}:/nix/var/nix/profiles/default/bin" | ||
|
|
||
| # Enable flakes | ||
| RUN /bin/mkdir -p /etc/nix && echo 'experimental-features = nix-command flakes' >> /etc/nix/nix.conf | ||
| RUN chown -R ${CNB_USER_ID}:${CNB_GROUP_ID} /nix | ||
|
|
||
| USER ${user_id} | ||
| EOF | ||
|
|
||
| BUILDPACK_ID="renku_nix-packages" | ||
| LAYER_NAME="nix-packages" | ||
| LAYER_PATH="/layers/${BUILDPACK_ID}/${LAYER_NAME}/nix/store" | ||
|
|
||
| cat >"$output_dir/run.Dockerfile" <<EOF | ||
| ARG base_image | ||
| FROM \${base_image} | ||
|
|
||
| USER root | ||
| RUN mkdir -p /nix && ln -sf ${LAYER_PATH} /nix/store | ||
| USER \${CNB_USER_ID} | ||
| EOF |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| api = "0.11" | ||
|
|
||
| [extension] | ||
| id = "renku/nix" | ||
| name = "Nix Installer" | ||
| version = "0.3.1" | ||
| description = "Installs Nix into the build image via image extension" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,5 +2,5 @@ api = "0.11" | |
|
|
||
| [extension] | ||
| id = "renku/r-deps" | ||
| version = "0.2.3" | ||
| version = "0.3.1" | ||
| name = "R dependencies" | ||
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| { | ||
| description = "A simple flake for testing the CNB nix buildpack"; | ||
|
|
||
| inputs = { | ||
| nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; | ||
| flake-utils.url = "github:numtide/flake-utils"; | ||
| }; | ||
|
|
||
| outputs = { self, nixpkgs, flake-utils }: | ||
| flake-utils.lib.eachDefaultSystem (system: | ||
| let | ||
| pkgs = import nixpkgs { inherit system; }; | ||
| in | ||
| { | ||
| packages.default = pkgs.buildEnv { | ||
| name = "cns-nix-env"; | ||
| paths = [ | ||
| pkgs.cowsay | ||
| pkgs.fortune | ||
| ]; | ||
| }; | ||
| } | ||
| ); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| flask |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
suggestion:
I would use
nix copyto only copy the derivation you buildnix build --json --print-out-paths ".#default" --json | jq ".[].outputs.out"ornix build --print-out-paths ".#my-package"nix copy /nix/store/... --to "$nix_layer/nix/storeThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
future: Also the attrset path in the installable
.#defaultcould be customized maybe ...:<flake-path>#<attribute>./tools/nix#my-stuffor so...maybe not so important....