forked from input-output-hk/haskell.nix
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix use of multiple subdirs in cabal.project (input-output-hk#790)
It is now possible to specify multiple subdirs in a `source-repository-package` block. This change fixes the parser code in haskell.nix so that it understands.
- Loading branch information
1 parent
3dfdf7a
commit 284b1eb
Showing
4 changed files
with
169 additions
and
70 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| { pkgs }: | ||
| let | ||
| span = pred: list: | ||
| let n = pkgs.lib.lists.foldr (x: acc: if pred x then acc + 1 else 0) 0 list; | ||
| in { fst = pkgs.lib.lists.take n list; snd = pkgs.lib.lists.drop n list; }; | ||
|
|
||
| # Look for a index-state: field in the cabal.project file | ||
| parseIndexState = rawCabalProject: | ||
| let | ||
| indexState = pkgs.lib.lists.concatLists ( | ||
| pkgs.lib.lists.filter (l: l != null) | ||
| (builtins.map (l: builtins.match "^index-state: *(.*)" l) | ||
| (pkgs.lib.splitString "\n" rawCabalProject))); | ||
| in | ||
| pkgs.lib.lists.head (indexState ++ [ null ]); | ||
|
|
||
| # Parse lines of a source-repository-package block | ||
| parseBlockLines = blockLines: (pkgs.lib.foldl' ({name, attrs}: s: | ||
| let | ||
| # Look for a new attribute name | ||
| pair = builtins.match " *([^:]*): *(.*)" s; | ||
|
|
||
| # Function to build the next parse state when the attribute name is known | ||
| nextState = name: value: { | ||
| inherit name; | ||
| # Support multi line attributes by appending the value to the named attribute | ||
| attrs = attrs // { | ||
| ${name} = | ||
| if attrs ? ${name} | ||
| then attrs.${name} + " " + value | ||
| else value; | ||
| }; | ||
| }; | ||
| in | ||
| if pair != null | ||
| then | ||
| # First line of a new attribute | ||
| nextState (builtins.head pair) (builtins.elemAt pair 1) | ||
| else | ||
| if name != null | ||
| then nextState name s # Append another line to the current attirbute | ||
| else __trace "Expected attribute but found `${s}`" { inherit name attrs; } | ||
| ) { name = null; attrs = {}; } blockLines).attrs; | ||
|
|
||
| hashPath = path: | ||
| builtins.readFile (pkgs.runCommand "hash-path" { preferLocalBuild = true; } | ||
| "echo -n $(${pkgs.nix}/bin/nix-hash --type sha256 --base32 ${path}) > $out"); | ||
|
|
||
| # Use pkgs.fetchgit if we have a sha256. Add comment like this | ||
| # --shar256: 003lm3pm0000hbfmii7xcdd9v20000flxf7gdl2pyxia7p014i8z | ||
| # otherwise use __fetchGit. | ||
| fetchRepo = cabalProjectFileName: lookupSha256: repo: | ||
| builtins.map (subdir: | ||
| let sha256 = repo."--sha256" or (lookupSha256 repo); | ||
| in (if sha256 != null | ||
| then pkgs.evalPackages.fetchgit { | ||
| url = repo.location; | ||
| rev = repo.tag; | ||
| inherit sha256; | ||
| } | ||
| else | ||
| let drv = builtins.fetchGit { | ||
| url = repo.location; | ||
| ref = repo.tag; | ||
| }; | ||
| in __trace "WARNING: No sha256 found for source-repository-package ${repo.location} ${repo.tag} download may fail in restricted mode (hydra)" | ||
| (__trace "Consider adding `--sha256: ${hashPath drv}` to the ${cabalProjectFileName} file or passing in a lookupSha256 argument" | ||
| drv) | ||
| ) + subdir) | ||
| (if repo ? subdir | ||
| then builtins.map (x: "/" + x) ( | ||
| pkgs.lib.filter (x: x != "") (pkgs.lib.splitString " " repo.subdir)) | ||
| else [""]); | ||
|
|
||
| # Parse a source-repository-package and fetch it if has `type: git` | ||
| parseBlock = cabalProjectFileName: lookupSha256: block: | ||
| let | ||
| x = span (pkgs.lib.strings.hasPrefix " ") (pkgs.lib.splitString "\n" block); | ||
| attrs = parseBlockLines x.fst; | ||
| in | ||
| if attrs."type" or "" != "git" | ||
| then { | ||
| sourceRepo = []; | ||
| otherText = "\nsource-repository-package\n" + block; | ||
| } | ||
| else { | ||
| sourceRepo = fetchRepo cabalProjectFileName lookupSha256 attrs; | ||
| otherText = pkgs.lib.strings.concatStringsSep "\n" x.snd; | ||
| }; | ||
|
|
||
| in { | ||
| inherit parseIndexState parseBlockLines parseBlock; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters