Fix build against nix master

dwarffs.cc

@@ -4,7 +4,7 @@
 
 #include "logging.hh"
 #include "shared.hh"
-#include "download.hh"
+#include "filetransfer.hh"
 #include "archive.hh"
 #include "compression.hh"
 #include "fs-accessor.hh"
@@ -163,11 +163,11 @@ std::shared_ptr<DebugFile> haveDebugFileUncached(const std::string & buildId, bo
     std::function<std::shared_ptr<DebugFile>(std::string)> tryUri;
 
     tryUri = [&](std::string uri) {
-        DownloadRequest req(canonUri(uri));
+        FileTransferRequest req(canonUri(uri));
 
         try {
 
-            auto res = getDownloader()->download(req);
+            auto res = getFileTransfer()->download(req);
             assert(res.data);
 
             /* Decompress .xz files. */
@@ -241,8 +241,8 @@ std::shared_ptr<DebugFile> haveDebugFileUncached(const std::string & buildId, bo
             printError("got unsupported data from '%s'", uri);
             return std::shared_ptr<DebugFile>();
 
-        } catch (DownloadError & e) {
-            if (e.error != Downloader::NotFound)
+        } catch (FileTransferError & e) {
+            if (e.error != FileTransfer::NotFound)
                 printError("while downloading '%s': %s", uri, e.what());
         }
 

flake.nix

@@ -3,9 +3,9 @@
 
   description = "A filesystem that fetches DWARF debug info from the Internet on demand";
 
-  inputs.nixpkgs.url = "nixpkgs/release-20.03";
+  inputs.nixpkgs.follows = "nix/nixpkgs";
 
-  outputs = { self, nixpkgs }:
+  outputs = { self, nix, nixpkgs }:
 
     let
       supportedSystems = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
@@ -16,7 +16,7 @@
 
       overlay = final: prev: {
 
-        dwarffs = with final; stdenv.mkDerivation {
+        dwarffs = with final; let nix = final.nix; in stdenv.mkDerivation {
           name = "dwarffs-0.1.${if self ? lastModified then lib.substring 0 8 (self.lastModifiedDate or self.lastModified) else "dirty"}";
 
           buildInputs = [ fuse nix nlohmann_json boost ];
@@ -41,7 +41,7 @@
 
       defaultPackage = forAllSystems (system: (import nixpkgs {
         inherit system;
-        overlays = [ self.overlay ];
+        overlays = [ self.overlay nix.overlay ];
       }).dwarffs);
 
       checks = forAllSystems (system: {