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

Commits on May 20, 2021

  1. haskellPackages.language-docker: use sdist 

    The upstream issue has been resolved and the current hackage sdist does
include everything necessary for running its test suite.
    @sternenseemann
    sternenseemann committed May 20, 2021

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Mic92 Jörg Thalheim
    GPG key ID: B3F5D81B0C6967C4
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fa700b5 View commit details
Showing with 0 additions and 12 deletions.
  1. +0 −12 pkgs/development/haskell-modules/configuration-common.nix
12 changes: 0 additions & 12 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -1869,18 +1869,6 @@ self: super: {
gi-gtk-declarative = doJailbreak super.gi-gtk-declarative;
gi-gtk-declarative-app-simple = doJailbreak super.gi-gtk-declarative-app-simple;

# Test assets missing from sdist
# https://github.com/hadolint/language-docker/issues/63
language-docker = overrideSrc super.language-docker {
src = pkgs.fetchFromGitHub {
owner = "hadolint";
repo = "language-docker";
rev = "refs/tags/${super.language-docker.version}";
sha256 = "06263jy538ni31vms5pzggmh64fyk62cv3lxnvkc6gylb94kljb8";
name = "language-docker-${super.language-docker.version}-source";
};
};

# 2021-05-09: Restrictive bound on hspec-golden. Dep removed in newer versions.
tomland = assert super.tomland.version == "1.3.2.0"; doJailbreak super.tomland;