From b50470d0af4bb9a002bcb53379081f53930ac5d6 Mon Sep 17 00:00:00 2001 From: Horiodino Date: Fri, 11 Oct 2024 17:48:58 +0530 Subject: [PATCH] update config Signed-off-by: Horiodino --- .github/workflows/go-base.yaml | 17 +-- .github/workflows/python-base.yaml | 11 +- .github/workflows/python-pip.yaml | 13 +-- .github/workflows/rust-base.yaml | 16 +-- go-server-example/bsf.hcl | 2 +- go-server-example/bsf.lock | 14 ++- go-server-example/bsf/flake.nix | 4 +- python-pip/bsf.hcl | 2 +- python-pip/bsf.lock | 14 ++- python-pip/bsf/flake.nix | 22 ++-- python/bsf.hcl | 2 +- python/bsf.lock | 14 ++- python/bsf/flake.lock | 103 +++++++++++++++-- python/bsf/flake.nix | 4 +- rust/bsf.hcl | 22 +++- rust/bsf.lock | 47 +------- rust/bsf/default.nix | 4 + rust/bsf/flake.lock | 170 ++++++++++++++++++++--------- rust/bsf/flake.nix | 54 +++++---- rust/output-folder | 0 20 files changed, 320 insertions(+), 215 deletions(-) create mode 100644 rust/output-folder diff --git a/.github/workflows/go-base.yaml b/.github/workflows/go-base.yaml index 877dff0..1077e51 100644 --- a/.github/workflows/go-base.yaml +++ b/.github/workflows/go-base.yaml @@ -85,7 +85,7 @@ jobs: tag: v0.1.0 hermetic_builds: - # needs: [merge-dev, merge-runtime] + needs: [merge-dev, merge-runtime] runs-on: ubuntu-latest permissions: id-token: write @@ -137,21 +137,8 @@ jobs: # Check for vulnerabilities :) - name: Check for vulnerabilities - run: | - grype holiodin01/go-final:latest - - # Check for vulnerabilities :) - - name: Check for vulnerabilities - run: | - grype holiodin01/go-final:latest + run: grype holiodin01/go-final:latest --only-fixed --fail-on high - output=$(grype holiodin01/go-final:latest) - if echo "$output" | grep -E 'Critical|High|Medium' > /dev/null; then - echo "Image Coinatins vulnerabilities" - exit 1 - else - echo "No high vulnerabilities found" - fi sign-the-image: needs: hermetic_builds diff --git a/.github/workflows/python-base.yaml b/.github/workflows/python-base.yaml index 4a430a2..a1c739d 100644 --- a/.github/workflows/python-base.yaml +++ b/.github/workflows/python-base.yaml @@ -55,7 +55,7 @@ jobs: hermetic_builds: - # needs: merge + needs: merge runs-on: ubuntu-latest permissions: id-token: write @@ -109,14 +109,7 @@ jobs: # Check for vulnerabilities :) - name: Check for vulnerabilities run: | - grype holiodin01/python-final:latest - output=$(grype holiodin01/python-final:latest) - if echo "$output" | grep -E 'Critical|High|Medium' > /dev/null; then - echo "Image Coinatins vulnerabilities" - exit 1 - else - echo "No high vulnerabilities found" - fi + grype holiodin01/python-final:latest --only-fixed --fail-on high sign-the-image: needs: hermetic_builds diff --git a/.github/workflows/python-pip.yaml b/.github/workflows/python-pip.yaml index fb2af4a..12d027a 100644 --- a/.github/workflows/python-pip.yaml +++ b/.github/workflows/python-pip.yaml @@ -54,7 +54,7 @@ jobs: tag: v0.1.0 hermetic_builds: - # needs: merge + needs: merge runs-on: ubuntu-latest permissions: id-token: write @@ -108,15 +108,8 @@ jobs: # Check for vulnerabilities :) - name: Check for vulnerabilities run: | - grype holiodin01/python-pip-final:latest - output=$(grype holiodin01/python-pip-final:latest) - if echo "$output" | grep -E 'Critical|High|Medium' > /dev/null; then - echo "Image Coinatins vulnerabilities" - exit 1 - else - echo "No high vulnerabilities found" - fi - + grype holiodin01/python-pip-final:latest --only-fixed --fail-on high + sign-the-image: needs: hermetic_builds runs-on: ubuntu-latest diff --git a/.github/workflows/rust-base.yaml b/.github/workflows/rust-base.yaml index 00064ae..c151739 100644 --- a/.github/workflows/rust-base.yaml +++ b/.github/workflows/rust-base.yaml @@ -83,6 +83,7 @@ jobs: tag: v0.1.0 hermetic_builds: + needs: [merge-dev, merge-runtime] runs-on: ubuntu-latest permissions: id-token: write @@ -134,21 +135,8 @@ jobs: # Check for vulnerabilities :) - name: Check for vulnerabilities - run: | - grype holiodin01/rust-final:latest - - # Check for vulnerabilities :) - - name: Check for vulnerabilities - run: | - grype holiodin01/rust-final:latest + run: grype holiodin01/rust-final:latest --only-fixed --fail-on high - output=$(grype holiodin01/rust-final:latest) - if echo "$output" | grep -E 'Critical|High|Medium' > /dev/null; then - echo "Image Coinatins vulnerabilities" - exit 1 - else - echo "No high vulnerabilities found" - fi sign-the-image: needs: hermetic_builds diff --git a/go-server-example/bsf.hcl b/go-server-example/bsf.hcl index d583b87..5eee82e 100644 --- a/go-server-example/bsf.hcl +++ b/go-server-example/bsf.hcl @@ -1,6 +1,6 @@ packages { - development = ["go@1.22.3", "gotools@0.18.0", "delve@1.22.1", "coreutils-full@~9.5", "tzdata@2024a", "bash@~5.2.15", "grype@~0.80.2", "skopeo@~1.16.1"] + development = ["bash@~5.2.15", "coreutils-full@~9.5", "delve@1.22.1", "gotools@0.18.0", "grype@~0.80.2", "skopeo@~1.16.1", "tzdata@2024a", "go@~1.23.1"] runtime = ["cacert@3.95"] } diff --git a/go-server-example/bsf.lock b/go-server-example/bsf.lock index 7c76c11..1de68d6 100644 --- a/go-server-example/bsf.lock +++ b/go-server-example/bsf.lock @@ -260,13 +260,13 @@ { "package": { "name": "go", - "revision": "7445ccd775d8b892fc56448d17345443a05f7fb4", - "version": "1.22.3", - "description": "The Go Programming language", + "revision": "2af19cfb6aa40768c4bbefd801a136270e099191", + "version": "1.23.1", + "description": "Go Programming language", "homepage": "https://go.dev/", "free": true, "spdx_id": "BSD-3-Clause", - "epoch_seconds": 1716993062, + "epoch_seconds": 1727301923, "platforms": [ "x86_64-darwin", "i686-darwin", @@ -294,9 +294,11 @@ "s390x-linux", "x86_64-linux", "wasm64-wasi", - "wasm32-wasi" + "wasm32-wasi", + "i686-freebsd", + "x86_64-freebsd" ], - "attr_name": "go" + "attr_name": "go_1_23" }, "runtime": false }, diff --git a/go-server-example/bsf/flake.nix b/go-server-example/bsf/flake.nix index 6975273..7f4ce7e 100644 --- a/go-server-example/bsf/flake.nix +++ b/go-server-example/bsf/flake.nix @@ -70,7 +70,7 @@ nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7-pkgs.bash nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4-pkgs.coreutils-full nixpkgs-d7570b04936e9b0f5268e0d834dee40368ad3308-pkgs.delve - nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4-pkgs.go + nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs.go_1_23 nixpkgs-d7570b04936e9b0f5268e0d834dee40368ad3308-pkgs.gotools nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs.grype nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs.skopeo @@ -105,7 +105,7 @@ nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7-pkgs.bash nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4-pkgs.coreutils-full nixpkgs-d7570b04936e9b0f5268e0d834dee40368ad3308-pkgs.delve - nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4-pkgs.go + nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs.go_1_23 nixpkgs-d7570b04936e9b0f5268e0d834dee40368ad3308-pkgs.gotools nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs.grype nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs.skopeo diff --git a/python-pip/bsf.hcl b/python-pip/bsf.hcl index ff43f68..0050bed 100644 --- a/python-pip/bsf.hcl +++ b/python-pip/bsf.hcl @@ -1,6 +1,6 @@ packages { - development = ["coreutils-full@9.5", "python3@3.12.2", "bash@5.2.15", "python3.12-pip@~24.0", "cosign@~2.4.0", "grype@~0.80.2"] + development = ["coreutils-full@9.5", "bash@5.2.15", "python3.12-pip@~24.0", "cosign@~2.4.0", "grype@~0.80.2", "python3@~3.12.5"] runtime = ["cacert@3.95"] } diff --git a/python-pip/bsf.lock b/python-pip/bsf.lock index 173dbbf..d02bb32 100644 --- a/python-pip/bsf.lock +++ b/python-pip/bsf.lock @@ -309,13 +309,13 @@ { "package": { "name": "python3", - "revision": "d7570b04936e9b0f5268e0d834dee40368ad3308", - "version": "3.12.2", - "description": "A high-level dynamically-typed programming language", + "revision": "2af19cfb6aa40768c4bbefd801a136270e099191", + "version": "3.12.5", + "description": "High-level dynamically-typed programming language", "homepage": "https://www.python.org", "free": true, "spdx_id": "Python-2.0", - "epoch_seconds": 1709830921, + "epoch_seconds": 1727301923, "platforms": [ "aarch64-linux", "armv5tel-linux", @@ -345,9 +345,11 @@ "i686-cygwin", "x86_64-cygwin", "x86_64-windows", - "i686-windows" + "i686-windows", + "i686-freebsd", + "x86_64-freebsd" ], - "attr_name": "python312" + "attr_name": "python312Full" }, "runtime": false }, diff --git a/python-pip/bsf/flake.nix b/python-pip/bsf/flake.nix index 7bdcd42..32b3f81 100644 --- a/python-pip/bsf/flake.nix +++ b/python-pip/bsf/flake.nix @@ -3,11 +3,10 @@ description = ""; inputs = { - nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7.url = "github:nixos/nixpkgs/1ebb7d7bba2953a4223956cfb5f068b0095f84a7"; nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14.url = "github:nixos/nixpkgs/ac5c1886fd9fe49748d7ab80accc4c847481df14"; nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4.url = "github:nixos/nixpkgs/7445ccd775d8b892fc56448d17345443a05f7fb4"; nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191.url = "github:nixos/nixpkgs/2af19cfb6aa40768c4bbefd801a136270e099191"; - nixpkgs-d7570b04936e9b0f5268e0d834dee40368ad3308.url = "github:nixos/nixpkgs/d7570b04936e9b0f5268e0d834dee40368ad3308"; + nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7.url = "github:nixos/nixpkgs/1ebb7d7bba2953a4223956cfb5f068b0095f84a7"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; @@ -28,11 +27,10 @@ nix2container , - nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7, nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14, nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4, nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191, - nixpkgs-d7570b04936e9b0f5268e0d834dee40368ad3308, + nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7, }: let supportedSystems = [ "x86_64-linux" "aarch64-darwin" "x86_64-darwin" "aarch64-linux" ]; @@ -40,11 +38,10 @@ forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f { inherit system; nix2containerPkgs = nix2container.packages.${system}; - nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7-pkgs = import nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7 { inherit system; }; nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14-pkgs = import nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14 { inherit system; }; nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4-pkgs = import nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4 { inherit system; }; nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs = import nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191 { inherit system; }; - nixpkgs-d7570b04936e9b0f5268e0d834dee40368ad3308-pkgs = import nixpkgs-d7570b04936e9b0f5268e0d834dee40368ad3308 { inherit system; }; + nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7-pkgs = import nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7 { inherit system; }; pkgs = import nixpkgs { inherit system; }; @@ -57,11 +54,10 @@ - nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7-pkgs, nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14-pkgs, nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4-pkgs, nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs, - nixpkgs-d7570b04936e9b0f5268e0d834dee40368ad3308-pkgs, + nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7-pkgs, ... }: { devShell = pkgs.mkShell { # The Nix packages provided in the environment @@ -70,7 +66,7 @@ nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4-pkgs.coreutils-full nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs.cosign nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs.grype - nixpkgs-d7570b04936e9b0f5268e0d834dee40368ad3308-pkgs.python312 + nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs.python312Full nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4-pkgs.python312Packages.pip ]; @@ -81,7 +77,7 @@ - nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7-pkgs, nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14-pkgs, nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4-pkgs, nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs, nixpkgs-d7570b04936e9b0f5268e0d834dee40368ad3308-pkgs, ... }: { + nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14-pkgs, nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4-pkgs, nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs, nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7-pkgs, ... }: { runtime = pkgs.buildEnv { name = "runtimeenv"; paths = [ @@ -95,7 +91,7 @@ - nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7-pkgs, nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14-pkgs, nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4-pkgs, nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs, nixpkgs-d7570b04936e9b0f5268e0d834dee40368ad3308-pkgs, ... }: { + nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14-pkgs, nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4-pkgs, nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs, nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7-pkgs, ... }: { development = pkgs.buildEnv { name = "devenv"; paths = [ @@ -103,7 +99,7 @@ nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4-pkgs.coreutils-full nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs.cosign nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs.grype - nixpkgs-d7570b04936e9b0f5268e0d834dee40368ad3308-pkgs.python312 + nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs.python312Full nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4-pkgs.python312Packages.pip ]; @@ -114,7 +110,7 @@ -ociImage_python-dev = forEachSupportedSystem ({ pkgs, nix2containerPkgs, system , nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7-pkgs, nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14-pkgs, nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4-pkgs, nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs, nixpkgs-d7570b04936e9b0f5268e0d834dee40368ad3308-pkgs, ... }: { +ociImage_python-dev = forEachSupportedSystem ({ pkgs, nix2containerPkgs, system , nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14-pkgs, nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4-pkgs, nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs, nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7-pkgs, ... }: { diff --git a/python/bsf.hcl b/python/bsf.hcl index 362a908..6d65a4f 100644 --- a/python/bsf.hcl +++ b/python/bsf.hcl @@ -1,6 +1,6 @@ packages { - development = ["coreutils-full@9.5", "python3@3.12.2", "poetry@1.8.2", "bash@5.2.15", "cosign@~2.4.0", "grype@~0.80.2"] + development = ["bash@5.2.15", "coreutils-full@9.5", "cosign@~2.4.0", "grype@~0.80.2", "poetry@1.8.2", "python3@~3.12.5"] runtime = ["cacert@3.95"] } diff --git a/python/bsf.lock b/python/bsf.lock index 2e2cd45..88f2880 100644 --- a/python/bsf.lock +++ b/python/bsf.lock @@ -354,13 +354,13 @@ { "package": { "name": "python3", - "revision": "d7570b04936e9b0f5268e0d834dee40368ad3308", - "version": "3.12.2", - "description": "A high-level dynamically-typed programming language", + "revision": "2af19cfb6aa40768c4bbefd801a136270e099191", + "version": "3.12.5", + "description": "High-level dynamically-typed programming language", "homepage": "https://www.python.org", "free": true, "spdx_id": "Python-2.0", - "epoch_seconds": 1709830921, + "epoch_seconds": 1727301923, "platforms": [ "aarch64-linux", "armv5tel-linux", @@ -390,9 +390,11 @@ "i686-cygwin", "x86_64-cygwin", "x86_64-windows", - "i686-windows" + "i686-windows", + "i686-freebsd", + "x86_64-freebsd" ], - "attr_name": "python312" + "attr_name": "python312Full" }, "runtime": false } diff --git a/python/bsf/flake.lock b/python/bsf/flake.lock index c1a9735..1e53e46 100644 --- a/python/bsf/flake.lock +++ b/python/bsf/flake.lock @@ -18,6 +18,24 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -39,18 +57,36 @@ "type": "github" } }, + "nix2container": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1724996935, + "narHash": "sha256-njRK9vvZ1JJsP8oV2OgkBrpJhgQezI03S7gzskCcHos=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "fa6bb0a1159f55d071ba99331355955ae30b3401", + "type": "github" + }, + "original": { + "owner": "nlewo", + "repo": "nix2container", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1724819573, - "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", - "owner": "nixos", + "lastModified": 1712920918, + "narHash": "sha256-1yxFvUcJfUphK9V91KufIQom7gCsztza0H4Rz2VCWUU=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", + "rev": "92323443a56f4e9fc4e4b712e3119f66d0969297", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", + "owner": "NixOS", "repo": "nixpkgs", "type": "github" } @@ -71,6 +107,22 @@ "type": "github" } }, + "nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191": { + "locked": { + "lastModified": 1727301923, + "narHash": "sha256-hZIzX7Qx9k1s+j5dDp20jgxJ0jTxX403/P6o1yJxi1k=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "2af19cfb6aa40768c4bbefd801a136270e099191", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "2af19cfb6aa40768c4bbefd801a136270e099191", + "type": "github" + } + }, "nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4": { "locked": { "lastModified": 1716993062, @@ -119,14 +171,30 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1724819573, + "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "poetry2nix": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nix-github-actions": "nix-github-actions", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_2", + "systems": "systems_3", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -145,8 +213,10 @@ }, "root": { "inputs": { - "nixpkgs": "nixpkgs", + "nix2container": "nix2container", + "nixpkgs": "nixpkgs_2", "nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7": "nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7", + "nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191": "nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191", "nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4": "nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4", "nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14": "nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14", "nixpkgs-d7570b04936e9b0f5268e0d834dee40368ad3308": "nixpkgs-d7570b04936e9b0f5268e0d834dee40368ad3308", @@ -169,6 +239,21 @@ } }, "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", diff --git a/python/bsf/flake.nix b/python/bsf/flake.nix index e3632cb..81b9fa1 100644 --- a/python/bsf/flake.nix +++ b/python/bsf/flake.nix @@ -74,7 +74,7 @@ nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs.cosign nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs.grype nixpkgs-d7570b04936e9b0f5268e0d834dee40368ad3308-pkgs.poetry - nixpkgs-d7570b04936e9b0f5268e0d834dee40368ad3308-pkgs.python312 + nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs.python312Full ]; }; @@ -107,7 +107,7 @@ nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs.cosign nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs.grype nixpkgs-d7570b04936e9b0f5268e0d834dee40368ad3308-pkgs.poetry - nixpkgs-d7570b04936e9b0f5268e0d834dee40368ad3308-pkgs.python312 + nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs.python312Full ]; }; diff --git a/rust/bsf.hcl b/rust/bsf.hcl index d293c07..9dec15f 100644 --- a/rust/bsf.hcl +++ b/rust/bsf.hcl @@ -1,12 +1,30 @@ packages { - development = ["coreutils-full@9.5", "bash@5.2.15", "cargo@1.75.0", "rustc@~1.73.0", "libiconv@~1.17", "clang-wrapper@~18.1.8", "cosign@~2.4.0", "grype@~0.80.2"] + development = ["coreutils-full@9.5", "bash@5.2.15", "cargo@1.75.0", "rustc@~1.73.0", "grype@~0.80.2", "libiconv@~1.17", "clang-wrapper@~18.1.8"] runtime = ["cacert@3.95", "patchelf@~0.18.0-unstable-2024-06-15"] } +rustapp { + workspaceSrc = "./." + projectName = "rust-todo" + release = true + rustVersion = "1.75.0" + rustToolchain = "" + rustChannel = "" + rustProfile = "" + rootFeatures = null + fetchCrateAlternativeRegistry = "" + hostPlatformCPU = "" + hostPlatformFeatures = null + extraRustComponents = null + cargoUnstableFlags = null + rustcLinkFlags = null + rustcBuildFlags = null +} + oci "rust-dev" { name = "docker.io/holiodin01/rust-base-dev" - layers = ["packages.runtime", "packages.dev"] + layers = ["packages.dev"] isBase = true cmd = [] entrypoint = [] diff --git a/rust/bsf.lock b/rust/bsf.lock index d928341..6f02451 100644 --- a/rust/bsf.lock +++ b/rust/bsf.lock @@ -1,6 +1,6 @@ { "app": { - "name": "" + "name": "rust-todo" }, "packages": [ { @@ -352,51 +352,6 @@ }, "runtime": false }, - { - "package": { - "name": "cosign", - "revision": "2af19cfb6aa40768c4bbefd801a136270e099191", - "version": "2.4.0", - "description": "Container Signing CLI with support for ephemeral keys and Sigstore signing", - "homepage": "https://github.com/sigstore/cosign", - "free": true, - "spdx_id": "Apache-2.0", - "epoch_seconds": 1727301923, - "platforms": [ - "x86_64-darwin", - "i686-darwin", - "aarch64-darwin", - "armv7a-darwin", - "aarch64-linux", - "armv5tel-linux", - "armv6l-linux", - "armv7a-linux", - "armv7l-linux", - "i686-linux", - "loongarch64-linux", - "m68k-linux", - "microblaze-linux", - "microblazeel-linux", - "mips-linux", - "mips64-linux", - "mips64el-linux", - "mipsel-linux", - "powerpc64-linux", - "powerpc64le-linux", - "riscv32-linux", - "riscv64-linux", - "s390-linux", - "s390x-linux", - "x86_64-linux", - "wasm64-wasi", - "wasm32-wasi", - "i686-freebsd", - "x86_64-freebsd" - ], - "attr_name": "cosign" - }, - "runtime": false - }, { "package": { "name": "grype", diff --git a/rust/bsf/default.nix b/rust/bsf/default.nix index e69de29..2f0a44d 100644 --- a/rust/bsf/default.nix +++ b/rust/bsf/default.nix @@ -0,0 +1,4 @@ + + {pkgs,rustPkgs}: + (rustPkgs pkgs).workspace.rust-todo {} + \ No newline at end of file diff --git a/rust/bsf/flake.lock b/rust/bsf/flake.lock index dfbdd1d..95e140b 100644 --- a/rust/bsf/flake.lock +++ b/rust/bsf/flake.lock @@ -1,9 +1,65 @@ { "nodes": { + "cargo2nix": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1705129117, + "narHash": "sha256-LgdDHibvimzYhxBK3kxCk2gAL7k4Hyigl5KI0X9cijA=", + "owner": "cargo2nix", + "repo": "cargo2nix", + "rev": "ae19a9e1f8f0880c088ea155ab66cee1fa001f59", + "type": "github" + }, + "original": { + "owner": "cargo2nix", + "ref": "release-0.11.0", + "repo": "cargo2nix", + "type": "github" + } + }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -20,15 +76,15 @@ }, "nix2container": { "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1720642556, - "narHash": "sha256-qsnqk13UmREKmRT7c8hEnz26X3GFFyIQrqx4EaRc1Is=", + "lastModified": 1724996935, + "narHash": "sha256-njRK9vvZ1JJsP8oV2OgkBrpJhgQezI03S7gzskCcHos=", "owner": "nlewo", "repo": "nix2container", - "rev": "3853e5caf9ad24103b13aa6e0e8bcebb47649fe4", + "rev": "fa6bb0a1159f55d071ba99331355955ae30b3401", "type": "github" }, "original": { @@ -39,15 +95,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1712920918, - "narHash": "sha256-1yxFvUcJfUphK9V91KufIQom7gCsztza0H4Rz2VCWUU=", - "owner": "NixOS", + "lastModified": 1705099185, + "narHash": "sha256-SxJenKtvcrKJd0TyJQMO3p6VA7PEp+vmMnmlKFzWMNs=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "92323443a56f4e9fc4e4b712e3119f66d0969297", + "rev": "2bce5ccff0ad7abda23e8bb56434b6877a446694", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", + "ref": "release-23.11", "repo": "nixpkgs", "type": "github" } @@ -68,22 +125,6 @@ "type": "github" } }, - "nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191": { - "locked": { - "lastModified": 1727301923, - "narHash": "sha256-hZIzX7Qx9k1s+j5dDp20jgxJ0jTxX403/P6o1yJxi1k=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "2af19cfb6aa40768c4bbefd801a136270e099191", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "rev": "2af19cfb6aa40768c4bbefd801a136270e099191", - "type": "github" - } - }, "nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4": { "locked": { "lastModified": 1716993062, @@ -132,48 +173,58 @@ "type": "github" } }, - "nixpkgs-d919897915f0f91216d2501b617d670deee993a0": { - "locked": { - "lastModified": 1720764143, - "narHash": "sha256-7YeouCB08A2H7IrJGIdJwwUTlVnbh2vBZeNMw+STJzQ=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "d919897915f0f91216d2501b617d670deee993a0", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "rev": "d919897915f0f91216d2501b617d670deee993a0", - "type": "github" - } - }, "nixpkgs_2": { "locked": { - "lastModified": 1721138476, - "narHash": "sha256-+W5eZOhhemLQxelojLxETfbFbc19NWawsXBlapYpqIA=", - "owner": "nixos", + "lastModified": 1712920918, + "narHash": "sha256-1yxFvUcJfUphK9V91KufIQom7gCsztza0H4Rz2VCWUU=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad0b5eed1b6031efaed382844806550c3dcb4206", + "rev": "92323443a56f4e9fc4e4b712e3119f66d0969297", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", + "owner": "NixOS", "repo": "nixpkgs", "type": "github" } }, "root": { "inputs": { + "cargo2nix": "cargo2nix", "nix2container": "nix2container", - "nixpkgs": "nixpkgs_2", + "nixpkgs": [ + "cargo2nix", + "nixpkgs" + ], "nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7": "nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7", - "nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191": "nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191", "nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4": "nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4", "nixpkgs-a731d0cb71c58f56895f71a5b02eda2962a46746": "nixpkgs-a731d0cb71c58f56895f71a5b02eda2962a46746", - "nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14": "nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14", - "nixpkgs-d919897915f0f91216d2501b617d670deee993a0": "nixpkgs-d919897915f0f91216d2501b617d670deee993a0" + "nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14": "nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14" + } + }, + "rust-overlay": { + "inputs": { + "flake-utils": [ + "cargo2nix", + "flake-utils" + ], + "nixpkgs": [ + "cargo2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1705112162, + "narHash": "sha256-IAM0+Uijh/fwlfoeDrOwau9MxcZW3zeDoUHc6Z3xfqM=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "9e0af26ffe52bf955ad5575888f093e41fba0104", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" } }, "systems": { @@ -190,6 +241,21 @@ "repo": "default", "type": "github" } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/rust/bsf/flake.nix b/rust/bsf/flake.nix index b22a873..fe374fe 100644 --- a/rust/bsf/flake.nix +++ b/rust/bsf/flake.nix @@ -3,12 +3,12 @@ description = ""; inputs = { - nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191.url = "github:nixos/nixpkgs/2af19cfb6aa40768c4bbefd801a136270e099191"; - nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7.url = "github:nixos/nixpkgs/1ebb7d7bba2953a4223956cfb5f068b0095f84a7"; nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14.url = "github:nixos/nixpkgs/ac5c1886fd9fe49748d7ab80accc4c847481df14"; nixpkgs-a731d0cb71c58f56895f71a5b02eda2962a46746.url = "github:nixos/nixpkgs/a731d0cb71c58f56895f71a5b02eda2962a46746"; nixpkgs-d919897915f0f91216d2501b617d670deee993a0.url = "github:nixos/nixpkgs/d919897915f0f91216d2501b617d670deee993a0"; nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4.url = "github:nixos/nixpkgs/7445ccd775d8b892fc56448d17345443a05f7fb4"; + nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191.url = "github:nixos/nixpkgs/2af19cfb6aa40768c4bbefd801a136270e099191"; + nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7.url = "github:nixos/nixpkgs/1ebb7d7bba2953a4223956cfb5f068b0095f84a7"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; @@ -16,6 +16,8 @@ + cargo2nix.url = "github:cargo2nix/cargo2nix/release-0.11.0"; + nixpkgs.follows = "cargo2nix/nixpkgs"; @@ -26,31 +28,49 @@ outputs = inputs@{ self, nixpkgs, - + cargo2nix, nix2container , - nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191, - nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7, nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14, nixpkgs-a731d0cb71c58f56895f71a5b02eda2962a46746, nixpkgs-d919897915f0f91216d2501b617d670deee993a0, nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4, + nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191, + nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7, }: let supportedSystems = [ "x86_64-linux" "aarch64-darwin" "x86_64-darwin" "aarch64-linux" ]; + rustPkgs = pkgs: pkgs.rustBuilder.makePackageSet { + packageFun = import ./Cargo.nix; + workspaceSrc = ../.; + + rustVersion = "1.75.0"; + + + + + + + + + + + + + }; forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f { inherit system; nix2containerPkgs = nix2container.packages.${system}; - nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs = import nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191 { inherit system; }; - nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7-pkgs = import nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7 { inherit system; }; nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14-pkgs = import nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14 { inherit system; }; nixpkgs-a731d0cb71c58f56895f71a5b02eda2962a46746-pkgs = import nixpkgs-a731d0cb71c58f56895f71a5b02eda2962a46746 { inherit system; }; nixpkgs-d919897915f0f91216d2501b617d670deee993a0-pkgs = import nixpkgs-d919897915f0f91216d2501b617d670deee993a0 { inherit system; }; nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4-pkgs = import nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4 { inherit system; }; + nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs = import nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191 { inherit system; }; + nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7-pkgs = import nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7 { inherit system; }; - pkgs = import nixpkgs { inherit system; }; + pkgs = import nixpkgs { inherit system; overlays = [cargo2nix.overlays.default]; }; }); @@ -60,12 +80,12 @@ - nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs, - nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7-pkgs, nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14-pkgs, nixpkgs-a731d0cb71c58f56895f71a5b02eda2962a46746-pkgs, nixpkgs-d919897915f0f91216d2501b617d670deee993a0-pkgs, nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4-pkgs, + nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs, + nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7-pkgs, ... }: { devShell = pkgs.mkShell { # The Nix packages provided in the environment @@ -74,7 +94,6 @@ nixpkgs-a731d0cb71c58f56895f71a5b02eda2962a46746-pkgs.cargo nixpkgs-d919897915f0f91216d2501b617d670deee993a0-pkgs.clang_18 nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4-pkgs.coreutils-full - nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs.cosign nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs.grype nixpkgs-a731d0cb71c58f56895f71a5b02eda2962a46746-pkgs.libiconv nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7-pkgs.rustc @@ -87,7 +106,7 @@ - nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs, nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7-pkgs, nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14-pkgs, nixpkgs-a731d0cb71c58f56895f71a5b02eda2962a46746-pkgs, nixpkgs-d919897915f0f91216d2501b617d670deee993a0-pkgs, nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4-pkgs, ... }: { + nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14-pkgs, nixpkgs-a731d0cb71c58f56895f71a5b02eda2962a46746-pkgs, nixpkgs-d919897915f0f91216d2501b617d670deee993a0-pkgs, nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4-pkgs, nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs, nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7-pkgs, ... }: { runtime = pkgs.buildEnv { name = "runtimeenv"; paths = [ @@ -102,7 +121,7 @@ - nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs, nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7-pkgs, nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14-pkgs, nixpkgs-a731d0cb71c58f56895f71a5b02eda2962a46746-pkgs, nixpkgs-d919897915f0f91216d2501b617d670deee993a0-pkgs, nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4-pkgs, ... }: { + nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14-pkgs, nixpkgs-a731d0cb71c58f56895f71a5b02eda2962a46746-pkgs, nixpkgs-d919897915f0f91216d2501b617d670deee993a0-pkgs, nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4-pkgs, nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs, nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7-pkgs, ... }: { development = pkgs.buildEnv { name = "devenv"; paths = [ @@ -110,7 +129,6 @@ nixpkgs-a731d0cb71c58f56895f71a5b02eda2962a46746-pkgs.cargo nixpkgs-d919897915f0f91216d2501b617d670deee993a0-pkgs.clang_18 nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4-pkgs.coreutils-full - nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs.cosign nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs.grype nixpkgs-a731d0cb71c58f56895f71a5b02eda2962a46746-pkgs.libiconv nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7-pkgs.rustc @@ -123,7 +141,7 @@ -ociImage_rust-dev = forEachSupportedSystem ({ pkgs, nix2containerPkgs, system , nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs, nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7-pkgs, nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14-pkgs, nixpkgs-a731d0cb71c58f56895f71a5b02eda2962a46746-pkgs, nixpkgs-d919897915f0f91216d2501b617d670deee993a0-pkgs, nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4-pkgs, ... }: { +ociImage_rust-dev = forEachSupportedSystem ({ pkgs, nix2containerPkgs, system , nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14-pkgs, nixpkgs-a731d0cb71c58f56895f71a5b02eda2962a46746-pkgs, nixpkgs-d919897915f0f91216d2501b617d670deee993a0-pkgs, nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4-pkgs, nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs, nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7-pkgs, ... }: { @@ -142,10 +160,6 @@ ociImage_rust-dev = forEachSupportedSystem ({ pkgs, nix2containerPkgs, system , maxLayers = 100; layers = [ (nix2containerPkgs.nix2container.buildLayer { - copyToRoot = [ - inputs.self.runtimeEnvs.${system}.runtime - ]; - }) (nix2containerPkgs.nix2container.buildLayer { copyToRoot = [ inputs.self.devEnvs.${system}.development ]; @@ -161,7 +175,7 @@ ociImage_rust-dev = forEachSupportedSystem ({ pkgs, nix2containerPkgs, system , }); -ociImage_rust-runtime = forEachSupportedSystem ({ pkgs, nix2containerPkgs, system , nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs, nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7-pkgs, nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14-pkgs, nixpkgs-a731d0cb71c58f56895f71a5b02eda2962a46746-pkgs, nixpkgs-d919897915f0f91216d2501b617d670deee993a0-pkgs, nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4-pkgs, ... }: { +ociImage_rust-runtime = forEachSupportedSystem ({ pkgs, nix2containerPkgs, system , nixpkgs-ac5c1886fd9fe49748d7ab80accc4c847481df14-pkgs, nixpkgs-a731d0cb71c58f56895f71a5b02eda2962a46746-pkgs, nixpkgs-d919897915f0f91216d2501b617d670deee993a0-pkgs, nixpkgs-7445ccd775d8b892fc56448d17345443a05f7fb4-pkgs, nixpkgs-2af19cfb6aa40768c4bbefd801a136270e099191-pkgs, nixpkgs-1ebb7d7bba2953a4223956cfb5f068b0095f84a7-pkgs, ... }: { diff --git a/rust/output-folder b/rust/output-folder new file mode 100644 index 0000000..e69de29