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

Commits on Jan 27, 2020

  1. haskellPackages.bustle: clean up with lib.pipe

    @jtojnar
    jtojnar committed Jan 27, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    GPG key ID: 7FAB2A15F7A607A4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ca45c5c View commit details

  2. haskellPackages.bustle: fix building on Hydra 

    Bustle is proclaiming OtherLicense even though the code is licensed under LGPL 2.1+. This causes cabal2nix to set hydraPlatforms = stdenv.lib.platforms.none in hackage-packages.nix for the package.

Lets let's unset the attribute and fix the license.
    @jtojnar
    jtojnar committed Jan 27, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    GPG key ID: 7FAB2A15F7A607A4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    25b2c9e View commit details

Commits on Jan 28, 2020

  1. Merge pull request #78559 from jtojnar/bustleFix 

    haskellPackages.bustle: fix building on Hydra
    @jtojnar
    jtojnar authored Jan 28, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    67f498c View commit details
Showing with 35 additions and 22 deletions.
  1. +35 −22 pkgs/development/haskell-modules/configuration-common.nix
57 changes: 35 additions & 22 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -602,28 +602,41 @@ self: super: {
# https://github.com/athanclark/sets/issues/2
sets = dontCheck super.sets;

# Install icons, metadata and cli program.
# Do not build hgettext as it is broken
# https://gitlab.freedesktop.org/bustle/bustle/issues/13
bustle = overrideCabal (disableCabalFlag (super.bustle.override { hgettext = null; }) "hgettext") (drv: {
buildDepends = [ pkgs.libpcap ];
buildTools = with pkgs.buildPackages; [ gettext perl help2man ];
patches = [
# fix build
# https://gitlab.freedesktop.org/bustle/bustle/merge_requests/14
(pkgs.fetchpatch {
url = "https://gitlab.freedesktop.org/bustle/bustle/commit/ee4b81cbc232d47ba9940f1987777b17452e71ff.patch";
sha256 = "0v9cvbmrma5jcqcg1narpm1549h0cg8mr6i00qxmq0x6hs04dnwa";
})
(pkgs.fetchpatch {
url = "https://gitlab.freedesktop.org/bustle/bustle/commit/aae6843f51f54679d440fb3813e61355dc8406b9.patch";
sha256 = "1a8hr38hd1gdkqhsy56hyl7njw8ci79iigr81aalkb7hn4ckvh2a";
})
];
postInstall = ''
make install PREFIX=$out
'';
});
bustle = pkgs.lib.pipe super.bustle [
# Do not build hgettext as it is broken
# https://gitlab.freedesktop.org/bustle/bustle/issues/13
(bustle: bustle.override { hgettext = null; })
(bustle: disableCabalFlag bustle "hgettext")

# Bustle specifies OtherLicense even though the code is actually LGPL
# https://gitlab.freedesktop.org/bustle/bustle/merge_requests/17
(bustle: bustle.overrideAttrs (attrs: {
meta = builtins.removeAttrs attrs.meta [ "hydraPlatforms" ] // {
license = pkgs.lib.licenses.lgpl21Plus;
};
}))

# Install icons, metadata and cli program.
(bustle: overrideCabal bustle (drv: {
buildDepends = [ pkgs.libpcap ];
buildTools = with pkgs.buildPackages; [ gettext perl help2man ];
patches = [
# fix build
# https://gitlab.freedesktop.org/bustle/bustle/merge_requests/14
(pkgs.fetchpatch {
url = "https://gitlab.freedesktop.org/bustle/bustle/commit/ee4b81cbc232d47ba9940f1987777b17452e71ff.patch";
sha256 = "0v9cvbmrma5jcqcg1narpm1549h0cg8mr6i00qxmq0x6hs04dnwa";
})
(pkgs.fetchpatch {
url = "https://gitlab.freedesktop.org/bustle/bustle/commit/aae6843f51f54679d440fb3813e61355dc8406b9.patch";
sha256 = "1a8hr38hd1gdkqhsy56hyl7njw8ci79iigr81aalkb7hn4ckvh2a";
})
];
postInstall = ''
make install PREFIX=$out
'';
}))
];

# Byte-compile elisp code for Emacs.
ghc-mod = overrideCabal super.ghc-mod (drv: {