···69 name = "git-annex-${super.git-annex.version}-src";
70 url = "git://git-annex.branchable.com/";
71 rev = "refs/tags/" + super.git-annex.version;
72- sha256 = "vwKcY7Yk+R0YkaXjJ7xKyQWGjySTUPox0xIaurbQZk0=";
73 };
74 }).override {
75 dbus = if pkgs.stdenv.isLinux then self.dbus else null;
···1335 '';
1336 })).override {
1337 # we are faster than stack here
1338- hie-bios = dontCheck self.hie-bios_0_6_1;
1339 lsp-test = dontCheck self.lsp-test_0_11_0_4;
1340 });
1341···1355 # use a fork of ghcide
1356 ghcide = self.hls-ghcide;
1357 # we are faster than stack here
1358- hie-bios = dontCheck self.hie-bios_0_6_1;
1359 lsp-test = dontCheck self.lsp-test_0_11_0_4;
1360 };
13611362 # https://github.com/kowainik/policeman/issues/57
1363 policeman = doJailbreak super.policeman;
13641365- # 2020-06-29: These three packages have bumped their dependencies for haskell-gi and haskell-gi-base beyond stack-lts.
1366- # Choosing a jailbreak, because a version override would rebuild most of the glibverse and the packages still build with the older version.
1367- gi-javascriptcore =
1368- # Remove these jailbreaks, when assert fails.
1369- assert (pkgs.lib.versionOlder super.haskell-gi-base.version "0.24");
1370- doJailbreak super.gi-javascriptcore;
1371- gi-soup = doJailbreak super.gi-soup;
1372- gi-webkit2 = doJailbreak super.gi-webkit2;
0000000000000013731374 # Missing -Iinclude parameter to doc-tests (pull has been accepted, so should be resolved when 0.5.3 released)
1375 # https://github.com/lehins/massiv/pull/104
···1451 haskeline = self.haskeline_0_8_0_0;
1452 };
1453 };
00014541455} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
···69 name = "git-annex-${super.git-annex.version}-src";
70 url = "git://git-annex.branchable.com/";
71 rev = "refs/tags/" + super.git-annex.version;
72+ sha256 = "1d24080xh7gl197i0y5bkn3j94hvh8zqyg9gfcnx2qdlxfca1knb";
73 };
74 }).override {
75 dbus = if pkgs.stdenv.isLinux then self.dbus else null;
···1335 '';
1336 })).override {
1337 # we are faster than stack here
1338+ hie-bios = dontCheck self.hie-bios_0_6_2;
1339 lsp-test = dontCheck self.lsp-test_0_11_0_4;
1340 });
1341···1355 # use a fork of ghcide
1356 ghcide = self.hls-ghcide;
1357 # we are faster than stack here
1358+ hie-bios = dontCheck self.hie-bios_0_6_2;
1359 lsp-test = dontCheck self.lsp-test_0_11_0_4;
1360 };
13611362 # https://github.com/kowainik/policeman/issues/57
1363 policeman = doJailbreak super.policeman;
13641365+ # 2020-08-14: gi-pango from stackage is to old for the C libs it links against in nixpkgs.
1366+ # That's why we need to bump a ton of dependency versions to unbreak them.
1367+ gi-pango = assert super.gi-pango.version == "1.0.22"; self.gi-pango_1_0_23;
1368+ haskell-gi-base = assert super.haskell-gi-base.version == "0.23.0"; addBuildDepends (self.haskell-gi-base_0_24_2) [ pkgs.gobject-introspection ];
1369+ haskell-gi = assert super.haskell-gi.version == "0.23.1"; self.haskell-gi_0_24_4;
1370+ gi-cairo = assert super.gi-cairo.version == "1.0.23"; self.gi-cairo_1_0_24;
1371+ gi-glib = assert super.gi-glib.version == "2.0.23"; self.gi-glib_2_0_24;
1372+ gi-gobject = assert super.gi-gobject.version == "2.0.22"; self.gi-gobject_2_0_24;
1373+ gi-atk = assert super.gi-atk.version == "2.0.21"; self.gi-atk_2_0_22;
1374+ gi-gio = assert super.gi-gio.version == "2.0.26"; self.gi-gio_2_0_27;
1375+ gi-gdk = assert super.gi-gdk.version == "3.0.22"; self.gi-gdk_3_0_23;
1376+ gi-gtk = assert super.gi-gtk.version == "3.0.33"; self.gi-gtk_3_0_35;
1377+ gi-gdkpixbuf = assert super.gi-gdkpixbuf.version == "2.0.23"; self.gi-gdkpixbuf_2_0_24;
1378+1379+ # 2020-08-14: Needs some manual patching to be compatible with haskell-gi-base 0.24
1380+ # Created upstream PR @ https://github.com/ghcjs/jsaddle/pull/119
1381+ jsaddle-webkit2gtk = appendPatch super.jsaddle-webkit2gtk (pkgs.fetchpatch {
1382+ url = "https://github.com/ghcjs/jsaddle/compare/9727365...09f44aa.patch";
1383+ sha256 = "1bkwgmc04544haycb69fqsd97lg24jc7hc1yrin2sgr4l7hz04pf";
1384+ stripLen = 2;
1385+ extraPrefix = "";
1386+ });
13871388 # Missing -Iinclude parameter to doc-tests (pull has been accepted, so should be resolved when 0.5.3 released)
1389 # https://github.com/lehins/massiv/pull/104
···1465 haskeline = self.haskeline_0_8_0_0;
1466 };
1467 };
1468+1469+ # https://github.com/bos/statistics/issues/170
1470+ statistics = dontCheck super.statistics;
14711472} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super