colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #278027 from strager/quick-lint-js-3.0.0

Browse Source 
quick-lint-js: 2.19.0 -> 3.0.0
This commit is contained in:
kirillrdy 2024-02-04 17:40:10 +11:00 committed by GitHub
commit 5d75993fa5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkgs/development/tools/quick-lint-js/build-tools-install.patch
View File

@ -1,32 +0,0 @@
From 3923f0df76d24b73d57f15eec61ab190ea048093 Mon Sep 17 00:00:00 2001
From: "Matthew \"strager\" Glazar" <strager.nds@gmail.com>
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

6
pkgs/development/tools/quick-lint-js/default.nix
View File

@ -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;