Unverified Commit 0f68824d authored by sternenseemann's avatar sternenseemann Committed by GitHub
Browse files

Merge pull request #181288 from NixOS/haskell-updates 

haskellPackages: update stackage and hackage
parents 656fa68f fdbcbdab

nixos/modules/services/system/cachix-agent/default.nix

+6 −3
Original line number Diff line number Diff line
@@ -52,12 +52,15 @@ in { 
      path = [ config.nix.package ];

      wantedBy = [ "multi-user.target" ];



      # don't restart while changing

      restartIfChanged = false;

      # Cachix requires $USER to be set

      environment.USER = "root";



      # don't stop the service if the unit disappears

      unitConfig.X-StopOnRemoval = false;



      environment.USER = "root";

      serviceConfig = {

        # we don't want to kill children processes as those are deployments

        KillMode = "process";

        Restart = "on-failure";

        EnvironmentFile = cfg.credentialsFile;

        ExecStart = "${cfg.package}/bin/cachix ${lib.optionalString cfg.verbose "--verbose"} deploy agent ${cfg.name} ${if cfg.profile != null then profile else ""}";

pkgs/data/misc/hackage/pin.json

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

  "commit": "c096b9d83b86ab92dffac5d97927e8458ebd4dfa",

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

  "sha256": "1j9j97zn8qhxsigi73319l0dairkymjk6mknsgindzgsvrrag9xg",

  "msg": "Update from Hackage at 2022-07-07T10:54:07Z"

  "commit": "0b418fc93e5dd9f19c4ca625c57e2cf984267e90",

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

  "sha256": "0rvx383fyl39spw0qr7a1rpqnyzfsjykakia4y2z3658aw4k72cx",

  "msg": "Update from Hackage at 2022-07-12T21:40:07Z"

}

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

+27 −11
Original line number Diff line number Diff line
@@ -352,15 +352,22 @@ self: super: { 
  lvmrun = disableHardening ["format"] (dontCheck super.lvmrun);

  matplotlib = dontCheck super.matplotlib;



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

  brick_0_73 = doDistribute (super.brick_0_73.overrideScope (self: super: {

    vty = self.vty_5_36;

  });

    text-zipper = self.text-zipper_0_12;

  }));



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

  # Needs brick ^>= 0.70

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

    brick = self.brick_0_71_1;

  }));

  matterhorn = doJailbreak (appendPatches [

    # Fix build with brick 0.73

    (fetchpatch {

      name = "matterhorn-brick-0.72.patch";

      url = "https://github.com/matterhorn-chat/matterhorn/commit/d52df3342b8420e219095aad477205e47fbef11b.patch";

      sha256 = "1ifvv926g9m8niyc9nl1hy9bkx4kf12ciyv2v8vnrzz3njp4fsrz";

    })

  ] (super.matterhorn.overrideScope (self: super: {

    brick = self.brick_0_73;

  })));



  memcache = dontCheck super.memcache;

  metrics = dontCheck super.metrics;
