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

Commits on Oct 18, 2019

  1. haskell-hjsmin: disable test suite to fix the build

    @peti
    peti committed Oct 18, 2019
    Copy the full SHA
    7e45b91 View commit details

  2. git-annex: update sha256 hash for the new 7.20191017 version

    @peti
    peti committed Oct 18, 2019
    Copy the full SHA
    9e13557 View commit details

  3. haskell-gtk: drop obsolete patches for the whole gtk package family

    @peti
    peti committed Oct 18, 2019
    Copy the full SHA
    fe79cb7 View commit details
Showing with 4 additions and 29 deletions.
  1. +4 −29 pkgs/development/haskell-modules/configuration-common.nix
33 changes: 4 additions & 29 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -74,7 +74,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 = "0v3wgx3qbillmnn3amnl568ls113y3qlyf3k7y5b9lmz22k93680";
sha256 = "1dawd7cxqgzv1irzgl9smzdw7b4v59k8xa5gbldkbww0ashyb8qv";
};
}).override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@@ -1227,34 +1227,6 @@ self: super: {
# The LTS-14.x version of optparse-applicative is too old.
cabal-plan = super.cabal-plan.override { optparse-applicative = self.optparse-applicative_0_15_1_0; };

# https://github.com/gtk2hs/gtk2hs/issues/276
glib = appendPatch super.glib (pkgs.fetchpatch {
url = https://github.com/gtk2hs/gtk2hs/pull/282/commits/4bb428e144ef2de9390f0f2239dcc50b7fc9a259.patch;
sha256 = "1s72s683p2n5ri1a030zywciq0020ms64cmsy48axndp6dp9vri7";
stripLen = 1;
});
pango = appendPatch super.pango (pkgs.fetchpatch {
url = https://github.com/gtk2hs/gtk2hs/pull/282/commits/0a6016e89ce98415bb395ca0cfafeaacf3b3fce6.patch;
sha256 = "1n9spriinyif4h1h9mfj9k87b80kcs39qlym5yxnxxg0yszqqcpc";
stripLen = 1;
});
gtk3 = appendPatch super.gtk3 (pkgs.fetchpatch {
url = https://github.com/gtk2hs/gtk2hs/pull/282/commits/cc0d8e8ef9bdffc776182a1f92225750bfea8f57.patch;
sha256 = "175zs694d04d7jfj8xq33rizw38bc3ninr00n26jyrg39vgkmc5j";
stripLen = 1;
});
gio = appendPatch super.gio (pkgs.fetchpatch {
url = https://github.com/gtk2hs/gtk2hs/pull/282/commits/f0f7cf524f1beaf227d8cce140abdf7c45efc8c6.patch;
sha256 = "1fadmibpk0q38fzp6a8ss6b1kh7v5d5mw3s9i45cd4dsg86hqb0i";
stripLen = 1;
});
gtk = appendPatch super.gtk (pkgs.fetchpatch {
url = https://github.com/gtk2hs/gtk2hs/pull/282/commits/a09720ae8fdc2f9391ba88308312e42d091a4f88.patch;
sha256 = "12ja6sprzl9si51rng8s2xx66ihpm6d6p00qi5czkpkrhr0457n7";
stripLen = 1;
postFetch = "sed -i -e s,gtk.cabal-renamed,gtk.cabal, $out";
});

# Version bounds for http-client are too strict:
# https://github.com/bitnomial/prometheus/issues/34
prometheus = doJailbreak super.prometheus;
@@ -1266,4 +1238,7 @@ self: super: {
sha256 = "0l8zbc56dy8ilxl3k49aiknmfhgpcg3jhs72lh3dk51d0a09d9sv";
});

# https://github.com/erikd/hjsmin/issues/32
hjsmin = dontCheck super.hjsmin;

} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super