Skip to content

Commit

Permalink
Merge pull request #202022 from NixOS/haskell-updates
Browse files Browse the repository at this point in the history
haskellPackages: stackage LTS 19 -> 20; GHC 9.0.2 -> 9.2.4
  • Loading branch information
maralorn authored Dec 24, 2022
2 parents 2a6c2b6 + 9fa43f6 commit bb7f53d
Show file tree
Hide file tree
Showing 38 changed files with 7,439 additions and 9,121 deletions.
4 changes: 4 additions & 0 deletions pkgs/applications/editors/yi/wrapper.nix
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ stdenv.mkDerivation {
# This wrapper and wrapper only is under PD
license = licenses.publicDomain;
maintainers = with maintainers; [ ];

# dependency yi-language no longer builds
hydraPlatforms = lib.platforms.none;
broken = true;
};

}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ stdenvNoCC.mkDerivation rec {
src = fetchurl {
name = "hledger-check-fancyassertion-${version}.hs";
url = "https://raw.githubusercontent.com/simonmichael/hledger/hledger-lib-${version}/bin/hledger-check-fancyassertions.hs";
sha256 = "1xy3ssxnwybq40nlffz95w7m9xbzf8ysb13svg0i8g5sfgrw11vk";
sha256 = "0lyyz8dqkknd9d073l613kdkaqd9r6ymdw94d7mwp17pxvfr17wf";
};

dontUnpack = true;
Expand Down
4 changes: 4 additions & 0 deletions pkgs/applications/science/logic/petrinizer/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,8 @@ mkDerivation rec {
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ raskin ];
inherit (sbv_7_13.meta) platforms;

# dependency sbv no longer builds
hydraPlatforms = lib.platforms.none;
broken = true;
}
8 changes: 4 additions & 4 deletions pkgs/data/misc/hackage/pin.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"commit": "e2ccf8a8796c9192280f796ce0f5d98ec783f856",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e2ccf8a8796c9192280f796ce0f5d98ec783f856.tar.gz",
"sha256": "092g4pbxyhkw1isbib967v5aw16iqs3w5iqcicv1irr4rphsr06z",
"msg": "Update from Hackage at 2022-11-11T17:48:48Z"
"commit": "d2f407d64c568ff572505378248cd834f808f6e0",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/d2f407d64c568ff572505378248cd834f808f6e0.tar.gz",
"sha256": "0agbmi2gjrg5gnp8dy76770lyh3ny42clm55wlr529320wnc14wm",
"msg": "Update from Hackage at 2022-12-18T22:10:13Z"
}
3 changes: 3 additions & 0 deletions pkgs/development/compilers/carp/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,7 @@ haskellPackages.mkDerivation rec {
# Windows not (yet) supported.
platforms = with lib.platforms; unix ++ darwin;

# doesn't build on ghc92
hydraPlatforms = lib.platforms.none;
broken = true;
}
2 changes: 2 additions & 0 deletions pkgs/development/compilers/elm/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ let
*/
elm-format = justStaticExecutables (overrideCabal (drv: {
jailbreak = true;
doCheck = assert (drv.version == "0.8.5"); false; # golden tests fail with optparse-applicative 0.17

description = "Formats Elm source code according to a standard set of rules based on the official Elm Style Guide";
homepage = "https://github.com/avh4/elm-format";
Expand Down Expand Up @@ -96,6 +97,7 @@ let
hspec = self.hspec_2_7_10;
hspec-core = self.hspec-core_2_7_10;
hspec-discover = self.hspec-discover_2_7_10;
hspec-meta = self.hspec-meta_2_7_8;

elm-format-test-lib = self.callPackage ./packages/elm-format-test-lib.nix {};
elm-format-markdown = self.callPackage ./packages/elm-format-markdown.nix {};
Expand Down
8 changes: 8 additions & 0 deletions pkgs/development/compilers/ghc/9.2.4.nix
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,14 @@ stdenv.mkDerivation (rec {
extraPrefix = "utils/haddock/";
stripLen = 1;
})
# Don't generate code that doesn't compile when --enable-relocatable is passed to Setup.hs
# Can be removed if the Cabal library included with ghc backports the linked fix
(fetchpatch {
url = "https://github.com/haskell/cabal/commit/6c796218c92f93c95e94d5ec2d077f6956f68e98.patch";
stripLen = 1;
extraPrefix = "libraries/Cabal/";
sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY=";
})
];

postPatch = "patchShebangs .";
Expand Down
8 changes: 8 additions & 0 deletions pkgs/development/compilers/ghc/9.2.5.nix
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,14 @@ stdenv.mkDerivation (rec {
extraPrefix = "utils/haddock/";
stripLen = 1;
})
# Don't generate code that doesn't compile when --enable-relocatable is passed to Setup.hs
# Can be removed if the Cabal library included with ghc backports the linked fix
(fetchpatch {
url = "https://github.com/haskell/cabal/commit/6c796218c92f93c95e94d5ec2d077f6956f68e98.patch";
stripLen = 1;
extraPrefix = "libraries/Cabal/";
sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY=";
})
];

postPatch = "patchShebangs .";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/haskell-modules/HACKING.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ $ ./maintainers/scripts/haskell/hydra-report.hs get-report
$ ./maintainers/scripts/haskell/hydra-report.hs ping-maintainers
```

The `hyda-report.hs ping-maintainers` command generates a Markdown document
The `hydra-report.hs ping-maintainers` command generates a Markdown document
that you can paste in a GitHub comment on the PR opened above. This
comment describes which Haskell packages are now failing to build. It also
pings the maintainers so that they know to fix up their packages.
Expand Down
6 changes: 3 additions & 3 deletions pkgs/development/haskell-modules/cabal2nix-unstable.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
}:
mkDerivation {
pname = "cabal2nix";
version = "unstable-2022-10-22";
version = "unstable-2022-12-08";
src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/bf7cc8f202e332953f7fbfc1d90490e4c197d287.tar.gz";
sha256 = "0fmpfl2nl215aids9yxdmdik77w7cppk900rnx23m07rmwg4xa4f";
url = "https://github.com/NixOS/cabal2nix/archive/021a48f4b4942462154b06fd81429a248638f87f.tar.gz";
sha256 = "1is1q5mqi86vzy3ni2959hr95gs9hwd5wiz92hanfli3infg00xc";
};
postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot";
isLibrary = true;
Expand Down
Loading

0 comments on commit bb7f53d

Please sign in to comment.