ilyakooo0/haskell.nix
1
0
Fork 0
mirror of https://github.com/ilyakooo0/haskell.nix.git synced 2024-09-20 03:18:00 +03:00
Code Issues Projects Releases Wiki Activity

Allow source spec to be a file (#904)

Browse Source
This commit is contained in:
Moritz Angermann 2020-10-31 15:04:09 +08:00 committed by GitHub
parent b40a90b035
commit 429702eabf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/ghc/configured-src.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation (rec {
patches = ghc-patches;
name = "${targetPrefix}ghc-${ghc-version}-configured-src";
# Make sure we never relax`$PATH` and hooks support for compatibility.
# Make sure we never relax`$PATH` and hooks support for compatability.
strictDeps = true;
nativeBuildInputs = [
@ -40,7 +40,9 @@ stdenv.mkDerivation (rec {
postPatch = "patchShebangs .";
src = fetchurl { inherit (src-spec) url sha256; };
src = if src-spec ? file
then src-spec.file
else fetchurl { inherit (src-spec) url sha256; };
# GHC is a bit confused on its cross terminology.
preConfigure = ''

6
nix/sources.nix
View File

@ -18,8 +18,8 @@ let
else
pkgs.fetchzip { inherit (spec) url sha256; };
fetch_git = spec:
builtins.fetchGit { url = spec.repo; inherit (spec) rev ref; };
fetch_git = pkgs: spec:
pkgs.fetchgit { url = spec.repo; inherit (spec) rev deepClone sha256; };
fetch_builtin-tarball = spec:
builtins.trace
@ -73,7 +73,7 @@ let
abort "ERROR: niv spec ${name} does not have a 'type' attribute"
else if spec.type == "file" then fetch_file pkgs spec
else if spec.type == "tarball" then fetch_tarball pkgs spec
else if spec.type == "git" then fetch_git spec
else if spec.type == "git" then fetch_git pkgs spec
else if spec.type == "builtin-tarball" then fetch_builtin-tarball spec
else if spec.type == "builtin-url" then fetch_builtin-url spec
else