@@ -2139,14 +2146,22 @@ self: super: { 


  # 2022-03-21: Newest stylish-haskell needs ghc-lib-parser-9_2

  stylish-haskell = (super.stylish-haskell.override {

    ghc-lib-parser = super.ghc-lib-parser_9_2_3_20220527;

    ghc-lib-parser = super.ghc-lib-parser_9_2_3_20220709;

    ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_1_0;

  });



  ghc-lib-parser-ex_9_2_1_0 = super.ghc-lib-parser-ex_9_2_1_0.override {

    ghc-lib-parser = super.ghc-lib-parser_9_2_3_20220527;

    ghc-lib-parser = super.ghc-lib-parser_9_2_3_20220709;

  };



  ghc-lib-parser-ex_9_2_0_4 = super.ghc-lib-parser-ex_9_2_0_4.override {

    ghc-lib-parser = super.ghc-lib-parser_9_2_3_20220709;

  };



  hlint_3_4_1 = doDistribute (super.hlint_3_4_1.override {

    ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4;

  });



  # To strict bound on hspec

  # https://github.com/dagit/zenc/issues/5

  zenc = doJailbreak super.zenc;
@@ -2207,9 +2222,10 @@ self: super: { 
  # file revision on hackage was gifted CRLF line endings

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



  # Too strict bound on deepseq

  # https://github.com/hadolint/hadolint/issues/800

  hadolint = doJailbreak super.hadolint;

  # Stackage LTS 19 still has 10.*

  hadolint = super.hadolint.override {

    language-docker = self.language-docker_11_0_0;

  };



  nix-tree = super.nix-tree;

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

+6 −17
Original line number Diff line number Diff line
@@ -51,11 +51,8 @@ self: super: { 
  # Tests fail because of typechecking changes

  conduit = dontCheck super.conduit;



  # 0.30 introduced support for GHC 9.2.x, so when this assert fails, the whole block can be removed

  cryptonite = assert super.cryptonite.version == "0.29"; appendPatch (pkgs.fetchpatch {

    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/cryptonite-0.29.patch";

    sha256 = "1g48lrmqgd88hqvfq3klz7lsrpwrir2v1931myrhh6dy0d9pqj09";

  }) super.cryptonite;

  # 0.30 introduced support for GHC 9.2.

  cryptonite = doDistribute self.cryptonite_0_30;



  # cabal-install needs more recent versions of Cabal

  cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: {
@@ -82,7 +79,7 @@ self: super: { 
  constraints = doJailbreak super.constraints;

  cpphs = overrideCabal (drv: { postPatch = "sed -i -e 's,time >=1.5 && <1.11,time >=1.5 \\&\\& <1.12,' cpphs.cabal";}) super.cpphs;

  data-fix = doJailbreak super.data-fix;

  dbus = super.dbus_1_2_24;

  dbus = self.dbus_1_2_25;

  dec = doJailbreak super.dec;

  ed25519 = doJailbreak super.ed25519;

  ghc-byteorder = doJailbreak super.ghc-byteorder;
@@ -100,8 +97,8 @@ self: super: { 
      self.data-default

    ] ++ drv.libraryHaskellDepends or [];

  }) super.ghc-exactprint;

  ghc-lib = self.ghc-lib_9_2_3_20220527;

  ghc-lib-parser = self.ghc-lib-parser_9_2_3_20220527;

  ghc-lib = self.ghc-lib_9_2_3_20220709;

  ghc-lib-parser = self.ghc-lib-parser_9_2_3_20220709;

  ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_1_0;

  hackage-security = doJailbreak super.hackage-security;

  hashable = super.hashable_1_4_0_2;
@@ -126,14 +123,6 @@ self: super: { 
  singleton-bool = doJailbreak super.singleton-bool;

  servant = doJailbreak super.servant;

  servant-auth = doJailbreak super.servant-auth;

  servant-server = appendPatches [

    # awaiting release

    (pkgs.fetchpatch {

      url = "https://github.com/haskell-servant/servant/commit/61d0d14b5cb01db3d589101b3f17b0178f52e386.diff";

      relative = "servant-server";

      sha256 = "sha256-3lM8xLO8avVRo8oncJR8QLDSWEzOaoCmzgVtyaEBEw8=";

    })

  ] (doJailbreak super.servant-server);

  servant-swagger = doJailbreak super.servant-swagger;

  servant-auth-swagger = doJailbreak super.servant-auth-swagger;

  shelly = doJailbreak super.shelly;
@@ -180,7 +169,7 @@ self: super: { 
  } super.memory);



  # Use hlint from git for GHC 9.2.1 support

  hlint = self.hlint_3_4;

  hlint = self.hlint_3_4_1;



  # https://github.com/sjakobi/bsb-http-chunked/issues/38

  bsb-http-chunked = dontCheck super.bsb-http-chunked;

pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml

+11 −0
Original line number Diff line number Diff line
@@ -421,6 +421,7 @@ broken-packages: 
  - bizzlelude-js

  - bkr

  - blakesum

  - Blammo

  - blas

  - blaze-html-contrib

  - blaze-html-hexpat
@@ -1268,6 +1269,7 @@ broken-packages: 
  - effin

  - egison-pattern-src

  - ehaskell

  - ehlo

  - ehs

  - eibd-client-simple

  - eigen
@@ -1380,6 +1382,7 @@ broken-packages: 
  - exinst

  - exists

  - exitcode

  - exon

  - exp-cache

  - explain

  - explicit-constraint-lens
@@ -2150,6 +2153,7 @@ broken-packages: 
  - heist-emanote

  - helic

  - helisp

  - helix

  - hell

  - helm

  - help-esb
@@ -2180,6 +2184,7 @@ broken-packages: 
  - hext

  - hextra

  - heyefi

  - heystone

  - hF2

  - hfann

  - HFitUI
@@ -4146,6 +4151,7 @@ broken-packages: 
  - pyfi

  - python-pickle

  - q4c12-twofinger

  - qbe

  - qc-oi-testgenerator

  - qd

  - qed
@@ -4323,6 +4329,7 @@ broken-packages: 
  - relacion

  - relapse

  - relevant-time

  - reload

  - remark

  - remarks

  - remote
@@ -4655,6 +4662,7 @@ broken-packages: 
  - simple-form

  - simple-genetic-algorithm

  - SimpleH

  - SimpleServer

  - simple-index

  - simpleirc

  - simple-log
@@ -4785,6 +4793,7 @@ broken-packages: 
  - sodium

  - soegtk

  - softfloat-hs

  - solga

  - sonic-visualiser

  - Sonnex

  - SoOSiM
@@ -5059,6 +5068,7 @@ broken-packages: 
  - tapioca

  - TaskMonad

  - tasty-auto

  - tasty-autocollect

  - tasty-fail-fast

  - tasty-grading-system

  - tasty-hedgehog-coverage
@@ -5573,6 +5583,7 @@ broken-packages: 
  - wai-request-spec

  - wai-responsible

  - wai-router

  - wai-routes

  - wai-secure-cookies

  - wai-session-alt

  - wai-session-mysql