From 189e6f5e1d949f50ab0b6e5acd25e230d206692d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 24 Jul 2020 20:51:16 +0200
Subject: [PATCH 1/3] Bump version to 3.0

Since there are some incompatible changes, it's better to bump the
major version number.
---
 .version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.version b/.version
index 7208c2182..f398a2061 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-2.4
\ No newline at end of file
+3.0
\ No newline at end of file

From b8eea7e81af53905be7845dffc6d0a83ea8edc97 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 28 Jul 2020 13:27:56 +0200
Subject: [PATCH 2/3] Remove putBytes

istream->tellg() returns -1 so we can't get the number of bytes
written.

Fixes 'uploaded 's3://nix-cache/nar/00819r9lp5kajr6baxfw5dhhc0cx8ndxaz43qmd2f0gn1hk1ynlp.nar.xz' (-1 bytes) in 11620 ms' messages.
---
 src/libstore/s3-binary-cache-store.cc | 7 ++-----
 src/libstore/s3-binary-cache-store.hh | 1 -
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/libstore/s3-binary-cache-store.cc b/src/libstore/s3-binary-cache-store.cc
index 1b7dff085..67935f3ba 100644
--- a/src/libstore/s3-binary-cache-store.cc
+++ b/src/libstore/s3-binary-cache-store.cc
@@ -343,13 +343,10 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore
             std::chrono::duration_cast<std::chrono::milliseconds>(now2 - now1)
                 .count();
 
-        auto size = istream->tellg();
-
-        printInfo("uploaded 's3://%s/%s' (%d bytes) in %d ms",
-            bucketName, path, size, duration);
+        printInfo("uploaded 's3://%s/%s' in %d ms",
+            bucketName, path, duration);
 
         stats.putTimeMs += duration;
-        stats.putBytes += size;
         stats.put++;
     }
 
diff --git a/src/libstore/s3-binary-cache-store.hh b/src/libstore/s3-binary-cache-store.hh
index 4d43fe4d2..b2b75d498 100644
--- a/src/libstore/s3-binary-cache-store.hh
+++ b/src/libstore/s3-binary-cache-store.hh
@@ -19,7 +19,6 @@ public:
     struct Stats
     {
         std::atomic<uint64_t> put{0};
-        std::atomic<uint64_t> putBytes{0};
         std::atomic<uint64_t> putTimeMs{0};
         std::atomic<uint64_t> get{0};
         std::atomic<uint64_t> getBytes{0};

From 2980b244b7e5f1660c4a07d7589f4a2dd47f9acd Mon Sep 17 00:00:00 2001
From: Carlo Nucera <carlo.nucera@protonmail.com>
Date: Tue, 28 Jul 2020 15:39:45 -0400
Subject: [PATCH 3/3] Use assert(false) instead of abort()

---
 src/libstore/derivations.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libstore/derivations.cc b/src/libstore/derivations.cc
index b708ecc57..ca77366bf 100644
--- a/src/libstore/derivations.cc
+++ b/src/libstore/derivations.cc
@@ -14,7 +14,7 @@ bool derivationIsCA(DerivationType dt) {
     };
     // Since enums can have non-variant values, but making a `default:` would
     // disable exhaustiveness warnings.
-    abort();
+    assert(false);
 }
 
 bool derivationIsFixed(DerivationType dt) {
@@ -22,7 +22,7 @@ bool derivationIsFixed(DerivationType dt) {
     case DerivationType::Regular: return false;
     case DerivationType::CAFixed: return true;
     };
-    abort();
+    assert(false);
 }
 
 bool derivationIsImpure(DerivationType dt) {
@@ -30,7 +30,7 @@ bool derivationIsImpure(DerivationType dt) {
     case DerivationType::Regular: return false;
     case DerivationType::CAFixed: return true;
     };
-    abort();
+    assert(false);
 }
 
 // FIXME Put this somewhere?