diff options
Diffstat (limited to 'nixpkgs/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch')
| -rw-r--r-- | nixpkgs/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch b/nixpkgs/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch index 80e74de95aa2..355baeb837a5 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch +++ b/nixpkgs/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch @@ -6,21 +6,36 @@ put into correct location before build phase starts. --- laminar-0.8/CMakeLists.txt +++ laminar-0.8-new/CMakeLists.txt -@@ -69,17 +69,6 @@ +@@ -82,15 +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.3.4/vue.min.js -- js/vue.min.js EXPECTED_MD5 ae2fca1cfa0e31377819b1b0ffef704c) --file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/vue-router/2.7.0/vue-router.min.js -- js/vue-router.min.js EXPECTED_MD5 5d3e35710dbe02de78c39e3e439b8d4e) +-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://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.min.js - js/Chart.min.js EXPECTED_MD5 f6c8efa65711e0cbbc99ba72997ecd0e) --file(DOWNLOAD https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css -- css/bootstrap.min.css EXPECTED_MD5 5d5357cb3704e1f43a1f5bfed2aebf42) # ...and compile them generate_compressed_bins(${CMAKE_BINARY_DIR} js/vue-router.min.js js/vue.min.js - js/ansi_up.js js/Chart.min.js css/bootstrap.min.css) + js/ansi_up.js js/Chart.min.js) +@@ -141,12 +132,12 @@ + target_link_libraries(laminar-tests ${GTEST_LIBRARY} capnp-rpc capnp kj-http kj-async kj pthread sqlite3 z) + endif() + +-set(SYSTEMD_UNITDIR /lib/systemd/system CACHE PATH "Path to systemd unit files") +-set(BASH_COMPLETIONS_DIR /usr/share/bash-completion/completions CACHE PATH "Path to bash completions directory") +-set(ZSH_COMPLETIONS_DIR /usr/share/zsh/site-functions CACHE PATH "Path to zsh completions directory") ++set(SYSTEMD_UNITDIR lib/systemd/system CACHE PATH "Path to systemd unit files") ++set(BASH_COMPLETIONS_DIR usr/share/bash-completion/completions CACHE PATH "Path to bash completions directory") ++set(ZSH_COMPLETIONS_DIR usr/share/zsh/site-functions CACHE PATH "Path to zsh completions directory") + install(TARGETS laminard RUNTIME DESTINATION sbin) + install(TARGETS laminarc RUNTIME DESTINATION bin) +-install(FILES etc/laminar.conf DESTINATION /etc) ++install(FILES etc/laminar.conf DESTINATION etc) + install(FILES etc/laminarc-completion.bash DESTINATION ${BASH_COMPLETIONS_DIR} RENAME laminarc) + install(FILES etc/laminarc-completion.zsh DESTINATION ${ZSH_COMPLETIONS_DIR} RENAME _laminarc) + |