From 3799f9d63a8a4c88f99dfb8fafe81cea253a8217 Mon Sep 17 00:00:00 2001 From: "Matthew \"strager\" Glazar" Date: Mon, 1 Jan 2024 02:48:33 -0500 Subject: [PATCH] quick-lint-js: 2.19.0 -> 3.0.0 --- .../quick-lint-js/build-tools-install.patch | 32 ------------------- .../tools/quick-lint-js/default.nix | 6 ++-- 2 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 pkgs/development/tools/quick-lint-js/build-tools-install.patch diff --git a/pkgs/development/tools/quick-lint-js/build-tools-install.patch b/pkgs/development/tools/quick-lint-js/build-tools-install.patch deleted file mode 100644 index 2326170d5236..000000000000 --- a/pkgs/development/tools/quick-lint-js/build-tools-install.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 3923f0df76d24b73d57f15eec61ab190ea048093 Mon Sep 17 00:00:00 2001 -From: "Matthew \"strager\" Glazar" -Date: Thu, 26 Oct 2023 18:08:30 -0400 -Subject: [PATCH] fix(build): fix installing build tools for cross-compilation - -'cmake --install . --component build-tools' copies no files [1]. This -was caused by commit 1f2e1a47 where the code calling install() became -dead code on accident. Call install() so that 'cmake --install' copies -the build artifacts as intended. - -[1] https://github.com/quick-lint/quick-lint-js/issues/1099 - -Refs: 1f2e1a4701793cac24eaac44d7af81a8b820b1bc ---- - docs/CHANGELOG.md | 7 +++++++ - tools/CMakeLists.txt | 1 - - 2 files changed, 7 insertions(+), 1 deletion(-) - - (docs/CHANGELOG.md changes omitted to reduce conflicts.) - -diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt -index 71ccbdf1b..b541afb52 100644 ---- a/tools/CMakeLists.txt -+++ b/tools/CMakeLists.txt -@@ -68,7 +68,6 @@ if (QUICK_LINT_JS_ENABLE_BUILD_TOOLS) - COMMENT "Building all quick-lint-js build-time tools" - DEPENDS ${QUICK_LINT_JS_BUILD_TOOL_TARGETS} - ) --elseif (QUICK_LINT_JS_ENABLE_BUILD_TOOLS) - install( - TARGETS ${QUICK_LINT_JS_BUILD_TOOL_TARGETS} - COMPONENT build-tools diff --git a/pkgs/development/tools/quick-lint-js/default.nix b/pkgs/development/tools/quick-lint-js/default.nix index 32c61c836b96..794e00f0908b 100644 --- a/pkgs/development/tools/quick-lint-js/default.nix +++ b/pkgs/development/tools/quick-lint-js/default.nix @@ -1,21 +1,19 @@ { buildPackages, cmake, fetchFromGitHub, lib, ninja, stdenv, testers, quick-lint-js }: let - version = "2.17.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "quick-lint"; repo = "quick-lint-js"; rev = version; - sha256 = "sha256-5+Cyw1cLgBkTePNNFoNAF2oHnLQDHr4vHiaZHJrewug="; + hash = "sha256-7apzP37GK5ZbCxcWfjK1ID6sYa24uoS1GUH3CBDmcRA="; }; quick-lint-js-build-tools = buildPackages.stdenv.mkDerivation { pname = "quick-lint-js-build-tools"; inherit version src; - patches = [ ./build-tools-install.patch ]; - nativeBuildInputs = [ cmake ninja ]; doCheck = false;