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: b93ca0fd67c2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 695960e95fbf
Choose a head ref
  • 15 commits
  • 13 files changed
  • 7 contributors

Commits on Apr 10, 2020

  1. LTS Haskell 15.7

    @peti
    peti committed Apr 10, 2020
    Copy the full SHA
    d80ce4b View commit details

  2. hackage2nix: disable failing builds to fix Nixpkgs evaluation errors

    @peti
    peti committed Apr 10, 2020
    Copy the full SHA
    7467d0a View commit details

  3. haskellPackages.idris: Fix build (new GHC 8.8 & old megaparsec 7) 

    The hackage-packages.nix change was generated by hackage2nix v2.15.1 from Hackage revision
commercialhaskell/all-cabal-hashes@ad4a70d.
    @chkno @peti
    chkno authored and peti committed Apr 10, 2020
    Copy the full SHA
    5c7bf51 View commit details

  4. haskellPackages.persistent-postgresql: don't check 

    Test suite requires database. Disabling tests as is done for mysql backend.
    @turboMaCk @peti
    turboMaCk authored and peti committed Apr 10, 2020
    Copy the full SHA
    0a4769b View commit details

  5. hackage2nix: update extra-packages we keep around for tensorflow 

    This is the first step towards unbreaking the tensorflow packages.
    @mikesperber @peti
    mikesperber authored and peti committed Apr 10, 2020
    Copy the full SHA
    267d7a1 View commit details

  6. hackage2nix: unbreak hsexif

    @samdoshi @peti
    samdoshi authored and peti committed Apr 10, 2020
    Copy the full SHA
    c64ba7e View commit details

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

    This update was generated by hackage2nix v2.15.1 from Hackage revision
commercialhaskell/all-cabal-hashes@c7e2a1a.
    @peti
    peti committed Apr 10, 2020
    Copy the full SHA
    450396e View commit details

  8. haskellPackages.llvm-hs: Use LLVM 9

    @jtojnar @peti
    jtojnar authored and peti committed Apr 10, 2020
    Copy the full SHA
    5427f5f View commit details

  9. ghc: don't use ld.gold with musl libc (fixes #84670) 

    ld.gold doesn't play well with musl as is documented in #49071 and
https://sourceware.org/bugzilla/show_bug.cgi?id=23856
    @adamse @peti
    adamse authored and peti committed Apr 10, 2020
    Copy the full SHA
    4675649 View commit details

  10. ghc: mention why ld.gold is disabled for musl libc

    @adamse @peti
    adamse authored and peti committed Apr 10, 2020
    Copy the full SHA
    08a9d51 View commit details

  11. haskell-tensorflow: fix evalution errors 

    The configuration-tensorflow.nix file specified several overrides for version
0.2.x packages, but those packages are no longer included in our package set
because they are so old. (Current versions seem to be in the range of 0.6.x.)

I fixed the evalution errors, but I did not verify whether these packages
actually build with the newer versions.
    @peti
    peti committed Apr 10, 2020
    Copy the full SHA
    6ec9d95 View commit details

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

    This update was generated by hackage2nix v2.15.1 from Hackage revision
commercialhaskell/all-cabal-hashes@c7e2a1a.
    @peti
    peti committed Apr 10, 2020
    Copy the full SHA
    a88efcf View commit details

  13. haskell-ShellCheck: drop obsolete patch to fix the build

    @peti
    peti committed Apr 10, 2020
    Copy the full SHA
    556367e View commit details

  14. darcs: don't try to build the package with ghc-8.8.x

    @peti
    peti committed Apr 10, 2020
    Copy the full SHA
    0eb4bfa View commit details

  15. Merge pull request #84712 from NixOS/haskell-updates 

    Update Haskell package set to LTS 15.7 (plus other fixes)
    @peti
    peti authored Apr 10, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    695960e View commit details
4 changes: 3 additions & 1 deletion pkgs/development/compilers/ghc/8.10.1.nix
View file
Original file line number Diff line number Diff line change
@@ -84,7 +84,9 @@ let

targetCC = builtins.head toolsForTarget;

useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false);
# ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
# see #84670 and #49071 for more background.
useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;

