From aa04cebd9b34cf4019d5f286076404c74a9ed8dd Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Mon, 26 Sep 2022 13:42:50 +0200 Subject: [PATCH] Remove fennel-luajit --- .github/workflows/build.yml | 2 -- README.md | 1 - overlay.nix | 1 - packages.nix | 1 - packages/fennel-luajit.nix | 16 ---------------- 5 files changed, 21 deletions(-) delete mode 100644 packages/fennel-luajit.nix diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ec879f1..c8f006e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,6 @@ jobs: with: name: nifoc authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - - run: nix build '.#fennel-luajit' - run: nix build '.#luarocks-jsregexp' - run: nix build '.#q' @@ -35,7 +34,6 @@ jobs: name: nifoc authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - run: nix build '.#cliclick' - - run: nix build '.#fennel-luajit' - run: nix build '.#luarocks-jsregexp' - run: nix build '.#phantomjs' - run: nix build '.#q' diff --git a/README.md b/README.md index 8fa3557..6aaa2ce 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,6 @@ * [agilebits-op](https://app-updates.agilebits.com/product_history/CLI2) * [cliclick](https://github.com/BlueM/cliclick) -* fennel-luajit * [luarocks-jsregexp](https://github.com/kmarius/jsregexp) * [phantomjs](https://github.com/ariya/phantomjs) * [q](https://github.com/natesales/q) diff --git a/overlay.nix b/overlay.nix index a477fa6..de0e5d2 100644 --- a/overlay.nix +++ b/overlay.nix @@ -6,7 +6,6 @@ in { inherit (custom) agilebits-op; inherit (custom) cliclick; - inherit (custom) fennel-luajit; inherit (custom) luarocks-jsregexp; inherit (custom) phantomjs; inherit (custom) q; diff --git a/packages.nix b/packages.nix index c21b00c..fb33dc0 100644 --- a/packages.nix +++ b/packages.nix @@ -3,7 +3,6 @@ { agilebits-op = import ./packages/agilebits-op.nix { inherit system lib pkgs; }; cliclick = import ./packages/cliclick.nix { inherit system lib pkgs; }; - fennel-luajit = import ./packages/fennel-luajit.nix { inherit system lib pkgs; }; luarocks-jsregexp = import ./packages/luarocks-jsregexp.nix { inherit system lib pkgs; }; phantomjs = import ./packages/phantomjs.nix { inherit system lib pkgs; }; q = import ./packages/q.nix { inherit system lib pkgs; }; diff --git a/packages/fennel-luajit.nix b/packages/fennel-luajit.nix deleted file mode 100644 index c1fab2a..0000000 --- a/packages/fennel-luajit.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ system, lib, pkgs }: - -pkgs.fennel.overrideAttrs ( - let - luaPackages = with pkgs.luajitPackages; [ readline ]; - in - o: rec { - buildInputs = [ pkgs.luajit pkgs.makeWrapper ] ++ luaPackages; - - postInstall = o.postInstall or "" + '' - wrapProgram $out/bin/fennel \ - --suffix LUA_CPATH ";" "${lib.concatMapStringsSep ";" pkgs.luajitPackages.getLuaCPath luaPackages}" \ - --suffix LUA_PATH ";" "${lib.concatMapStringsSep ";" pkgs.luajitPackages.getLuaPath luaPackages}" - ''; - } -)