diff --git a/pkgs/applications/office/marp/default.nix b/pkgs/applications/office/marp/default.nix deleted file mode 100644 index c223fa40cc4..00000000000 --- a/pkgs/applications/office/marp/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchurl, atomEnv, libXScrnSaver, gtk2 }: - -stdenv.mkDerivation rec { - pname = "marp"; - version = "0.0.14"; - - src = fetchurl { - url = "https://github.com/yhatt/marp/releases/download/v${version}/${version}-Marp-linux-x64.tar.gz"; - sha256 = "0nklzxwdx5llzfwz1hl2jpp2kwz78w4y63h5l00fh6fv6zisw6j4"; - }; - - unpackPhase = '' - mkdir {locales,resources} - tar --delay-directory-restore -xf $src - chmod u+x {locales,resources} - ''; - - installPhase = '' - mkdir -p $out/lib/marp $out/bin - cp -r ./* $out/lib/marp - ln -s $out/lib/marp/Marp $out/bin - ''; - - postFixup = '' - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${atomEnv.libPath}:${lib.makeLibraryPath [ libXScrnSaver gtk2 ]}:$out/lib/marp" \ - $out/bin/Marp - ''; - - meta = with lib; { - description = "Markdown presentation writer, powered by Electron"; - homepage = "https://yhatt.github.io/marp/"; - license = licenses.mit; - maintainers = [ maintainers.puffnfresh ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3daa67b1e17..2e42ed27b8f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -826,6 +826,7 @@ mapAliases ({ manpages = throw "'manpages' has been renamed to/replaced by 'man-pages'"; # Converted to throw 2022-02-22 marathon = throw "marathon has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 + marp = throw "marp has been removed from nixpkgs, as it's unmaintained and has security issues"; # Added 2022-06-04 matcha = throw "matcha was renamed to matcha-gtk-theme"; # added 2020-05-09 mathics = throw "mathics has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15 matrique = spectral; # Added 2020-01-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ac0b34ce0e..e1627a46f55 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28015,8 +28015,6 @@ with pkgs; electron = electron_9; }; - marp = callPackage ../applications/office/marp { }; - magnetico = callPackage ../applications/networking/p2p/magnetico { }; mastodon-bot = nodePackages.mastodon-bot;