mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-30 08:44:31 +00:00
571c71e6f7
We are migrating packages that meet below requirements:
1. using `callPackage`
2. called path is a directory
3. overriding set is empty (`{ }`)
4. not containing path expressions other than relative path (to
makenixpkgs-vet happy)
5. not referenced by nix files outside of the directory, other
than`pkgs/top-level/all-packages.nix`
6. not referencing nix files outside of the directory
7. not referencing `default.nix` (since it's changed to `package.nix`)
8. `outPath` doesn't change after migration
The tool is here: https://github.com/Aleksanaa/by-name-migrate.
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
diff --git a/pkg/machine/machine_common.go b/pkg/machine/machine_common.go
|
|
index 1afc3d15b..a8aafcaae 100644
|
|
--- a/pkg/machine/machine_common.go
|
|
+++ b/pkg/machine/machine_common.go
|
|
@@ -33,13 +33,8 @@ func GetDevNullFiles() (*os.File, *os.File, error) {
|
|
// WaitAPIAndPrintInfo prints info about the machine and does a ping test on the
|
|
// API socket
|
|
func WaitAPIAndPrintInfo(forwardState APIForwardingState, name, helper, forwardSock string, noInfo, rootful bool) {
|
|
- suffix := ""
|
|
var fmtString string
|
|
|
|
- if name != DefaultMachineName {
|
|
- suffix = " " + name
|
|
- }
|
|
-
|
|
if forwardState == NoForwarding {
|
|
return
|
|
}
|
|
@@ -61,14 +56,6 @@ address can't be used by podman. `
|
|
|
|
if len(helper) < 1 {
|
|
fmt.Print(fmtString)
|
|
- } else {
|
|
- fmtString += `If you would like to install it, run the following commands:
|
|
-
|
|
- sudo %s install
|
|
- podman machine stop%[2]s; podman machine start%[2]s
|
|
-
|
|
-`
|
|
- fmt.Printf(fmtString, helper, suffix)
|
|
}
|
|
case MachineLocal:
|
|
fmt.Printf("\nAnother process was listening on the default Docker API socket address.\n")
|