From f563ca29d25fb5e65afdefaaab7a11826bb87802 Mon Sep 17 00:00:00 2001 From: Christoph Honal Date: Mon, 10 Jun 2024 15:57:41 +0200 Subject: [PATCH] lv_img_conv: Remove --- .../development/tools/lv_img_conv/default.nix | 64 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 -- 3 files changed, 1 insertion(+), 68 deletions(-) delete mode 100644 pkgs/development/tools/lv_img_conv/default.nix diff --git a/pkgs/development/tools/lv_img_conv/default.nix b/pkgs/development/tools/lv_img_conv/default.nix deleted file mode 100644 index e00b960c46b9..000000000000 --- a/pkgs/development/tools/lv_img_conv/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib -, stdenv -, buildNpmPackage -, fetchFromGitHub -, pkg-config -, python3 -, pixman -, libpng -, libjpeg -, librsvg -, giflib -, cairo -, pango -, nodePackages -, makeWrapper -, CoreText -, nix-update-script -}: - -buildNpmPackage rec { - pname = "lv_img_conv"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "lvgl"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-LB7NZKwrpvps1cKzRoARHL4S48gBHadvxwA6JMmm/ME="; - }; - - npmDepsHash = "sha256-uDF22wlL3BlMQ/+Wmtgyjp4CVN6sDnjqjEPB4SeQuPk="; - - nativeBuildInputs = [ - pkg-config - python3 - makeWrapper - ]; - - buildInputs = [ - pixman - libpng - libjpeg - librsvg - giflib - cairo - pango - ] ++ lib.optionals stdenv.isDarwin [ - CoreText - ]; - - postInstall = '' - makeWrapper ${nodePackages.ts-node}/bin/ts-node $out/bin/lv_img_conv --add-flags $out/lib/node_modules/lv_img_conv/lib/cli.ts - ''; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - changelog = "https://github.com/lvgl/lv_img_conv/releases/tag/v${version}"; - description = "Image converter for LVGL"; - homepage = "https://github.com/lvgl/lv_img_conv"; - license = licenses.mit; - maintainers = with maintainers; [ stargate01 ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b3060ead0e19..c9cc5ced90ba 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -774,6 +774,7 @@ mapAliases ({ lobster-two = google-fonts; # Added 2021-07-22 luxcorerender = throw "'luxcorerender' has been removed as it's unmaintained and broken in nixpkgs since a while ago"; # Added 2023-06-07 + lv_img_conv = throw "'lv_img_conv' has been removed from nixpkgs as it is broken"; # Added 2024-06-18 lxd = lib.warn "lxd has been renamed to lxd-lts" lxd-lts; # Added 2024-04-01 lxd-unwrapped = lib.warn "lxd-unwrapped has been renamed to lxd-unwrapped-lts" lxd-unwrapped-lts; # Added 2024-04-01 lzma = xz; # moved from top-level 2021-03-14 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a145ec53318..7e8ddd82b9a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10430,10 +10430,6 @@ with pkgs; lv = callPackage ../tools/text/lv { }; - lv_img_conv = callPackage ../development/tools/lv_img_conv { - inherit (darwin.apple_sdk.frameworks) CoreText; - }; - lwc = callPackage ../tools/misc/lwc { }; lxd-image-server = callPackage ../tools/virtualization/lxd-image-server { };