From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Wed, 3 Oct 2018 23:30:42 +0200
Subject: [PATCH] bastet: Change source of unordered_set.

This allows building bastet 0.43.2 with boost >=1.66.
It was backported verbatim from the upstream master branch.

From 0e03f8d4d6bc6949cf1c447e632ce0d1b98c4be1 Mon Sep 17 00:00:00 2001
From: Federico Poloni <fpoloni@di.unipi.it>
Date: Wed, 4 Oct 2017 19:35:01 +0200
Subject: [PATCH] Changed source of unordered_set (should hopefully fix #6
 without reopening #1)

---
 BastetBlockChooser.hpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/BastetBlockChooser.hpp b/BastetBlockChooser.hpp
index 992e556..7ee3b7c 100644
--- a/BastetBlockChooser.hpp
+++ b/BastetBlockChooser.hpp
@@ -23,8 +23,7 @@
 
 #include "Well.hpp"
 
-#include <boost/tr1/tr1/unordered_set>
-#include <set>
+#include <boost/unordered_set.hpp>
 #include <boost/functional/hash.hpp>
 
 namespace Bastet{
@@ -75,7 +74,7 @@ namespace Bastet{
   public:
     Searcher(BlockType b, const Well *well, Vertex v, WellVisitor *visitor);
   private:
-    std::tr1::unordered_set<Vertex> _visited;
+    boost::unordered_set<Vertex> _visited;
     //std::set<Vertex> _visited; ^^ the above is more efficient, we need to do many inserts
     BlockType _block;
     const Well *_well;
=389ce4e42b1ee031126bb6c339c0ba7b683ea596'>tree</a><a href='/guix/commit/build-aux/test-env.in?id=389ce4e42b1ee031126bb6c339c0ba7b683ea596'>commit</a><a href='/guix/diff/build-aux/test-env.in?id=389ce4e42b1ee031126bb6c339c0ba7b683ea596'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/build-aux/test-env.in'>
<input type='hidden' name='id' value='389ce4e42b1ee031126bb6c339c0ba7b683ea596'/><input type='hidden' name='showmsg' value='1'/><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=389ce4e42b1ee031126bb6c339c0ba7b683ea596&amp;showmsg=1'>root</a>/<a href='/guix/log/build-aux?id=389ce4e42b1ee031126bb6c339c0ba7b683ea596&amp;showmsg=1'>build-aux</a>/<a href='/guix/log/build-aux/test-env.in?id=389ce4e42b1ee031126bb6c339c0ba7b683ea596&amp;showmsg=1'>test-env.in</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/build-aux/test-env.in?id=389ce4e42b1ee031126bb6c339c0ba7b683ea596'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2021-04-20 12:13:16 +0200'>2021-04-20</span></td><td class='logsubject'><a href='/guix/commit/build-aux/test-env.in?id=d95168321f4a9bf6857b598da0a183b45a868d54'>import: Remove Nix importer.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
This importer has suffered from bitrot and no longer works with current
Nix and Nixpkgs.  See &lt;https://bugs.gnu.org/32339&gt; and
&lt;https://bugs.gnu.org/36255&gt;.

* guix/import/snix.scm, guix/scripts/import/nix.scm,
tests/snix.scm: Remove.
* Makefile.am (MODULES, SCM_TESTS): Remove them.
* guix/scripts/import.scm (importers): Remove "nix".
* build-aux/test-env.in: Remove NIXPKGS variable.
* configure.ac: Remove '--with-nixpkgs' option.
* doc/guix.texi (Invoking guix import): Remove bit about "guix import
nix".
* etc/completion/fish/guix.fish: Likewise.


</td></tr>
<tr class='logheader'><td><span title='2019-10-16 22:53:40 +0200'>2019-10-16</span></td><td class='logsubject'><a href='/guix/commit/build-aux/test-env.in?id=a1aaca314ca94700ebe3449d6bd73522f2d243bc'>build: Remove references to 'NIX_LOCALSTATE_DIR'.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* build-aux/test-env.in: Remove references to 'NIX_LOCALSTATE_DIR'.


</td></tr>
<tr class='logheader'><td><span title='2019-10-16 22:53:40 +0200'>2019-10-16</span></td><td class='logsubject'><a href='/guix/commit/build-aux/test-env.in?id=47e99e626b46b2fc433506a822d251de68ad6241'>daemon: Remove traces of 'NIX_ROOT_FINDER'.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
This is a followup to 2e3e5d21988fc2cafb2a9eaf4b00976ea425629d.

* build-aux/test-env.in: Remove mentions of 'NIX_ROOT_FINDER'.
* nix/libstore/gc.cc (LocalStore::collectGarbage): Adjust comment
accordingly.


</td></tr>
<tr class='logheader'><td><span title='2019-02-04 00:03:30 +0100'>2019-02-04</span></td><td class='logsubject'><a href='/guix/commit/build-aux/test-env.in?id=a87d66f371da2a84d7bba1cae58b71c9c9af73aa'>daemon: Rename 'NIX_STATE_DIR' and 'NIX_DB_DIR' environment variables.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
Fixes &lt;https://bugs.gnu.org/22459&gt;.
Reported by Jeff Mickey &lt;j@codemac.net&gt;.

* guix/config.scm.in (%state-directory): Change NIX_STATE_DIR to
GUIX_STATE_DIRECTORY.
(%store-database-directory): Change NIX_DB_DIR to
GUIX_DATABASE_DIRECTORY.
* nix/libstore/globals.cc (Settings::processEnvironment): Likewise.
* guix/self.scm (make-config.scm): Likewise.
* build-aux/build-self.scm (make-config.scm): Likewise.
* build-aux/test-env.in: Likewise.
* tests/derivations.scm ("derivation #:leaked-env-vars"): Likewise.
* tests/guix-build.sh (GUIX_DAEMON_SOCKET): Likewise.
* tests/guix-daemon.sh (socket): Likewise.


</td></tr>
<tr class='logheader'><td><span title='2018-05-13 23:16:16 +0200'>2018-05-13</span></td><td class='logsubject'><a href='/guix/commit/build-aux/test-env.in?id=9e7b87ddc51c640c529d445e350c3d6ef43e301d'>build: 'test-env' does not 'guix download' non-existent files.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
Reported by uniq10.

* build-aux/test-env.in: Check whether FILE exists before invoking 'guix
download'.


</td></tr>