Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c1a66a49fb2a
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d994f1cfd4d9
Choose a head ref
  • 16 commits
  • 6 files changed
  • 6 contributors

Commits on Sep 27, 2018

  1. dune: 1.2.1 -> 1.3.0

    @vbgl
    vbgl committed Sep 27, 2018

    Unverified

    No user is associated with the committer email.
    Learn about vigilant mode
    Copy the full SHA
    d4ba6c0 View commit details

Commits on Sep 28, 2018

  1. Merge pull request #47436 from vbgl/dune-1.3.0 

    dune: 1.2.1 -> 1.3.0
    @srhb
    srhb authored Sep 28, 2018

    Unverified

    No user is associated with the committer email.
    Learn about vigilant mode
    Copy the full SHA
    535ac18 View commit details

  2. haskellPackages.term-rewriting: doJailbreak and dontCheck

    @srhb
    srhb committed Sep 28, 2018

    Unverified

    No user is associated with the committer email.
    Learn about vigilant mode
    Copy the full SHA
    5c45ca0 View commit details

  3. ansible: add dopy dependency for digitalocean integration (#47441)

    @offlinehacker @xeji
    offlinehacker authored and xeji committed Sep 28, 2018
    Copy the full SHA
    dd7de49 View commit details

  4. haskellPackages.generic-lens: apply patch to fix tests

    Nathan van Doorn committed Sep 28, 2018
    Copy the full SHA
    550fe15 View commit details

  5. Merge pull request #47456 from srhb/haskellPackages-term-rewriting 

    haskellPackages.term-rewriting: doJailbreak and dontCheck
    @basvandijk
    basvandijk authored Sep 28, 2018
    Copy the full SHA
    5af67a3 View commit details

  6. Merge pull request #47424 from Taneb/dontcheck-generic-lens 

    haskellPackages.generic-lens: dontCheck
    @basvandijk
    basvandijk authored Sep 28, 2018
    Copy the full SHA
    0ab8fa2 View commit details

  7. haskell-fgl: fix build with ghc-8.6.x

    @peti
    peti committed Sep 28, 2018
    Copy the full SHA
    35cf30b View commit details

  8. haskell-lens: disable test suite to fix build with ghc-8.6.x

    @peti
    peti committed Sep 28, 2018
    Copy the full SHA
    147c5da View commit details

  9. haskell-JuicyPixels: use latest version when building with ghc-8.6.x

    @peti
    peti committed Sep 28, 2018
    Copy the full SHA
    b68e320 View commit details

  10. haskell-Glob: use latest version when building with ghc-8.6.x

    @peti
    peti committed Sep 28, 2018
    Copy the full SHA
    9f66035 View commit details

  11. haskell-control-monad-free: mark broken when building with ghc-8.6.x

    @peti
    peti committed Sep 28, 2018
    Copy the full SHA
    89223a9 View commit details

  12. haskell-lens: put override into alphabetical order

    @peti
    peti committed Sep 28, 2018
    Copy the full SHA
    bb5638e View commit details

  13. haskell-hslogger: use latest version when building with ghc-8.6.x

    @peti
    peti committed Sep 28, 2018
    Copy the full SHA
    2c5e1c0 View commit details

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

    This update was generated by hackage2nix v2.11.1 from Hackage revision
commercialhaskell/all-cabal-hashes@deb25ca.
    @peti
    peti committed Sep 28, 2018
    Copy the full SHA
    fd02cfd View commit details

  15. git-annex: update sha256 for new version 6.20180926

    @peti
    peti committed Sep 28, 2018
    Copy the full SHA
    d994f1c View commit details
11 changes: 10 additions & 1 deletion pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -86,7 +86,7 @@ self: super: {
name = "git-annex-${super.git-annex.version}-src";
url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + super.git-annex.version;
sha256 = "1y56dlhx3azny5hzixn9x4kmzzpmakzyvw45qk8x4ffsc7jqq5bs";
sha256 = "09rhss1s6gxmqvb8k2l0f55mv38igyvikmm6d07zxkw6049q3maz";
};
}).override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@@ -999,6 +999,9 @@ self: super: {
'';
});

# https://github.com/haskell-rewriting/term-rewriting/issues/11
term-rewriting = dontCheck (doJailbreak super.term-rewriting);

# https://github.com/nick8325/twee/pull/1
twee-lib = dontHaddock super.twee-lib;

@@ -1150,4 +1153,10 @@ self: super: {
};
};

# https://github.com/kcsongor/generic-lens/pull/60
generic-lens = appendPatch super.generic-lens (pkgs.fetchpatch {
url = https://github.com/kcsongor/generic-lens/commit/d9af1ec22785d6c21e928beb88fc3885c6f05bed.patch;
sha256 = "0ljwcha9l52gs5bghxq3gbzxfqmfz3hxxcg9arjsjw8f7kw946xq";
});

} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
12 changes: 11 additions & 1 deletion pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
View file
Original file line number Diff line number Diff line change
@@ -46,14 +46,21 @@ self: super: {

# LTS-12.x versions do not compile.
contravariant = self.contravariant_1_5;
control-monad-free = markBrokenVersion "0.6.1" super.control-monad-free;
doctest = self.doctest_0_16_0_1;
doctest_0_16_0_1 = dontCheck super.doctest_0_16_0_1;
Glob = self.Glob_0_9_3;
haddock-library = markBroken super.haddock-library;
hslogger = self.hslogger_1_2_12;
hspec = self.hspec_2_5_7;
hspec-core = self.hspec-core_2_5_7;
hspec-core_2_5_7 = super.hspec-core_2_5_7.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_4; });
hspec-discover = self.hspec-discover_2_5_7;
hspec-meta = self.hspec-meta_2_5_6;
hspec-meta_2_5_6 = super.hspec-meta_2_5_6.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_4; });
JuicyPixels = self.JuicyPixels_3_3_1;
lens = dontCheck super.lens; # avoid depending on broken polyparse
polyparse = markBrokenVersion "1.12" super.polyparse;
primitive = self.primitive_0_6_4_0;
tagged = self.tagged_0_8_6;
unordered-containers = dontCheck super.unordered-containers;
@@ -65,8 +72,11 @@ self: super: {
hashable-time = doJailbreak super.hashable-time; # base >=4.7 && <4.12
integer-logarithms = doJailbreak super.integer-logarithms; # base >=4.3 && <4.12
optparse-applicative = doJailbreak super.optparse-applicative; # https://github.com/pcapriotti/optparse-applicative/issues/319
polyparse = markBrokenVersion "1.12" super.polyparse; # version 1.12 fails to compile
tar = doJailbreak super.tar; # containers >=0.2 && <0.6
test-framework = doJailbreak super.test-framework; # containers >=0.1 && <0.6

# https://github.com/haskell/fgl/issues/79
# https://github.com/haskell/fgl/issues/81
fgl = appendPatch super.fgl ./patches/fgl-monad-fail.patch;

}
Loading