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: a9854029d21b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7535e46134c9
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 28, 2020

  1. haskellPackages.hadolint: mark unbroken, remove override

    @zowoq
    zowoq committed Apr 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
    00d0db8 View commit details

  2. Merge pull request #86161 from zowoq/hadolint 

    haskellPackages.hadolint: mark unbroken, remove override
    @cdepillabout
    cdepillabout authored Apr 28, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    frenck Franck Nijhof
    GPG key ID: D62583BA8AB11CA3
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7535e46 View commit details
Showing with 0 additions and 6 deletions.
  1. +0 −1 pkgs/development/haskell-modules/configuration-hackage2nix.yaml
  2. +0 −5 pkgs/development/haskell-modules/configuration-nix.nix
1 change: 0 additions & 1 deletion pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View file
Original file line number Diff line number Diff line change
@@ -5338,7 +5338,6 @@ broken-packages:
- haddock-leksah
- haddock-test
- haddocset
- hadolint
- hadoop-formats
- hadoop-rpc
- hadoop-tools
5 changes: 0 additions & 5 deletions pkgs/development/haskell-modules/configuration-nix.nix
View file
Original file line number Diff line number Diff line change
@@ -628,11 +628,6 @@ self: super: builtins.intersectAttrs super {
http-download = dontCheck super.http-download;
pantry = dontCheck super.pantry;

# Hadolint wants to build a statically linked binary by default.
hadolint = overrideCabal super.hadolint (drv: {
preConfigure = "sed -i -e /ld-options:/d hadolint.cabal";
});

# gtk2hs-buildtools is listed in setupHaskellDepends, but we
# need it during the build itself, too.
cairo = addBuildTool super.cairo self.buildHaskellPackages.gtk2hs-buildtools;