Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b8c827c2660f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 21fdd139680e
Choose a head ref
  • 15 commits
  • 4 files changed
  • 1 contributor

Commits on Jun 14, 2019

  1. LTS Haskell 13.25

    @peti
    peti committed Jun 14, 2019
    Copy the full SHA
    c0c65d6 View commit details

  2. hackage-packages.nix: automatic Haskell package set update 

    This update was generated by hackage2nix v2.14.3-6-g315012a from Hackage revision
commercialhaskell/all-cabal-hashes@413f238.
    @peti
    peti committed Jun 14, 2019
    Copy the full SHA
    bb5ef79 View commit details

  3. haskell-pandoc: update overrides for latest version

    @peti
    peti committed Jun 14, 2019
    Copy the full SHA
    09b0c36 View commit details

  4. haskell-hlint: use the latest ghc-lib-parser version

    @peti
    peti committed Jun 14, 2019
    Copy the full SHA
    142b8b5 View commit details

  5. haskell-tasty-lua: disable test suite to fix the build

    @peti
    peti committed Jun 14, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    65ca963 View commit details

  6. haskell-hslua-module-system: re-enable the build; it succeeds fine now

    @peti
    peti committed Jun 14, 2019
    Copy the full SHA
    caeebbb View commit details

  7. haskell-cryptol: update overrides for new sbv version

    @peti
    peti committed Jun 14, 2019
    Copy the full SHA
    0a253d7 View commit details

  8. haskell-constraints-deriving: disable test suite to fix the build

    @peti
    peti committed Jun 14, 2019
    Copy the full SHA
    e112631 View commit details

  9. haskell-ip: use version 1.5.x to fix the build

    @peti
    peti committed Jun 14, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    af37181 View commit details

  10. hackage2nix: disable broken builds to fix Hydra evaluation

    @peti
    peti committed Jun 14, 2019
    Copy the full SHA
    9df1e34 View commit details

  11. pandoc: update build dependency version for the new 2.7.3 release

    @peti
    peti committed Jun 14, 2019
    Copy the full SHA
    a8a43ab View commit details

  12. hackage2nix: update list of broken builds

    @peti
    peti committed Jun 14, 2019
    Copy the full SHA
    4b3e62d View commit details

  13. all-cabal-hashes: update to Hackage at 2019-06-14T00:22:02Z

    @peti
    peti committed Jun 14, 2019
    Copy the full SHA
    c2e65c0 View commit details

  14. haskell-stack: add plenty of overrides to fix the build in LTS-13.x

    @peti
    peti committed Jun 14, 2019
    Copy the full SHA
    9b68353 View commit details

  15. hackage-packages.nix: automatic Haskell package set update 

    This update was generated by hackage2nix v2.14.3-6-g315012a from Hackage revision
commercialhaskell/all-cabal-hashes@0bcde76.
    @peti
    peti committed Jun 14, 2019
    Copy the full SHA
    21fdd13 View commit details
4 changes: 2 additions & 2 deletions pkgs/data/misc/hackage/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ fetchurl }:

fetchurl {
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/85d71d5231521c70b961570dbbee953253fb379b.tar.gz";
sha256 = "1mdp2ivnx7wvd63bq1li9gpsm5sv1s167crv1jjlqw578lbi8hv7";
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/bee48f46f4c9e9c1195bf81efb61fa5fb0aec0dc.tar.gz";
sha256 = "0wxj0iakqy1cyncga8s1qlb8c06vj3ilh5z8lpann7xr8yh6sm4b";
}
27 changes: 23 additions & 4 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -860,7 +860,7 @@ self: super: {
# Wrap the generated binaries to include their run-time dependencies in
# $PATH. Also, cryptol needs a version of sbl that's newer than what we have
# in LTS-13.x.
cryptol = overrideCabal (super.cryptol.override { sbv = self.sbv_8_2; }) (drv: {
cryptol = overrideCabal (super.cryptol.override { sbv = self.sbv_8_3; }) (drv: {
buildTools = drv.buildTools or [] ++ [ pkgs.makeWrapper ];
postInstall = drv.postInstall or "" + ''
for b in $out/bin/cryptol $out/bin/cryptol-html; do
@@ -1099,7 +1099,14 @@ self: super: {

# Generate shell completion.
cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
stack = generateOptparseApplicativeCompletion "stack" super.stack;
stack = generateOptparseApplicativeCompletion "stack" (super.stack.overrideScope (self: super: {
ansi-terminal = self.ansi-terminal_0_9_1;
concurrent-output = self.concurrent-output_1_10_10; # needed for new ansi-terminal version
rio = self.rio_0_1_9_2;
hi-file-parser = dontCheck super.hi-file-parser; # Avoid depending on newer hspec versions.
http-download = dontCheck super.http-download;
pantry-tmp = dontCheck super.pantry-tmp;
}));

# musl fixes
# dontCheck: use of non-standard strptime "%s" which musl doesn't support; only used in test
@@ -1174,7 +1181,7 @@ self: super: {
# https://github.com/mgajda/json-autotype/issues/25
json-autotype = dontCheck super.json-autotype;

# The LTS-13.x version doesn't suffice to build hlint, hoogle, etc.
# The LTS-13.x versions doesn't suffice to build these packages.
hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; });
hoogle = super.hoogle.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; });

@@ -1217,8 +1224,11 @@ self: super: {

# Use latest pandoc despite what LTS says.
# Test suite fails in both 2.5 and 2.6: https://github.com/jgm/pandoc/issues/5309.
pandoc = doDistribute super.pandoc_2_7_2;
cmark-gfm = self.cmark-gfm_0_2_0;
pandoc = doDistribute super.pandoc_2_7_3;
pandoc-citeproc = doDistribute super.pandoc-citeproc_0_16_2;
skylighting = self.skylighting_0_8_1_1;
skylighting-core = self.skylighting-core_0_8_1_1;

# Current versions of tasty-hedgehog need hedgehog 1.x, which
# we don't have in LTS-13.x.
@@ -1270,4 +1280,13 @@ self: super: {
# https://github.com/pruvisto/heap/issues/11
heap = dontCheck super.heap;

# https://github.com/hslua/tasty-lua/issues/1
tasty-lua = dontCheck super.tasty-lua;

# Test suite won't link for no apparent reason.
constraints-deriving = dontCheck super.constraints-deriving;

# The old LTS-13.x version does not compile.
ip = self.ip_1_5_0;

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