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: 4537d0de341f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 31714a442d64
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 1, 2019

  1. haskell: Speed up cross callHackage by using native source 

    The extract of code from hackage is the same on all platforms.
    @Ericson2314
    Ericson2314 committed Oct 1, 2019
    Copy the full SHA
    d6f1e70 View commit details

Commits on Oct 2, 2019

  1. Merge pull request #70192 from obsidiansystems/call-hackage-cross 

    haskell: Speed up cross callHackage by using native source
    @peti
    peti authored Oct 2, 2019
    Copy the full SHA
    31714a4 View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/development/haskell-modules/make-package-set.nix
6 changes: 3 additions & 3 deletions pkgs/development/haskell-modules/make-package-set.nix
View file
Original file line number Diff line number Diff line change
@@ -122,9 +122,9 @@ let
haskellSrc2nix = { name, src, sha256 ? null, extraCabal2nixOptions ? "" }:
let
sha256Arg = if sha256 == null then "--sha256=" else ''--sha256="${sha256}"'';
in pkgs.buildPackages.stdenv.mkDerivation {
in buildPackages.stdenv.mkDerivation {
name = "cabal2nix-${name}";
nativeBuildInputs = [ pkgs.buildPackages.cabal2nix ];
nativeBuildInputs = [ buildPackages.cabal2nix ];
preferLocalBuild = true;
allowSubstitutes = false;
phases = ["installPhase"];
@@ -137,7 +137,7 @@ let
'';
};

all-cabal-hashes-component = name: version: pkgs.runCommand "all-cabal-hashes-component-${name}-${version}" {} ''
all-cabal-hashes-component = name: version: buildPackages.runCommand "all-cabal-hashes-component-${name}-${version}" {} ''
tar --wildcards -xzvf ${all-cabal-hashes} \*/${name}/${version}/${name}.{json,cabal}
mkdir -p $out
mv */${name}/${version}/${name}.{json,cabal} $out