From 7267c72d32af2f40f78acd4f02e4fc7a41b4158b Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Thu, 2 May 2024 20:00:59 -0700 Subject: [PATCH] Remove flake-compat, add readme flake-compat is a kind of unhelpful thing to add here since it makes it impossible to update lix separately from its module when not using flakes. We would like non-flakes users to not use the flake by using module.nix directly. --- README.md | 5 +++++ default.nix | 10 ---------- flake.lock | 16 ---------------- flake.nix | 1 - 4 files changed, 5 insertions(+), 27 deletions(-) create mode 100644 README.md delete mode 100644 default.nix diff --git a/README.md b/README.md new file mode 100644 index 0000000..c86dc5c --- /dev/null +++ b/README.md @@ -0,0 +1,5 @@ +# Lix NixOS module + +See the [beta guide][beta-guide] for details on how to use this: + +[beta-guide]: https://wiki.lix.systems/link/1 diff --git a/default.nix b/default.nix deleted file mode 100644 index b25de19..0000000 --- a/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -(import - ( - let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in - fetchTarball { - url = lock.nodes.flake-compat.locked.url or "https://git.lix.systems/lix-project/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; - sha256 = lock.nodes.flake-compat.locked.narHash; - } - ) - { src = ./.; } -).defaultNix diff --git a/flake.lock b/flake.lock index 70759fc..6c991e3 100644 --- a/flake.lock +++ b/flake.lock @@ -1,20 +1,5 @@ { "nodes": { - "flake-compat": { - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "ref": "refs/heads/master", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "git", - "url": "ssh://git@git.lix.systems/lix-project/flake-compat" - }, - "original": { - "type": "git", - "url": "ssh://git@git.lix.systems/lix-project/flake-compat" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -82,7 +67,6 @@ }, "root": { "inputs": { - "flake-compat": "flake-compat", "flake-utils": "flake-utils", "flakey-profile": "flakey-profile", "lix": "lix", diff --git a/flake.nix b/flake.nix index c83e664..c0769d9 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,6 @@ flake = false; }; inputs.flake-utils.url = "github:numtide/flake-utils"; - inputs.flake-compat.url = "git+ssh://git@git.lix.systems/lix-project/flake-compat"; inputs.flakey-profile.url = "github:lf-/flakey-profile"; outputs = inputs@{ self, nixpkgs, lix, flake-utils, flakey-profile, ... }: