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: 0dd99c0fa0cf
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: db7dc9472f95
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 18, 2019

  1. jl: Patch to work with MonadFail GHC 8.6 change 

    Backport of #57284
(cherry picked from commit 79e3dcb)
    @srhb
    srhb committed Mar 18, 2019
    Copy the full SHA
    db7dc94 View commit details
Showing with 9 additions and 1 deletion.
  1. +9 −1 pkgs/development/tools/jl/default.nix
10 changes: 9 additions & 1 deletion pkgs/development/tools/jl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ mkDerivation, fetchFromGitHub
{ mkDerivation, fetchFromGitHub, fetchpatch
, aeson, aeson-pretty, attoparsec, base, bytestring, conduit, conduit-extra
, containers, exceptions, mtl, optparse-simple, parsec, scientific, stdenv
, text, unordered-containers, vector
@@ -12,6 +12,14 @@ mkDerivation rec {
rev = "v${version}";
sha256 = "1hlnwsl4cj0l4x8dxwda2fcnk789cwlphl9gv9cfrivl43mgkgar";
};
patches = [
# MonadFail compatibility patch. Should be removed with the next release
(fetchpatch {
url = https://github.com/chrisdone/jl/commit/6d40308811cbc22a96b47ebe69ec308b4e9fd356.patch;
sha256 = "1pg92ffkg8kim5r8rz8js6fjqyjisg1266sf7p9jyxjgsskwpa4g";
})
];

isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [