nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-23 02:39:37 +01:00
Code Activity

Tagging release 2.28.1

Browse source 
-----BEGIN PGP SIGNATURE-----
 
 iQFHBAABCAAxFiEEtUHVUwEnDgvPFcpdgXC0cm1xmN4FAmfzku8THGVkb2xzdHJh
 QGdtYWlsLmNvbQAKCRCBcLRybXGY3ngWB/0e5vMSgZtARQXjuyexyJyy2m8JIQzJ
 Stw7dP0/oAvWYWuytez3jX4KC9xztMELblgZzXQhO72wIfzpa/CmxWQXVSaHm6Kq
 zYAWhxXz2HKGEPd8bS6eCFCZcrmChso7UN2WjrROYwB+1HO5S1rtOJtv2K1zvy5C
 xRMoOpSfKVfn63FoODhenW3UWbfeck5Dmb6eirPxvIMUIcDi2FeX5MVlklgNhxum
 351/Ymo5dxyK1pGmm8NrvB/3RSk7rVRUR+R4257lCmrN0g4gvM0G4MvxGm+XHMmC
 d/tmeU+JKPiXKFDSWmuTCmwCenu/q95QRadKST+Wls+qc4gHQLCaXfgn
 =hcKx
 -----END PGP SIGNATURE-----

Merge tag '2.28.1' into sync-2.28.0

Tagging release 2.28.1
This commit is contained in:
Eelco Dolstra 2025-04-07 11:21:07 +02:00
commit 59d1634aab
41 changed files with 208 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/libstore/filetransfer.cc
View file

@ -8,11 +8,12 @@
#include "nix/util/callback.hh"
#include "nix/util/signals.hh"
#if ENABLE_S3
#include "store-config-private.hh"
#if NIX_WITH_S3_SUPPORT
#include <aws/core/client/ClientConfiguration.h>
#endif
#if __linux__
#ifdef __linux__
# include "nix/util/namespaces.hh"
#endif
@ -623,7 +624,7 @@ struct curlFileTransfer : public FileTransfer
});
#endif
#if __linux__
#ifdef __linux__
try {
tryUnshareFilesystem();
} catch (nix::Error & e) {
@ -757,7 +758,7 @@ struct curlFileTransfer : public FileTransfer
#endif
}
#if ENABLE_S3
#if NIX_WITH_S3_SUPPORT
std::tuple<std::string, std::string, Store::Params> parseS3Uri(std::string uri)
{
auto [path, params] = splitUriAndParams(uri);
@ -780,7 +781,7 @@ struct curlFileTransfer : public FileTransfer
if (hasPrefix(request.uri, "s3://")) {
// FIXME: do this on a worker thread
try {
#if ENABLE_S3
#if NIX_WITH_S3_SUPPORT
auto [bucketName, key, params] = parseS3Uri(request.uri);
std::string profile = getOr(params, "profile", "");