mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-02 11:03:57 +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.
35 lines
875 B
Diff
35 lines
875 B
Diff
diff --git a/cmd/main.go b/cmd/main.go
|
|
index f9af7038..099ff2e2 100644
|
|
--- a/cmd/main.go
|
|
+++ b/cmd/main.go
|
|
@@ -24,11 +24,6 @@ import (
|
|
)
|
|
|
|
func main() {
|
|
- if !pufferpanel.UserInGroup("pufferpanel") {
|
|
- fmt.Println("You do not have permission to use this command")
|
|
- return
|
|
- }
|
|
-
|
|
defer logging.Close()
|
|
|
|
defer func() {
|
|
diff --git a/cmd/user.go b/cmd/user.go
|
|
index d4a27aaf..9bf21910 100644
|
|
--- a/cmd/user.go
|
|
+++ b/cmd/user.go
|
|
@@ -218,10 +218,9 @@ type userCreate struct {
|
|
}
|
|
|
|
func editUser(cmd *cobra.Command, args []string) {
|
|
- if !pufferpanel.UserInGroup() {
|
|
- fmt.Printf("You do not have permission to use this command")
|
|
- return
|
|
- }
|
|
+ // Keeping import to avoid merge conflicts with future updates in case
|
|
+ // PufferPanel starts using this import elsewhere in this file.
|
|
+ _ = pufferpanel.UserInGroup
|
|
|
|
db, err := database.GetConnection()
|
|
if err != nil {
|