From f69d3d2ee681b36f401bd3d26ba10e3747ad3f6b Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Wed, 17 Aug 2022 15:36:31 +0200 Subject: [PATCH] Remove marksman --- .github/workflows/build.yml | 2 -- README.md | 1 - overlay.nix | 1 - packages.nix | 1 - packages/marksman.nix | 44 ------------------------------------- 5 files changed, 49 deletions(-) delete mode 100644 packages/marksman.nix diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1f6cf7f..ec879f1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,6 @@ jobs: authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - run: nix build '.#fennel-luajit' - run: nix build '.#luarocks-jsregexp' - - run: nix build '.#marksman' - run: nix build '.#q' build-x86_64-darwin: @@ -38,6 +37,5 @@ jobs: - run: nix build '.#cliclick' - run: nix build '.#fennel-luajit' - run: nix build '.#luarocks-jsregexp' - - run: nix build '.#marksman' - run: nix build '.#phantomjs' - run: nix build '.#q' diff --git a/README.md b/README.md index 742dba2..8fa3557 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,5 @@ * [cliclick](https://github.com/BlueM/cliclick) * fennel-luajit * [luarocks-jsregexp](https://github.com/kmarius/jsregexp) -* [marksman](https://github.com/artempyanykh/marksman) * [phantomjs](https://github.com/ariya/phantomjs) * [q](https://github.com/natesales/q) diff --git a/overlay.nix b/overlay.nix index d403eab..a477fa6 100644 --- a/overlay.nix +++ b/overlay.nix @@ -8,7 +8,6 @@ in inherit (custom) cliclick; inherit (custom) fennel-luajit; inherit (custom) luarocks-jsregexp; - inherit (custom) marksman; inherit (custom) phantomjs; inherit (custom) q; } diff --git a/packages.nix b/packages.nix index 0686a65..c21b00c 100644 --- a/packages.nix +++ b/packages.nix @@ -5,7 +5,6 @@ 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; }; - marksman = import ./packages/marksman.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/marksman.nix b/packages/marksman.nix deleted file mode 100644 index 32846da..0000000 --- a/packages/marksman.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ system, lib, pkgs }: - -let - osSuffix = if pkgs.stdenv.isDarwin then "macos" else "linux"; - - osHash = - if pkgs.stdenv.isDarwin then - "00bl5ls0lmcz24xxykjlgr99dx74rcs9ia0hp6xf5hck9239vxik" - else - "1vsk66nwp39xbivvawrz50y8y7za4xdclq61pl5ry77dbj8pv6np"; -in -pkgs.stdenv.mkDerivation rec { - pname = "marksman"; - version = "2022-08-15"; - - src = pkgs.fetchurl { - url = "https://github.com/artempyanykh/${pname}/releases/download/${version}/marksman-${osSuffix}"; - sha256 = osHash; - }; - - unpackPhase = '' - echo "$src is already the binary" - true - ''; - - dontStrip = true; - - installPhase = '' - install -D $src $out/bin/marksman - ''; - - doInstallCheck = true; - - installCheckPhase = '' - $out/bin/marksman --version - ''; - - meta = with lib; { - description = "Write Markdown with code assist and intelligence in the comfort of your favourite editor"; - homepage = "https://github.com/artempyanykh/marksman"; - license = licenses.mit; - platforms = [ "x86_64-darwin" "x86_64-linux" ]; - }; -}