1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 21:01:16 +02:00

Merge remote-tracking branch 'origin/master' into flakes

This commit is contained in:
Eelco Dolstra 2020-06-17 10:26:52 +02:00
commit 1524752c17
139 changed files with 2586 additions and 1707 deletions

View file

@ -1,6 +1,7 @@
#pragma once
#include "types.hh"
#include "error.hh"
#include "logging.hh"
#include "ansicolor.hh"
@ -459,8 +460,8 @@ std::string filterANSIEscapes(const std::string & s,
/* Base64 encoding/decoding. */
string base64Encode(const string & s);
string base64Decode(const string & s);
string base64Encode(std::string_view s);
string base64Decode(std::string_view s);
/* Get a value for the specified key from an associate container. */