Compare commits

..

No commits in common. "main" and "main" have entirely different histories.
main ... main

2 changed files with 20 additions and 14 deletions

View file

@ -2,14 +2,25 @@
## Usage ## 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`: To use, add the following to your `flake.nix`:
<!-- FIXME: this can use the standard non-api archive url when we are
un-privated -->
```nix ```nix
inputs.flake-compat = { inputs.flake-compat.url = "https://git.lix.systems/api/v1/repos/lix-project/flake-compat/archive/main.tar.gz";
url = "git+https://git.lix.systems/lix-project/flake-compat";
# Optional:
flake = false;
};
``` ```
Afterwards, create a `default.nix` file containing the following: Afterwards, create a `default.nix` file containing the following:
@ -17,13 +28,10 @@ Afterwards, create a `default.nix` file containing the following:
```nix ```nix
(import (import
( (
let let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in
lock = builtins.fromJSON (builtins.readFile ./flake.lock); fetchTarball {
inherit (lock.nodes.flake-compat.locked) narHash rev url; url = lock.nodes.flake-compat.locked.url;
in sha256 = lock.nodes.flake-compat.locked.narHash;
builtins.fetchTarball {
url = "${url}/archive/${rev}.tar.gz";
sha256 = narHash;
} }
) )
{ src = ./.; } { src = ./.; }

View file

@ -228,8 +228,6 @@ let
in in
rec { rec {
inputs = result.inputs // { self = result; };
defaultNix = defaultNix =
(builtins.removeAttrs result ["__functor"]) (builtins.removeAttrs result ["__functor"])
// (if result ? defaultPackage.${system} then { default = result.defaultPackage.${system}; } else {}) // (if result ? defaultPackage.${system} then { default = result.defaultPackage.${system}; } else {})