From 3927c768d7875dae8d459f2ae33b28b6e1565874 Mon Sep 17 00:00:00 2001 From: hololeap Date: Fri, 23 Sep 2022 16:28:58 -0600 Subject: [PATCH 1/2] Add source-repository to all cabal files Add a source-repository stanza to any .cabal files in the project that are missing it. This metadata can be useful for package maintainers. See: https://cabal.readthedocs.io/en/stable/cabal-package.html#source-repositories Signed-off-by: hololeap --- ghcide-bench/ghcide-bench.cabal | 4 ++++ hie-compat/hie-compat.cabal | 4 ++++ .../hls-alternate-number-format-plugin.cabal | 4 ++++ plugins/hls-brittany-plugin/hls-brittany-plugin.cabal | 4 ++++ .../hls-call-hierarchy-plugin.cabal | 4 ++++ .../hls-change-type-signature-plugin.cabal | 4 ++++ plugins/hls-class-plugin/hls-class-plugin.cabal | 4 ++++ plugins/hls-code-range-plugin/hls-code-range-plugin.cabal | 4 ++++ .../hls-explicit-fixity-plugin.cabal | 4 ++++ .../hls-explicit-imports-plugin.cabal | 4 ++++ plugins/hls-floskell-plugin/hls-floskell-plugin.cabal | 4 ++++ plugins/hls-gadt-plugin/hls-gadt-plugin.cabal | 4 ++++ .../hls-haddock-comments-plugin.cabal | 4 ++++ plugins/hls-hlint-plugin/hls-hlint-plugin.cabal | 4 ++++ plugins/hls-module-name-plugin/hls-module-name-plugin.cabal | 4 ++++ plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal | 4 ++++ plugins/hls-pragmas-plugin/hls-pragmas-plugin.cabal | 4 ++++ .../hls-qualify-imported-names-plugin.cabal | 4 ++++ plugins/hls-refactor-plugin/hls-refactor-plugin.cabal | 4 ++++ .../hls-refine-imports-plugin.cabal | 4 ++++ plugins/hls-rename-plugin/hls-rename-plugin.cabal | 4 ++++ plugins/hls-retrie-plugin/hls-retrie-plugin.cabal | 4 ++++ plugins/hls-splice-plugin/hls-splice-plugin.cabal | 4 ++++ plugins/hls-stan-plugin/hls-stan-plugin.cabal | 5 ++++- .../hls-stylish-haskell-plugin.cabal | 4 ++++ plugins/hls-tactics-plugin/hls-tactics-plugin.cabal | 4 ++++ shake-bench/shake-bench.cabal | 4 ++++ 27 files changed, 108 insertions(+), 1 deletion(-) diff --git a/ghcide-bench/ghcide-bench.cabal b/ghcide-bench/ghcide-bench.cabal index 450aadba50..2a87563121 100644 --- a/ghcide-bench/ghcide-bench.cabal +++ b/ghcide-bench/ghcide-bench.cabal @@ -14,6 +14,10 @@ homepage: https://github.com/haskell/haskell-language-server/tree/mast bug-reports: https://github.com/haskell/haskell-language-server/issues tested-with: GHC == 8.6.5 || == 8.8.4 || == 8.10.7 || == 9.0.2 || == 9.2.3 || == 9.2.4 +source-repository head + type: git + location: https://github.com/haskell/haskell-language-server.git + executable ghcide-bench default-language: Haskell2010 build-depends: diff --git a/hie-compat/hie-compat.cabal b/hie-compat/hie-compat.cabal index 4573c410f2..8dd3f899b9 100644 --- a/hie-compat/hie-compat.cabal +++ b/hie-compat/hie-compat.cabal @@ -17,6 +17,10 @@ category: Development homepage: https://github.com/haskell/haskell-language-server/tree/master/hie-compat#readme bug-reports: https://github.com/haskell/haskell-language-server/issues +source-repository head + type: git + location: https://github.com/haskell/haskell-language-server.git + flag ghc-lib description: build against ghc-lib instead of the ghc package default: False diff --git a/plugins/hls-alternate-number-format-plugin/hls-alternate-number-format-plugin.cabal b/plugins/hls-alternate-number-format-plugin/hls-alternate-number-format-plugin.cabal index 4d6487e274..041998756d 100644 --- a/plugins/hls-alternate-number-format-plugin/hls-alternate-number-format-plugin.cabal +++ b/plugins/hls-alternate-number-format-plugin/hls-alternate-number-format-plugin.cabal @@ -17,6 +17,10 @@ extra-source-files: test/testdata/*.hs test/testdata/*.yaml +source-repository head + type: git + location: https://github.com/haskell/haskell-language-server.git + library buildable: True exposed-modules: Ide.Plugin.AlternateNumberFormat, Ide.Plugin.Conversion diff --git a/plugins/hls-brittany-plugin/hls-brittany-plugin.cabal b/plugins/hls-brittany-plugin/hls-brittany-plugin.cabal index 872f3c1c12..23c7853f23 100644 --- a/plugins/hls-brittany-plugin/hls-brittany-plugin.cabal +++ b/plugins/hls-brittany-plugin/hls-brittany-plugin.cabal @@ -16,6 +16,10 @@ extra-source-files: LICENSE test/testdata/**/*.hs +source-repository head + type: git + location: https://github.com/haskell/haskell-language-server.git + library if impl(ghc >= 9.2) buildable: False diff --git a/plugins/hls-call-hierarchy-plugin/hls-call-hierarchy-plugin.cabal b/plugins/hls-call-hierarchy-plugin/hls-call-hierarchy-plugin.cabal index 771de409c6..abd5b17d33 100644 --- a/plugins/hls-call-hierarchy-plugin/hls-call-hierarchy-plugin.cabal +++ b/plugins/hls-call-hierarchy-plugin/hls-call-hierarchy-plugin.cabal @@ -15,6 +15,10 @@ extra-source-files: LICENSE test/testdata/*.hs +source-repository head + type: git + location: https://github.com/haskell/haskell-language-server.git + library buildable: True exposed-modules: Ide.Plugin.CallHierarchy diff --git a/plugins/hls-change-type-signature-plugin/hls-change-type-signature-plugin.cabal b/plugins/hls-change-type-signature-plugin/hls-change-type-signature-plugin.cabal index 6c453854b7..e348255a2a 100644 --- a/plugins/hls-change-type-signature-plugin/hls-change-type-signature-plugin.cabal +++ b/plugins/hls-change-type-signature-plugin/hls-change-type-signature-plugin.cabal @@ -18,6 +18,10 @@ extra-source-files: test/testdata/*.txt test/testdata/*.yaml +source-repository head + type: git + location: https://github.com/haskell/haskell-language-server.git + library buildable: True exposed-modules: Ide.Plugin.ChangeTypeSignature diff --git a/plugins/hls-class-plugin/hls-class-plugin.cabal b/plugins/hls-class-plugin/hls-class-plugin.cabal index d388c3a7a8..7fd5483ed5 100644 --- a/plugins/hls-class-plugin/hls-class-plugin.cabal +++ b/plugins/hls-class-plugin/hls-class-plugin.cabal @@ -20,6 +20,10 @@ extra-source-files: LICENSE test/testdata/*.hs +source-repository head + type: git + location: https://github.com/haskell/haskell-language-server.git + library if impl(ghc >= 9.3) buildable: False diff --git a/plugins/hls-code-range-plugin/hls-code-range-plugin.cabal b/plugins/hls-code-range-plugin/hls-code-range-plugin.cabal index a9000a0158..4b228dcde0 100644 --- a/plugins/hls-code-range-plugin/hls-code-range-plugin.cabal +++ b/plugins/hls-code-range-plugin/hls-code-range-plugin.cabal @@ -20,6 +20,10 @@ extra-source-files: test/testdata/selection-range/*.yaml test/testdata/selection-range/*.txt +source-repository head + type: git + location: https://github.com/haskell/haskell-language-server.git + library exposed-modules: Ide.Plugin.CodeRange diff --git a/plugins/hls-explicit-fixity-plugin/hls-explicit-fixity-plugin.cabal b/plugins/hls-explicit-fixity-plugin/hls-explicit-fixity-plugin.cabal index 9bbab0d8c7..066d53737d 100644 --- a/plugins/hls-explicit-fixity-plugin/hls-explicit-fixity-plugin.cabal +++ b/plugins/hls-explicit-fixity-plugin/hls-explicit-fixity-plugin.cabal @@ -15,6 +15,10 @@ extra-source-files: LICENSE test/testdata/*.hs +source-repository head + type: git + location: https://github.com/haskell/haskell-language-server.git + library buildable: True exposed-modules: Ide.Plugin.ExplicitFixity diff --git a/plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal b/plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal index c7b8e65fbe..15f12c7f60 100644 --- a/plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal +++ b/plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal @@ -15,6 +15,10 @@ extra-source-files: test/testdata/*.hs test/testdata/*.yaml +source-repository head + type: git + location: https://github.com/haskell/haskell-language-server.git + library buildable: True exposed-modules: Ide.Plugin.ExplicitImports diff --git a/plugins/hls-floskell-plugin/hls-floskell-plugin.cabal b/plugins/hls-floskell-plugin/hls-floskell-plugin.cabal index c27181926e..3e4811da3b 100644 --- a/plugins/hls-floskell-plugin/hls-floskell-plugin.cabal +++ b/plugins/hls-floskell-plugin/hls-floskell-plugin.cabal @@ -16,6 +16,10 @@ extra-source-files: LICENSE test/testdata/**/*.hs +source-repository head + type: git + location: https://github.com/haskell/haskell-language-server.git + library if impl(ghc >= 9.3) buildable: False diff --git a/plugins/hls-gadt-plugin/hls-gadt-plugin.cabal b/plugins/hls-gadt-plugin/hls-gadt-plugin.cabal index 3db304c269..a4b1568436 100644 --- a/plugins/hls-gadt-plugin/hls-gadt-plugin.cabal +++ b/plugins/hls-gadt-plugin/hls-gadt-plugin.cabal @@ -15,6 +15,10 @@ extra-source-files: LICENSE test/testdata/*.hs +source-repository head + type: git + location: https://github.com/haskell/haskell-language-server.git + library if impl(ghc >= 9.3) buildable: False diff --git a/plugins/hls-haddock-comments-plugin/hls-haddock-comments-plugin.cabal b/plugins/hls-haddock-comments-plugin/hls-haddock-comments-plugin.cabal index 5b97c917b5..d3cb390791 100644 --- a/plugins/hls-haddock-comments-plugin/hls-haddock-comments-plugin.cabal +++ b/plugins/hls-haddock-comments-plugin/hls-haddock-comments-plugin.cabal @@ -17,6 +17,10 @@ extra-source-files: LICENSE test/testdata/*.hs +source-repository head + type: git + location: https://github.com/haskell/haskell-language-server.git + library if impl(ghc >= 9.2) buildable: False diff --git a/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal b/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal index 4de8669b9f..a29c40e033 100644 --- a/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal +++ b/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal @@ -20,6 +20,10 @@ extra-source-files: test/testdata/**/*.hs test/testdata/**/*.h +source-repository head + type: git + location: https://github.com/haskell/haskell-language-server.git + flag pedantic description: Enable -Werror default: False diff --git a/plugins/hls-module-name-plugin/hls-module-name-plugin.cabal b/plugins/hls-module-name-plugin/hls-module-name-plugin.cabal index 223fb76370..811ba7105b 100644 --- a/plugins/hls-module-name-plugin/hls-module-name-plugin.cabal +++ b/plugins/hls-module-name-plugin/hls-module-name-plugin.cabal @@ -19,6 +19,10 @@ extra-source-files: test/testdata/**/*.cabal test/testdata/**/*.project +source-repository head + type: git + location: https://github.com/haskell/haskell-language-server.git + library buildable: True exposed-modules: Ide.Plugin.ModuleName diff --git a/plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal b/plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal index 6d436087ad..b17ccbf741 100644 --- a/plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal +++ b/plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal @@ -16,6 +16,10 @@ extra-source-files: LICENSE test/testdata/**/*.hs +source-repository head + type: git + location: https://github.com/haskell/haskell-language-server.git + library if impl(ghc >= 9.3) buildable: False diff --git a/plugins/hls-pragmas-plugin/hls-pragmas-plugin.cabal b/plugins/hls-pragmas-plugin/hls-pragmas-plugin.cabal index af2f13d639..20abe18fa4 100644 --- a/plugins/hls-pragmas-plugin/hls-pragmas-plugin.cabal +++ b/plugins/hls-pragmas-plugin/hls-pragmas-plugin.cabal @@ -17,6 +17,10 @@ extra-source-files: test/testdata/*.hs test/testdata/*.yaml +source-repository head + type: git + location: https://github.com/haskell/haskell-language-server.git + library buildable: True exposed-modules: Ide.Plugin.Pragmas diff --git a/plugins/hls-qualify-imported-names-plugin/hls-qualify-imported-names-plugin.cabal b/plugins/hls-qualify-imported-names-plugin/hls-qualify-imported-names-plugin.cabal index 4c00fb91f4..f60416b3cc 100644 --- a/plugins/hls-qualify-imported-names-plugin/hls-qualify-imported-names-plugin.cabal +++ b/plugins/hls-qualify-imported-names-plugin/hls-qualify-imported-names-plugin.cabal @@ -17,6 +17,10 @@ extra-source-files: test/data/*.hs test/data/*.yaml +source-repository head + type: git + location: https://github.com/haskell/haskell-language-server.git + library exposed-modules: Ide.Plugin.QualifyImportedNames hs-source-dirs: src diff --git a/plugins/hls-refactor-plugin/hls-refactor-plugin.cabal b/plugins/hls-refactor-plugin/hls-refactor-plugin.cabal index d61d1593ee..7dfa8a020c 100644 --- a/plugins/hls-refactor-plugin/hls-refactor-plugin.cabal +++ b/plugins/hls-refactor-plugin/hls-refactor-plugin.cabal @@ -17,6 +17,10 @@ extra-source-files: test/data/**/*.hs test/data/**/*.yaml +source-repository head + type: git + location: https://github.com/haskell/haskell-language-server.git + library if impl(ghc >= 9.3) buildable: False diff --git a/plugins/hls-refine-imports-plugin/hls-refine-imports-plugin.cabal b/plugins/hls-refine-imports-plugin/hls-refine-imports-plugin.cabal index 47abdac196..f47053736f 100644 --- a/plugins/hls-refine-imports-plugin/hls-refine-imports-plugin.cabal +++ b/plugins/hls-refine-imports-plugin/hls-refine-imports-plugin.cabal @@ -15,6 +15,10 @@ extra-source-files: test/testdata/*.hs test/testdata/*.yaml +source-repository head + type: git + location: https://github.com/haskell/haskell-language-server.git + library buildable: True exposed-modules: Ide.Plugin.RefineImports diff --git a/plugins/hls-rename-plugin/hls-rename-plugin.cabal b/plugins/hls-rename-plugin/hls-rename-plugin.cabal index c3f063b332..8092a27d9e 100644 --- a/plugins/hls-rename-plugin/hls-rename-plugin.cabal +++ b/plugins/hls-rename-plugin/hls-rename-plugin.cabal @@ -16,6 +16,10 @@ extra-source-files: test/testdata/*.hs test/testdata/*.yaml +source-repository head + type: git + location: https://github.com/haskell/haskell-language-server.git + library if impl(ghc >= 9.3) buildable: False diff --git a/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal b/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal index d484973769..9b1347b4d0 100644 --- a/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal +++ b/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal @@ -12,6 +12,10 @@ category: Development build-type: Simple extra-source-files: LICENSE +source-repository head + type: git + location: https://github.com/haskell/haskell-language-server.git + library if impl(ghc >= 9.3) buildable: False diff --git a/plugins/hls-splice-plugin/hls-splice-plugin.cabal b/plugins/hls-splice-plugin/hls-splice-plugin.cabal index fa6d14a3a7..8e045230c8 100644 --- a/plugins/hls-splice-plugin/hls-splice-plugin.cabal +++ b/plugins/hls-splice-plugin/hls-splice-plugin.cabal @@ -22,6 +22,10 @@ extra-source-files: test/testdata/*.hs test/testdata/*.yaml +source-repository head + type: git + location: https://github.com/haskell/haskell-language-server.git + library if impl(ghc >= 9.3) buildable: False diff --git a/plugins/hls-stan-plugin/hls-stan-plugin.cabal b/plugins/hls-stan-plugin/hls-stan-plugin.cabal index 855314adc0..370d206f81 100644 --- a/plugins/hls-stan-plugin/hls-stan-plugin.cabal +++ b/plugins/hls-stan-plugin/hls-stan-plugin.cabal @@ -16,12 +16,15 @@ extra-source-files: LICENSE test/testdata/*.hs +source-repository head + type: git + location: https://github.com/haskell/haskell-language-server.git + flag pedantic description: Enable -Werror default: False manual: True - library if impl(ghc < 8.8) || impl(ghc >= 9.0) buildable: False diff --git a/plugins/hls-stylish-haskell-plugin/hls-stylish-haskell-plugin.cabal b/plugins/hls-stylish-haskell-plugin/hls-stylish-haskell-plugin.cabal index 9f28cd4bb9..e8e7690326 100644 --- a/plugins/hls-stylish-haskell-plugin/hls-stylish-haskell-plugin.cabal +++ b/plugins/hls-stylish-haskell-plugin/hls-stylish-haskell-plugin.cabal @@ -15,6 +15,10 @@ extra-source-files: LICENSE test/testdata/*.hs +source-repository head + type: git + location: https://github.com/haskell/haskell-language-server.git + library if impl(ghc >= 9.3) buildable: False diff --git a/plugins/hls-tactics-plugin/hls-tactics-plugin.cabal b/plugins/hls-tactics-plugin/hls-tactics-plugin.cabal index f62dbc5786..d06fe4297c 100644 --- a/plugins/hls-tactics-plugin/hls-tactics-plugin.cabal +++ b/plugins/hls-tactics-plugin/hls-tactics-plugin.cabal @@ -19,6 +19,10 @@ extra-source-files: test/golden/*.hs test/golden/*.yaml +source-repository head + type: git + location: https://github.com/haskell/haskell-language-server.git + flag pedantic description: Enable -Werror default: False diff --git a/shake-bench/shake-bench.cabal b/shake-bench/shake-bench.cabal index ec1649ccd5..365ef99820 100644 --- a/shake-bench/shake-bench.cabal +++ b/shake-bench/shake-bench.cabal @@ -11,6 +11,10 @@ build-type: Simple -- description is a single line so that implicit-hie can parse it description: A library Shake rules to build and run benchmarks for multiple revisions of a project. An example of usage can be found in the ghcide benchmark suite +source-repository head + type: git + location: https://github.com/haskell/haskell-language-server.git + library exposed-modules: Development.Benchmark.Rules hs-source-dirs: src From 72d19f2e896c26a347d3b95a1927b3e5ef9e3f84 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Mar 2023 17:58:53 +0000 Subject: [PATCH 2/2] Bump cachix/install-nix-action from 17 to 20 Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 17 to 20. - [Release notes](https://github.com/cachix/install-nix-action/releases) - [Commits](https://github.com/cachix/install-nix-action/compare/v17...v20) --- updated-dependencies: - dependency-name: cachix/install-nix-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/nix.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index eff8fa2123..920151d016 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -55,7 +55,7 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v17 + - uses: cachix/install-nix-action@v20 with: install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install install_options: '--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve' @@ -89,7 +89,7 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v17 + - uses: cachix/install-nix-action@v20 with: install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install install_options: '--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve'