diff --git a/.github/workflows/compare-nix.yml b/.github/workflows/compare-nix.yml index d8e3c8c..8a58009 100644 --- a/.github/workflows/compare-nix.yml +++ b/.github/workflows/compare-nix.yml @@ -14,21 +14,22 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true + #cancel-in-progress: true jobs: tests: runs-on: ubuntu-latest steps: - name: Install Nix - uses: cachix/install-nix-action@11f4ad19be46fd34c005a2864996d8f197fb51c6 + uses: cachix/install-nix-action@6ed004b9ccb68dbc28e7c85bee15fa93dbd214ac with: - install_url: https://releases.nixos.org/nix/nix-2.16.1/install + install_url: https://releases.nixos.org/nix/nix-2.15.1/install nix_path: nixpkgs=channel:nixpkgs-23.05 extra_nix_config: | - experimental-features = nix-command flakes + experimental-features = nix-command flakes ca-derivations impure-derivations fetch-closure access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} substituters = https://cache.nixos.org - trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= + trusted-substituters = https://cache.floxdev.com + trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= flox-store-public-0:8c/B+kjIaQ+BloCmNkRUKwaVPFWkriSAd0JJvuDu4F0= max-jobs = auto cores = 0 substitute = true @@ -37,6 +38,7 @@ jobs: connect-timeout = 5 stalled-download-timeout = 90 timeout = 0 + allow-import-from-derivation = true - name: Setup Nix Registry run: | @@ -46,25 +48,28 @@ jobs: - name: SQLite3 pkg-config Test shell: bash + env: + REPO: ${{ github.repository }} + #FLOX_NOSET_LD_AUDIT: 1 run: | set -eu; set -o pipefail; - _ec=0; - trap '_ec="$?"; echo "ERROR: code $_ec" >&2; exit "$_ec";' HUP TERM INT; if [[ "$GITHUB_REF" == "refs/heads/main" ]]; then - selfURI="github:${{ github.repository }}"; + selfURI="github:$REPO"; else - selfURI="github:${{ github.repository }}/$GITHUB_REF"; + selfURI="github:$REPO/$GITHUB_REF"; fi echo "selfURI: $selfURI" >&2; echo "Installing deps" >&2; - nix profile install 'nixpkgs#sqlite^bin,out,dev'; - nix profile install 'nixpkgs#pkg-config'; - nix profile install "$selfURI#etc-profiles"; + nix profile install 'nixpkgs#sqlite^bin,out,dev' -L; + nix profile install 'nixpkgs#pkg-config' -L; + nix profile install "$selfURI#etc-profiles" -L; + echo "Activating env" >&2; export FLOX_ENV="$HOME/.nix-profile"; + export LD_FLOXLIB_DEBUG=1; . "$FLOX_ENV/etc/profile"; echo "Checking if pkg-config can find sqlite" >&2; diff --git a/.github/workflows/trivial-test.yml b/.github/workflows/trivial-test.yml index 465f4b5..3c6a5e0 100644 --- a/.github/workflows/trivial-test.yml +++ b/.github/workflows/trivial-test.yml @@ -14,7 +14,7 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true + #cancel-in-progress: true jobs: tests: runs-on: ubuntu-latest @@ -40,20 +40,10 @@ jobs: run: | set -eu; set -o pipefail; - _ec=0; - trap '_ec="$?"; echo "ERROR: code $_ec" >&2; exit "$_ec";' HUP TERM INT; echo "Creating sqlite-dev" >&2; flox create -e sqlite-dev; - trap ' - _ec="$?"; - echo "ERROR: code $_ec" >&2; - flox destroy -e sqlite-dev; - exit "$_ec"; - ' HUP TERM INT; - trap '_ec="$?"; flox destroy -e sqlite-dev; exit "$_ec";' EXIT; - echo "Creating flox.nix" >&2; cat <<'EOF' > ./flox.nix { diff --git a/.gitignore b/.gitignore index 4a4b1d0..9d78e63 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ /.flox +result +result-* diff --git a/flake.lock b/flake.lock index 0f3fac6..5436686 100644 --- a/flake.lock +++ b/flake.lock @@ -1,51 +1,6 @@ { "nodes": { "builtfilter": { - "inputs": { - "flox-floxpkgs": [ - "flox-floxpkgs" - ] - }, - "locked": { - "lastModified": 1683889736, - "narHash": "sha256-Sxn6VNrojAl9Tu0dDy6ZqPUe0GNwRKwzHAkptXM63Wg=", - "owner": "flox", - "repo": "builtfilter", - "rev": "f29903b144bb20e5be80f55d3fafa323c28a2cb0", - "type": "github" - }, - "original": { - "owner": "flox", - "ref": "builtfilter-rs", - "repo": "builtfilter", - "type": "github" - } - }, - "builtfilter_2": { - "inputs": { - "flox-floxpkgs": [ - "flox-floxpkgs", - "etc-profiles", - "ld-floxlib", - "flox-floxpkgs" - ] - }, - "locked": { - "lastModified": 1683889736, - "narHash": "sha256-Sxn6VNrojAl9Tu0dDy6ZqPUe0GNwRKwzHAkptXM63Wg=", - "owner": "flox", - "repo": "builtfilter", - "rev": "f29903b144bb20e5be80f55d3fafa323c28a2cb0", - "type": "github" - }, - "original": { - "owner": "flox", - "ref": "builtfilter-rs", - "repo": "builtfilter", - "type": "github" - } - }, - "builtfilter_3": { "inputs": { "flox-floxpkgs": [ "ld-floxlib", @@ -88,95 +43,6 @@ } }, "capacitor_2": { - "inputs": { - "nixpkgs": "nixpkgs_2", - "nixpkgs-lib": "nixpkgs-lib_2" - }, - "locked": { - "lastModified": 1675629156, - "narHash": "sha256-55UOZa4MUTgCwyK8jrskwFLATDuMAvXyC7GGcsF45Xg=", - "owner": "flox", - "repo": "capacitor", - "rev": "0694a193660db2cb1a7a6e04949478b25f81d802", - "type": "github" - }, - "original": { - "owner": "flox", - "ref": "v0", - "repo": "capacitor", - "type": "github" - } - }, - "capacitor_3": { - "inputs": { - "nixpkgs": [ - "flox-floxpkgs", - "etc-profiles", - "ld-floxlib", - "flox-floxpkgs", - "nixpkgs", - "nixpkgs" - ], - "nixpkgs-lib": "nixpkgs-lib_3" - }, - "locked": { - "lastModified": 1675629156, - "narHash": "sha256-55UOZa4MUTgCwyK8jrskwFLATDuMAvXyC7GGcsF45Xg=", - "owner": "flox", - "repo": "capacitor", - "rev": "0694a193660db2cb1a7a6e04949478b25f81d802", - "type": "github" - }, - "original": { - "owner": "flox", - "repo": "capacitor", - "type": "github" - } - }, - "capacitor_4": { - "inputs": { - "nixpkgs": [ - "flox-floxpkgs", - "nixpkgs", - "nixpkgs" - ], - "nixpkgs-lib": "nixpkgs-lib_4" - }, - "locked": { - "lastModified": 1675629156, - "narHash": "sha256-55UOZa4MUTgCwyK8jrskwFLATDuMAvXyC7GGcsF45Xg=", - "owner": "flox", - "repo": "capacitor", - "rev": "0694a193660db2cb1a7a6e04949478b25f81d802", - "type": "github" - }, - "original": { - "owner": "flox", - "repo": "capacitor", - "type": "github" - } - }, - "capacitor_5": { - "inputs": { - "nixpkgs": "nixpkgs_12", - "nixpkgs-lib": "nixpkgs-lib_5" - }, - "locked": { - "lastModified": 1675629156, - "narHash": "sha256-55UOZa4MUTgCwyK8jrskwFLATDuMAvXyC7GGcsF45Xg=", - "owner": "flox", - "repo": "capacitor", - "rev": "0694a193660db2cb1a7a6e04949478b25f81d802", - "type": "github" - }, - "original": { - "owner": "flox", - "ref": "v0", - "repo": "capacitor", - "type": "github" - } - }, - "capacitor_6": { "inputs": { "nixpkgs": [ "ld-floxlib", @@ -184,7 +50,7 @@ "nixpkgs", "nixpkgs" ], - "nixpkgs-lib": "nixpkgs-lib_6" + "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { "lastModified": 1675629156, @@ -204,7 +70,7 @@ "inputs": { "flake-compat": "flake-compat", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "rust-overlay": "rust-overlay" }, "locked": { @@ -221,69 +87,6 @@ "type": "github" } }, - "crane_2": { - "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_7", - "rust-overlay": "rust-overlay_2" - }, - "locked": { - "lastModified": 1686621798, - "narHash": "sha256-FUwWszmSiDzUdTk8f69xwMoYlhdPaLvDaIYOE/y6VXc=", - "owner": "ipetkov", - "repo": "crane", - "rev": "75f7d715f8088f741be9981405f6444e2d49efdd", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_3": { - "inputs": { - "flake-compat": "flake-compat_5", - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_13", - "rust-overlay": "rust-overlay_3" - }, - "locked": { - "lastModified": 1686621798, - "narHash": "sha256-FUwWszmSiDzUdTk8f69xwMoYlhdPaLvDaIYOE/y6VXc=", - "owner": "ipetkov", - "repo": "crane", - "rev": "75f7d715f8088f741be9981405f6444e2d49efdd", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "etc-profiles": { - "inputs": { - "flox-floxpkgs": [ - "flox-floxpkgs" - ], - "ld-floxlib": "ld-floxlib" - }, - "locked": { - "lastModified": 1687976863, - "narHash": "sha256-UTEgsyXL5xDqhR9CJwjkMfg0GR1Y7SxR/jOqN4r8+AQ=", - "owner": "flox", - "repo": "etc-profiles", - "rev": "857ea2664e6ef574a3e98f3e22c03e8c9aee65d3", - "type": "github" - }, - "original": { - "owner": "flox", - "repo": "etc-profiles", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -316,70 +119,6 @@ "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-compat_4": { - "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_5": { - "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_6": { - "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": { "inputs": { "systems": "systems" @@ -416,146 +155,34 @@ "type": "github" } }, - "flake-utils_3": { + "floco": { "inputs": { - "systems": "systems_3" + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "lastModified": 1684245865, + "narHash": "sha256-CJSxo7fvAAjdMaQWALyNG6LKMjOGZC/uxlbX1KuegWU=", + "owner": "aakropotkin", + "repo": "floco", + "rev": "e1231f054258f7d62652109725881767765b1efb", "type": "github" }, "original": { - "owner": "numtide", - "repo": "flake-utils", + "owner": "aakropotkin", + "repo": "floco", + "rev": "e1231f054258f7d62652109725881767765b1efb", "type": "github" } }, - "flake-utils_4": { + "flox": { "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_5": { - "inputs": { - "systems": "systems_5" - }, - "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_6": { - "inputs": { - "systems": "systems_6" - }, - "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "floco": { - "inputs": { - "nixpkgs": "nixpkgs_4" - }, - "locked": { - "lastModified": 1684245865, - "narHash": "sha256-CJSxo7fvAAjdMaQWALyNG6LKMjOGZC/uxlbX1KuegWU=", - "owner": "aakropotkin", - "repo": "floco", - "rev": "e1231f054258f7d62652109725881767765b1efb", - "type": "github" - }, - "original": { - "owner": "aakropotkin", - "repo": "floco", - "rev": "e1231f054258f7d62652109725881767765b1efb", - "type": "github" - } - }, - "floco_2": { - "inputs": { - "nixpkgs": "nixpkgs_8" - }, - "locked": { - "lastModified": 1684245865, - "narHash": "sha256-CJSxo7fvAAjdMaQWALyNG6LKMjOGZC/uxlbX1KuegWU=", - "owner": "aakropotkin", - "repo": "floco", - "rev": "e1231f054258f7d62652109725881767765b1efb", - "type": "github" - }, - "original": { - "owner": "aakropotkin", - "repo": "floco", - "rev": "e1231f054258f7d62652109725881767765b1efb", - "type": "github" - } - }, - "floco_3": { - "inputs": { - "nixpkgs": "nixpkgs_14" - }, - "locked": { - "lastModified": 1684245865, - "narHash": "sha256-CJSxo7fvAAjdMaQWALyNG6LKMjOGZC/uxlbX1KuegWU=", - "owner": "aakropotkin", - "repo": "floco", - "rev": "e1231f054258f7d62652109725881767765b1efb", - "type": "github" - }, - "original": { - "owner": "aakropotkin", - "repo": "floco", - "rev": "e1231f054258f7d62652109725881767765b1efb", - "type": "github" - } - }, - "flox": { - "inputs": { - "crane": "crane", - "floco": "floco", - "flox-floxpkgs": [ - "flox-floxpkgs", - "etc-profiles", - "ld-floxlib", - "flox-floxpkgs" - ], - "shellHooks": "shellHooks" + "crane": "crane", + "floco": "floco", + "flox-floxpkgs": [ + "ld-floxlib", + "flox-floxpkgs" + ], + "shellHooks": "shellHooks" }, "locked": { "lastModified": 1686824858, @@ -576,31 +203,8 @@ "inputs": { "builtfilter": "builtfilter", "capacitor": "capacitor", - "etc-profiles": "etc-profiles", - "flox": "flox_2", - "nixpkgs": "nixpkgs_10", - "tracelinks": "tracelinks_2" - }, - "locked": { - "lastModified": 1687976967, - "narHash": "sha256-EG0ZK/g/DYDrHJCNbm1dyyoVWP4o1wfcj8NJx1drCyU=", - "owner": "flox", - "repo": "floxpkgs", - "rev": "b8ecb4057ba09505df067282ac45ec75441689e4", - "type": "github" - }, - "original": { - "owner": "flox", - "repo": "floxpkgs", - "type": "github" - } - }, - "flox-floxpkgs_2": { - "inputs": { - "builtfilter": "builtfilter_2", - "capacitor": "capacitor_2", "flox": "flox", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "tracelinks": "tracelinks" }, "locked": { @@ -617,127 +221,7 @@ "type": "github" } }, - "flox-floxpkgs_3": { - "inputs": { - "builtfilter": "builtfilter_3", - "capacitor": "capacitor_5", - "flox": "flox_3", - "nixpkgs": "nixpkgs_16", - "tracelinks": "tracelinks_3" - }, - "locked": { - "lastModified": 1686828047, - "narHash": "sha256-KgqjjeWoAvwE+4ie27y+E2ZhwNkU2n3pIKqlJatiJqs=", - "owner": "flox", - "repo": "floxpkgs", - "rev": "d12b0310b8fefe279589fd771d194bca0f560f08", - "type": "github" - }, - "original": { - "owner": "flox", - "repo": "floxpkgs", - "type": "github" - } - }, - "flox_2": { - "inputs": { - "crane": "crane_2", - "floco": "floco_2", - "flox-floxpkgs": [ - "flox-floxpkgs" - ], - "shellHooks": "shellHooks_2" - }, - "locked": { - "lastModified": 1686824858, - "narHash": "sha256-29En5YzPyNPTuKbEbc/19R0TjwyS+ZiD+xob+dCocOk=", - "ref": "latest", - "rev": "1ab9bb637a4871c9a8cf9ceaefa1f5b9d8bc8234", - "revCount": 519, - "type": "git", - "url": "ssh://git@github.com/flox/flox" - }, - "original": { - "ref": "latest", - "type": "git", - "url": "ssh://git@github.com/flox/flox" - } - }, - "flox_3": { - "inputs": { - "crane": "crane_3", - "floco": "floco_3", - "flox-floxpkgs": [ - "ld-floxlib", - "flox-floxpkgs" - ], - "shellHooks": "shellHooks_3" - }, - "locked": { - "lastModified": 1686824858, - "narHash": "sha256-29En5YzPyNPTuKbEbc/19R0TjwyS+ZiD+xob+dCocOk=", - "ref": "latest", - "rev": "1ab9bb637a4871c9a8cf9ceaefa1f5b9d8bc8234", - "revCount": 519, - "type": "git", - "url": "ssh://git@github.com/flox/flox" - }, - "original": { - "ref": "latest", - "type": "git", - "url": "ssh://git@github.com/flox/flox" - } - }, "gitignore": { - "inputs": { - "nixpkgs": [ - "flox-floxpkgs", - "etc-profiles", - "ld-floxlib", - "flox-floxpkgs", - "flox", - "shellHooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_2": { - "inputs": { - "nixpkgs": [ - "flox-floxpkgs", - "flox", - "shellHooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_3": { "inputs": { "nixpkgs": [ "ld-floxlib", @@ -763,36 +247,19 @@ }, "ld-floxlib": { "inputs": { - "flox-floxpkgs": "flox-floxpkgs_2" - }, - "locked": { - "lastModified": 1687975941, - "narHash": "sha256-QzuoRXzPy5G8ePnhKQpxK7e/6Qs6YVnCZlq1oilap4g=", - "owner": "flox", - "repo": "ld-floxlib", - "rev": "b868e931d035c93a9a325a65bc312f15441d9d15", - "type": "github" - }, - "original": { - "owner": "flox", - "repo": "ld-floxlib", - "type": "github" - } - }, - "ld-floxlib_2": { - "inputs": { - "flox-floxpkgs": "flox-floxpkgs_3" + "flox-floxpkgs": "flox-floxpkgs" }, "locked": { - "lastModified": 1687975941, - "narHash": "sha256-QzuoRXzPy5G8ePnhKQpxK7e/6Qs6YVnCZlq1oilap4g=", + "lastModified": 1688147879, + "narHash": "sha256-zJYnXjDndM4zN30Jd9KG2VdB9iKSjRRA0xvO32Z3T1o=", "owner": "flox", "repo": "ld-floxlib", - "rev": "b868e931d035c93a9a325a65bc312f15441d9d15", + "rev": "7cba11e96415228a513e053c608e9506ea3c3dcb", "type": "github" }, "original": { "owner": "flox", + "ref": "aameen.skip-version", "repo": "ld-floxlib", "type": "github" } @@ -815,11 +282,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1687654967, - "narHash": "sha256-ki8vItcjn8Z8n+QD9NEoCQbbbG7VzWy71hyOkFFwCkM=", + "lastModified": 1686445117, + "narHash": "sha256-QfbAtKFmh92rv0j1e9d7EDgPLDERn1EY6FGXwKG09SM=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "b3ec8fb525fc0c8f08eff5ef93c684b4c6d0e777", + "rev": "a08e40a9bc625b7ee428bd7b64cdcff516023c5d", "type": "github" }, "original": { @@ -843,73 +310,13 @@ "type": "github" } }, - "nixpkgs-lib_3": { + "nixpkgs-stable": { "locked": { - "lastModified": 1686445117, - "narHash": "sha256-QfbAtKFmh92rv0j1e9d7EDgPLDERn1EY6FGXwKG09SM=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "a08e40a9bc625b7ee428bd7b64cdcff516023c5d", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs-lib_4": { - "locked": { - "lastModified": 1687654967, - "narHash": "sha256-ki8vItcjn8Z8n+QD9NEoCQbbbG7VzWy71hyOkFFwCkM=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "b3ec8fb525fc0c8f08eff5ef93c684b4c6d0e777", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs-lib_5": { - "locked": { - "lastModified": 1686445117, - "narHash": "sha256-QfbAtKFmh92rv0j1e9d7EDgPLDERn1EY6FGXwKG09SM=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "a08e40a9bc625b7ee428bd7b64cdcff516023c5d", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs-lib_6": { - "locked": { - "lastModified": 1686445117, - "narHash": "sha256-QfbAtKFmh92rv0j1e9d7EDgPLDERn1EY6FGXwKG09SM=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "a08e40a9bc625b7ee428bd7b64cdcff516023c5d", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1685801374, - "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", + "lastModified": 1685801374, + "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", "type": "github" }, "original": { @@ -935,70 +342,6 @@ "type": "github" } }, - "nixpkgs-stable_3": { - "locked": { - "lastModified": 1685801374, - "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_4": { - "locked": { - "lastModified": 1684754342, - "narHash": "sha256-plGnjnbnPLoZCTdQX21oT7xliQhFtgcWlkuDHgtEb1o=", - "owner": "flox", - "repo": "nixpkgs", - "rev": "7084250df3d7f9735087d3234407f3c1fc2400e3", - "type": "github" - }, - "original": { - "owner": "flox", - "ref": "stable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_5": { - "locked": { - "lastModified": 1685801374, - "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_6": { - "locked": { - "lastModified": 1684754342, - "narHash": "sha256-plGnjnbnPLoZCTdQX21oT7xliQhFtgcWlkuDHgtEb1o=", - "owner": "flox", - "repo": "nixpkgs", - "rev": "7084250df3d7f9735087d3234407f3c1fc2400e3", - "type": "github" - }, - "original": { - "owner": "flox", - "ref": "stable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-staging": { "locked": { "lastModified": 1684754342, @@ -1015,38 +358,6 @@ "type": "github" } }, - "nixpkgs-staging_2": { - "locked": { - "lastModified": 1687661089, - "narHash": "sha256-RhF9PiNfOQpm/Q2BR+2305KDR9FCXD6QJizbZ5vxVvQ=", - "owner": "flox", - "repo": "nixpkgs", - "rev": "f742512ccc99e6ac457d6d4ddce78f283c4bbfde", - "type": "github" - }, - "original": { - "owner": "flox", - "ref": "staging", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-staging_3": { - "locked": { - "lastModified": 1684754342, - "narHash": "sha256-plGnjnbnPLoZCTdQX21oT7xliQhFtgcWlkuDHgtEb1o=", - "owner": "flox", - "repo": "nixpkgs", - "rev": "7084250df3d7f9735087d3234407f3c1fc2400e3", - "type": "github" - }, - "original": { - "owner": "flox", - "ref": "staging", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { "lastModified": 1684754342, @@ -1063,206 +374,7 @@ "type": "github" } }, - "nixpkgs-unstable_2": { - "locked": { - "lastModified": 1687681650, - "narHash": "sha256-M2If+gRcfpmaJy/XbfSsRzLlPpoU4nr0NHnKKl50fd8=", - "owner": "flox", - "repo": "nixpkgs", - "rev": "1c9db9710cb23d60570ad4d7ab829c2d34403de3", - "type": "github" - }, - "original": { - "owner": "flox", - "ref": "unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-unstable_3": { - "locked": { - "lastModified": 1684754342, - "narHash": "sha256-plGnjnbnPLoZCTdQX21oT7xliQhFtgcWlkuDHgtEb1o=", - "owner": "flox", - "repo": "nixpkgs", - "rev": "7084250df3d7f9735087d3234407f3c1fc2400e3", - "type": "github" - }, - "original": { - "owner": "flox", - "ref": "unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_10": { - "inputs": { - "capacitor": "capacitor_4", - "flox": [ - "flox-floxpkgs", - "flox" - ], - "flox-floxpkgs": [ - "flox-floxpkgs" - ], - "nixpkgs": "nixpkgs_11", - "nixpkgs-stable": "nixpkgs-stable_4", - "nixpkgs-staging": "nixpkgs-staging_2", - "nixpkgs-unstable": "nixpkgs-unstable_2", - "nixpkgs__flox__aarch64-darwin": "nixpkgs__flox__aarch64-darwin_2", - "nixpkgs__flox__aarch64-linux": "nixpkgs__flox__aarch64-linux_2", - "nixpkgs__flox__i686-linux": "nixpkgs__flox__i686-linux_2", - "nixpkgs__flox__x86_64-darwin": "nixpkgs__flox__x86_64-darwin_2", - "nixpkgs__flox__x86_64-linux": "nixpkgs__flox__x86_64-linux_2" - }, - "locked": { - "lastModified": 1687788718, - "narHash": "sha256-0IPnixb1LudsHyMSbBh+nJjZNlnbTbFEraoRDlMG7mg=", - "owner": "flox", - "repo": "nixpkgs-flox", - "rev": "7ef6e4b3523b3d4d0d6ba5bd6c945671fa965c99", - "type": "github" - }, - "original": { - "owner": "flox", - "repo": "nixpkgs-flox", - "type": "github" - } - }, - "nixpkgs_11": { - "locked": { - "lastModified": 1684754342, - "narHash": "sha256-plGnjnbnPLoZCTdQX21oT7xliQhFtgcWlkuDHgtEb1o=", - "owner": "flox", - "repo": "nixpkgs", - "rev": "7084250df3d7f9735087d3234407f3c1fc2400e3", - "type": "github" - }, - "original": { - "id": "nixpkgs-stable", - "type": "indirect" - } - }, - "nixpkgs_12": { - "locked": { - "lastModified": 1684754342, - "narHash": "sha256-plGnjnbnPLoZCTdQX21oT7xliQhFtgcWlkuDHgtEb1o=", - "owner": "flox", - "repo": "nixpkgs", - "rev": "7084250df3d7f9735087d3234407f3c1fc2400e3", - "type": "github" - }, - "original": { - "owner": "flox", - "ref": "stable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_13": { - "locked": { - "lastModified": 1685714850, - "narHash": "sha256-OcvbIJq4CGwwFr9m7M/SQcDPZ64hhR4t77oZgEeh7ZY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c6ffce3d5df7b4c588ce80a0c6e2d2348a611707", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_14": { - "locked": { - "lastModified": 1674236650, - "narHash": "sha256-B4GKL1YdJnII6DQNNJ4wDW1ySJVx2suB1h/v4Ql8J0Q=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "cfb43ad7b941d9c3606fb35d91228da7ebddbfc5", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_15": { - "locked": { - "lastModified": 1685866647, - "narHash": "sha256-4jKguNHY/edLYImB+uL8jKPL/vpfOvMmSlLAGfxSrnY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a53a3bec10deef6e1cc1caba5bc60f53b959b1e8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_16": { - "inputs": { - "capacitor": "capacitor_6", - "flox": [ - "ld-floxlib", - "flox-floxpkgs", - "flox" - ], - "flox-floxpkgs": [ - "ld-floxlib", - "flox-floxpkgs" - ], - "nixpkgs": [ - "ld-floxlib", - "flox-floxpkgs", - "nixpkgs", - "nixpkgs-stable" - ], - "nixpkgs-stable": "nixpkgs-stable_6", - "nixpkgs-staging": "nixpkgs-staging_3", - "nixpkgs-unstable": "nixpkgs-unstable_3", - "nixpkgs__flox__aarch64-darwin": "nixpkgs__flox__aarch64-darwin_3", - "nixpkgs__flox__aarch64-linux": "nixpkgs__flox__aarch64-linux_3", - "nixpkgs__flox__i686-linux": "nixpkgs__flox__i686-linux_3", - "nixpkgs__flox__x86_64-darwin": "nixpkgs__flox__x86_64-darwin_3", - "nixpkgs__flox__x86_64-linux": "nixpkgs__flox__x86_64-linux_3" - }, - "locked": { - "lastModified": 1686770319, - "narHash": "sha256-9ffqbrKUa0g2aql8B8SDXTCDzyU8PnW7JI1uisuk0dQ=", - "owner": "flox", - "repo": "nixpkgs-flox", - "rev": "48e8d0cfdc7bc98e9bf4d65a67ea324b3d952ea7", - "type": "github" - }, - "original": { - "owner": "flox", - "repo": "nixpkgs-flox", - "type": "github" - } - }, "nixpkgs_2": { - "locked": { - "lastModified": 1684754342, - "narHash": "sha256-plGnjnbnPLoZCTdQX21oT7xliQhFtgcWlkuDHgtEb1o=", - "owner": "flox", - "repo": "nixpkgs", - "rev": "7084250df3d7f9735087d3234407f3c1fc2400e3", - "type": "github" - }, - "original": { - "owner": "flox", - "ref": "stable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1685714850, "narHash": "sha256-OcvbIJq4CGwwFr9m7M/SQcDPZ64hhR4t77oZgEeh7ZY=", @@ -1278,7 +390,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1674236650, "narHash": "sha256-B4GKL1YdJnII6DQNNJ4wDW1ySJVx2suB1h/v4Ql8J0Q=", @@ -1292,7 +404,7 @@ "type": "indirect" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1685866647, "narHash": "sha256-4jKguNHY/edLYImB+uL8jKPL/vpfOvMmSlLAGfxSrnY=", @@ -1308,25 +420,19 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "inputs": { - "capacitor": "capacitor_3", + "capacitor": "capacitor_2", "flox": [ - "flox-floxpkgs", - "etc-profiles", "ld-floxlib", "flox-floxpkgs", "flox" ], "flox-floxpkgs": [ - "flox-floxpkgs", - "etc-profiles", "ld-floxlib", "flox-floxpkgs" ], "nixpkgs": [ - "flox-floxpkgs", - "etc-profiles", "ld-floxlib", "flox-floxpkgs", "nixpkgs", @@ -1336,338 +442,116 @@ "nixpkgs-staging": "nixpkgs-staging", "nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs__flox__aarch64-darwin": "nixpkgs__flox__aarch64-darwin", - "nixpkgs__flox__aarch64-linux": "nixpkgs__flox__aarch64-linux", - "nixpkgs__flox__i686-linux": "nixpkgs__flox__i686-linux", - "nixpkgs__flox__x86_64-darwin": "nixpkgs__flox__x86_64-darwin", - "nixpkgs__flox__x86_64-linux": "nixpkgs__flox__x86_64-linux" - }, - "locked": { - "lastModified": 1686770319, - "narHash": "sha256-9ffqbrKUa0g2aql8B8SDXTCDzyU8PnW7JI1uisuk0dQ=", - "owner": "flox", - "repo": "nixpkgs-flox", - "rev": "48e8d0cfdc7bc98e9bf4d65a67ea324b3d952ea7", - "type": "github" - }, - "original": { - "owner": "flox", - "repo": "nixpkgs-flox", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1685714850, - "narHash": "sha256-OcvbIJq4CGwwFr9m7M/SQcDPZ64hhR4t77oZgEeh7ZY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c6ffce3d5df7b4c588ce80a0c6e2d2348a611707", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { - "locked": { - "lastModified": 1674236650, - "narHash": "sha256-B4GKL1YdJnII6DQNNJ4wDW1ySJVx2suB1h/v4Ql8J0Q=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "cfb43ad7b941d9c3606fb35d91228da7ebddbfc5", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_9": { - "locked": { - "lastModified": 1685866647, - "narHash": "sha256-4jKguNHY/edLYImB+uL8jKPL/vpfOvMmSlLAGfxSrnY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a53a3bec10deef6e1cc1caba5bc60f53b959b1e8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs__flox__aarch64-darwin": { - "flake": false, - "locked": { - "host": "catalog.floxsdlc.com", - "lastModified": 1686769905, - "narHash": "sha256-3bTAKno+hbVkaj/7nIuG8CgBuS347E6ksPcwwjcMw78=", - "owner": "flox", - "repo": "nixpkgs-flox", - "rev": "7800311cb0d5c8970021f9f6691115feb0be7c04", - "type": "github" - }, - "original": { - "host": "catalog.floxsdlc.com", - "owner": "flox", - "ref": "aarch64-darwin", - "repo": "nixpkgs-flox", - "type": "github" - } - }, - "nixpkgs__flox__aarch64-darwin_2": { - "flake": false, - "locked": { - "host": "catalog.floxsdlc.com", - "lastModified": 1687788253, - "narHash": "sha256-gz19wXdw2JHZX9i3lE50xQn0kHWJSDrdP/8aJuNx/DY=", - "owner": "flox", - "repo": "nixpkgs-flox", - "rev": "026a271a78fa569989010b6ebdba66381870cde7", - "type": "github" - }, - "original": { - "host": "catalog.floxsdlc.com", - "owner": "flox", - "ref": "aarch64-darwin", - "repo": "nixpkgs-flox", - "type": "github" - } - }, - "nixpkgs__flox__aarch64-darwin_3": { - "flake": false, - "locked": { - "host": "catalog.floxsdlc.com", - "lastModified": 1686769905, - "narHash": "sha256-3bTAKno+hbVkaj/7nIuG8CgBuS347E6ksPcwwjcMw78=", - "owner": "flox", - "repo": "nixpkgs-flox", - "rev": "7800311cb0d5c8970021f9f6691115feb0be7c04", - "type": "github" - }, - "original": { - "host": "catalog.floxsdlc.com", - "owner": "flox", - "ref": "aarch64-darwin", - "repo": "nixpkgs-flox", - "type": "github" - } - }, - "nixpkgs__flox__aarch64-linux": { - "flake": false, - "locked": { - "host": "catalog.floxsdlc.com", - "lastModified": 1686769880, - "narHash": "sha256-t5LMiPoNgzB6UKBvUzMlsC3vcYvKoWT6InPHpTf6QNo=", - "owner": "flox", - "repo": "nixpkgs-flox", - "rev": "234e8b5adf58fe3b1b6a33680f0a6ba8d8b639d0", - "type": "github" - }, - "original": { - "host": "catalog.floxsdlc.com", - "owner": "flox", - "ref": "aarch64-linux", - "repo": "nixpkgs-flox", - "type": "github" - } - }, - "nixpkgs__flox__aarch64-linux_2": { - "flake": false, - "locked": { - "host": "catalog.floxsdlc.com", - "lastModified": 1687788220, - "narHash": "sha256-GSBPBUixzI+Y+GrLwLM56w/zTLVd9pHOJIVUYoyNhnY=", - "owner": "flox", - "repo": "nixpkgs-flox", - "rev": "67623a9ab10d435557920e9a598ba8d7632fe48c", - "type": "github" - }, - "original": { - "host": "catalog.floxsdlc.com", - "owner": "flox", - "ref": "aarch64-linux", - "repo": "nixpkgs-flox", - "type": "github" - } - }, - "nixpkgs__flox__aarch64-linux_3": { - "flake": false, - "locked": { - "host": "catalog.floxsdlc.com", - "lastModified": 1686769880, - "narHash": "sha256-t5LMiPoNgzB6UKBvUzMlsC3vcYvKoWT6InPHpTf6QNo=", - "owner": "flox", - "repo": "nixpkgs-flox", - "rev": "234e8b5adf58fe3b1b6a33680f0a6ba8d8b639d0", - "type": "github" - }, - "original": { - "host": "catalog.floxsdlc.com", - "owner": "flox", - "ref": "aarch64-linux", - "repo": "nixpkgs-flox", - "type": "github" - } - }, - "nixpkgs__flox__i686-linux": { - "flake": false, - "locked": { - "host": "catalog.floxsdlc.com", - "lastModified": 1686770241, - "narHash": "sha256-2EJ6vCG+iMklp4mcUGhZPJk7brx2fHn2fHUYKjtJI34=", - "owner": "flox", - "repo": "nixpkgs-flox", - "rev": "cd8107202cd66d4047d2f1decb29cf03ad6195cd", - "type": "github" - }, - "original": { - "host": "catalog.floxsdlc.com", - "owner": "flox", - "ref": "i686-linux", - "repo": "nixpkgs-flox", - "type": "github" - } - }, - "nixpkgs__flox__i686-linux_2": { - "flake": false, - "locked": { - "host": "catalog.floxsdlc.com", - "lastModified": 1687788598, - "narHash": "sha256-KqAPNxWj9WyVEXVc9+gCy1AuocpIhqospyTSJcxS/oU=", - "owner": "flox", - "repo": "nixpkgs-flox", - "rev": "bab1f9dcf3ebd32e7fd09daa71300c1e0e52cb9d", - "type": "github" - }, - "original": { - "host": "catalog.floxsdlc.com", - "owner": "flox", - "ref": "i686-linux", - "repo": "nixpkgs-flox", - "type": "github" - } - }, - "nixpkgs__flox__i686-linux_3": { - "flake": false, + "nixpkgs__flox__aarch64-linux": "nixpkgs__flox__aarch64-linux", + "nixpkgs__flox__i686-linux": "nixpkgs__flox__i686-linux", + "nixpkgs__flox__x86_64-darwin": "nixpkgs__flox__x86_64-darwin", + "nixpkgs__flox__x86_64-linux": "nixpkgs__flox__x86_64-linux" + }, "locked": { - "host": "catalog.floxsdlc.com", - "lastModified": 1686770241, - "narHash": "sha256-2EJ6vCG+iMklp4mcUGhZPJk7brx2fHn2fHUYKjtJI34=", + "lastModified": 1686770319, + "narHash": "sha256-9ffqbrKUa0g2aql8B8SDXTCDzyU8PnW7JI1uisuk0dQ=", "owner": "flox", "repo": "nixpkgs-flox", - "rev": "cd8107202cd66d4047d2f1decb29cf03ad6195cd", + "rev": "48e8d0cfdc7bc98e9bf4d65a67ea324b3d952ea7", "type": "github" }, "original": { - "host": "catalog.floxsdlc.com", "owner": "flox", - "ref": "i686-linux", "repo": "nixpkgs-flox", "type": "github" } }, - "nixpkgs__flox__x86_64-darwin": { - "flake": false, + "nixpkgs_6": { "locked": { - "host": "catalog.floxsdlc.com", - "lastModified": 1686770232, - "narHash": "sha256-DFuwK3Vul8z9va99vpcWmz32WBv4Hd5tIT/qWdkG/bo=", + "lastModified": 1684754342, + "narHash": "sha256-plGnjnbnPLoZCTdQX21oT7xliQhFtgcWlkuDHgtEb1o=", "owner": "flox", - "repo": "nixpkgs-flox", - "rev": "21a6177aae1307aaabc94cacff8f729495fa9df0", + "repo": "nixpkgs", + "rev": "7084250df3d7f9735087d3234407f3c1fc2400e3", "type": "github" }, "original": { - "host": "catalog.floxsdlc.com", - "owner": "flox", - "ref": "x86_64-darwin", - "repo": "nixpkgs-flox", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, - "nixpkgs__flox__x86_64-darwin_2": { + "nixpkgs__flox__aarch64-darwin": { "flake": false, "locked": { "host": "catalog.floxsdlc.com", - "lastModified": 1687788584, - "narHash": "sha256-Ffc/XVvi+dM8iGEN0qAw5kNcoHKqhvSF1wL5+RM6yu0=", + "lastModified": 1686769905, + "narHash": "sha256-3bTAKno+hbVkaj/7nIuG8CgBuS347E6ksPcwwjcMw78=", "owner": "flox", "repo": "nixpkgs-flox", - "rev": "9322182bb1d53541954eabe274e041b3bedbbb57", + "rev": "7800311cb0d5c8970021f9f6691115feb0be7c04", "type": "github" }, "original": { "host": "catalog.floxsdlc.com", "owner": "flox", - "ref": "x86_64-darwin", + "ref": "aarch64-darwin", "repo": "nixpkgs-flox", "type": "github" } }, - "nixpkgs__flox__x86_64-darwin_3": { + "nixpkgs__flox__aarch64-linux": { "flake": false, "locked": { "host": "catalog.floxsdlc.com", - "lastModified": 1686770232, - "narHash": "sha256-DFuwK3Vul8z9va99vpcWmz32WBv4Hd5tIT/qWdkG/bo=", + "lastModified": 1686769880, + "narHash": "sha256-t5LMiPoNgzB6UKBvUzMlsC3vcYvKoWT6InPHpTf6QNo=", "owner": "flox", "repo": "nixpkgs-flox", - "rev": "21a6177aae1307aaabc94cacff8f729495fa9df0", + "rev": "234e8b5adf58fe3b1b6a33680f0a6ba8d8b639d0", "type": "github" }, "original": { "host": "catalog.floxsdlc.com", "owner": "flox", - "ref": "x86_64-darwin", + "ref": "aarch64-linux", "repo": "nixpkgs-flox", "type": "github" } }, - "nixpkgs__flox__x86_64-linux": { + "nixpkgs__flox__i686-linux": { "flake": false, "locked": { "host": "catalog.floxsdlc.com", - "lastModified": 1686770212, - "narHash": "sha256-Nf8RF6JYjlw65DvBQfkEz2Ev6UFyCM38oPJEIXKNfXc=", + "lastModified": 1686770241, + "narHash": "sha256-2EJ6vCG+iMklp4mcUGhZPJk7brx2fHn2fHUYKjtJI34=", "owner": "flox", "repo": "nixpkgs-flox", - "rev": "209643b52be208bca6eae3a8df22a2e9ea8c175f", + "rev": "cd8107202cd66d4047d2f1decb29cf03ad6195cd", "type": "github" }, "original": { "host": "catalog.floxsdlc.com", "owner": "flox", - "ref": "x86_64-linux", + "ref": "i686-linux", "repo": "nixpkgs-flox", "type": "github" } }, - "nixpkgs__flox__x86_64-linux_2": { + "nixpkgs__flox__x86_64-darwin": { "flake": false, "locked": { "host": "catalog.floxsdlc.com", - "lastModified": 1687788554, - "narHash": "sha256-k0nGvnhAoxkxsOxIJ+B1smDowHwExo5+/yemmnH8RoE=", + "lastModified": 1686770232, + "narHash": "sha256-DFuwK3Vul8z9va99vpcWmz32WBv4Hd5tIT/qWdkG/bo=", "owner": "flox", "repo": "nixpkgs-flox", - "rev": "ff93610b257d149a5c5cf2ee2b9b90f9ed92b587", + "rev": "21a6177aae1307aaabc94cacff8f729495fa9df0", "type": "github" }, "original": { "host": "catalog.floxsdlc.com", "owner": "flox", - "ref": "x86_64-linux", + "ref": "x86_64-darwin", "repo": "nixpkgs-flox", "type": "github" } }, - "nixpkgs__flox__x86_64-linux_3": { + "nixpkgs__flox__x86_64-linux": { "flake": false, "locked": { "host": "catalog.floxsdlc.com", @@ -1688,75 +572,11 @@ }, "root": { "inputs": { - "flox-floxpkgs": "flox-floxpkgs", - "ld-floxlib": "ld-floxlib_2" + "ld-floxlib": "ld-floxlib", + "nixpkgs": "nixpkgs_6" } }, "rust-overlay": { - "inputs": { - "flake-utils": [ - "flox-floxpkgs", - "etc-profiles", - "ld-floxlib", - "flox-floxpkgs", - "flox", - "crane", - "flake-utils" - ], - "nixpkgs": [ - "flox-floxpkgs", - "etc-profiles", - "ld-floxlib", - "flox-floxpkgs", - "flox", - "crane", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1685759304, - "narHash": "sha256-I3YBH6MS3G5kGzNuc1G0f9uYfTcNY9NYoRc3QsykLk4=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "c535b4f3327910c96dcf21851bbdd074d0760290", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { - "inputs": { - "flake-utils": [ - "flox-floxpkgs", - "flox", - "crane", - "flake-utils" - ], - "nixpkgs": [ - "flox-floxpkgs", - "flox", - "crane", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1685759304, - "narHash": "sha256-I3YBH6MS3G5kGzNuc1G0f9uYfTcNY9NYoRc3QsykLk4=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "c535b4f3327910c96dcf21851bbdd074d0760290", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_3": { "inputs": { "flake-utils": [ "ld-floxlib", @@ -1792,7 +612,7 @@ "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_2", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -1809,50 +629,6 @@ "type": "github" } }, - "shellHooks_2": { - "inputs": { - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_4", - "gitignore": "gitignore_2", - "nixpkgs": "nixpkgs_9", - "nixpkgs-stable": "nixpkgs-stable_3" - }, - "locked": { - "lastModified": 1686668298, - "narHash": "sha256-AADh9NqHh6X2LOem4BvI7oCkMm+JPCSCE7iIw5nn0VA=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "5b6b54d3f722aa95cbf4ddbe35390a0af8c0015a", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "shellHooks_3": { - "inputs": { - "flake-compat": "flake-compat_6", - "flake-utils": "flake-utils_6", - "gitignore": "gitignore_3", - "nixpkgs": "nixpkgs_15", - "nixpkgs-stable": "nixpkgs-stable_5" - }, - "locked": { - "lastModified": 1686668298, - "narHash": "sha256-AADh9NqHh6X2LOem4BvI7oCkMm+JPCSCE7iIw5nn0VA=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "5b6b54d3f722aa95cbf4ddbe35390a0af8c0015a", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -1883,112 +659,7 @@ "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" - } - }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tracelinks": { - "inputs": { - "flox-floxpkgs": [ - "flox-floxpkgs", - "etc-profiles", - "ld-floxlib", - "flox-floxpkgs" - ] - }, - "locked": { - "lastModified": 1683889723, - "narHash": "sha256-h7LMr8tgu4RJecin4oEO50WoTU0rTomAW9+7AJroX0Y=", - "ref": "main", - "rev": "e05561bdd0ed9d10c66e35a1d8e66defab949534", - "revCount": 11, - "type": "git", - "url": "ssh://git@github.com/flox/tracelinks" - }, - "original": { - "ref": "main", - "type": "git", - "url": "ssh://git@github.com/flox/tracelinks" - } - }, - "tracelinks_2": { - "inputs": { - "flox-floxpkgs": [ - "flox-floxpkgs" - ] - }, - "locked": { - "lastModified": 1683889723, - "narHash": "sha256-h7LMr8tgu4RJecin4oEO50WoTU0rTomAW9+7AJroX0Y=", - "ref": "main", - "rev": "e05561bdd0ed9d10c66e35a1d8e66defab949534", - "revCount": 11, - "type": "git", - "url": "ssh://git@github.com/flox/tracelinks" - }, - "original": { - "ref": "main", - "type": "git", - "url": "ssh://git@github.com/flox/tracelinks" - } - }, - "tracelinks_3": { "inputs": { "flox-floxpkgs": [ "ld-floxlib", diff --git a/flake.nix b/flake.nix index bf0a247..77122d6 100644 --- a/flake.nix +++ b/flake.nix @@ -1,8 +1,105 @@ +# ============================================================================ # +# +# +# +# ---------------------------------------------------------------------------- # + { - description = "Installable /etc/profile.d activation scripts for use with flox"; - inputs.flox-floxpkgs.url = "github:flox/floxpkgs"; - inputs.ld-floxlib.url = "github:flox/ld-floxlib"; +# ---------------------------------------------------------------------------- # + + description = + "Installable /etc/profile.d activation scripts for use with flox"; + + inputs.ld-floxlib.url = "github:flox/ld-floxlib/aameen.skip-version"; + + +# ---------------------------------------------------------------------------- # + + outputs = { self, nixpkgs, ld-floxlib, ... }: let + +# ---------------------------------------------------------------------------- # + + eachDefaultSystemMap = let + defaultSystems = [ + "x86_64-linux" "aarch64-linux" + "x86_64-darwin" "aarch64-darwin" + ]; + in fn: let + proc = system: { name = system; value = fn system; }; + in builtins.listToAttrs ( map proc defaultSystems ); + + +# ---------------------------------------------------------------------------- # + + overlays.deps = final: prev: { + ldFloxlib = + ( builtins.getAttr final.system ld-floxlib.packages ).ld-floxlib; + }; + overlays.etc-profiles = final: prev: { + etc-profiles = final.callPackage ./pkgs/etc-profiles { + src = builtins.path { path = ./.; }; + }; + }; + overlays.default = + nixpkgs.lib.composeExtensions overlays.deps overlays.etc-profiles; + + +# ---------------------------------------------------------------------------- # + + legacyPackages = eachDefaultSystemMap ( system: let + nixpkgsFor = builtins.getAttr system nixpkgs.legacyPackages; + pkgsFor = nixpkgsFor.extend overlays.default; + in { + inherit (pkgsFor) etc-profiles; + } ); + + +# ---------------------------------------------------------------------------- # + + in { + inherit overlays legacyPackages; + packages = eachDefaultSystemMap ( system: { + inherit (builtins.getAttr system legacyPackages) etc-profiles; + default = ( builtins.getAttr system legacyPackages ).etc-profiles; + } ); + + catalog = eachDefaultSystemMap ( system: let + pkg = ( builtins.getAttr system legacyPackages ).etc-profiles; + withMeta = pkg // { + meta.publishData = { + cache = []; + element = { + attrPath = ["packages" system "etc-profiles"]; + originalUrl = "github:flox/etc-profiles" + ( + if self.sourceInfo ? rev then "/" + self.sourceInfo.rev else + if self.sourceInfo ? ref then "/" + self.sourceInfo.ref else "" + ); + storePaths = map ( o: o.outPath ) pkg.all; + }; + type = "catalogRender"; + version = 1; + eval = pkg.meta; + source.locked = builtins.intersectAttrs { + lastModified = true; + revCount = true; + } self.sourceInfo; + }; + }; + in { + stable.etc-profiles."0_1_0" = withMeta; + stable.etc-profiles."latest" = withMeta; + } ); + }; + + +# ---------------------------------------------------------------------------- # - outputs = args @ {flox-floxpkgs, ...}: flox-floxpkgs.project args (_: {}); } + + +# ---------------------------------------------------------------------------- # +# +# +# +# ============================================================================ # diff --git a/pkgs/etc-profiles/base.nix b/pkgs/etc-profiles/base.nix deleted file mode 100644 index cc1d371..0000000 --- a/pkgs/etc-profiles/base.nix +++ /dev/null @@ -1,70 +0,0 @@ -# ============================================================================ # -# -# Creates a starter `/etc/profile' that aggregates -# `/etc/profile.d/*.sh' "child scripts". -# -# ---------------------------------------------------------------------------- # - -{ self, version, bash, coreutils, hostPlatform, ld-floxlib, lib, system }: let - pname = "profile-base"; -in ( derivation { - inherit system pname version; - name = pname + "-" + version; - builder = bash.outPath + "/bin/bash"; - PATH = coreutils.outPath + "/bin"; - args = ["-eu" "-o" "pipefail" "-c" ('' - mkdir -p "$out/etc" "$out/lib"; - cp -- ${self}/profile "$out/etc/profile"; - '' + lib.optionalString hostPlatform.isLinux '' - for i in ${ld-floxlib}/lib/*; do - ln -s "$i" "$out/lib/$(basename $i)"; - done - '')]; - preferLocalBuild = true; - allowSubstitutes = system == ( builtins.currentSystem or null ); -} ) // { - meta.description = - "An `/etc/profile' script to source `/etc/profile.d/*.sh`"; - meta.longDescription = '' - An `/etc/profile' script to source `/etc/profile.d/*.sh` - - Users can define and install scripts in `/etc/profile.d' as - "custom packages"/installables to share common setup processes - across environments. - - Recommended usage: - # flox.nix - { - packages.nixpkgs-flox.sqlite = { - meta.outputsToInstall = ["bin" "out" "dev"]; - }; - - # Provides developer environment hooks for use with python3. - packages.flox.etc-profiles = { - # Optionally, specify language packages to install. - # Invoke `flox search -c flox etc-profiles -l` to see - # a list of all supported language pack outputs. Please - # note that all/most language packs depend on including - # the "common_paths" output. - meta.outputsToInstall = [ "base" "common_paths" "python3" ]; - }; - - shell.hook = '${""}' - [[ -r "$FLOX_ENV/etc/profile" ]] && . "$FLOX_ENV/etc/profile"; - pkg-config --list-all >&2; - '${""}' - } - ''; - meta.outputsToInstall = ["out"]; - meta.platforms = [ - "x86_64-linux" "aarch64-linux" "i686-linux" - "x86_64-darwin" "aarch64-darwin" - ]; -} - - -# ---------------------------------------------------------------------------- # -# -# -# -# ============================================================================ # diff --git a/pkgs/etc-profiles/default.nix b/pkgs/etc-profiles/default.nix index 8cf064a..8acfb7a 100644 --- a/pkgs/etc-profiles/default.nix +++ b/pkgs/etc-profiles/default.nix @@ -1,63 +1,28 @@ -{ self, inputs, lib, buildEnv, runCommand, bash, coreutils, hostPlatform, system }: - - -let - pname = "etc-profiles"; - version = "0.1.0-${lib.flox-floxpkgs.getRev self}"; - src = self; - ld-floxlib = inputs.ld-floxlib.packages.ld-floxlib; - - splitSname = script: let - sname = baseNameOf script; - m = builtins.match "([^_]*)_(.*).sh" sname; - bname = builtins.elemAt m 1; - in { - inherit sname bname; - priority = builtins.head m; - pname = "profile-" + bname; - }; - - base = import ./base.nix { - inherit self version bash coreutils hostPlatform ld-floxlib lib system; - }; - - mkEtcProfile = import ./mk-profile.nix { - inherit bash coreutils system; - version = base.version; - }; - - mkProfileLocal = { - script - , description ? null - , longDescription ? null - , ... - } @ args: let - ss = splitSname script; - in { - name = lib.replaceStrings ["-"] ["_"] ss.bname; - value = lib.makeOverridable mkEtcProfile ( - ( removeAttrs ss ["bname"] ) // args - ); - }; - - profiles = builtins.listToAttrs ( map mkProfileLocal [ - { script = src + "/profile.d/0100_common-paths.sh"; } - { script = src + "/profile.d/0500_node.sh"; } - { script = src + "/profile.d/0500_python3.sh"; } - ] ); - - etcProfiles = buildEnv { - name = pname + "-" + version; - paths = [ base ] ++ (builtins.attrValues profiles); - }; - -in runCommand "etc-profiles.${version}" { - inherit pname version; - outputs = [ "out" "base" ] ++ (builtins.attrNames profiles); - meta.description = "Installable /etc/profile.d activation scripts for use with flox"; -} '' - cp -R -- ${etcProfiles}/. $out - cp -R -- ${base}/. $base - ${lib.concatStringsSep "\n" (lib.mapAttrsToList (output: outpath: - "cp -R -- ${outpath}/. \$${output}") profiles)} -'' +# ============================================================================ # +# +# Creates a starter `/etc/profile' that aggregates +# `/etc/profile.d/*.sh' "child scripts". +# +# ---------------------------------------------------------------------------- # + +{ src +, inputs ? null +, ld-floxlib ? inputs.ld-floxlib +, lib +, config +, bash +, coreutils +, hostPlatform +, system +, ldFloxlib ? + ( ld-floxlib.packages.${system} or ld-floxlib.packages ).ld-floxlib +}: import ./pkg-fun.nix { + inherit src lib ldFloxlib config bash coreutils hostPlatform system; +} + + +# ---------------------------------------------------------------------------- # +# +# +# +# ============================================================================ # diff --git a/pkgs/etc-profiles/mk-profile.nix b/pkgs/etc-profiles/mk-profile.nix deleted file mode 100644 index 658513d..0000000 --- a/pkgs/etc-profiles/mk-profile.nix +++ /dev/null @@ -1,56 +0,0 @@ -# ============================================================================ # -# -# Creates a `/etc/profile.d/*.sh' script as an installable. -# -# ---------------------------------------------------------------------------- # - -let - prioToPrefix = p: let - pi = if builtins.isString p then builtins.fromJSON p else p; - ps = if builtins.isString p then p else toString p; - in if p == null then "" else - if pi < 1000 then "000" + ps + "_" else - if pi < 100 then "00" + ps + "_" else - if pi < 10 then "0" + ps + "_" else - ps + "_"; - npp = p: let - m = builtins.match "profile-(.*)" p; - in if m == null then p else builtins.head m; -in -{ version, bash, coreutils, system }: -{ script -, pname -, priority ? null # Integer 0-9999 or `null' -, sname ? ( prioToPrefix priority ) + ( npp pname ) -, description ? "An `/etc/profile.d/*.sh` script managing ${npp pname}." -, longDescription ? description -, platforms ? [ - "x86_64-linux" "aarch64-linux" "i686-linux" - "x86_64-darwin" "aarch64-darwin" - ] -}: ( derivation { - inherit system pname script sname; - name = pname + "-" + version; - builder = bash.outPath + "/bin/bash"; - PATH = coreutils.outPath + "/bin"; - args = let - profile_d = builtins.path { path = ./profile.d; }; - in ["-eu" "-o" "pipefail" "-c" '' - mkdir -p "$out/etc/profile.d"; - cp -- "$script" "$out/etc/profile.d/$sname"; - '']; - preferLocalBuild = true; - allowSubstitutes = system == ( builtins.currentSystem or null ); -} ) // { - meta = { - inherit description longDescription platforms; - outputsToInstall = ["out"]; - }; -} - - -# ---------------------------------------------------------------------------- # -# -# -# -# ============================================================================ # diff --git a/pkgs/etc-profiles/pkg-fun.nix b/pkgs/etc-profiles/pkg-fun.nix new file mode 100644 index 0000000..12bf9ee --- /dev/null +++ b/pkgs/etc-profiles/pkg-fun.nix @@ -0,0 +1,110 @@ +# ============================================================================ # +# +# Creates a starter `/etc/profile' that aggregates +# `/etc/profile.d/*.sh' "child scripts". +# +# ---------------------------------------------------------------------------- # + +{ src +, lib +, ldFloxlib +, config +, bash +, coreutils +, hostPlatform +, system +}: let + +# ---------------------------------------------------------------------------- # + + pname = "etc-profiles"; + version = "0.1.0"; + drv = derivation { + inherit pname version system ldFloxlib; + name = pname + "-" + version; + builder = bash.outPath + "/bin/bash"; + outputs = ["common_paths" "node" "python3" "out"]; + profile = builtins.path { path = ( toString src ) + "/profile"; }; + profile_d = builtins.path { path = ( toString src ) + "/profile.d"; }; + PATH = coreutils.outPath + "/bin"; + # ${if ! hostPlatform.isLinux then "" else '' + # ln -s -- "$ldFloxlib/lib/"* "$out/lib/"; + # '' + # } + args = ["-eu" "-o" "pipefail" "-c" '' + mkdir -p "$out/etc" \ + "$out/lib" \ + "$common_paths/etc/profile.d" \ + "$node/etc/profile.d" \ + "$python3/etc/profile.d" \ + ; + cp -- "$profile" "$out/etc/profile"; + cp -- "$profile_d/0100_common-paths.sh" "$common_paths/etc/profile.d/"; + cp -- "$profile_d/0500_node.sh" "$node/etc/profile.d/"; + cp -- "$profile_d/0500_python3.sh" "$python3/etc/profile.d/"; + '']; + }; + + +# --------------------------------------------------------------------------- # + +in drv // { + meta = let + lfm = ldFloxlib.meta or {}; + license = lib.licenses.mit; + # Inherit broken from `ld-floxlib' + broken = if hostPlatform.isLinux then ( lfm.broken or false ) else false; + platforms = [ + "x86_64-linux" "aarch64-linux" "i686-linux" + "x86_64-darwin" "aarch64-darwin" + ]; + unsupported = ! ( builtins.elem hostPlatform.system platforms ); + unfree = ! license.free; + in { + inherit (drv) name; + inherit license broken platforms unfree unsupported; + available = ( config.allowBroken || ( ! broken ) ) && + ( config.allowUnfree || ( ! unfree ) ) && + ( config.allowUnsupportedSystem || ( ! unsupported ) ); + homepage = "https://github.com/flox/etc-profiles"; + outputsToInstall = ["common_paths" "python3" "node" "out"]; + description = '' + Installable /etc/profile.d activation scripts for use with flox + ''; + longDescription = '' + An `/etc/profile' script to source `/etc/profile.d/*.sh` + + Users can define and install scripts in `/etc/profile.d' as + "custom packages"/installables to share common setup processes + across environments. + + Recommended usage: + # flox.nix + { + packages.nixpkgs-flox.sqlite = { + meta.outputsToInstall = ["bin" "out" "dev"]; + }; + + # Provides developer environment hooks for use with python3. + packages.flox.etc-profiles = { + # Optionally, specify language packages to install. + # Please note that all/most language packs depend on including + # the "common_paths" output, and ALL depend on "out". + meta.outputsToInstall = ["out" "common_paths" "python3"]; + }; + + shell.hook = '${""}' + [[ -r "$FLOX_ENV/etc/profile" ]] && . "$FLOX_ENV/etc/profile"; + pkg-config --list-all >&2; + '${""}' + } + ''; + }; +} + + +# ---------------------------------------------------------------------------- # +# +# +# +# ============================================================================ # diff --git a/profile.d/0100_common-paths.sh b/profile.d/0100_common-paths.sh index 3cc8fec..f3f3f4c 100644 --- a/profile.d/0100_common-paths.sh +++ b/profile.d/0100_common-paths.sh @@ -28,18 +28,11 @@ export \ XDG_DATA_DIRS \ ; -case "$(uname -s)" in -Linux*) - if [ -z "${FLOX_NOSET_LD_AUDIT:-}" -a -e "$FLOX_ENV/lib/ld-floxlib.so" ]; then - LD_AUDIT="$FLOX_ENV/lib/ld-floxlib.so"; - export LD_AUDIT; - fi - ;; -Darwin*) - DYLD_FALLBACK_LIBRARY_PATH="$FLOX_ENV/lib:${DYLD_FALLBACK_LIBRARY_PATH:-/usr/local/lib:/usr/lib}"; - export DYLD_FALLBACK_LIBRARY_PATH; - ;; -esac +if [ -z "${FLOX_NOSET_LD_LIBRARY_PATH:-}" ]; then + LD_LIBRARY_PATH="$FLOX_ENV/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"; + export LD_LIBRARY_PATH; +fi + # ---------------------------------------------------------------------------- # # diff --git a/profile.d/0500_node.sh b/profile.d/0500_node.sh index e37843f..3627443 100644 --- a/profile.d/0500_node.sh +++ b/profile.d/0500_node.sh @@ -5,7 +5,7 @@ # ---------------------------------------------------------------------------- # # Only run if `node' is in `PATH' -if command -v node >/dev/null; then +if node --version >/dev/null 2>/dev/null; then NODE_PATH="$FLOX_ENV/lib/node_modules${NODE_PATH:+:$NODE_PATH}"; export NODE_PATH; fi diff --git a/profile.d/0500_python3.sh b/profile.d/0500_python3.sh index 9fbbc8d..b1a8fab 100644 --- a/profile.d/0500_python3.sh +++ b/profile.d/0500_python3.sh @@ -5,7 +5,7 @@ # ---------------------------------------------------------------------------- # # Only run if `python3' is in `PATH' -if command -v python3 >/dev/null; then +if python3 --version >/dev/null 2>/dev/null; then # Get the major/minor version from `python3' to determine the correct path. _env_pypath="$FLOX_ENV/lib/python$( python3 -c 'import sys