From 4b4697c8dd66bd2b1e4d6b831bbde46e27d62c46 Mon Sep 17 00:00:00 2001
From: Justus Winter <teythoon@avior.uberspace.de>
Date: Tue, 21 Jul 2020 16:10:12 +0200
Subject: [PATCH 1/2] Unbundle googletest.

---
 src/tests/CMakeLists.txt          | 2 +-
 src/tests/gtest-CMakeLists.txt.in | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 0a841666..d3c4fbe6 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -53,7 +53,7 @@ endif()
 # maintain compiler/linker settings on Windows
 set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
 # add to our build (provides gtest_main target)
-add_subdirectory(${CMAKE_CURRENT_BINARY_DIR}/googletest-src
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/googletest-src
                  ${CMAKE_CURRENT_BINARY_DIR}/googletest-build
                  EXCLUDE_FROM_ALL)
 
diff --git a/src/tests/gtest-CMakeLists.txt.in b/src/tests/gtest-CMakeLists.txt.in
index a43e8e5d..3cc0ddd5 100644
--- a/src/tests/gtest-CMakeLists.txt.in
+++ b/src/tests/gtest-CMakeLists.txt.in
@@ -4,9 +4,9 @@ project(googletest-download NONE)
 
 include(ExternalProject)
 ExternalProject_Add(googletest
-  GIT_REPOSITORY    https://github.com/google/googletest.git
-  GIT_TAG           c43f710
-  SOURCE_DIR        "${CMAKE_CURRENT_BINARY_DIR}/googletest-src"
+#  GIT_REPOSITORY    https://github.com/google/googletest.git
+#  GIT_TAG           c43f710
+  SOURCE_DIR        "${CMAKE_CURRENT_SOURCE_DIR}/googletest-src"
   BINARY_DIR        "${CMAKE_CURRENT_BINARY_DIR}/googletest-build"
   CONFIGURE_COMMAND ""
   BUILD_COMMAND     ""
-- 
2.20.1

bafbf0ed99d'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=5b18fe9cf9197f949373a1ece52c4bafbf0ed99d'>root</a>/<a href='/guix/log/etc?id=5b18fe9cf9197f949373a1ece52c4bafbf0ed99d'>etc</a>/<a href='/guix/log/etc/completion?id=5b18fe9cf9197f949373a1ece52c4bafbf0ed99d'>completion</a>/<a href='/guix/log/etc/completion/zsh?id=5b18fe9cf9197f949373a1ece52c4bafbf0ed99d'>zsh</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/etc/completion/zsh?id=5b18fe9cf9197f949373a1ece52c4bafbf0ed99d&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-10-24 20:17:05 +0200'>2021-10-24</span></td><td><a href='/guix/commit/etc/completion/zsh?id=55f6d9e818512b4e3e4adacfa99deb201b6854be'>etc: completion: Filter gratuitous spaces from available packages.</a><span class='msg-avail'>...<span class='msg-tooltip'>Tested with:

  guix environment --{ad-hoc,pure} zsh guix bash-completion coreutils -- zsh
  % fpath=(~/guix/etc/completion/zsh $fpath)
  % autoload -U compinit; compinit

* etc/completion/zsh/_guix (_guix_list_available_packages): Remove spaces.

Co-authored-by: Tobias Geerinckx-Rice &lt;me@tobias.gr&gt;
</span></span></td><td>Liliana Marie Prikler</td></tr>
<tr><td><span title='2021-08-28 17:57:50 +0200'>2021-08-28</span></td><td><a href='/guix/commit/etc/completion/zsh?id=a8dd285d5a0670abf124a721e6ba94da045b24ba'>zsh completion: Add missing commands and arguments.</a><span class='msg-avail'>...<span class='msg-tooltip'>* etc/completion/zsh/_guix (_guix_install, _guix_remove, _guix_upgrade):
  New functions.
  (_guix_build, _guix_challenge, _guix_download, _guix_environment,
  _guix_packages, _guix_gc, _guix_hash, _guix_lint, _guix_package,
  _guix_publish, _guix_pull, _guix_refresh, _guix_size, _guix_system):
  Add some of the missing arguments.
  (_guix_cmds): Add missing commands.

Co-authored-by: Brice Waegeneire &lt;brice@waegenei.re&gt;
</span></span></td><td>Noah Evans</td></tr>
<tr><td><span title='2021-02-17 10:52:28 +0100'>2021-02-17</span></td><td><a href='/guix/commit/etc/completion/zsh?id=ee2a5da80a9bda25542c00a7a35a9ddddcbd58af'>scripts: system: Remove 'vm-image' command.</a><span class='msg-avail'>...<span class='msg-tooltip'>Remove the 'vm-image' command that has been superseded by the 'image'
command.

* gnu/system/vm.scm (system-qemu-image): Remove it.
* guix/scripts/system.scm (system-derivation-for-action): Mark 'vm-image'
command as deprecated and use the image API to produce the VM image.
(perform-action, show-help): Adapt accordingly.
* tests/guix-system.sh: Ditto.
* doc/guix.texi (Invoking guix system,
Running Guix in a VM): Ditto.
* etc/completion/fish/guix.fish: Ditto.
* etc/completion/zsh/_guix: Ditto.
</span></span></td><td>Mathieu Othacehe</td></tr>