diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2023-08-17 00:33:57 +0200 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2023-08-17 00:33:57 +0200 |
| commit | 9e4a1cf233ab6457bb73a6616b7c3ce9f219845c (patch) | |
| tree | 33ae3045ced9b41ef916e0ff35282afacbcaca98 /pkgs/development/haskell-modules | |
| parent | f3403ee5a2260a385040c51b94c3933f7490b2cf (diff) | |
| download | nixpkgs-9e4a1cf233ab6457bb73a6616b7c3ce9f219845c.tar nixpkgs-9e4a1cf233ab6457bb73a6616b7c3ce9f219845c.tar.gz nixpkgs-9e4a1cf233ab6457bb73a6616b7c3ce9f219845c.tar.bz2 nixpkgs-9e4a1cf233ab6457bb73a6616b7c3ce9f219845c.tar.lz nixpkgs-9e4a1cf233ab6457bb73a6616b7c3ce9f219845c.tar.xz nixpkgs-9e4a1cf233ab6457bb73a6616b7c3ce9f219845c.tar.zst nixpkgs-9e4a1cf233ab6457bb73a6616b7c3ce9f219845c.zip | |
haskell.packages.ghc94.ghc-tags: pin to matching version 1.6
haskell.packages.ghc96.ghc-tags: test on Hydra
Diffstat (limited to 'pkgs/development/haskell-modules')
4 files changed, 26 insertions, 4 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 1d9b216da6b..7b9feb98dcb 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -94,6 +94,8 @@ in { # 2022-10-06: https://gitlab.haskell.org/ghc/ghc/-/issues/22260 ghc-check = dontHaddock super.ghc-check; + ghc-tags = self.ghc-tags_1_6; + # Too strict upper bound on template-haskell # https://github.com/mokus0/th-extras/issues/18 th-extras = doJailbreak super.th-extras; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 0eaf65bb07e..8b5b82af83d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1919,7 +1919,6 @@ broken-packages: - ghc-syb - ghc-syb-utils - ghc-tags-core - - ghc-tags # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/230957256 at 2023-08-16 - ghc-time-alloc-prof - ghc-usage - gh-labeler diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 68c63619fb2..9f32c901111 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -139,6 +139,7 @@ extra-packages: - commonmark-extensions < 0.2.3.3 # 2022-12-17: required by emanote 1.0.0.0 (to avoid a bug in 0.2.3.3) - retrie < 1.2.0.0 # 2022-12-30: required for hls on ghc < 9.2 - ghc-tags == 1.5.* # 2023-02-18: preserve for ghc-lib == 9.2.* + - ghc-tags == 1.6.* # 2023-02-18: preserve for ghc-lib == 9.4.* - shake-cabal < 0.2.2.3 # 2023-07-01: last version to support Cabal 3.6.* - unix-compat < 0.7 # 2023-07-04: Need System.PosixCompat.User for git-annex - algebraic-graphs < 0.7 # 2023-08-14: Needed for building weeder < 2.6.0 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f9ed3125f9c..549095408ba 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -113048,7 +113048,29 @@ self: { license = lib.licenses.mpl20; hydraPlatforms = lib.platforms.none; mainProgram = "ghc-tags"; - broken = true; + }) {}; + + "ghc-tags_1_6" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , containers, deepseq, directory, filepath, ghc, ghc-boot + , ghc-paths, optparse-applicative, process, stm, temporary, text + , time, vector, yaml + }: + mkDerivation { + pname = "ghc-tags"; + version = "1.6"; + sha256 = "0iiqapx4v4jz4d7ni4dcvpfl948ydx2a7kxvjsk2irdcknzymblw"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson async attoparsec base bytestring containers deepseq directory + filepath ghc ghc-boot ghc-paths optparse-applicative process stm + temporary text time vector yaml + ]; + description = "Utility for generating ctags and etags with GHC API"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + mainProgram = "ghc-tags"; }) {}; "ghc-tags" = callPackage @@ -113070,9 +113092,7 @@ self: { ]; description = "Utility for generating ctags and etags with GHC API"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; mainProgram = "ghc-tags"; - broken = true; }) {}; "ghc-tags-core" = callPackage |