327aeed · obelisk · git.iko.soy

git.iko.soy/obelisk

on master help sign in

Use old fetchFromGitHubPrivate method

327aeedMatthew Bauer7 years ago

lib/command/src/Obelisk/Command/Thunk.hs+4−10

@@ -470,16 +470,10 @@ gitHubStandaloneLoaderV4 = T.unlines

470 , " url = \"https://github.com/${owner}/${repo}/archive/${rev}.tar.gz\";"

471 , " inherit sha256; })"

472 , " else (import <nixpkgs> {}).fetchFromGitHub;"

473− , " fetchFromGitHubPrivate ="

473+ , " fetchFromGitHubPrivate = { owner, repo, rev, sha256, ... }:"

474− , " { owner, repo, rev, branch ? null, name ? null, sha256 ? null"

474+ , " (import <nixpkgs> {}).fetchFromGitHub"

475− , " , private ? false, fetchSubmodules ? false"

475+ , " { inherit owner repo rev sha256; private = true; }"

476− , " , githubBase ? \"github.com\", ...}: assert !fetchSubmodules;"

477− , " builtins.fetchGit ({"

478− , " url = \"ssh://git@${githubBase}/${owner}/${repo}.git\";"

479− , " inherit rev;"

480− , " } // (if branch == null then {} else { ref = branch; })"

481− , " // (if name == null then {} else { inherit name; }));"

482− , "in import (fetch (builtins.fromJSON (builtins.readFile ./github.json)))"

476+ , "in import (fetch (builtins.fromJSON (builtins.readFile ./github.json)))"

483 ]

477 ]

484

478

485plainGitStandaloneLoaders :: NonEmpty Text

479plainGitStandaloneLoaders :: NonEmpty Text