From bd5f3dbe118d569ffb201ce14394572ac5fc412c Mon Sep 17 00:00:00 2001
From: Kevin Quick <kquick@galois.com>
Date: Thu, 24 Sep 2020 12:30:03 -0700
Subject: Fixes fall-through to report correct description of hash-file
 command.

---
 src/nix/hash.cc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/nix')

diff --git a/src/nix/hash.cc b/src/nix/hash.cc
index 0eca4f8ea..494f00a20 100644
--- a/src/nix/hash.cc
+++ b/src/nix/hash.cc
@@ -44,6 +44,7 @@ struct CmdHash : Command
         switch (mode) {
         case FileIngestionMethod::Flat:
             d = "print cryptographic hash of a regular file";
+            break;
         case FileIngestionMethod::Recursive:
             d = "print cryptographic hash of the NAR serialisation of a path";
         };
-- 
cgit v1.2.3


From 64e9b3c83b7cf7f3c7348426666ccca2ca395d28 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 29 Sep 2020 23:33:16 +0200
Subject: nix registry list: Show 'dir' attribute

Issue #4050.
---
 src/nix/registry.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/nix')

diff --git a/src/nix/registry.cc b/src/nix/registry.cc
index 367268683..cb11ec195 100644
--- a/src/nix/registry.cc
+++ b/src/nix/registry.cc
@@ -31,8 +31,8 @@ struct CmdRegistryList : StoreCommand
                     registry->type == Registry::User   ? "user  " :
                     registry->type == Registry::System ? "system" :
                     "global",
-                    entry.from.to_string(),
-                    entry.to.to_string());
+                    entry.from.toURLString(),
+                    entry.to.toURLString(attrsToQuery(entry.extraAttrs)));
             }
         }
     }
-- 
cgit v1.2.3


From f3280004e2be3f7533190ddf71ee1ec7c0d7d60d Mon Sep 17 00:00:00 2001
From: DavHau <hsngrmpf+github@gmail.com>
Date: Thu, 1 Oct 2020 11:34:13 +0700
Subject: add more examples to --help of `nix run`

---
 src/nix/run.cc | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/nix')

diff --git a/src/nix/run.cc b/src/nix/run.cc
index cbaba9d90..e6584346e 100644
--- a/src/nix/run.cc
+++ b/src/nix/run.cc
@@ -167,6 +167,14 @@ struct CmdRun : InstallableCommand, RunCommon
                 "To run Blender:",
                 "nix run blender-bin"
             },
+            Example{
+                "To run vim from nixpkgs:",
+                "nix run nixpkgs#vim"
+            },
+            Example{
+                "To run vim from nixpkgs with arguments:",
+                "nix run nixpkgs#vim -- --help"
+            },
         };
     }
 
-- 
cgit v1.2.3


From d5d196b0a15fdba50363b89a61eb894a49153b08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Fri, 2 Oct 2020 12:10:31 +0200
Subject: Fix profile update in nix command

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

(limited to 'src/nix')

diff --git a/src/nix/command.cc b/src/nix/command.cc
index 37a4bc785..ba7de9fdd 100644
--- a/src/nix/command.cc
+++ b/src/nix/command.cc
@@ -152,7 +152,7 @@ void MixProfile::updateProfile(const Buildables & buildables)
                 for (auto & output : bfd.outputs) {
                     /* Output path should be known because we just tried to
                        build it. */
-                    assert(!output.second);
+                    assert(output.second);
                     result.push_back(*output.second);
                 }
             },
-- 
cgit v1.2.3