Unverified Commit 4269070d authored by Dennis Gosnell's avatar Dennis Gosnell Committed by GitHub
Browse files

Merge pull request #142641 from NixOS/haskell-updates 

haskellPackages: update stackage and hackage
parents 1403ce52 316dee01

pkgs/data/misc/hackage/pin.json

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

  "commit": "b60d5f4b773d16857c105718faad9699e145edcd",

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

  "sha256": "19avxynbjhkhvjy5kcxgd3fp0b2nczsk213s1za488r6kksj90f5",

  "msg": "Update from Hackage at 2021-10-18T14:27:09Z"

  "commit": "f2537d46db49014726f8ad00dcc60f5e41213397",

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

  "sha256": "021j2xn1xk8fqs7648si42n7z6rjzp4jnags4jkfnk1f81swns6h",

  "msg": "Update from Hackage at 2021-10-23T04:57:02Z"

}

pkgs/development/compilers/ghc/9.2.1.nix

+4 −14
Original line number Diff line number Diff line
@@ -142,24 +142,14 @@ let 


in

stdenv.mkDerivation (rec {

  version = "9.2.0.20210821";

  version = "9.2.1";

  pname = "${targetPrefix}ghc${variantSuffix}";



  src = fetchurl {

    url = "https://downloads.haskell.org/ghc/9.2.1-rc1/ghc-${version}-src.tar.xz";

    sha256 = "1q2pppxv2avhykyxvyq72r5p97rkkiqp19b77yhp85ralbcp4ivw";

    url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";

    sha256 = "f444012f97a136d9940f77cdff03fda48f9475e2ed0fec966c4d35c4df55f746";

  };



  patches = [

    # picked from release branch, remove with the next release candidate,

    # see https://gitlab.haskell.org/ghc/ghc/-/issues/19950#note_373726

    (fetchpatch {

      name = "fix-darwin-link-failure.patch";

      url = "https://gitlab.haskell.org/ghc/ghc/-/commit/77456387025ca74299ecc70621cbdb62b1b6ffc9.patch";

      sha256 = "1g8smrn7hj8cbp9fhrylvmrb15s0xd8lhdgxqnx0asnd4az82gj8";

    })

  ];



  enableParallelBuilding = true;



  outputs = [ "out" "doc" ];
@@ -255,7 +245,7 @@ stdenv.mkDerivation (rec { 
  ] ++ lib.optionals enableDocs [

    sphinx

  ] ++ lib.optionals stdenv.isDarwin [

    # TODO(@sternenseemann): use XATTR env var after backport of

    # TODO(@sternenseemann): backport addition of XATTR env var like

    # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6447

    xattr

  ];

pkgs/development/compilers/ghcjs/patches/vector-ghcjs-storable-set.patch

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
diff --git a/Data/Vector/Storable/Mutable.hs b/Data/Vector/Storable/Mutable.hs

index 8b538bc..2b74fce 100644

--- a/Data/Vector/Storable/Mutable.hs

+++ b/Data/Vector/Storable/Mutable.hs

@@ -197,7 +197,9 @@ storableSet (MVector n fp) x

                   1 -> storableSetAsPrim n fp x (undefined :: Word8)

                   2 -> storableSetAsPrim n fp x (undefined :: Word16)

                   4 -> storableSetAsPrim n fp x (undefined :: Word32)

+#if !defined(ghcjs_HOST_OS)

                   8 -> storableSetAsPrim n fp x (undefined :: Word64)

+#endif

                   _ -> unsafeWithForeignPtr fp $ \p -> do

                        poke p x

pkgs/development/haskell-modules/cabal2nix-unstable.nix

+3 −3
Original line number Diff line number Diff line
@@ -8,10 +8,10 @@ 
}:

mkDerivation {

  pname = "cabal2nix";

  version = "unstable-2021-09-28";

  version = "unstable-2021-10-23";

  src = fetchzip {

    url = "https://github.com/NixOS/cabal2nix/archive/b4d893ed1a7a66b0046dd8a48f62b81de670ab02.tar.gz";

    sha256 = "0xl5a0gfxrqz8pkx43zrj84xvcg15723lgvirxdcvc4zqa732zjg";

    url = "https://github.com/NixOS/cabal2nix/archive/8aeef87436468a416e5908b48ec82ac3f15eb885.tar.gz";

    sha256 = "1w6wabp0v2fii5i28nsp0ss6dsz222p94mmxrrns3q0df82s2cm1";

  };

  isLibrary = true;

  isExecutable = true;

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

+26 −29
Original line number Diff line number Diff line
@@ -281,7 +281,9 @@ self: super: { 
  lvmrun = disableHardening (dontCheck super.lvmrun) ["format"];

  matplotlib = dontCheck super.matplotlib;

  # https://github.com/matterhorn-chat/matterhorn/issues/679 they do not want to be on stackage

  matterhorn = doJailbreak super.matterhorn; # this is needed until the end of time :')

  matterhorn = doJailbreak (super.matterhorn.overrideScope (self: super: {

    brick = self.brick_0_64_2;

  }));

  memcache = dontCheck super.memcache;

  metrics = dontCheck super.metrics;

  milena = dontCheck super.milena;
@@ -631,20 +633,7 @@ self: super: { 
  #   removed when the next idris release (1.3.4 probably) comes

  #   around.

  idris = generateOptparseApplicativeCompletion "idris"

    (doJailbreak (dontCheck

      (appendPatches super.idris [

        # compatibility with haskeline >= 0.8

        (pkgs.fetchpatch {

          url = "https://github.com/idris-lang/Idris-dev/commit/89a87cf666eb8b27190c779e72d0d76eadc1bc14.patch";

          sha256 = "0fv493zlpgjsf57w0sncd4vqfkabfczp3xazjjmqw54m9rsfix35";

        })

        # compatibility with megaparsec >= 0.9

        (pkgs.fetchpatch {

          url = "https://github.com/idris-lang/Idris-dev/commit/6ea9bc913877d765048d7cdb7fc5aec60b196fac.patch";

          sha256 = "0yms74d1xdxd1c08dnp45nb1ddzq54n6hqgzxx0r494wy614ir8q";

        })

      ])

    ));

    (doJailbreak (dontCheck super.idris));



  # https://github.com/pontarius/pontarius-xmpp/issues/105

  pontarius-xmpp = dontCheck super.pontarius-xmpp;
@@ -692,19 +681,17 @@ self: super: { 
  # For 2.17 support: https://github.com/JonasDuregard/sized-functors/pull/10

  size-based = doJailbreak super.size-based;



  # Remove as soon as we update to monoid-extras 0.6 and unpin these packages

  dual-tree = doJailbreak super.dual-tree;

  diagrams-core = doJailbreak super.diagrams-core;

  # https://github.com/diagrams/diagrams-braille/issues/1

  diagrams-braille = doJailbreak super.diagrams-braille;



  # Apply patch from master to add compat with optparse-applicative >= 0.16.

  # We unfortunately can't upgrade to 1.4.4 which includes this patch yet

  # since it would require monoid-extras 0.6 which breaks other diagrams libs.

  diagrams-lib = doJailbreak (appendPatch super.diagrams-lib

    (pkgs.fetchpatch {

      url = "https://github.com/diagrams/diagrams-lib/commit/4b9842c3e3d653be69af19778970337775e2404d.patch";

      sha256 = "0xqvzh3ip9i0nv8xnh41afxki64r259pxq8ir1a4v99ggnldpjaa";

      includes = [ "*/CmdLine.hs" ];

    }));

  # https://github.com/timbod7/haskell-chart/pull/231#issuecomment-953745932

  Chart-diagrams = doJailbreak super.Chart-diagrams;



  # https://github.com/xu-hao/namespace/issues/1

  namespace = doJailbreak super.namespace;



  # https://github.com/cchalmers/plots/issues/46

  plots = doJailbreak super.plots;



  # https://github.com/diagrams/diagrams-solve/issues/4

  diagrams-solve = dontCheck super.diagrams-solve;
@@ -1132,8 +1119,10 @@ self: super: { 
  });



  # Chart-tests needs and compiles some modules from Chart itself

  Chart-tests = (addExtraLibrary super.Chart-tests self.QuickCheck).overrideAttrs (old: {

    preCheck = old.postPatch or "" + ''

  Chart-tests = overrideCabal (addExtraLibrary super.Chart-tests self.QuickCheck) (old: {

    # https://github.com/timbod7/haskell-chart/issues/233

    jailbreak = true;

    preCheck = old.preCheck or "" + ''

      tar --one-top-level=../chart --strip-components=1 -xf ${self.Chart.src}

    '';

  });
@@ -2071,4 +2060,12 @@ EOT 
  # file revision on hackage was gifted CRLF line endings

  gogol-core = appendPatch super.gogol-core ./patches/gogol-core-144.patch;



  # cabal tries to install files we're supplying from the system

  # https://github.com/hslua/hslua/pull/103

  lua = appendPatch super.lua (pkgs.fetchpatch {

    url = "https://github.com/hslua/hslua/pull/103/commits/814bf1bb284151e827b1c11a7277819ed2779dd2.patch";

    sha256 = "1kj0g51lkjyf6jv2ikayb3cfh0dcr669swmxl9a2mcrizxcbkrhy";

    stripLen = 1;

  });



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