From 87e36b9f189f56dd79778fd78cd21035d43822f8 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Thu, 2 May 2024 19:56:08 -0700 Subject: [PATCH] un-flakes your hub fixes #66 --- .github/workflows/flakehub-publish.yml | 18 ------------------ README.md | 19 +++++++++++++++++-- 2 files changed, 17 insertions(+), 20 deletions(-) delete mode 100644 .github/workflows/flakehub-publish.yml diff --git a/.github/workflows/flakehub-publish.yml b/.github/workflows/flakehub-publish.yml deleted file mode 100644 index c09fc64..0000000 --- a/.github/workflows/flakehub-publish.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: "Publish to FlakeHub" -on: - push: - tags: - - "v*.*.*" -jobs: - flakehub-publish: - runs-on: "ubuntu-latest" - permissions: - id-token: "write" - contents: "read" - steps: - - uses: "actions/checkout@v3" - - uses: "DeterminateSystems/nix-installer-action@main" - - uses: "DeterminateSystems/flakehub-push@main" - with: - name: "edolstra/flake-compat" - visibility: "public" diff --git a/README.md b/README.md index a444766..b865d74 100644 --- a/README.md +++ b/README.md @@ -2,10 +2,25 @@ ## Usage +> [!WARNING] +> During the Lix private beta period during which Forgejo is private, this +> requires configuring netrc in Lix for the tarball download to work. +> +> Your netrc should look something like so: +> ``` +> machine git.lix.systems login YOUR-USERNAME password SOME-PERSONAL-ACCESS-TOKEN-REPO-READ +> ``` +> +> We are terribly sorry for the UX for this being very bad +> ([issue](https://git.lix.systems/lix-project/lix/issues/254)). + To use, add the following to your `flake.nix`: + + ```nix -inputs.flake-compat.url = "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"; +inputs.flake-compat.url = "https://git.lix.systems/api/v1/repos/lix-project/flake-compat/archive/main.tar.gz"; ``` Afterwards, create a `default.nix` file containing the following: @@ -15,7 +30,7 @@ Afterwards, create a `default.nix` file containing the following: ( let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in fetchTarball { - url = lock.nodes.flake-compat.locked.url or "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; + url = lock.nodes.flake-compat.locked.url; sha256 = lock.nodes.flake-compat.locked.narHash; } )