diff --git a/default.nix b/default.nix deleted file mode 100644 index afce557..0000000 --- a/default.nix +++ /dev/null @@ -1 +0,0 @@ -{ pkgs ? import {} }: pkgs.callPackage ./nix/package.nix {} diff --git a/docs/installation.md b/docs/installation.md index 74ba747..b16c325 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -26,8 +26,7 @@ I think `fennel-ls` and `fennel-ls-git` may be in the AUR. #### NixOS -If you are using NixOS, you can use the included `/flake.nix` or -`/default.nix`. +Included in [nixpkgs](https://github.com/NixOS/nixpkgs/blob/master/pkgs/by-name/fe/fennel-ls/package.nix) #### Debian/Ubuntu diff --git a/flake.lock b/flake.lock deleted file mode 100644 index 342ddab..0000000 --- a/flake.lock +++ /dev/null @@ -1,57 +0,0 @@ -{ - "nodes": { - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 0, - "narHash": "sha256-S+S97c/HzkO2A/YsU7ZmNF9w2s7Xk6P8dzmfDdckzLs=", - "path": "/nix/store/sb3x0gk95v9h285ch8cdqv3gfjp97p1b-source", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "root": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/flake.nix b/flake.nix deleted file mode 100644 index cb06dbd..0000000 --- a/flake.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - description = "A language server for fennel"; - - inputs.flake-utils.url = "github:numtide/flake-utils"; - - outputs = { self, nixpkgs, flake-utils }: - flake-utils.lib.eachDefaultSystem (system: - let - pkgs = import nixpkgs { inherit system; }; - inherit (flake-utils.lib) mkApp; - inherit (pkgs) callPackage; - in - { - packages = { - fennel_ls = callPackage ./nix/package.nix { - version = self.shortRev or self.shortDirtyRev or self.lastModifiedDate; - }; - default = self.packages.${system}.fennel_ls; - }; - - devShells = { - fennel_ls = callPackage ./nix/shell.nix { - fennel_ls = self.packages.${system}.fennel_ls; - }; - - default = self.devShells.${system}.fennel_ls; - }; - - apps = rec { - fennel_ls = mkApp { - drv = self.packages.${system}.fennel_ls; - exePath = "/bin/fennel-ls"; - }; - default = self.apps.${system}.fennel_ls; - }; - } - ); -} diff --git a/nix/package.nix b/nix/package.nix deleted file mode 100644 index bc4807b..0000000 --- a/nix/package.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ version ? "dirty" -, stdenv -, lua -}: stdenv.mkDerivation { - pname = "fennel_ls"; - inherit version; - - src = ./..; - - makeFlags = [ "PREFIX=$(out)" ]; - - buildInputs = [ lua ]; - - doCheck = true; - -} diff --git a/nix/shell.nix b/nix/shell.nix deleted file mode 100644 index aa44249..0000000 --- a/nix/shell.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ callPackage -, fennel_ls ? callPackage ./package.nix { } -, mkShell -}: mkShell { - buildInputs = fennel_ls.buildInputs or [ ]; - nativeBuildInputs = fennel_ls.nativeBuildInputs or [ ]; -}