Merge pull request #345 from sapcc/reuse-shell-nix

majewsky · web-flow · commit 2eb7fac43503 · 2025-08-14T09:50:02.000+02:00
Add reuse tool to shell.nix
diff --git a/internal/nix/nix-shell.go b/internal/nix/nix-shell.go
@@ -49,6 +49,9 @@ func RenderShell(cfg core.Configuration, sr golang.ScanResult, renderGoreleaserC
 	if sr.UsesPostgres {
 		packages = append(packages, "postgresql_"+core.DefaultPostgresVersion)
 	}
+	if cfg.Reuse.Enabled.UnwrapOr(true) {
+		packages = append(packages, "reuse")
+	}
 	packages = append(packages, cfg.Nix.ExtraPackages...)
 
 	slices.Sort(packages)
diff --git a/shell.nix b/shell.nix
@@ -12,6 +12,7 @@ mkShell {
     go_1_24
     golangci-lint
     gotools # goimports
+    reuse
     # keep this line if you use bash
     bashInteractive
   ];

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,9 @@ func RenderShell(cfg core.Configuration, sr golang.ScanResult, renderGoreleaserC`
`49`	`49`	`if sr.UsesPostgres {`
`50`	`50`	`packages = append(packages, "postgresql_"+core.DefaultPostgresVersion)`
`51`	`51`	`}`
	`52`	`+ if cfg.Reuse.Enabled.UnwrapOr(true) {`
	`53`	`+ packages = append(packages, "reuse")`
	`54`	`+ }`
`52`	`55`	`packages = append(packages, cfg.Nix.ExtraPackages...)`
`53`	`56`
`54`	`57`	`slices.Sort(packages)`