From cb1a79a96aa0602383f2fe33702f6adeee708922 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 21 Oct 2019 18:58:38 +0200
Subject: Fix build

---
 src/nix/make-content-addressable.cc | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'src/nix/make-content-addressable.cc')

diff --git a/src/nix/make-content-addressable.cc b/src/nix/make-content-addressable.cc
index 16344ee14..5b99b5084 100644
--- a/src/nix/make-content-addressable.cc
+++ b/src/nix/make-content-addressable.cc
@@ -11,11 +11,6 @@ struct CmdMakeContentAddressable : StorePathsCommand
         realiseMode = Build;
     }
 
-    std::string name() override
-    {
-        return "make-content-addressable";
-    }
-
     std::string description() override
     {
         return "rewrite a path or closure to content-addressable form";
@@ -92,4 +87,4 @@ struct CmdMakeContentAddressable : StorePathsCommand
     }
 };
 
-static RegisterCommand r1(make_ref<CmdMakeContentAddressable>());
+static auto r1 = registerCommand<CmdMakeContentAddressable>("make-content-addressable");
-- 
cgit v1.2.3


From 94eb5fad76cd086e3f49329532f81083726f89b3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 15 Jul 2020 20:05:42 +0200
Subject: Clean up RealiseMode

---
 src/nix/make-content-addressable.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/nix/make-content-addressable.cc')

diff --git a/src/nix/make-content-addressable.cc b/src/nix/make-content-addressable.cc
index fb36fc410..b2ded35dd 100644
--- a/src/nix/make-content-addressable.cc
+++ b/src/nix/make-content-addressable.cc
@@ -10,7 +10,7 @@ struct CmdMakeContentAddressable : StorePathsCommand, MixJSON
 {
     CmdMakeContentAddressable()
     {
-        realiseMode = Build;
+        realiseMode = Realise::Outputs;
     }
 
     std::string description() override
-- 
cgit v1.2.3


From 2d6d53bc87ef7468ad73431cf76123316f4c82bf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 15 Jul 2020 20:28:16 +0200
Subject: nix: Fix examples

---
 src/nix/make-content-addressable.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/nix/make-content-addressable.cc')

diff --git a/src/nix/make-content-addressable.cc b/src/nix/make-content-addressable.cc
index b2ded35dd..712043978 100644
--- a/src/nix/make-content-addressable.cc
+++ b/src/nix/make-content-addressable.cc
@@ -23,7 +23,7 @@ struct CmdMakeContentAddressable : StorePathsCommand, MixJSON
         return {
             Example{
                 "To create a content-addressable representation of GNU Hello (but not its dependencies):",
-                "nix make-content-addressable nixpkgs.hello"
+                "nix make-content-addressable nixpkgs#hello"
             },
             Example{
                 "To compute a content-addressable representation of the current NixOS system closure:",
-- 
cgit v1.2.3