From 5d8d05cc64ec37937936a53cb49268b91da9d5f4 Mon Sep 17 00:00:00 2001 From: guangtao Date: Sun, 29 Oct 2023 17:28:16 -0700 Subject: [PATCH] refactor: cleanup --- .envrc | 7 +- .github/workflows/nightly.yaml | 13 +- .github/workflows/nix-darwin.yaml | 10 +- .github/workflows/nix-linux.yaml | 15 +- flake.lock | 1102 +---------------- flake.nix | 80 +- nix/julia2nix/devshellProfiles/nightly.nix | 17 - .../cells}/julia2nix/compiler/default.nix | 0 .../julia2nix/devshellProfiles/checks.nix | 0 .../julia2nix/devshellProfiles/default.nix | 0 .../cells}/julia2nix/devshellProfiles/dev.nix | 0 .../julia2nix/devshellProfiles/nightly.nix | 17 + .../julia2nix/devshellProfiles/packages.nix | 0 .../julia2nix/devshellProfiles/update.nix | 2 +- .../cells}/julia2nix/devshells/default.nix | 2 +- .../cells}/julia2nix/devshells/main.toml | 0 .../cells}/julia2nix/entrypoints/default.nix | 0 .../julia2nix/entrypoints/doc/Manifest.toml | 0 .../julia2nix/entrypoints/doc/Project.toml | 0 .../julia2nix/entrypoints/doc/julia2nix.toml | 0 .../julia2nix/entrypoints/fix-symlink.sh | 0 .../julia2nix/entrypoints/ion/Manifest.toml | 0 .../julia2nix/entrypoints/ion/Project.toml | 0 .../julia2nix/entrypoints/ion/julia2nix.toml | 0 nix/{ => std/cells}/julia2nix/lib/default.nix | 0 .../cells}/julia2nix/nixago/Manifest.toml | 0 .../cells}/julia2nix/nixago/Project.toml | 0 .../cells}/julia2nix/nixago/default.nix | 26 +- .../cells}/julia2nix/nixago/format.jl | 0 .../cells}/julia2nix/nixago/julia2nix.toml | 0 .../julia2nix/overlays/builder/default.nix | 0 .../julia2nix/overlays/builder/depot.nix | 8 +- .../julia2nix/overlays/builder/patches.nix | 0 .../cells}/julia2nix/overlays/default.nix | 0 .../cells}/julia2nix/overlays/installApp.nix | 0 .../cells}/julia2nix/overlays/installBin.nix | 0 .../julia2nix/overlays/julia-wrapped.nix | 0 .../overlays/patches/_sources/generated.json | 0 .../overlays/patches/_sources/generated.nix | 0 .../julia2nix/overlays/patches/conda.nix | 0 .../cells}/julia2nix/overlays/patches/gr.nix | 0 .../julia2nix/overlays/patches/sources.toml | 0 .../cells}/julia2nix/overlays/version.nix | 0 .../cells}/julia2nix/packages/default.nix | 12 +- .../cells}/julia2nix/packages/fhs/default.nix | 2 +- .../cells}/julia2nix/packages/fhs/julia.nix | 0 .../toolchain/_sources/generated.json | 48 +- .../packages/toolchain/_sources/generated.nix | 48 +- .../julia2nix/packages/toolchain/changelog | 0 .../julia2nix/packages/toolchain/sources.toml | 0 nix/{ => std/cells}/patches/devshells.nix | 0 nix/std/flake.lock | 1007 +++++++++++++++ nix/std/flake.nix | 51 + 53 files changed, 1195 insertions(+), 1272 deletions(-) delete mode 100644 nix/julia2nix/devshellProfiles/nightly.nix rename nix/{ => std/cells}/julia2nix/compiler/default.nix (100%) rename nix/{ => std/cells}/julia2nix/devshellProfiles/checks.nix (100%) rename nix/{ => std/cells}/julia2nix/devshellProfiles/default.nix (100%) rename nix/{ => std/cells}/julia2nix/devshellProfiles/dev.nix (100%) create mode 100644 nix/std/cells/julia2nix/devshellProfiles/nightly.nix rename nix/{ => std/cells}/julia2nix/devshellProfiles/packages.nix (100%) rename nix/{ => std/cells}/julia2nix/devshellProfiles/update.nix (85%) rename nix/{ => std/cells}/julia2nix/devshells/default.nix (98%) rename nix/{ => std/cells}/julia2nix/devshells/main.toml (100%) rename nix/{ => std/cells}/julia2nix/entrypoints/default.nix (100%) rename nix/{ => std/cells}/julia2nix/entrypoints/doc/Manifest.toml (100%) rename nix/{ => std/cells}/julia2nix/entrypoints/doc/Project.toml (100%) rename nix/{ => std/cells}/julia2nix/entrypoints/doc/julia2nix.toml (100%) rename nix/{ => std/cells}/julia2nix/entrypoints/fix-symlink.sh (100%) rename nix/{ => std/cells}/julia2nix/entrypoints/ion/Manifest.toml (100%) rename nix/{ => std/cells}/julia2nix/entrypoints/ion/Project.toml (100%) rename nix/{ => std/cells}/julia2nix/entrypoints/ion/julia2nix.toml (100%) rename nix/{ => std/cells}/julia2nix/lib/default.nix (100%) rename nix/{ => std/cells}/julia2nix/nixago/Manifest.toml (100%) rename nix/{ => std/cells}/julia2nix/nixago/Project.toml (100%) rename nix/{ => std/cells}/julia2nix/nixago/default.nix (69%) rename nix/{ => std/cells}/julia2nix/nixago/format.jl (100%) rename nix/{ => std/cells}/julia2nix/nixago/julia2nix.toml (100%) rename nix/{ => std/cells}/julia2nix/overlays/builder/default.nix (100%) rename nix/{ => std/cells}/julia2nix/overlays/builder/depot.nix (89%) rename nix/{ => std/cells}/julia2nix/overlays/builder/patches.nix (100%) rename nix/{ => std/cells}/julia2nix/overlays/default.nix (100%) rename nix/{ => std/cells}/julia2nix/overlays/installApp.nix (100%) rename nix/{ => std/cells}/julia2nix/overlays/installBin.nix (100%) rename nix/{ => std/cells}/julia2nix/overlays/julia-wrapped.nix (100%) rename nix/{ => std/cells}/julia2nix/overlays/patches/_sources/generated.json (100%) rename nix/{ => std/cells}/julia2nix/overlays/patches/_sources/generated.nix (100%) rename nix/{ => std/cells}/julia2nix/overlays/patches/conda.nix (100%) rename nix/{ => std/cells}/julia2nix/overlays/patches/gr.nix (100%) rename nix/{ => std/cells}/julia2nix/overlays/patches/sources.toml (100%) rename nix/{ => std/cells}/julia2nix/overlays/version.nix (100%) rename nix/{ => std/cells}/julia2nix/packages/default.nix (89%) rename nix/{ => std/cells}/julia2nix/packages/fhs/default.nix (99%) rename nix/{ => std/cells}/julia2nix/packages/fhs/julia.nix (100%) rename nix/{ => std/cells}/julia2nix/packages/toolchain/_sources/generated.json (78%) rename nix/{ => std/cells}/julia2nix/packages/toolchain/_sources/generated.nix (69%) rename nix/{ => std/cells}/julia2nix/packages/toolchain/changelog (100%) rename nix/{ => std/cells}/julia2nix/packages/toolchain/sources.toml (100%) rename nix/{ => std/cells}/patches/devshells.nix (100%) create mode 100644 nix/std/flake.lock create mode 100644 nix/std/flake.nix diff --git a/.envrc b/.envrc index 3b03789..f1d1681 100644 --- a/.envrc +++ b/.envrc @@ -1,4 +1,9 @@ # shellcheck disable=SC1090 -source "$(fetchurl "https://raw.githubusercontent.com/paisano-nix/direnv/main/lib" "sha256-R3K8Flvbovj4IOvdlWNtQKLMMSQV464WjG9eU29ixHk=")" +watch_file flakes.nix flake.lock +watch_file local/flake.nix local/flake.lock +# shellcheck disable=SC1090 +source "$(fetchurl "https://raw.githubusercontent.com/gtrunsec/direnv/main/lib" "sha256-tuMA8WGkwcYq9V3MtlN6xdVvKd2YkdEpdK4ZyAN6VDM=")" + +registry="$PRJ_ROOT/nix/std#__std" use envreload //julia2nix/devshells/default diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index 5773c7c..07685cc 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -11,16 +11,9 @@ jobs: check: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.5.3 - - uses: nixbuild/nix-quick-install-action@v21 - with: - nix_conf: | - experimental-features = nix-command flakes - access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} - - - uses: cachix/cachix-action@v12 - with: - name: zeek + - uses: actions/checkout@main + - uses: DeterminateSystems/nix-installer-action@main + - uses: DeterminateSystems/magic-nix-cache-action@main - name: Julia Version Update env: diff --git a/.github/workflows/nix-darwin.yaml b/.github/workflows/nix-darwin.yaml index 3d8417f..e4c28ab 100644 --- a/.github/workflows/nix-darwin.yaml +++ b/.github/workflows/nix-darwin.yaml @@ -11,13 +11,9 @@ jobs: runs-on: macOS-latest steps: - - uses: actions/checkout@v3.5.3 - - - uses: nixbuild/nix-quick-install-action@v21 - with: - nix_conf: | - experimental-features = nix-command flakes - access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} + - uses: actions/checkout@main + - uses: DeterminateSystems/nix-installer-action@main + - uses: DeterminateSystems/magic-nix-cache-action@main - name: Init julia2nix.jl with nix develop run: | diff --git a/.github/workflows/nix-linux.yaml b/.github/workflows/nix-linux.yaml index fb371ec..6afea68 100644 --- a/.github/workflows/nix-linux.yaml +++ b/.github/workflows/nix-linux.yaml @@ -9,16 +9,9 @@ jobs: check: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.5.3 - - uses: nixbuild/nix-quick-install-action@v21 - with: - nix_conf: | - experimental-features = nix-command flakes - access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} - - - uses: cachix/cachix-action@v12 - with: - name: zeek + - uses: actions/checkout@main + - uses: DeterminateSystems/nix-installer-action@main + - uses: DeterminateSystems/magic-nix-cache-action@main - name: Nix Flake Show run: nix flake show @@ -30,7 +23,7 @@ jobs: run: nix develop --show-trace --command -- init - name: Build JuliaDoc - run: nix run -Lv .#x86_64-linux.julia2nix.entrypoints.mkdoc docs + run: nix run -Lv ./nix/std#x86_64-linux.julia2nix.entrypoints.mkdoc docs - name: Check Template Shells run: | diff --git a/flake.lock b/flake.lock index 3f934fb..1eaa414 100644 --- a/flake.lock +++ b/flake.lock @@ -1,694 +1,27 @@ { "nodes": { - "POP": { - "inputs": { - "flake-compat": "flake-compat", - "nixlib": "nixlib", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1655410953, - "narHash": "sha256-Er0zdhu7QwpWvVKfauqZqTnxDz6THTWOTVWLoz+Opmw=", - "owner": "divnix", - "repo": "POP", - "rev": "8babe4c9126298d05ebb5ab04727d741b51c022e", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "POP", - "type": "github" - } - }, - "blank": { - "locked": { - "lastModified": 1625557891, - "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", - "owner": "divnix", - "repo": "blank", - "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "blank", - "type": "github" - } - }, - "cortex": { - "flake": false, - "locked": { - "lastModified": 1643528409, - "narHash": "sha256-ldmenmCzCEuuBlMtaQYe79vYbcTORgkCXgYgGkOzkL8=", - "owner": "gtrunsec", - "repo": "cortex", - "rev": "ad9a963534e5be323a33eaf0f9aa3e914cca8093", - "type": "github" - }, - "original": { - "owner": "gtrunsec", - "repo": "cortex", - "type": "github" - } - }, - "crane": { - "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_4", - "nixpkgs": [ - "std-ext", - "std", - "paisano-mdbook-preprocessor", - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1676162383, - "narHash": "sha256-krUCKdz7ebHlFYm/A7IbKDnj2ZmMMm3yIEQcooqm7+E=", - "owner": "ipetkov", - "repo": "crane", - "rev": "6fb400ec631b22ccdbc7090b38207f7fb5cfb5f2", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "devshell": { - "inputs": { - "flake-utils": [ - "std-ext", - "std", - "flake-utils" - ], - "nixpkgs": [ - "std-ext", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1682700442, - "narHash": "sha256-qjaAAcCYgp1pBBG7mY9z95ODUBZMtUpf0Qp3Gt/Wha0=", - "owner": "numtide", - "repo": "devshell", - "rev": "fb6673fe9fe4409e3f43ca86968261e970918a83", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "dmerge": { - "inputs": { - "haumea": [ - "std-ext", - "flops", - "haumea" - ], - "namaka": [ - "std-ext", - "flops", - "namaka" - ], - "nixlib": "nixlib_2", - "yants": "yants" - }, - "locked": { - "lastModified": 1684239705, - "narHash": "sha256-goQcIld5PfRlIfC3atNLzLqnOHaMh9m4yoyykraDNlM=", - "owner": "divnix", - "repo": "dmerge", - "rev": "a740c5632789ff872a54a5b6595ef07287ff273e", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "dmerge", - "type": "github" - } - }, - "dmerge_2": { - "inputs": { - "haumea": "haumea_2", - "namaka": "namaka_2", - "nixlib": [ - "std-ext", - "std", - "nixpkgs" - ], - "yants": [ - "std-ext", - "std", - "yants" - ] - }, + "call-flake": { "locked": { - "lastModified": 1684178600, - "narHash": "sha256-EtSQcCHRQUBBEj4vbYU0vgPUYiKP261ero5k1QfQ3Bc=", + "lastModified": 1698542398, + "narHash": "sha256-bmhE1TmrJG4ba93l9WQTLuYM53kwGQAjYHRvHOeuxWU=", "owner": "divnix", - "repo": "dmerge", - "rev": "ac9932f26325afac5baa59cf6478432d17762a4e", + "repo": "call-flake", + "rev": "4c92816c2ba27a91f8252a9305a14173e1293571", "type": "github" }, "original": { "owner": "divnix", - "ref": "0.2.0", - "repo": "dmerge", - "type": "github" - } - }, - "emacs-overlay": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_6" - }, - "locked": { - "lastModified": 1676258056, - "narHash": "sha256-LhXVnPc+IPHupy7QexUrzYuloSGXvXEgvIkAlhFs+yY=", - "owner": "nix-community", - "repo": "emacs-overlay", - "rev": "09ebba158540ba3171b5f319b71427b51db8794b", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "emacs-overlay", - "type": "github" - } - }, - "fenix": { - "inputs": { - "nixpkgs": "nixpkgs_7", - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1677306201, - "narHash": "sha256-VZ9x7qdTosFvVsrpgFHrtYfT6PU3yMIs7NRYn9ELapI=", - "owner": "nix-community", - "repo": "fenix", - "rev": "0923f0c162f65ae40261ec940406049726cfeab4", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-utils": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flops": { - "inputs": { - "POP": "POP", - "dmerge": "dmerge", - "haumea": "haumea", - "namaka": "namaka", - "nixlib": "nixlib_3", - "yants": "yants_2" - }, - "locked": { - "lastModified": 1685155146, - "narHash": "sha256-VByJ7DGoYz+m2CMkbAo4ABR1UJ/HM8wy/43FJMek5Kk=", - "owner": "gtrunsec", - "repo": "flops", - "rev": "b7a140cc87c4e8c1cda484f7ccba6af80dafd448", - "type": "github" - }, - "original": { - "owner": "gtrunsec", - "repo": "flops", - "type": "github" - } - }, - "haumea": { - "inputs": { - "nixpkgs": [ - "std-ext", - "flops", - "nixlib" - ] - }, - "locked": { - "lastModified": 1685133574, - "narHash": "sha256-BH/utyzbdD74772wQ2JUf0QP9hw8vz8QhjLAt/W5NhU=", - "owner": "nix-community", - "repo": "haumea", - "rev": "214d73d9d5c44f92b6401af688c2688448768e23", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "haumea", - "type": "github" - } - }, - "haumea_2": { - "inputs": { - "nixpkgs": [ - "std-ext", - "std", - "dmerge", - "nixlib" - ] - }, - "locked": { - "lastModified": 1681176209, - "narHash": "sha256-bJLDun6esIyWtwRVXcsgzGbh4UKu8wJDrPgykqPyzmg=", - "owner": "nix-community", - "repo": "haumea", - "rev": "b915b66b27da3a595d77b139e945bb0a2fcac926", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "haumea", - "type": "github" - } - }, - "incl": { - "inputs": { - "nixlib": [ - "std-ext", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1669263024, - "narHash": "sha256-E/+23NKtxAqYG/0ydYgxlgarKnxmDbg6rCMWnOBqn9Q=", - "owner": "divnix", - "repo": "incl", - "rev": "ce7bebaee048e4cd7ebdb4cee7885e00c4e2abca", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "incl", - "type": "github" - } - }, - "n2c": { - "inputs": { - "flake-utils": [ - "std-ext", - "std", - "flake-utils" - ], - "nixpkgs": [ - "std-ext", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1677330646, - "narHash": "sha256-hUYCwJneMjnxTvj30Fjow6UMJUITqHlpUGpXMPXUJsU=", - "owner": "nlewo", - "repo": "nix2container", - "rev": "ebca8f58d450cae1a19c07701a5a8ae40afc9efc", - "type": "github" - }, - "original": { - "owner": "nlewo", - "repo": "nix2container", - "type": "github" - } - }, - "namaka": { - "inputs": { - "haumea": [ - "std-ext", - "flops", - "haumea" - ], - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1683059428, - "narHash": "sha256-ZTMqleCWmuNWhZE375gtF1j1JRkaKEUFN1AM43e7h4Y=", - "owner": "nix-community", - "repo": "namaka", - "rev": "2deba2f416454aec770bc1cc7365e39c73e6b1d7", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "v0.1.1", - "repo": "namaka", - "type": "github" - } - }, - "namaka_2": { - "inputs": { - "haumea": [ - "std-ext", - "std", - "dmerge", - "haumea" - ], - "nixpkgs": [ - "std-ext", - "std", - "dmerge", - "nixlib" - ] - }, - "locked": { - "lastModified": 1683059428, - "narHash": "sha256-ZTMqleCWmuNWhZE375gtF1j1JRkaKEUFN1AM43e7h4Y=", - "owner": "nix-community", - "repo": "namaka", - "rev": "2deba2f416454aec770bc1cc7365e39c73e6b1d7", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "v0.1.1", - "repo": "namaka", - "type": "github" - } - }, - "nix-filter": { - "locked": { - "lastModified": 1666547822, - "narHash": "sha256-razwnAybPHyoAyhkKCwXdxihIqJi1G6e1XP4FQOJTEs=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "1a3b735e13e90a8d2fd5629f2f8363bd7ffbbec7", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, - "nix-filter_2": { - "locked": { - "lastModified": 1666547822, - "narHash": "sha256-razwnAybPHyoAyhkKCwXdxihIqJi1G6e1XP4FQOJTEs=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "1a3b735e13e90a8d2fd5629f2f8363bd7ffbbec7", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, - "nixago": { - "inputs": { - "flake-utils": [ - "std-ext", - "std", - "flake-utils" - ], - "nixago-exts": [ - "std-ext", - "std", - "blank" - ], - "nixpkgs": [ - "std-ext", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1683210100, - "narHash": "sha256-bhGDOlkWtlhVECpoOog4fWiFJmLCpVEg09a40aTjCbw=", - "owner": "nix-community", - "repo": "nixago", - "rev": "1da60ad9412135f9ed7a004669fdcf3d378ec630", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixago", - "type": "github" - } - }, - "nixlib": { - "locked": { - "lastModified": 1653180592, - "narHash": "sha256-sVGwmxTj7CY1D4ioy7E+iJE+1/yHqQlxjnTpar3ap/E=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "42c5f5785b70cd64b4afd830dc31d0b08461abd5", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixlib_2": { - "locked": { - "lastModified": 1681001314, - "narHash": "sha256-5sDnCLdrKZqxLPK4KA8+f4A3YKO/u6ElpMILvX0g72c=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "367c0e1086a4eb4502b24d872cea2c7acdd557f4", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixlib_3": { - "locked": { - "lastModified": 1681001314, - "narHash": "sha256-5sDnCLdrKZqxLPK4KA8+f4A3YKO/u6ElpMILvX0g72c=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "367c0e1086a4eb4502b24d872cea2c7acdd557f4", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixos": { - "locked": { - "lastModified": 1683408522, - "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", + "repo": "call-flake", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1686519857, - "narHash": "sha256-VkBhuq67aXXiCoEmicziuDLUPPjeOTLQoj6OeVai5zM=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "6b1b72c0f887a478a5aac355674ff6df0fc44f44", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-lock": { - "locked": { - "lastModified": 1663419078, - "narHash": "sha256-cxEeMnaTGMTeDAvXnZmqcF50qoyJOsQENhYxSnW9ZMs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0cfb3c002b61807ca0bab3efe514476bdf2e5478", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0cfb3c002b61807ca0bab3efe514476bdf2e5478", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1653581809, - "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "83658b28fe638a170a19b8933aa008b30640fbd1", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1680758185, - "narHash": "sha256-sCVWwfnk7zEX8Z+OItiH+pcSklrlsLZ4TJTtnxAYREw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "0e19daa510e47a40e06257e205965f3b96ce0ac9", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1660438583, - "narHash": "sha256-rJUTYxFKlWUJI3njAwEc1pKAVooAViZGJvsgqfh/q/E=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "bbd8f7cd87d0b29294ef3072ffdbd61d60f05da4", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1685399834, - "narHash": "sha256-Lt7//5snriXSdJo5hlVcDkpERL1piiih0UXIz1RUcC4=", + "lastModified": 1698553279, + "narHash": "sha256-T/9P8yBSLcqo/v+FTOBK+0rjzjPMctVymZydbvR/Fak=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "58c85835512b0db938600b6fe13cc3e3dc4b364e", + "rev": "90e85bc7c1a6fc0760a94ace129d3a1c61c3d035", "type": "github" }, "original": { @@ -698,423 +31,10 @@ "type": "github" } }, - "nixpkgs_6": { - "locked": { - "lastModified": 1673540789, - "narHash": "sha256-xqnxBOK3qctIeUVxecydrEDbEXjsvHCPGPbvsl63M/U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0f213d0fee84280d8c3a97f7469b988d6fe5fcdf", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1677063315, - "narHash": "sha256-qiB4ajTeAOVnVSAwCNEEkoybrAlA+cpeiBxLobHndE8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "988cc958c57ce4350ec248d2d53087777f9e1949", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nosys": { - "locked": { - "lastModified": 1668010795, - "narHash": "sha256-JBDVBnos8g0toU7EhIIqQ1If5m/nyBqtHhL3sicdPwI=", - "owner": "divnix", - "repo": "nosys", - "rev": "feade0141487801c71ff55623b421ed535dbdefa", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "nosys", - "type": "github" - } - }, - "org-roam-book-template": { - "inputs": { - "cortex": "cortex", - "emacs-overlay": "emacs-overlay", - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", - "nix-filter": "nix-filter_2", - "nixpkgs": [ - "std-ext", - "nixpkgs" - ], - "ox-hugo": "ox-hugo" - }, - "locked": { - "lastModified": 1678147210, - "narHash": "sha256-Mj9C519d0F8aQC3dTk3TCOGAdBg8bX9BkALordtZ3Po=", - "owner": "gtrunsec", - "repo": "org-roam-book-template", - "rev": "c97abbc42e7048fb866c5dfff78b04846b87570d", - "type": "github" - }, - "original": { - "owner": "gtrunsec", - "repo": "org-roam-book-template", - "type": "github" - } - }, - "ox-hugo": { - "flake": false, - "locked": { - "lastModified": 1669851508, - "narHash": "sha256-7m9B647uOBnSWYsxIfavlTCsT8loDm33v/epqYSUhLw=", - "owner": "kaushalmodi", - "repo": "ox-hugo", - "rev": "706b5f622d168bb8e0cf503e0525d2db9177c83e", - "type": "github" - }, - "original": { - "owner": "kaushalmodi", - "repo": "ox-hugo", - "type": "github" - } - }, - "paisano": { - "inputs": { - "nixpkgs": [ - "std-ext", - "std", - "nixpkgs" - ], - "nosys": "nosys", - "yants": [ - "std-ext", - "std", - "yants" - ] - }, - "locked": { - "lastModified": 1678949904, - "narHash": "sha256-oAoF66hYYz1RPh3lEwb9/4e4iyBAfTbQKZRRQ8gP0Ds=", - "owner": "paisano-nix", - "repo": "core", - "rev": "88f2aff10a5064551d1d4cb86800d17084489ce3", - "type": "github" - }, - "original": { - "owner": "paisano-nix", - "repo": "core", - "type": "github" - } - }, - "paisano-actions": { - "inputs": { - "nixpkgs": [ - "std-ext", - "std", - "paisano-mdbook-preprocessor", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1677306424, - "narHash": "sha256-H9/dI2rGEbKo4KEisqbRPHFG2ajF8Tm111NPdKGIf28=", - "owner": "paisano-nix", - "repo": "actions", - "rev": "65ec4e080b3480167fc1a748c89a05901eea9a9b", - "type": "github" - }, - "original": { - "owner": "paisano-nix", - "repo": "actions", - "type": "github" - } - }, - "paisano-mdbook-preprocessor": { - "inputs": { - "crane": "crane", - "fenix": "fenix", - "nixpkgs": [ - "std-ext", - "std", - "nixpkgs" - ], - "paisano-actions": "paisano-actions", - "std": [ - "std-ext", - "std" - ] - }, - "locked": { - "lastModified": 1680654400, - "narHash": "sha256-Qdpio+ldhUK3zfl22Mhf8HUULdUOJXDWDdO7MIK69OU=", - "owner": "paisano-nix", - "repo": "mdbook-paisano-preprocessor", - "rev": "11a8fc47f574f194a7ae7b8b98001f6143ba4cf1", - "type": "github" - }, - "original": { - "owner": "paisano-nix", - "repo": "mdbook-paisano-preprocessor", - "type": "github" - } - }, - "paisano-tui": { - "inputs": { - "nixpkgs": [ - "std-ext", - "std", - "blank" - ], - "std": [ - "std-ext", - "std" - ] - }, - "locked": { - "lastModified": 1681847764, - "narHash": "sha256-mdd7PJW1BZvxy0cIKsPfAO+ohVl/V7heE5ZTAHzTdv8=", - "owner": "paisano-nix", - "repo": "tui", - "rev": "3096bad91cae73ab8ab3367d31f8a143d248a244", - "type": "github" - }, - "original": { - "owner": "paisano-nix", - "ref": "0.1.1", - "repo": "tui", - "type": "github" - } - }, "root": { "inputs": { - "nix-filter": "nix-filter", - "nixpkgs": "nixpkgs", - "nixpkgs-lock": "nixpkgs-lock", - "std": [ - "std-ext", - "std" - ], - "std-data-collection": [ - "std-ext", - "std-data-collection" - ], - "std-ext": "std-ext" - } - }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1677221702, - "narHash": "sha256-1M+58rC4eTCWNmmX0hQVZP20t3tfYNunl9D/PrGUyGE=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "f5401f620699b26ed9d47a1d2e838143a18dbe3b", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, - "rust-overlay": { - "inputs": { - "flake-utils": [ - "std-ext", - "std", - "paisano-mdbook-preprocessor", - "crane", - "flake-utils" - ], - "nixpkgs": [ - "std-ext", - "std", - "paisano-mdbook-preprocessor", - "crane", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1675391458, - "narHash": "sha256-ukDKZw922BnK5ohL9LhwtaDAdCsJL7L6ScNEyF1lO9w=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "383a4acfd11d778d5c2efcf28376cbd845eeaedf", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "std": { - "inputs": { - "arion": [ - "std-ext", - "std", - "blank" - ], - "blank": "blank", - "devshell": "devshell", - "dmerge": "dmerge_2", - "flake-utils": "flake-utils_3", - "incl": "incl", - "makes": [ - "std-ext", - "std", - "blank" - ], - "microvm": [ - "std-ext", - "std", - "blank" - ], - "n2c": "n2c", - "nixago": "nixago", - "nixpkgs": [ - "std-ext", - "nixpkgs" - ], - "paisano": "paisano", - "paisano-mdbook-preprocessor": "paisano-mdbook-preprocessor", - "paisano-tui": "paisano-tui", - "yants": "yants_3" - }, - "locked": { - "lastModified": 1684882168, - "narHash": "sha256-Yu1yw1sPWZsXe7BX7HaHg+O8fWKHCpy/AwgGfBdhivw=", - "owner": "divnix", - "repo": "std", - "rev": "959f54d6698ff7fea01e4e6d8e5d7d95fcf66844", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "std", - "type": "github" - } - }, - "std-data-collection": { - "inputs": { - "nixpkgs": [ - "std-ext", - "nixpkgs" - ], - "std": [ - "std-ext", - "std" - ] - }, - "locked": { - "lastModified": 1676163535, - "narHash": "sha256-xofkWLBqU4zj5vzJhWor2Z9CyPGKt7UGkTchsCT48Po=", - "owner": "divnix", - "repo": "std-data-collection", - "rev": "f713d81a6197e1b0854fb201cc7acde5ef9e93d4", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "std-data-collection", - "type": "github" - } - }, - "std-ext": { - "inputs": { - "flops": "flops", - "nixos": "nixos", - "nixpkgs": "nixpkgs_5", - "org-roam-book-template": "org-roam-book-template", - "std": "std", - "std-data-collection": "std-data-collection" - }, - "locked": { - "lastModified": 1685482807, - "narHash": "sha256-ssieO2aCYgWKIMVvkJGxrAAD1pfIBgdLWA28EeSVbCE=", - "owner": "gtrunsec", - "repo": "std-ext", - "rev": "64c26586c586e7369f25e4ce43ea10d6cc74bd33", - "type": "github" - }, - "original": { - "owner": "gtrunsec", - "repo": "std-ext", - "type": "github" - } - }, - "yants": { - "inputs": { - "nixpkgs": [ - "std-ext", - "flops", - "dmerge", - "nixlib" - ] - }, - "locked": { - "lastModified": 1677285314, - "narHash": "sha256-hlAcg2514zKrPu8jn24BUsIjjvXvCLdw1jvKgBTpqko=", - "owner": "divnix", - "repo": "yants", - "rev": "9eab24b273ce021406c852166c216b86e2bb4ec4", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "yants", - "type": "github" - } - }, - "yants_2": { - "inputs": { - "nixpkgs": "nixpkgs_4" - }, - "locked": { - "lastModified": 1677285314, - "narHash": "sha256-hlAcg2514zKrPu8jn24BUsIjjvXvCLdw1jvKgBTpqko=", - "owner": "divnix", - "repo": "yants", - "rev": "9eab24b273ce021406c852166c216b86e2bb4ec4", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "yants", - "type": "github" - } - }, - "yants_3": { - "inputs": { - "nixpkgs": [ - "std-ext", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1667096281, - "narHash": "sha256-wRRec6ze0gJHmGn6m57/zhz/Kdvp9HS4Nl5fkQ+uIuA=", - "owner": "divnix", - "repo": "yants", - "rev": "d18f356ec25cb94dc9c275870c3a7927a10f8c3c", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "yants", - "type": "github" + "call-flake": "call-flake", + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index f5a009e..3775fdb 100644 --- a/flake.nix +++ b/flake.nix @@ -1,65 +1,27 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - nix-filter.url = "github:/numtide/nix-filter"; - # TOOD: use the locked prefetch version, will be removed by replacing with nix-prefetch-url - nixpkgs-lock.url = "github:NixOS/nixpkgs/0cfb3c002b61807ca0bab3efe514476bdf2e5478"; + nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + call-flake.url = "github:divnix/call-flake"; }; - - inputs = { - std-ext.url = "github:gtrunsec/std-ext"; - std.follows = "std-ext/std"; - std-data-collection.follows = "std-ext/std-data-collection"; - }; - - outputs = { - self, - std, - ... - } @ inputs: - (std.growOn { - inherit inputs; - cellsFrom = ./nix; - systems = [ - "aarch64-darwin" - "aarch64-linux" - "x86_64-darwin" - "x86_64-linux" - ]; - cellBlocks = with std.blockTypes; [ - (installables "packages") - - (nixago "nixago") - - (runnables "entrypoints") - - (devshells "devshells") - (functions "devshellProfiles") - - (functions "lib") - (functions "workflow") - (functions "overlays") - (functions "compiler") - - (data "containerJobs") - ]; - } - { - lib = std.harvest inputs.self ["julia2nix" "lib"]; - devShells = std.harvest inputs.self ["julia2nix" "devshells"]; - overlays = (std.harvest inputs.self ["julia2nix" "overlays"]).x86_64-linux; - packages = std.harvest inputs.self ["julia2nix" "packages"]; - }) - { - templates = { - devshell = { - description = "The devshell template which contains several Julia Packages"; - path = ./templates/dev; - }; - jlrs = { - description = "The tempalte which contains jlrs development of Nix"; - path = ./templates/jlrs; - }; + outputs = inputs: let + std = inputs.call-flake ./nix/std; + eachSystem = inputs.nixpkgs.lib.genAttrs [ + "x86_64-linux" + "x86_64-darwin" + "aarch64-linux" + "aarch64-darwin" + ]; + in (eachSystem (system: std.${system})) // { + inherit (std) lib packages devShells overlays; + templates = { + devshell = { + description = "The devshell template which contains several Julia Packages"; + path = ./templates/dev; + }; + jlrs = { + description = "The tempalte which contains jlrs development of Nix"; + path = ./templates/jlrs; }; }; + }; } diff --git a/nix/julia2nix/devshellProfiles/nightly.nix b/nix/julia2nix/devshellProfiles/nightly.nix deleted file mode 100644 index e76fc68..0000000 --- a/nix/julia2nix/devshellProfiles/nightly.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - inputs, - cell, -}: { - config, - lib, - pkgs, - ... -}: { - commands = lib.optionals (pkgs.system != "x86_64-darwin") [ - { - name = "julia-nightly"; - command = "${cell.packages.julia_nightly-bin}/bin/julia"; - help = "julia nightly version"; - } - ]; -} diff --git a/nix/julia2nix/compiler/default.nix b/nix/std/cells/julia2nix/compiler/default.nix similarity index 100% rename from nix/julia2nix/compiler/default.nix rename to nix/std/cells/julia2nix/compiler/default.nix diff --git a/nix/julia2nix/devshellProfiles/checks.nix b/nix/std/cells/julia2nix/devshellProfiles/checks.nix similarity index 100% rename from nix/julia2nix/devshellProfiles/checks.nix rename to nix/std/cells/julia2nix/devshellProfiles/checks.nix diff --git a/nix/julia2nix/devshellProfiles/default.nix b/nix/std/cells/julia2nix/devshellProfiles/default.nix similarity index 100% rename from nix/julia2nix/devshellProfiles/default.nix rename to nix/std/cells/julia2nix/devshellProfiles/default.nix diff --git a/nix/julia2nix/devshellProfiles/dev.nix b/nix/std/cells/julia2nix/devshellProfiles/dev.nix similarity index 100% rename from nix/julia2nix/devshellProfiles/dev.nix rename to nix/std/cells/julia2nix/devshellProfiles/dev.nix diff --git a/nix/std/cells/julia2nix/devshellProfiles/nightly.nix b/nix/std/cells/julia2nix/devshellProfiles/nightly.nix new file mode 100644 index 0000000..7ffb1ed --- /dev/null +++ b/nix/std/cells/julia2nix/devshellProfiles/nightly.nix @@ -0,0 +1,17 @@ +{ + inputs, + cell, +}: { + config, + lib, + pkgs, + ... +}: { + commands = lib.optionals (pkgs.system != "x86_64-darwin") [ + # { + # name = "julia-nightly"; + # command = "${cell.packages.julia_nightly-bin}/bin/julia"; + # help = "julia nightly version"; + # } + ]; +} diff --git a/nix/julia2nix/devshellProfiles/packages.nix b/nix/std/cells/julia2nix/devshellProfiles/packages.nix similarity index 100% rename from nix/julia2nix/devshellProfiles/packages.nix rename to nix/std/cells/julia2nix/devshellProfiles/packages.nix diff --git a/nix/julia2nix/devshellProfiles/update.nix b/nix/std/cells/julia2nix/devshellProfiles/update.nix similarity index 85% rename from nix/julia2nix/devshellProfiles/update.nix rename to nix/std/cells/julia2nix/devshellProfiles/update.nix index 3a0a2dc..dc58e2f 100644 --- a/nix/julia2nix/devshellProfiles/update.nix +++ b/nix/std/cells/julia2nix/devshellProfiles/update.nix @@ -16,7 +16,7 @@ fi nix develop github:GTrunSec/std-ext#devShells.x86_64-linux.update \ --refresh --command \ - nvfetcher-update nix/julia2nix/packages/toolchain/sources.toml + nvfetcher-update nix/std/cells/julia2nix/packages/toolchain/sources.toml ''; help = "Generate nix sources expr for the latest version of packages"; } diff --git a/nix/julia2nix/devshells/default.nix b/nix/std/cells/julia2nix/devshells/default.nix similarity index 98% rename from nix/julia2nix/devshells/default.nix rename to nix/std/cells/julia2nix/devshells/default.nix index f6aabcb..fedf548 100644 --- a/nix/julia2nix/devshells/default.nix +++ b/nix/std/cells/julia2nix/devshells/default.nix @@ -15,7 +15,7 @@ in }; nixago = [ - cell.nixago.treefmt + # cell.nixago.treefmt ]; imports = diff --git a/nix/julia2nix/devshells/main.toml b/nix/std/cells/julia2nix/devshells/main.toml similarity index 100% rename from nix/julia2nix/devshells/main.toml rename to nix/std/cells/julia2nix/devshells/main.toml diff --git a/nix/julia2nix/entrypoints/default.nix b/nix/std/cells/julia2nix/entrypoints/default.nix similarity index 100% rename from nix/julia2nix/entrypoints/default.nix rename to nix/std/cells/julia2nix/entrypoints/default.nix diff --git a/nix/julia2nix/entrypoints/doc/Manifest.toml b/nix/std/cells/julia2nix/entrypoints/doc/Manifest.toml similarity index 100% rename from nix/julia2nix/entrypoints/doc/Manifest.toml rename to nix/std/cells/julia2nix/entrypoints/doc/Manifest.toml diff --git a/nix/julia2nix/entrypoints/doc/Project.toml b/nix/std/cells/julia2nix/entrypoints/doc/Project.toml similarity index 100% rename from nix/julia2nix/entrypoints/doc/Project.toml rename to nix/std/cells/julia2nix/entrypoints/doc/Project.toml diff --git a/nix/julia2nix/entrypoints/doc/julia2nix.toml b/nix/std/cells/julia2nix/entrypoints/doc/julia2nix.toml similarity index 100% rename from nix/julia2nix/entrypoints/doc/julia2nix.toml rename to nix/std/cells/julia2nix/entrypoints/doc/julia2nix.toml diff --git a/nix/julia2nix/entrypoints/fix-symlink.sh b/nix/std/cells/julia2nix/entrypoints/fix-symlink.sh similarity index 100% rename from nix/julia2nix/entrypoints/fix-symlink.sh rename to nix/std/cells/julia2nix/entrypoints/fix-symlink.sh diff --git a/nix/julia2nix/entrypoints/ion/Manifest.toml b/nix/std/cells/julia2nix/entrypoints/ion/Manifest.toml similarity index 100% rename from nix/julia2nix/entrypoints/ion/Manifest.toml rename to nix/std/cells/julia2nix/entrypoints/ion/Manifest.toml diff --git a/nix/julia2nix/entrypoints/ion/Project.toml b/nix/std/cells/julia2nix/entrypoints/ion/Project.toml similarity index 100% rename from nix/julia2nix/entrypoints/ion/Project.toml rename to nix/std/cells/julia2nix/entrypoints/ion/Project.toml diff --git a/nix/julia2nix/entrypoints/ion/julia2nix.toml b/nix/std/cells/julia2nix/entrypoints/ion/julia2nix.toml similarity index 100% rename from nix/julia2nix/entrypoints/ion/julia2nix.toml rename to nix/std/cells/julia2nix/entrypoints/ion/julia2nix.toml diff --git a/nix/julia2nix/lib/default.nix b/nix/std/cells/julia2nix/lib/default.nix similarity index 100% rename from nix/julia2nix/lib/default.nix rename to nix/std/cells/julia2nix/lib/default.nix diff --git a/nix/julia2nix/nixago/Manifest.toml b/nix/std/cells/julia2nix/nixago/Manifest.toml similarity index 100% rename from nix/julia2nix/nixago/Manifest.toml rename to nix/std/cells/julia2nix/nixago/Manifest.toml diff --git a/nix/julia2nix/nixago/Project.toml b/nix/std/cells/julia2nix/nixago/Project.toml similarity index 100% rename from nix/julia2nix/nixago/Project.toml rename to nix/std/cells/julia2nix/nixago/Project.toml diff --git a/nix/julia2nix/nixago/default.nix b/nix/std/cells/julia2nix/nixago/default.nix similarity index 69% rename from nix/julia2nix/nixago/default.nix rename to nix/std/cells/julia2nix/nixago/default.nix index 0f0f309..022a109 100644 --- a/nix/julia2nix/nixago/default.nix +++ b/nix/std/cells/julia2nix/nixago/default.nix @@ -2,7 +2,7 @@ inputs, cell, }: let - inherit (inputs) std-data-collection nixpkgs; + inherit (inputs) nixpkgs; l = inputs.nixpkgs.lib // builtins; inherit (nixpkgs) stdenv; juliaFormatter = cell.lib.buildEnv { @@ -34,16 +34,16 @@ in { inherit juliaFormatter; - treefmt = std-data-collection.data.configs.treefmt { - data.formatter.prettier = { - excludes = ["Manifest.toml" "Project.toml" "generated.json" "julia2nix.toml"]; - }; - data.formatter.nix = { - excludes = ["generated.nix"]; - }; - data.formatter.julia = l.mkIf stdenv.isLinux { - command = "${juliaFormatter}/bin/format.jl"; - includes = ["*.jl"]; - }; - }; + # treefmt = std-data-collection.data.configs.treefmt { + # data.formatter.prettier = { + # excludes = ["Manifest.toml" "Project.toml" "generated.json" "julia2nix.toml"]; + # }; + # data.formatter.nix = { + # excludes = ["generated.nix"]; + # }; + # data.formatter.julia = l.mkIf stdenv.isLinux { + # command = "${juliaFormatter}/bin/format.jl"; + # includes = ["*.jl"]; + # }; + # }; } diff --git a/nix/julia2nix/nixago/format.jl b/nix/std/cells/julia2nix/nixago/format.jl similarity index 100% rename from nix/julia2nix/nixago/format.jl rename to nix/std/cells/julia2nix/nixago/format.jl diff --git a/nix/julia2nix/nixago/julia2nix.toml b/nix/std/cells/julia2nix/nixago/julia2nix.toml similarity index 100% rename from nix/julia2nix/nixago/julia2nix.toml rename to nix/std/cells/julia2nix/nixago/julia2nix.toml diff --git a/nix/julia2nix/overlays/builder/default.nix b/nix/std/cells/julia2nix/overlays/builder/default.nix similarity index 100% rename from nix/julia2nix/overlays/builder/default.nix rename to nix/std/cells/julia2nix/overlays/builder/default.nix diff --git a/nix/julia2nix/overlays/builder/depot.nix b/nix/std/cells/julia2nix/overlays/builder/depot.nix similarity index 89% rename from nix/julia2nix/overlays/builder/depot.nix rename to nix/std/cells/julia2nix/overlays/builder/depot.nix index d68caba..f789ea7 100644 --- a/nix/julia2nix/overlays/builder/depot.nix +++ b/nix/std/cells/julia2nix/overlays/builder/depot.nix @@ -48,17 +48,13 @@ dontBuild = true; dontFixup = true; sourceRoot = "."; - unpackPhase = '' - unpackDir="$TMPDIR/unpack" - unpackFile "$src" - cp -r "$src" "package" - ''; installPhase = '' runHook preInstall mkdir -p $out/${path} - cp -rf --no-preserve=mode,ownership package/* $out/${path} + cp -rf --no-preserve=mode,ownership $src/* $out/${path} + runHook postInstall '' + lib.optionalString patch-context (let diff --git a/nix/julia2nix/overlays/builder/patches.nix b/nix/std/cells/julia2nix/overlays/builder/patches.nix similarity index 100% rename from nix/julia2nix/overlays/builder/patches.nix rename to nix/std/cells/julia2nix/overlays/builder/patches.nix diff --git a/nix/julia2nix/overlays/default.nix b/nix/std/cells/julia2nix/overlays/default.nix similarity index 100% rename from nix/julia2nix/overlays/default.nix rename to nix/std/cells/julia2nix/overlays/default.nix diff --git a/nix/julia2nix/overlays/installApp.nix b/nix/std/cells/julia2nix/overlays/installApp.nix similarity index 100% rename from nix/julia2nix/overlays/installApp.nix rename to nix/std/cells/julia2nix/overlays/installApp.nix diff --git a/nix/julia2nix/overlays/installBin.nix b/nix/std/cells/julia2nix/overlays/installBin.nix similarity index 100% rename from nix/julia2nix/overlays/installBin.nix rename to nix/std/cells/julia2nix/overlays/installBin.nix diff --git a/nix/julia2nix/overlays/julia-wrapped.nix b/nix/std/cells/julia2nix/overlays/julia-wrapped.nix similarity index 100% rename from nix/julia2nix/overlays/julia-wrapped.nix rename to nix/std/cells/julia2nix/overlays/julia-wrapped.nix diff --git a/nix/julia2nix/overlays/patches/_sources/generated.json b/nix/std/cells/julia2nix/overlays/patches/_sources/generated.json similarity index 100% rename from nix/julia2nix/overlays/patches/_sources/generated.json rename to nix/std/cells/julia2nix/overlays/patches/_sources/generated.json diff --git a/nix/julia2nix/overlays/patches/_sources/generated.nix b/nix/std/cells/julia2nix/overlays/patches/_sources/generated.nix similarity index 100% rename from nix/julia2nix/overlays/patches/_sources/generated.nix rename to nix/std/cells/julia2nix/overlays/patches/_sources/generated.nix diff --git a/nix/julia2nix/overlays/patches/conda.nix b/nix/std/cells/julia2nix/overlays/patches/conda.nix similarity index 100% rename from nix/julia2nix/overlays/patches/conda.nix rename to nix/std/cells/julia2nix/overlays/patches/conda.nix diff --git a/nix/julia2nix/overlays/patches/gr.nix b/nix/std/cells/julia2nix/overlays/patches/gr.nix similarity index 100% rename from nix/julia2nix/overlays/patches/gr.nix rename to nix/std/cells/julia2nix/overlays/patches/gr.nix diff --git a/nix/julia2nix/overlays/patches/sources.toml b/nix/std/cells/julia2nix/overlays/patches/sources.toml similarity index 100% rename from nix/julia2nix/overlays/patches/sources.toml rename to nix/std/cells/julia2nix/overlays/patches/sources.toml diff --git a/nix/julia2nix/overlays/version.nix b/nix/std/cells/julia2nix/overlays/version.nix similarity index 100% rename from nix/julia2nix/overlays/version.nix rename to nix/std/cells/julia2nix/overlays/version.nix diff --git a/nix/julia2nix/packages/default.nix b/nix/std/cells/julia2nix/packages/default.nix similarity index 89% rename from nix/julia2nix/packages/default.nix rename to nix/std/cells/julia2nix/packages/default.nix index 3ba9b15..03023cb 100644 --- a/nix/julia2nix/packages/default.nix +++ b/nix/std/cells/julia2nix/packages/default.nix @@ -2,11 +2,11 @@ inputs, cell, }: let - inherit (inputs) std self; + inherit (inputs) std self toplevel; l = inputs.nixpkgs.lib // builtins; - src = std.incl self [ + src = std.incl toplevel [ "src" "julia2nix.toml" "Project.toml" @@ -60,11 +60,11 @@ in { }; build-depot = cell.lib.buildDepot { - julia2nix = "${std.incl self ["julia2nix.toml"]}/julia2nix.toml"; + julia2nix = "${std.incl inputs.toplevel ["julia2nix.toml"]}/julia2nix.toml"; }; build-conda = cell.lib.buildEnv { - src = "${std.incl self ["testenv"]}/testenv/conda"; + src = "${std.incl inputs.toplevel ["testenv"]}/testenv/conda"; name = "build-conda"; package = cell.packages.julia-wrapped; extraInstallPhase = with nixpkgs; '' @@ -93,8 +93,8 @@ in { name = "julia2nix-write-all-systems"; runtimeInputs = [cell.packages.build-project]; text = '' - export NIX_PATH=${inputs.nixpkgs-lock.outPath} - julia ${std.incl self ["testenv"]}/testenv/writejulia2nix.jl + export NIX_PATH=${inputs.nixpkgs-lock.outPath} + julia ${std.incl self ["testenv"]}/testenv/writejulia2nix.jl ''; }; diff --git a/nix/julia2nix/packages/fhs/default.nix b/nix/std/cells/julia2nix/packages/fhs/default.nix similarity index 99% rename from nix/julia2nix/packages/fhs/default.nix rename to nix/std/cells/julia2nix/packages/fhs/default.nix index 766f351..270888f 100644 --- a/nix/julia2nix/packages/fhs/default.nix +++ b/nix/std/cells/julia2nix/packages/fhs/default.nix @@ -72,7 +72,7 @@ with pkgs.lib; let pango pango.out pdf2svg - qt4 + qt5.qtbase systemd xorg.libICE xorg.libSM diff --git a/nix/julia2nix/packages/fhs/julia.nix b/nix/std/cells/julia2nix/packages/fhs/julia.nix similarity index 100% rename from nix/julia2nix/packages/fhs/julia.nix rename to nix/std/cells/julia2nix/packages/fhs/julia.nix diff --git a/nix/julia2nix/packages/toolchain/_sources/generated.json b/nix/std/cells/julia2nix/packages/toolchain/_sources/generated.json similarity index 78% rename from nix/julia2nix/packages/toolchain/_sources/generated.json rename to nix/std/cells/julia2nix/packages/toolchain/_sources/generated.json index 2c68745..5a68e4e 100644 --- a/nix/julia2nix/packages/toolchain/_sources/generated.json +++ b/nix/std/cells/julia2nix/packages/toolchain/_sources/generated.json @@ -68,11 +68,11 @@ "pinned": false, "src": { "name": null, - "sha256": "sha256-A2P1O6KmOgmX7aTetEk/hqNTs58+a8iYWvOHQLin1hI=", + "sha256": "sha256-zKczQExJufOc1niNrvV8S3oNciLUKx018A69bk/AP30=", "type": "url", - "url": "https://julialang-s3.julialang.org/bin/mac/aarch64/1.9/julia-1.9.1-macaarch64.dmg" + "url": "https://julialang-s3.julialang.org/bin/mac/aarch64/1.9/julia-1.9.3-macaarch64.dmg" }, - "version": "1.9.1-macaarch64.dmg" + "version": "1.9.3-macaarch64.dmg" }, "julia-19-aarch64-linux": { "cargoLocks": null, @@ -83,11 +83,11 @@ "pinned": false, "src": { "name": null, - "sha256": "sha256-tkPM0+Kllg985wVSQ3Q9Cjm63aOXS849d4Yd02O63RA=", + "sha256": "sha256-VUN4efa5hHDZbEBIuSJQG2Q9//uIZavrkMczOoPfdSQ=", "type": "url", - "url": "https://julialang-s3.julialang.org/bin/linux/aarch64/1.9/julia-1.9.1-linux-aarch64.tar.gz" + "url": "https://julialang-s3.julialang.org/bin/linux/aarch64/1.9/julia-1.9.3-linux-aarch64.tar.gz" }, - "version": "1.9.1-linux-aarch64.tar.gz" + "version": "1.9.3-linux-aarch64.tar.gz" }, "julia-19-x86_64-darwin": { "cargoLocks": null, @@ -98,11 +98,11 @@ "pinned": false, "src": { "name": null, - "sha256": "sha256-4TKER2c8R16KRmBXdhI8NeCG/7Y39rLOrwNs5lrRgyY=", + "sha256": "sha256-qceM0Bl4vWDoONWFWB5YdQMTVZw4CaoK585VLCza/jk=", "type": "url", - "url": "https://julialang-s3.julialang.org/bin/mac/x64/1.9/julia-1.9.1-mac64.dmg" + "url": "https://julialang-s3.julialang.org/bin/mac/x64/1.9/julia-1.9.3-mac64.dmg" }, - "version": "1.9.1-mac64.dmg" + "version": "1.9.3-mac64.dmg" }, "julia-19-x86_64-linux": { "cargoLocks": null, @@ -113,11 +113,11 @@ "pinned": false, "src": { "name": null, - "sha256": "sha256-zeFKWPiZJR8wz87YcFVib0SEV4Blnr6NUMvExnsxmXw=", + "sha256": "sha256-12ZwzJuj4P1MFUXdPQAmnAaUl2oRdjEnlevOFpLTI9E=", "type": "url", - "url": "https://julialang-s3.julialang.org/bin/linux/x64/1.9/julia-1.9.1-linux-x86_64.tar.gz" + "url": "https://julialang-s3.julialang.org/bin/linux/x64/1.9/julia-1.9.3-linux-x86_64.tar.gz" }, - "version": "1.9.1-linux-x86_64.tar.gz" + "version": "1.9.3-linux-x86_64.tar.gz" }, "julia-nightly-110-aarch64-darwin": { "cargoLocks": null, @@ -128,11 +128,11 @@ "pinned": false, "src": { "name": null, - "sha256": "sha256-pSbwYtXvvajrrd4EYThzhVPmGiv5OHZVCpUcTxe+ERo=", + "sha256": "sha256-f4WWN/2vDa4hqRcCqQ7lWFzGFdE1dkBpgtmdyJS+Otc=", "type": "url", - "url": "https://julialangnightlies-s3.julialang.org/bin/macos/aarch64/1.10/julia-a40dec12b3-macos-aarch64.dmg" + "url": "https://julialangnightlies-s3.julialang.org/bin/macos/aarch64/1.10/julia-be2c35a8d2-macos-aarch64.dmg" }, - "version": "a40dec12b3" + "version": "be2c35a8d2" }, "julia-nightly-110-aarch64-linux": { "cargoLocks": null, @@ -143,11 +143,11 @@ "pinned": false, "src": { "name": null, - "sha256": "sha256-eoSfwMi4NudBfSmV1et0aBCiKbGDqbmsUuOGIJ2sCO4=", + "sha256": "sha256-Zgq6No/jKocvFakcK7r6QlE2ARIYMZonTGVBzZageKo=", "type": "url", - "url": "https://julialangnightlies-s3.julialang.org/bin/linux/aarch64/1.10/julia-a40dec12b3-linux-aarch64.tar.gz" + "url": "https://julialangnightlies-s3.julialang.org/bin/linux/aarch64/1.10/julia-be2c35a8d2-linux-aarch64.tar.gz" }, - "version": "a40dec12b3" + "version": "be2c35a8d2" }, "julia-nightly-110-x86_64-darwin": { "cargoLocks": null, @@ -158,11 +158,11 @@ "pinned": false, "src": { "name": null, - "sha256": "sha256-JwwFwuGPFoBEZdEuFB3Bv8jxUoKE2cv6TbEYPHEEWik=", + "sha256": "sha256-UUbizludvliGV+msTxReqQqYtxf91YZKStB/e8/eB/o=", "type": "url", - "url": "https://julialangnightlies-s3.julialang.org/bin/macos/x86_64/1.10/julia-a40dec12b3-macos-x86_64.dmg" + "url": "https://julialangnightlies-s3.julialang.org/bin/macos/x86_64/1.10/julia-be2c35a8d2-macos-x86_64.dmg" }, - "version": "a40dec12b3" + "version": "be2c35a8d2" }, "julia-nightly-110-x86_64-linux": { "cargoLocks": null, @@ -173,10 +173,10 @@ "pinned": false, "src": { "name": null, - "sha256": "sha256-hzmOP8Zj03fFd8lPCVufptw91nYHbPurVfR7ycCLlQI=", + "sha256": "sha256-ld0hLM0oSfU+wXSm6dLbQcnBPKjeNbkNSbP04DxIYpY=", "type": "url", - "url": "https://julialangnightlies-s3.julialang.org/bin/linux/x86_64/1.10/julia-a40dec12b3-linux-x86_64.tar.gz" + "url": "https://julialangnightlies-s3.julialang.org/bin/linux/x86_64/1.10/julia-be2c35a8d2-linux-x86_64.tar.gz" }, - "version": "a40dec12b3" + "version": "be2c35a8d2" } } \ No newline at end of file diff --git a/nix/julia2nix/packages/toolchain/_sources/generated.nix b/nix/std/cells/julia2nix/packages/toolchain/_sources/generated.nix similarity index 69% rename from nix/julia2nix/packages/toolchain/_sources/generated.nix rename to nix/std/cells/julia2nix/packages/toolchain/_sources/generated.nix index a2d7939..15f2ad4 100644 --- a/nix/julia2nix/packages/toolchain/_sources/generated.nix +++ b/nix/std/cells/julia2nix/packages/toolchain/_sources/generated.nix @@ -35,66 +35,66 @@ }; julia-19-aarch64-darwin = { pname = "julia-19-aarch64-darwin"; - version = "1.9.1-macaarch64.dmg"; + version = "1.9.3-macaarch64.dmg"; src = fetchurl { - url = "https://julialang-s3.julialang.org/bin/mac/aarch64/1.9/julia-1.9.1-macaarch64.dmg"; - sha256 = "sha256-A2P1O6KmOgmX7aTetEk/hqNTs58+a8iYWvOHQLin1hI="; + url = "https://julialang-s3.julialang.org/bin/mac/aarch64/1.9/julia-1.9.3-macaarch64.dmg"; + sha256 = "sha256-zKczQExJufOc1niNrvV8S3oNciLUKx018A69bk/AP30="; }; }; julia-19-aarch64-linux = { pname = "julia-19-aarch64-linux"; - version = "1.9.1-linux-aarch64.tar.gz"; + version = "1.9.3-linux-aarch64.tar.gz"; src = fetchurl { - url = "https://julialang-s3.julialang.org/bin/linux/aarch64/1.9/julia-1.9.1-linux-aarch64.tar.gz"; - sha256 = "sha256-tkPM0+Kllg985wVSQ3Q9Cjm63aOXS849d4Yd02O63RA="; + url = "https://julialang-s3.julialang.org/bin/linux/aarch64/1.9/julia-1.9.3-linux-aarch64.tar.gz"; + sha256 = "sha256-VUN4efa5hHDZbEBIuSJQG2Q9//uIZavrkMczOoPfdSQ="; }; }; julia-19-x86_64-darwin = { pname = "julia-19-x86_64-darwin"; - version = "1.9.1-mac64.dmg"; + version = "1.9.3-mac64.dmg"; src = fetchurl { - url = "https://julialang-s3.julialang.org/bin/mac/x64/1.9/julia-1.9.1-mac64.dmg"; - sha256 = "sha256-4TKER2c8R16KRmBXdhI8NeCG/7Y39rLOrwNs5lrRgyY="; + url = "https://julialang-s3.julialang.org/bin/mac/x64/1.9/julia-1.9.3-mac64.dmg"; + sha256 = "sha256-qceM0Bl4vWDoONWFWB5YdQMTVZw4CaoK585VLCza/jk="; }; }; julia-19-x86_64-linux = { pname = "julia-19-x86_64-linux"; - version = "1.9.1-linux-x86_64.tar.gz"; + version = "1.9.3-linux-x86_64.tar.gz"; src = fetchurl { - url = "https://julialang-s3.julialang.org/bin/linux/x64/1.9/julia-1.9.1-linux-x86_64.tar.gz"; - sha256 = "sha256-zeFKWPiZJR8wz87YcFVib0SEV4Blnr6NUMvExnsxmXw="; + url = "https://julialang-s3.julialang.org/bin/linux/x64/1.9/julia-1.9.3-linux-x86_64.tar.gz"; + sha256 = "sha256-12ZwzJuj4P1MFUXdPQAmnAaUl2oRdjEnlevOFpLTI9E="; }; }; julia-nightly-110-aarch64-darwin = { pname = "julia-nightly-110-aarch64-darwin"; - version = "a40dec12b3"; + version = "be2c35a8d2"; src = fetchurl { - url = "https://julialangnightlies-s3.julialang.org/bin/macos/aarch64/1.10/julia-a40dec12b3-macos-aarch64.dmg"; - sha256 = "sha256-pSbwYtXvvajrrd4EYThzhVPmGiv5OHZVCpUcTxe+ERo="; + url = "https://julialangnightlies-s3.julialang.org/bin/macos/aarch64/1.10/julia-be2c35a8d2-macos-aarch64.dmg"; + sha256 = "sha256-f4WWN/2vDa4hqRcCqQ7lWFzGFdE1dkBpgtmdyJS+Otc="; }; }; julia-nightly-110-aarch64-linux = { pname = "julia-nightly-110-aarch64-linux"; - version = "a40dec12b3"; + version = "be2c35a8d2"; src = fetchurl { - url = "https://julialangnightlies-s3.julialang.org/bin/linux/aarch64/1.10/julia-a40dec12b3-linux-aarch64.tar.gz"; - sha256 = "sha256-eoSfwMi4NudBfSmV1et0aBCiKbGDqbmsUuOGIJ2sCO4="; + url = "https://julialangnightlies-s3.julialang.org/bin/linux/aarch64/1.10/julia-be2c35a8d2-linux-aarch64.tar.gz"; + sha256 = "sha256-Zgq6No/jKocvFakcK7r6QlE2ARIYMZonTGVBzZageKo="; }; }; julia-nightly-110-x86_64-darwin = { pname = "julia-nightly-110-x86_64-darwin"; - version = "a40dec12b3"; + version = "be2c35a8d2"; src = fetchurl { - url = "https://julialangnightlies-s3.julialang.org/bin/macos/x86_64/1.10/julia-a40dec12b3-macos-x86_64.dmg"; - sha256 = "sha256-JwwFwuGPFoBEZdEuFB3Bv8jxUoKE2cv6TbEYPHEEWik="; + url = "https://julialangnightlies-s3.julialang.org/bin/macos/x86_64/1.10/julia-be2c35a8d2-macos-x86_64.dmg"; + sha256 = "sha256-UUbizludvliGV+msTxReqQqYtxf91YZKStB/e8/eB/o="; }; }; julia-nightly-110-x86_64-linux = { pname = "julia-nightly-110-x86_64-linux"; - version = "a40dec12b3"; + version = "be2c35a8d2"; src = fetchurl { - url = "https://julialangnightlies-s3.julialang.org/bin/linux/x86_64/1.10/julia-a40dec12b3-linux-x86_64.tar.gz"; - sha256 = "sha256-hzmOP8Zj03fFd8lPCVufptw91nYHbPurVfR7ycCLlQI="; + url = "https://julialangnightlies-s3.julialang.org/bin/linux/x86_64/1.10/julia-be2c35a8d2-linux-x86_64.tar.gz"; + sha256 = "sha256-ld0hLM0oSfU+wXSm6dLbQcnBPKjeNbkNSbP04DxIYpY="; }; }; } diff --git a/nix/julia2nix/packages/toolchain/changelog b/nix/std/cells/julia2nix/packages/toolchain/changelog similarity index 100% rename from nix/julia2nix/packages/toolchain/changelog rename to nix/std/cells/julia2nix/packages/toolchain/changelog diff --git a/nix/julia2nix/packages/toolchain/sources.toml b/nix/std/cells/julia2nix/packages/toolchain/sources.toml similarity index 100% rename from nix/julia2nix/packages/toolchain/sources.toml rename to nix/std/cells/julia2nix/packages/toolchain/sources.toml diff --git a/nix/patches/devshells.nix b/nix/std/cells/patches/devshells.nix similarity index 100% rename from nix/patches/devshells.nix rename to nix/std/cells/patches/devshells.nix diff --git a/nix/std/flake.lock b/nix/std/flake.lock new file mode 100644 index 0000000..4f9327f --- /dev/null +++ b/nix/std/flake.lock @@ -0,0 +1,1007 @@ +{ + "nodes": { + "POP": { + "inputs": { + "flake-compat": "flake-compat", + "nixlib": "nixlib", + "nixpkgs": [ + "std-ext", + "flops" + ] + }, + "locked": { + "lastModified": 1655410953, + "narHash": "sha256-Er0zdhu7QwpWvVKfauqZqTnxDz6THTWOTVWLoz+Opmw=", + "owner": "divnix", + "repo": "POP", + "rev": "8babe4c9126298d05ebb5ab04727d741b51c022e", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "POP", + "type": "github" + } + }, + "blank": { + "locked": { + "lastModified": 1625557891, + "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", + "owner": "divnix", + "repo": "blank", + "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "blank", + "type": "github" + } + }, + "call-flake": { + "locked": { + "lastModified": 1689473344, + "narHash": "sha256-bmhE1TmrJG4ba93l9WQTLuYM53kwGQAjYHRvHOeuxWU=", + "owner": "divnix", + "repo": "call-flake", + "rev": "a07e91d3fb59eb9f7ec706a151e1a7b36a1e8727", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "call-flake", + "type": "github" + } + }, + "call-flake_2": { + "locked": { + "lastModified": 1687380775, + "narHash": "sha256-bmhE1TmrJG4ba93l9WQTLuYM53kwGQAjYHRvHOeuxWU=", + "owner": "divnix", + "repo": "call-flake", + "rev": "74061f6c241227cd05e79b702db9a300a2e4131a", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "call-flake", + "type": "github" + } + }, + "cortex": { + "flake": false, + "locked": { + "lastModified": 1643528409, + "narHash": "sha256-ldmenmCzCEuuBlMtaQYe79vYbcTORgkCXgYgGkOzkL8=", + "owner": "jethrokuan", + "repo": "cortex", + "rev": "ad9a963534e5be323a33eaf0f9aa3e914cca8093", + "type": "github" + }, + "original": { + "owner": "jethrokuan", + "repo": "cortex", + "type": "github" + } + }, + "devshell": { + "inputs": { + "nixpkgs": "nixpkgs_2", + "systems": "systems" + }, + "locked": { + "lastModified": 1695973661, + "narHash": "sha256-BP2H4c42GThPIhERtTpV1yCtwQHYHEKdRu7pjrmQAwo=", + "owner": "numtide", + "repo": "devshell", + "rev": "cd4e2fda3150dd2f689caeac07b7f47df5197c31", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "dmerge": { + "inputs": { + "haumea": [ + "std-ext", + "flops", + "haumea" + ], + "nixlib": [ + "std-ext", + "flops", + "nixlib" + ], + "yants": [ + "std-ext", + "flops", + "yants" + ] + }, + "locked": { + "lastModified": 1686862774, + "narHash": "sha256-ojGtRQ9pIOUrxsQEuEPerUkqIJEuod9hIflfNkY+9CE=", + "owner": "divnix", + "repo": "dmerge", + "rev": "9f7f7a8349d33d7bd02e0f2b484b1f076e503a96", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "dmerge", + "type": "github" + } + }, + "dmerge_2": { + "inputs": { + "haumea": [ + "std-ext", + "std", + "haumea" + ], + "nixlib": [ + "std-ext", + "std", + "lib" + ], + "yants": [ + "std-ext", + "std", + "yants" + ] + }, + "locked": { + "lastModified": 1686862774, + "narHash": "sha256-ojGtRQ9pIOUrxsQEuEPerUkqIJEuod9hIflfNkY+9CE=", + "owner": "divnix", + "repo": "dmerge", + "rev": "9f7f7a8349d33d7bd02e0f2b484b1f076e503a96", + "type": "github" + }, + "original": { + "owner": "divnix", + "ref": "0.2.1", + "repo": "dmerge", + "type": "github" + } + }, + "emacs-overlay": { + "inputs": { + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_5", + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1690483432, + "narHash": "sha256-o4/IGadFvyT68byD+NglNK+zykMMjglXdsCSL63OJLc=", + "owner": "nix-community", + "repo": "emacs-overlay", + "rev": "01c076bb6f9fd34630f4c87cfab18ea4e85ef819", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "emacs-overlay", + "type": "github" + } + }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-utils": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_6": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_7": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flops": { + "inputs": { + "POP": "POP", + "call-flake": "call-flake", + "dmerge": "dmerge", + "haumea": "haumea", + "nixlib": "nixlib_2", + "yants": "yants" + }, + "locked": { + "lastModified": 1694677528, + "narHash": "sha256-j29810CVcDZGPkm1EeBn0hfeOt2kfpLYhXrDjI02eL0=", + "owner": "gtrunsec", + "repo": "flops", + "rev": "1004a97ea0c3960d162d2b13e862b347191e3ba9", + "type": "github" + }, + "original": { + "owner": "gtrunsec", + "repo": "flops", + "type": "github" + } + }, + "haumea": { + "inputs": { + "nixpkgs": [ + "std-ext", + "flops", + "nixlib" + ] + }, + "locked": { + "lastModified": 1689557889, + "narHash": "sha256-kllmt6JnHlry+WAASdSMDaRwbiuk2dFhkbW3Qz1w8BU=", + "owner": "nix-community", + "repo": "haumea", + "rev": "d6a9593ff2160ce29bf6d905e9ccbcecd66baeef", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "haumea", + "type": "github" + } + }, + "haumea_2": { + "inputs": { + "nixpkgs": [ + "std-ext", + "std", + "lib" + ] + }, + "locked": { + "lastModified": 1685133229, + "narHash": "sha256-FePm/Gi9PBSNwiDFq3N+DWdfxFq0UKsVVTJS3cQPn94=", + "owner": "nix-community", + "repo": "haumea", + "rev": "34dd58385092a23018748b50f9b23de6266dffc2", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "v0.2.2", + "repo": "haumea", + "type": "github" + } + }, + "incl": { + "inputs": { + "nixlib": [ + "std-ext", + "std", + "lib" + ] + }, + "locked": { + "lastModified": 1669263024, + "narHash": "sha256-E/+23NKtxAqYG/0ydYgxlgarKnxmDbg6rCMWnOBqn9Q=", + "owner": "divnix", + "repo": "incl", + "rev": "ce7bebaee048e4cd7ebdb4cee7885e00c4e2abca", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "incl", + "type": "github" + } + }, + "lib": { + "locked": { + "lastModified": 1694306727, + "narHash": "sha256-26fkTOJOI65NOTNKFvtcJF9mzzf/kK9swHzfYt1Dl6Q=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "c30b6a84c0b84ec7aecbe74466033facc9ed103f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nix-filter": { + "locked": { + "lastModified": 1694857738, + "narHash": "sha256-bxxNyLHjhu0N8T3REINXQ2ZkJco0ABFPn6PIe2QUfqo=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "41fd48e00c22b4ced525af521ead8792402de0ea", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "nix-filter", + "type": "github" + } + }, + "nix-filter_2": { + "locked": { + "lastModified": 1687178632, + "narHash": "sha256-HS7YR5erss0JCaUijPeyg2XrisEb959FIct3n2TMGbE=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "d90c75e8319d0dd9be67d933d8eb9d0894ec9174", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "nix-filter", + "type": "github" + } + }, + "nixago": { + "inputs": { + "flake-utils": "flake-utils", + "nixago-exts": "nixago-exts", + "nixpkgs": [ + "std-ext", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1687381756, + "narHash": "sha256-IUMIlYfrvj7Yli4H2vvyig8HEPpfCeMaE6+kBGPzFyk=", + "owner": "nix-community", + "repo": "nixago", + "rev": "dacceb10cace103b3e66552ec9719fa0d33c0dc9", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixago", + "type": "github" + } + }, + "nixago-exts": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixago": "nixago_2", + "nixpkgs": [ + "std-ext", + "nixago", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1676070308, + "narHash": "sha256-QaJ65oc2l8iwQIGWUJ0EKjCeSuuCM/LqR8RauxZUUkc=", + "owner": "nix-community", + "repo": "nixago-extensions", + "rev": "e5380cb0456f4ea3c86cf94e3039eb856bf07d0b", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixago-extensions", + "type": "github" + } + }, + "nixago-exts_2": { + "inputs": { + "flake-utils": "flake-utils_4", + "nixago": "nixago_3", + "nixpkgs": [ + "std-ext", + "nixago", + "nixago-exts", + "nixago", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1655508669, + "narHash": "sha256-BDDdo5dZQMmwNH/GNacy33nPBnCpSIydWFPZs0kkj/g=", + "owner": "nix-community", + "repo": "nixago-extensions", + "rev": "3022a932ce109258482ecc6568c163e8d0b426aa", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixago-extensions", + "type": "github" + } + }, + "nixago_2": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixago-exts": "nixago-exts_2", + "nixpkgs": [ + "std-ext", + "nixago", + "nixago-exts", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1676070010, + "narHash": "sha256-iYzJIWptE1EUD8VINAg66AAMUajizg8JUYN3oBmb8no=", + "owner": "nix-community", + "repo": "nixago", + "rev": "d480ba6c0c16e2c5c0bd2122852d6a0c9ad1ed0e", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "rename-config-data", + "repo": "nixago", + "type": "github" + } + }, + "nixago_3": { + "inputs": { + "flake-utils": "flake-utils_5", + "nixpkgs": [ + "std-ext", + "nixago", + "nixago-exts", + "nixago", + "nixago-exts", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1655405483, + "narHash": "sha256-Crd49aZWNrpczlRTOwWGfwBMsTUoG9vlHDKQC7cx264=", + "owner": "nix-community", + "repo": "nixago", + "rev": "e6a9566c18063db5b120e69e048d3627414e327d", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixago", + "type": "github" + } + }, + "nixlib": { + "locked": { + "lastModified": 1653180592, + "narHash": "sha256-sVGwmxTj7CY1D4ioy7E+iJE+1/yHqQlxjnTpar3ap/E=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "42c5f5785b70cd64b4afd830dc31d0b08461abd5", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixlib_2": { + "locked": { + "lastModified": 1689469483, + "narHash": "sha256-2SBhY7rZQ/iNCxe04Eqxlz9YK9KgbaTMBssq3/BgdWY=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "02fea408f27186f139153e1ae88f8ab2abd9c22c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1698553279, + "narHash": "sha256-T/9P8yBSLcqo/v+FTOBK+0rjzjPMctVymZydbvR/Fak=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "90e85bc7c1a6fc0760a94ace129d3a1c61c3d035", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lock": { + "locked": { + "lastModified": 1663419078, + "narHash": "sha256-cxEeMnaTGMTeDAvXnZmqcF50qoyJOsQENhYxSnW9ZMs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0cfb3c002b61807ca0bab3efe514476bdf2e5478", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0cfb3c002b61807ca0bab3efe514476bdf2e5478", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1690370995, + "narHash": "sha256-9z//23jGegLJrf3ITStLwVf715O39dq5u48Kr/XW14U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f3fbbc36b4e179a5985b9ab12624e9dfe7989341", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1677383253, + "narHash": "sha256-UfpzWfSxkfXHnb4boXZNaKsAcUrZT9Hw+tao1oZxd08=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9952d6bc395f5841262b006fbace8dd7e143b634", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1660438583, + "narHash": "sha256-rJUTYxFKlWUJI3njAwEc1pKAVooAViZGJvsgqfh/q/E=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "bbd8f7cd87d0b29294ef3072ffdbd61d60f05da4", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1692190437, + "narHash": "sha256-yJUZzmzSmDYb9ONPnMQDru66RjZgGQZRvj3tQebkexk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9b2aa98db6b10503666a50f4eb93b2fc0d57bde5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1690272529, + "narHash": "sha256-MakzcKXEdv/I4qJUtq/k/eG+rVmyOZLnYNC2w1mB59Y=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ef99fa5c5ed624460217c31ac4271cfb5cb2502c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nosys": { + "locked": { + "lastModified": 1668010795, + "narHash": "sha256-JBDVBnos8g0toU7EhIIqQ1If5m/nyBqtHhL3sicdPwI=", + "owner": "divnix", + "repo": "nosys", + "rev": "feade0141487801c71ff55623b421ed535dbdefa", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "nosys", + "type": "github" + } + }, + "org-roam-book-template": { + "inputs": { + "cortex": "cortex", + "emacs-overlay": "emacs-overlay", + "flake-utils": "flake-utils_7", + "nix-filter": "nix-filter_2", + "nixpkgs": [ + "std-ext", + "nixpkgs" + ], + "ox-hugo": "ox-hugo" + }, + "locked": { + "lastModified": 1690491859, + "narHash": "sha256-m50lZ8IU04pBsFaRvGmrUB47an3dGm2vRZPJ56yB49Y=", + "owner": "gtrunsec", + "repo": "org-roam-book-template", + "rev": "e866a31a36ce3f8673c08f5d1053646c3aa8acc8", + "type": "github" + }, + "original": { + "owner": "gtrunsec", + "repo": "org-roam-book-template", + "type": "github" + } + }, + "ox-hugo": { + "flake": false, + "locked": { + "lastModified": 1689004512, + "narHash": "sha256-eMS2aR9DZMN/t5bt31Jsi8a2pCqKopQKjqXbNl6VHKY=", + "owner": "kaushalmodi", + "repo": "ox-hugo", + "rev": "cb1b6cfd7b080e889352150416c1725f11ba937a", + "type": "github" + }, + "original": { + "owner": "kaushalmodi", + "repo": "ox-hugo", + "type": "github" + } + }, + "paisano": { + "inputs": { + "call-flake": "call-flake_2", + "nixpkgs": [ + "std-ext", + "std", + "nixpkgs" + ], + "nosys": "nosys", + "yants": [ + "std-ext", + "std", + "yants" + ] + }, + "locked": { + "lastModified": 1693982790, + "narHash": "sha256-WTZYlqGUjzzz/PSzcvjEZz2kkwYSXObjeQVrFBaqa2Y=", + "owner": "paisano-nix", + "repo": "core", + "rev": "3e897a19418361ece34841105122ed4f9379ca96", + "type": "github" + }, + "original": { + "owner": "paisano-nix", + "repo": "core", + "type": "github" + } + }, + "paisano-tui": { + "flake": false, + "locked": { + "lastModified": 1694014205, + "narHash": "sha256-u0+T6vMznzfjDMUd01ZXQsrQPMEhMjrQwUPTFsPBR1k=", + "owner": "paisano-nix", + "repo": "tui", + "rev": "587ab9fd07bd969d59df73bfe527b5f8a4e752d1", + "type": "github" + }, + "original": { + "owner": "paisano-nix", + "ref": "0.2.0", + "repo": "tui", + "type": "github" + } + }, + "root": { + "inputs": { + "nix-filter": "nix-filter", + "nixpkgs": "nixpkgs", + "nixpkgs-lock": "nixpkgs-lock", + "std": [ + "std-ext", + "std" + ], + "std-ext": "std-ext" + } + }, + "std": { + "inputs": { + "arion": [ + "std-ext", + "std", + "blank" + ], + "blank": "blank", + "devshell": [ + "std-ext", + "devshell" + ], + "dmerge": "dmerge_2", + "haumea": "haumea_2", + "incl": "incl", + "lib": "lib", + "makes": [ + "std-ext", + "std", + "blank" + ], + "microvm": [ + "std-ext", + "std", + "blank" + ], + "n2c": [ + "std-ext", + "std", + "blank" + ], + "nixago": [ + "std-ext", + "nixago" + ], + "nixpkgs": [ + "std-ext", + "nixpkgs" + ], + "paisano": "paisano", + "paisano-tui": "paisano-tui", + "terranix": [ + "std-ext", + "std", + "blank" + ], + "yants": "yants_2" + }, + "locked": { + "lastModified": 1695893106, + "narHash": "sha256-sUHZO7v65zT8HyQ6gZqp18HX8PgTRIhtX1xSg+/I+7M=", + "owner": "divnix", + "repo": "std", + "rev": "c5d97ddcd1bd33e87a7271ead97464f20f447058", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "std", + "type": "github" + } + }, + "std-ext": { + "inputs": { + "devshell": "devshell", + "flops": "flops", + "nixago": "nixago", + "nixpkgs": "nixpkgs_4", + "org-roam-book-template": "org-roam-book-template", + "std": "std" + }, + "locked": { + "lastModified": 1696124180, + "narHash": "sha256-vlZQzY/5EwC1U5IwxJC6NRSz+o+pGe6fEAFELybx2KE=", + "owner": "gtrunsec", + "repo": "std-ext", + "rev": "26edfe60afff4d7b0f636376c2facdf4b3127fa3", + "type": "github" + }, + "original": { + "owner": "gtrunsec", + "repo": "std-ext", + "type": "github" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "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" + } + }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "yants": { + "inputs": { + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1686863218, + "narHash": "sha256-kooxYm3/3ornWtVBNHM3Zh020gACUyFX2G0VQXnB+mk=", + "owner": "divnix", + "repo": "yants", + "rev": "8f0da0dba57149676aa4817ec0c880fbde7a648d", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "yants", + "type": "github" + } + }, + "yants_2": { + "inputs": { + "nixpkgs": [ + "std-ext", + "std", + "lib" + ] + }, + "locked": { + "lastModified": 1686863218, + "narHash": "sha256-kooxYm3/3ornWtVBNHM3Zh020gACUyFX2G0VQXnB+mk=", + "owner": "divnix", + "repo": "yants", + "rev": "8f0da0dba57149676aa4817ec0c880fbde7a648d", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "yants", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/nix/std/flake.nix b/nix/std/flake.nix new file mode 100644 index 0000000..33ec548 --- /dev/null +++ b/nix/std/flake.nix @@ -0,0 +1,51 @@ +{ + inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; + nix-filter.url = "github:/numtide/nix-filter"; + # TOOD: use the locked prefetch version, will be removed by replacing with nix-prefetch-url + nixpkgs-lock.url = "github:NixOS/nixpkgs/0cfb3c002b61807ca0bab3efe514476bdf2e5478"; + }; + + inputs = { + std-ext.url = "github:gtrunsec/std-ext"; + std.follows = "std-ext/std"; + }; + + outputs = { + self, + std, + ... + } @ inputs: (std.growOn { + inputs = inputs // {toplevel = ../..;}; + cellsFrom = ./cells; + systems = [ + "aarch64-darwin" + "aarch64-linux" + "x86_64-darwin" + "x86_64-linux" + ]; + cellBlocks = with std.blockTypes; [ + (installables "packages") + + (nixago "nixago") + + (runnables "entrypoints") + + (devshells "devshells") + (functions "devshellProfiles") + + (functions "lib") + (functions "workflow") + (functions "overlays") + (functions "compiler") + + (data "containerJobs") + ]; + } + { + lib = std.harvest inputs.self ["julia2nix" "lib"]; + devShells = std.harvest inputs.self ["julia2nix" "devshells"]; + overlays = (std.harvest inputs.self ["julia2nix" "overlays"]).x86_64-linux; + packages = std.harvest inputs.self ["julia2nix" "packages"]; + }); +}