From ea2e23496672257dd1728ce36259249c3efb8aec Mon Sep 17 00:00:00 2001 From: Akshay Date: Tue, 19 Oct 2021 20:46:03 +0530 Subject: add default.nix and shell.nix with flake-compat --- default.nix | 6 ++++++ flake.lock | 17 ----------------- flake.nix | 5 ----- shell.nix | 6 ++++++ 4 files changed, 12 insertions(+), 22 deletions(-) create mode 100644 default.nix create mode 100644 shell.nix diff --git a/default.nix b/default.nix new file mode 100644 index 0000000..d4c7ec2 --- /dev/null +++ b/default.nix @@ -0,0 +1,6 @@ +# The `default.nix` in flake-compat reads `flake.nix` and `flake.lock` from `src` and +# returns an attribute set of the shape `{ defaultNix, shellNix }` + +(import (fetchTarball https://github.com/edolstra/flake-compat/archive/master.tar.gz) { + src = ./.; +}).defaultNix diff --git a/flake.lock b/flake.lock index e8d9eb6..372771c 100644 --- a/flake.lock +++ b/flake.lock @@ -1,21 +1,5 @@ { "nodes": { - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1627913399, - "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "import-cargo": { "locked": { "lastModified": 1594305518, @@ -65,7 +49,6 @@ }, "root": { "inputs": { - "flake-compat": "flake-compat", "import-cargo": "import-cargo", "mozillapkgs": "mozillapkgs", "nixpkgs": "nixpkgs" diff --git a/flake.nix b/flake.nix index f7f62aa..8a7c97a 100644 --- a/flake.nix +++ b/flake.nix @@ -8,11 +8,6 @@ flake = false; }; - flake-compat = { - url = "github:edolstra/flake-compat"; - flake = false; - }; - import-cargo.url = github:edolstra/import-cargo; }; diff --git a/shell.nix b/shell.nix new file mode 100644 index 0000000..9e96703 --- /dev/null +++ b/shell.nix @@ -0,0 +1,6 @@ +# The `default.nix` in flake-compat reads `flake.nix` and `flake.lock` from `src` and +# returns an attribute set of the shape `{ defaultNix, shellNix }` + +(import (fetchTarball https://github.com/edolstra/flake-compat/archive/master.tar.gz) { + src = ./.; +}).shellNix -- cgit v1.2.3