Unverified Commit bc4e52b6 authored by sterni's avatar sterni Committed by GitHub
Browse files

Merge pull request #139967 from NixOS/haskell-updates 

haskellPackages: update stackage and hackage
parents 8296c4d2 5b39a0e3

pkgs/applications/office/hledger-check-fancyassertions/default.nix

0 → 100644
+41 −0
Original line number Diff line number Diff line 
{lib, stdenvNoCC, haskellPackages, fetchurl, writers}:



stdenvNoCC.mkDerivation rec {

  pname = "hledger-check-fancyassertions";

  version = "1.23";



  src = fetchurl {

    url = "https://raw.githubusercontent.com/simonmichael/hledger/hledger-lib-${version}/bin/hledger-check-fancyassertions.hs";

    sha256 = "08p2din1j7l4c29ipn68k8vvs3ys004iy8a3zf318lzby4h04h0n";

  };



  dontUnpack = true;

  dontBuild = true;



  executable = writers.writeHaskell

    "hledger-check-fancyassertions"

    {

      libraries = with haskellPackages; [

        base base-compat base-compat-batteries filepath hledger-lib_1_23

        megaparsec microlens optparse-applicative string-qq text time

        transformers

      ];

      inherit (haskellPackages) ghc;

    }

    src;



  installPhase = ''

    runHook preInstall

    install -D $executable $out/bin/${pname}

    runHook postInstall

  '';



  meta = with lib; {

    description = "Complex account balance assertions for hledger journals";

    homepage = "https://hledger.org/";

    changelog = "https://github.com/simonmichael/hledger/blob/master/CHANGES.md";

    license = licenses.gpl3;

    maintainers = [ maintainers.DamienCassou ];

    platforms = lib.platforms.all; # GHC can cross-compile

  };

}

pkgs/data/misc/hackage/pin.json

+4 −4
Original line number Diff line number Diff line 
{

  "commit": "e0bd041989865809059f6039125dfb93cb075f72",

  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e0bd041989865809059f6039125dfb93cb075f72.tar.gz",

  "sha256": "1fpm2kawxlias5xxmiara6224akgii0mnwnlyklc8szflv9cbs17",

  "msg": "Update from Hackage at 2021-09-19T21:23:33Z"

  "commit": "85edb79d7ee62685f6ccc57b932ff3920affcb77",

  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/85edb79d7ee62685f6ccc57b932ff3920affcb77.tar.gz",

  "sha256": "13yxypamp0pwx8mcslg4mgq5599cldhmfss881m22zqjkbqvi8sj",

  "msg": "Update from Hackage at 2021-09-29T20:58:23Z"

}

pkgs/development/haskell-modules/configuration-common.nix

+20 −0
Original line number Diff line number Diff line
@@ -856,6 +856,11 @@ self: super: { 
      stripLen = 1;

    });



  # hledger-lib 1.23 depends on doctest >= 0.18

  hledger-lib_1_23 = super.hledger-lib_1_23.override {

    doctest = self.doctest_0_18_1;

  };



  # Copy hledger man pages from data directory into the proper place. This code

  # should be moved into the cabal2nix generator.

  hledger = overrideCabal super.hledger (drv: {
@@ -1987,4 +1992,19 @@ EOT 
  hw-xml = assert pkgs.lib.versionOlder self.generic-lens.version "2.2.0.0";

    doJailbreak super.hw-xml;



  # doctests fail due to deprecation warnings in 0.2

  candid = assert pkgs.lib.versionOlder super.candid.version "0.3";

    overrideCabal super.candid (drv: {

      version = "0.3";

      sha256 = "0zq29zddkkwvlyz9qmxl942ml53m6jawl4m5rkb2510glbkcvr5x";

      libraryHaskellDepends = drv.libraryHaskellDepends ++ [

        self.file-embed

      ];

    });



  # Needs network >= 3.1.2

  quic = super.quic.overrideScope (self: super: {

    network = self.network_3_1_2_2;

  });



} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

pkgs/development/haskell-modules/configuration-darwin.nix

+1 −0
Original line number Diff line number Diff line
@@ -197,6 +197,7 @@ self: super: ({ 
  hls-pragmas-plugin = dontCheck super.hls-pragmas-plugin;

  hls-haddock-comments-plugin = dontCheck super.hls-haddock-comments-plugin;

  hls-floskell-plugin = dontCheck super.hls-floskell-plugin;

  hls-call-hierarchy-plugin = dontCheck super.hls-call-hierarchy-plugin;



  # We are lacking pure pgrep at the moment for tests to work

  tmp-postgres = dontCheck super.tmp-postgres;

pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ self: super: { 
  # 2021-09-18: Need path >= 0.9.0 for ghc 9 compat

  path = self.path_0_9_0;

  # 2021-09-18: Need ormolu >= 0.3.0.0 for ghc 9 compat

  ormolu = self.ormolu_0_3_0_0;

  ormolu = doDistribute self.ormolu_0_3_0_1;

  # 2021-09-18: https://github.com/haskell/haskell-language-server/issues/2206

  # Restrictive upper bound on ormolu

  hls-ormolu-plugin = doJailbreak super.hls-ormolu-plugin;