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: ff060e74b830
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2b9916c715d2
Choose a head ref
  • 10 commits
  • 6 files changed
  • 2 contributors

Commits on Nov 5, 2018

  1. ghc-8.2.1-binary: Patch shebang causing failures in Centos 6

    @unode @peti
    unode authored and peti committed Nov 5, 2018

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 82AE0A31B33CEFCF
    Learn about vigilant mode
    Copy the full SHA
    3bcdb39 View commit details

  2. hackage2nix: disable failing Hydra builds

    @peti
    peti committed Nov 5, 2018

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 82AE0A31B33CEFCF
    Learn about vigilant mode
    Copy the full SHA
    68b1d62 View commit details

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

    This update was generated by hackage2nix v2.11.1-3-gc8d18e2 from Hackage revision
commercialhaskell/all-cabal-hashes@01afc16.
    @peti
    peti committed Nov 5, 2018

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 82AE0A31B33CEFCF
    Learn about vigilant mode
    Copy the full SHA
    d15d643 View commit details

  4. haskell-hpack: update overrides for the new version

    @peti
    peti committed Nov 5, 2018

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 82AE0A31B33CEFCF
    Learn about vigilant mode
    Copy the full SHA
    db203c8 View commit details

  5. haskell-hspec: update overrides for the new version

    @peti
    peti committed Nov 5, 2018

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 82AE0A31B33CEFCF
    Learn about vigilant mode
    Copy the full SHA
    748ea69 View commit details

  6. haskell-hspec-core: update overrides for the new version

    @peti
    peti committed Nov 5, 2018

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 82AE0A31B33CEFCF
    Learn about vigilant mode
    Copy the full SHA
    627624f View commit details

  7. haskell-hspec-discover: update overrides for the new version

    @peti
    peti committed Nov 5, 2018

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 82AE0A31B33CEFCF
    Learn about vigilant mode
    Copy the full SHA
    72825b5 View commit details

  8. haskell-hspec: update overrides for the new version some more

    @peti
    peti committed Nov 5, 2018

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 82AE0A31B33CEFCF
    Learn about vigilant mode
    Copy the full SHA
    0a74322 View commit details

  9. haskell-vty: update overrides for the new version

    @peti
    peti committed Nov 5, 2018

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 82AE0A31B33CEFCF
    Learn about vigilant mode
    Copy the full SHA
    90acab5 View commit details

  10. haskell-pandoc: update overrides for the new version

    @peti
    peti committed Nov 5, 2018

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 82AE0A31B33CEFCF
    Learn about vigilant mode
    Copy the full SHA
    2b9916c View commit details
1 change: 1 addition & 0 deletions pkgs/development/compilers/ghc/8.2.1-binary.nix
View file
Original file line number Diff line number Diff line change
@@ -75,6 +75,7 @@ stdenv.mkDerivation rec {
# Some scripts used during the build need to have their shebangs patched
''
patchShebangs ghc-${version}/utils/
patchShebangs ghc-${version}/configure
'' +

# Strip is harmful, see also below. It's important that this happens
4 changes: 2 additions & 2 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -1065,11 +1065,11 @@ self: super: {

# The tool needs a newer hpack version than the one mandated by LTS-12.x.
cabal2nix = super.cabal2nix.overrideScope (self: super: {
hpack = self.hpack_0_31_0;
hpack = self.hpack_0_31_1;
yaml = self.yaml_0_11_0_0;
});
stack2nix = super.stack2nix.overrideScope (self: super: {
hpack = self.hpack_0_31_0;
hpack = self.hpack_0_31_1;
yaml = self.yaml_0_11_0_0;
});

4 changes: 2 additions & 2 deletions pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
View file
Original file line number Diff line number Diff line change
@@ -63,11 +63,11 @@ self: super: {
# more verbose but friendlier for Hydra.
stack = (doJailbreak super.stack).override {
Cabal = self.Cabal_2_4_0_1;
hpack = self.hpack_0_31_0.override { Cabal = self.Cabal_2_4_0_1; };
hpack = self.hpack_0_31_1.override { Cabal = self.Cabal_2_4_0_1; };
yaml = self.yaml_0_11_0_0;
hackage-security = self.hackage-security.override { Cabal = self.Cabal_2_4_0_1; };
};
hpack_0_31_0 = super.hpack_0_31_0.override {
hpack_0_31_1 = super.hpack_0_31_1.override {
yaml = self.yaml_0_11_0_0;
};

12 changes: 6 additions & 6 deletions pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
View file
Original file line number Diff line number Diff line change
@@ -56,12 +56,12 @@ self: super: {
hledger = doJailbreak super.hledger;
hledger-lib = doJailbreak super.hledger-lib;
hledger-ui = doJailbreak super.hledger-ui;
hpack = self.hpack_0_31_0;
hpack = self.hpack_0_31_1;
hslua = self.hslua_1_0_1;
hslua-module-text = self.hslua-module-text_0_2_0;
hspec = self.hspec_2_5_8;
hspec-core = self.hspec-core_2_5_8;
hspec-discover = self.hspec-discover_2_5_8;
hspec = self.hspec_2_6_0;
hspec-core = self.hspec-core_2_6_0;
hspec-discover = self.hspec-discover_2_6_0;
hspec-megaparsec = doJailbreak super.hspec-megaparsec; # newer versions need megaparsec 7.x
hspec-meta = self.hspec-meta_2_5_6;
JuicyPixels = self.JuicyPixels_3_3_2;
@@ -74,7 +74,7 @@ self: super: {
QuickCheck = self.QuickCheck_2_12_6_1;
semigroupoids = self.semigroupoids_5_3_1;
tagged = self.tagged_0_8_6;
vty = self.vty_5_25;
vty = self.vty_5_25_1;
wizards = doJailbreak super.wizards;
wl-pprint-extras = doJailbreak super.wl-pprint-extras;
yaml = self.yaml_0_11_0_0;
@@ -107,7 +107,7 @@ self: super: {
skylighting-core = dontCheck super.skylighting-core;

# https://github.com/jgm/pandoc/issues/4974
pandoc = doJailbreak super.pandoc_2_3_1;
pandoc = doJailbreak super.pandoc_2_4;

# Break out of "yaml >=0.10.4.0 && <0.11".
stack = doJailbreak super.stack;
Loading