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

Commits on Mar 7, 2020

  1. ghc: consistent downloads.haskell.org src URLs 

    Consistency is good in general and these seem to work just as well as the
others, but it also helps with blacklisting package updates, as in:
nix-community/nixpkgs-update#160
    @bhipple
    bhipple committed Mar 7, 2020
    Copy the full SHA
    072a3bd View commit details

  2. Merge pull request #81983 from bhipple/feature/ghc-urls 

    ghc: consistent downloads.haskell.org src URLs
    @peti
    peti authored Mar 7, 2020
    Copy the full SHA
    0ba1c9f View commit details
Showing with 3 additions and 3 deletions.
  1. +1 −1 pkgs/development/compilers/ghc/8.4.4.nix
  2. +2 −2 pkgs/development/compilers/ghc/8.6.5.nix
2 changes: 1 addition & 1 deletion pkgs/development/compilers/ghc/8.4.4.nix
View file
Original file line number Diff line number Diff line change
@@ -87,7 +87,7 @@ stdenv.mkDerivation (rec {
name = "${targetPrefix}ghc-${version}";

src = fetchurl {
url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz";
url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
sha256 = "1ch4j2asg7pr52ai1hwzykxyj553wndg7wq93i47ql4fllspf48i";
};

4 changes: 2 additions & 2 deletions pkgs/development/compilers/ghc/8.6.5.nix
View file
Original file line number Diff line number Diff line change
@@ -92,7 +92,7 @@ stdenv.mkDerivation (rec {
name = "${targetPrefix}ghc-${version}";

src = fetchurl {
url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz";
url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
sha256 = "0qg3zsmbk4rkwkc3jpas3zs74qaxmw4sp4v1mhsbj0a0dzls2jjd";
};

@@ -187,7 +187,7 @@ stdenv.mkDerivation (rec {
strictDeps = true;

# Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
dontAddExtraLibs = true;
dontAddExtraLibs = true;

nativeBuildInputs = [
perl autoconf automake m4 python3 sphinx