in
stdenv.mkDerivation (rec {
4 changes: 3 additions & 1 deletion pkgs/development/compilers/ghc/8.4.4.nix
View file
Original file line number Diff line number Diff line change
@@ -79,7 +79,9 @@ let

targetCC = builtins.head toolsForTarget;

useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false);
# ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
# see #84670 and #49071 for more background.
useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;

in
stdenv.mkDerivation (rec {
4 changes: 3 additions & 1 deletion pkgs/development/compilers/ghc/8.6.5.nix
View file
Original file line number Diff line number Diff line change
@@ -84,7 +84,9 @@ let

targetCC = builtins.head toolsForTarget;

useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false);
# ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
# see #84670 and #49071 for more background.
useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;

in
stdenv.mkDerivation (rec {
4 changes: 3 additions & 1 deletion pkgs/development/compilers/ghc/8.8.1.nix
View file
Original file line number Diff line number Diff line change
@@ -84,7 +84,9 @@ let

targetCC = builtins.head toolsForTarget;

useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false);
# ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
# see #84670 and #49071 for more background.
useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;

in
stdenv.mkDerivation (rec {
4 changes: 3 additions & 1 deletion pkgs/development/compilers/ghc/8.8.2.nix
View file
Original file line number Diff line number Diff line change
@@ -84,7 +84,9 @@ let

targetCC = builtins.head toolsForTarget;

useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false);
# ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
# see #84670 and #49071 for more background.
useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;

in
stdenv.mkDerivation (rec {
4 changes: 3 additions & 1 deletion pkgs/development/compilers/ghc/8.8.3.nix
View file
Original file line number Diff line number Diff line change
@@ -84,7 +84,9 @@ let

targetCC = builtins.head toolsForTarget;

useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false);
# ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
# see #84670 and #49071 for more background.
useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;

in
stdenv.mkDerivation (rec {
4 changes: 3 additions & 1 deletion pkgs/development/compilers/ghc/head.nix
View file
Original file line number Diff line number Diff line change
@@ -85,7 +85,9 @@ let

targetCC = builtins.head toolsForTarget;

useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false);
# ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
# see #84670 and #49071 for more background.
useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;

in
stdenv.mkDerivation (rec {
31 changes: 15 additions & 16 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -45,18 +45,6 @@ self: super: {
# Needs older QuickCheck version
attoparsec-varword = dontCheck super.attoparsec-varword;

# https://github.com/koalaman/shellcheck/issues/1778
ShellCheck = overrideCabal super.ShellCheck (drv: {
patches = [
# cabal 3.0 support
( pkgs.fetchpatch {
url = "https://github.com/koalaman/shellcheck/commit/2c026f1ec7c205c731ff2a0ccd85365f37245.patch";
sha256 = "0z6yf350ngr6rwfkvdy670c476fgzj8a0n4ppdm1xr8r1lij7sfz";
excludes = [ "Dockerfile" ];
})
];
});

# Tests are failing
# https://github.com/bos/statistics/issues/123
statistics = dontCheck super.statistics;
@@ -716,10 +704,19 @@ self: super: {
'';
});

# The standard libraries are compiled separately
idris = generateOptparseApplicativeCompletion "idris" (
doJailbreak (dontCheck super.idris)
);
# The standard libraries are compiled separately.
# The megaparsec-7 override is needed because https://github.com/idris-lang/Idris-dev/issues/4826 declares that
# idris1 has no plans to migrate to megaparsec-8.
# The idris-lang/Idris-dev#4808 patch is for GHC 8.8 compatibility, and can likely be removed with the next release.
idris = generateOptparseApplicativeCompletion "idris" (doJailbreak (dontCheck
(appendPatches
(super.idris.override { megaparsec = self.megaparsec_7_0_5; }) [
(pkgs.fetchpatch {
url = "https://github.com/idris-lang/Idris-dev/pull/4808.diff";
sha256 = "060ib1rczy34ip8xf3bv1pf28655f6s0bvvij19jhh5dpcr0pf71";
excludes = [ ".travis.yml" "Makefile" "appveyor.yml" ];
})
])));

# https://github.com/bos/math-functions/issues/25
math-functions = dontCheck super.math-functions;
@@ -1465,7 +1462,9 @@ self: super: {
vty = self.vty_5_28_2;
});

# Test suite requires database
persistent-mysql = dontCheck super.persistent-mysql;
persistent-postgresql = dontCheck super.persistent-postgresql;

# Fix EdisonAPI and EdisonCore for GHC 8.8:
# https://github.com/robdockins/edison/pull/16
5 changes: 5 additions & 0 deletions pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
View file
Original file line number Diff line number Diff line change
@@ -91,4 +91,9 @@ self: super: {
# ghc-8.8:
# https://github.com/adnelson/semver-range/issues/15
semver-range = dontCheck super.semver-range;

# The current version 2.14.2 does not compile with ghc-8.8.x or newer because
# of issues with Cabal 3.x.
darcs = dontDistribute super.darcs;

}
Loading