diff --git a/pkgs/development/tools/continuous-integration/laminar/default.nix b/pkgs/development/tools/continuous-integration/laminar/default.nix index 8d06ff94a032..dc1eac59ceda 100644 --- a/pkgs/development/tools/continuous-integration/laminar/default.nix +++ b/pkgs/development/tools/continuous-integration/laminar/default.nix @@ -14,14 +14,9 @@ let url = "https://cdnjs.cloudflare.com/ajax/libs/vue/2.6.12/vue.min.js"; sha256 = "1hm5kci2g6n5ikrvp1kpkkdzimjgylv1xicg2vnkbvd9rb56qa99"; }; - js.vue-router = fetchurl { - url = - "https://cdnjs.cloudflare.com/ajax/libs/vue-router/3.4.8/vue-router.min.js"; - sha256 = "0418waib896ywwxkxliip75zp94k3s9wld51afrqrcq70axld0c9"; - }; js.ansi_up = fetchurl { - url = "https://raw.githubusercontent.com/drudru/ansi_up/v1.3.0/ansi_up.js"; - sha256 = "1993dywxqi2ylnxybwk7m0s0bg2bq7kfllpyr0s8ck6chd0p8i6r"; + url = "https://raw.githubusercontent.com/drudru/ansi_up/v4.0.4/ansi_up.js"; + sha256 = "1dx8wn38ds8d01kkih26fx1yrisg3kpz61qynjr4zil03ap0hrlr"; }; js.Chart = fetchurl { url = "https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.min.js"; @@ -29,10 +24,10 @@ let }; in stdenv.mkDerivation rec { pname = "laminar"; - version = "1.0"; + version = "1.1"; src = fetchurl { url = "https://github.com/ohwgiles/laminar/archive/${version}.tar.gz"; - sha256 = "11m6h3rdmj2rsmsryy7r40gqccj4gg1cnqwy6blscs87gx4s423g"; + sha256 = "1lzfmfjygmbdr2n1q49kwwffw8frz5y6iczhdz5skwmzwg0chbsf"; }; patches = [ ./patches/no-network.patch ]; nativeBuildInputs = [ cmake pandoc ]; @@ -40,7 +35,6 @@ in stdenv.mkDerivation rec { preBuild = '' mkdir -p js css cp ${js.vue} js/vue.min.js - cp ${js.vue-router} js/vue-router.min.js cp ${js.ansi_up} js/ansi_up.js cp ${js.Chart} js/Chart.min.js ''; diff --git a/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch b/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch index 355baeb837a5..33683fdb1519 100644 --- a/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch +++ b/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch @@ -4,25 +4,23 @@ does so unconditionally is twice as bad. Required files are downloaded as separate fixed-output derivations and put into correct location before build phase starts. ---- laminar-0.8/CMakeLists.txt -+++ laminar-0.8-new/CMakeLists.txt -@@ -82,15 +82,6 @@ +--- laminar-1.1/CMakeLists.txt ++++ laminar-1.1-new/CMakeLists.txt +@@ -82,13 +82,6 @@ COMMAND sh -c '( echo -n "\\#define INDEX_HTML_UNCOMPRESSED_SIZE " && wc -c < "${CMAKE_SOURCE_DIR}/src/resources/index.html" ) > index_html_size.h' DEPENDS src/resources/index.html) -# Download 3rd-party frontend JS libs... -file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/vue/2.6.12/vue.min.js - js/vue.min.js EXPECTED_MD5 fb192338844efe86ec759a40152fcb8e) --file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/vue-router/3.4.8/vue-router.min.js -- js/vue-router.min.js EXPECTED_MD5 5f51d4dbbf68fd6725956a5a2b865f3b) --file(DOWNLOAD https://raw.githubusercontent.com/drudru/ansi_up/v1.3.0/ansi_up.js -- js/ansi_up.js EXPECTED_MD5 158566dc1ff8f2804de972f7e841e2f6) +-file(DOWNLOAD https://raw.githubusercontent.com/drudru/ansi_up/v4.0.4/ansi_up.js +- js/ansi_up.js EXPECTED_MD5 b31968e1a8fed0fa82305e978161f7f5) -file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.min.js - js/Chart.min.js EXPECTED_MD5 f6c8efa65711e0cbbc99ba72997ecd0e) # ...and compile them - generate_compressed_bins(${CMAKE_BINARY_DIR} js/vue-router.min.js js/vue.min.js + generate_compressed_bins(${CMAKE_BINARY_DIR} js/vue.min.js js/ansi_up.js js/Chart.min.js) -@@ -141,12 +132,12 @@ +@@ -139,12 +132,12 @@ target_link_libraries(laminar-tests ${GTEST_LIBRARY} capnp-rpc capnp kj-http kj-async kj pthread sqlite3 z) endif()