Commit af398a35 authored by Ben Gamari's avatar Ben Gamari 🐢

Merge branch 'master' of gitlab.haskell.org:bgamari/ghc-utils into master

parents af540289 251e4475
......@@ -71,8 +71,8 @@ with nixpkgs; rec {
src = fetchFromGitHub {
owner = "mozilla";
repo = "rr";
rev = "42bf5814f990fca61c743013041d02a84d383926";
sha256 = "0pqlcwy9smdjcmfghqlm8zp5p8rnsxa6xl2pr3a8x7bzgs9471ri";
rev = "8fc7d2a09a739fee1883d262501e88613165c1dd";
sha256 = "sha256:0avq5lv082z2sasggfn2awnfrh08cr8f0i9iw1dnrcxa6pc3bi9k";
};
});
......
......@@ -33,8 +33,8 @@ EOF
image=$(docker commit \
--change "WORKDIR /home/ghc/ghc" \
--change "ENV BIN_DIST_NAME tmp"
--change "ENV BUILD_FLAVOUR $BUILD_FLAVOUR"
--change "ENV BIN_DIST_NAME tmp" \
--change "ENV BUILD_FLAVOUR $BUILD_FLAVOUR" \
$(cat $cidfile))
echo $image
rm -f $cidfile
......
......@@ -54,9 +54,10 @@ def list_submodules(repo: Path) -> List[Tuple[Path, str, str]]:
parts = line.split()
if len(parts) == 0:
continue
path = parts[1]
sha = parts[2]
rev = git_describe(repo, sha)
path = parts[0]
sha = parts[1]
rev = git_describe(path, sha)
result.append((path, sha, rev))
return result
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment