ehmry/sigil
ehmry
/
sigil
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

erisPatchHook: generate a Dhall manifest

This commit is contained in:
Ehmry - 2022-05-24 10:07:41 -05:00
parent 7bd3ce4e07
commit 20281a8420
3 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
overlay/default.nix
View File

@ -168,6 +168,18 @@ in nullPkgs // {
# Packages from the Nimble flake with adjustments. # Packages from the Nimble flake with adjustments.
prev.nimPackages.overrideScope' (_: prev': { prev.nimPackages.overrideScope' (_: prev': {
dhall = with prev'; buildNimPackage rec {
name = "dhall";
version = "0.1.0";
src = prev.fetchFromSourcehut {
owner = "~ehmry";
repo = "dhall-nim";
rev = version;
hash = "sha256-AhGD/h61Yqiq80woD8bfrvwuTjqCPGYCmUFhK5xFur4=";
};
buildInputs = [ bigints cbor ];
};
genode = prev'.genode.overrideAttrs (attrs: rec { genode = prev'.genode.overrideAttrs (attrs: rec {
version = "20.11.1"; version = "20.11.1";
src = fetchgit { src = fetchgit {

5
overlay/eris-patch-hook/default.nix
View File

@ -1,10 +1,11 @@
{ buildNimPackage, patchelf, base32, eris }: { buildNimPackage, patchelf, base32, bigints, cbor, dhall, eris }:
buildNimPackage { buildNimPackage {
name = "eris_patch"; name = "eris_patch";
buildInputs = [ base32 eris ]; buildInputs = [ base32 bigints cbor dhall eris ];
inherit patchelf; inherit patchelf;
unpackPhase = "install -D ${./eris_patch.nim} ./src/eris_patch.nim"; unpackPhase = "install -D ${./eris_patch.nim} ./src/eris_patch.nim";
nimBinOnly = true;
preConfigure = '' preConfigure = ''
cat << EOF > eris_patch.nimble cat << EOF > eris_patch.nimble
bin = @[ "src/eris_patch"] bin = @[ "src/eris_patch"]

30
overlay/eris-patch-hook/eris_patch.nim
View File

@ -1,14 +1,25 @@
import std/[asyncdispatch, deques, json, os, osproc, streams, strutils, tables]
import dhall/[render, terms]
import eris import eris
import std/asyncdispatch, std/deques, std/json, std/os, std/osproc, std/streams, proc toDhall(js: JsonNode): Value =
std/strutils, std/tables case js.kind
of JString:
result = newValue(js.str)
of JObject:
result = newRecordLiteral(js.fields.len)
for key, val in js.fields.pairs:
result.table[key] = val.toDhall
else:
raiseAssert "unhandled JSON value"
if getEnv("dontErisPatch") != "": quit 0 if getEnv("dontErisPatch") != "": quit 0
let let
patchelf = getEnv("ERIS_PATCHELF", "patchelf") patchelf = getEnv("ERIS_PATCHELF", "patchelf")
nixStore = getEnv("NIX_STORE", "/nix/store") nixStore = getEnv("NIX_STORE", "/nix/store")
manifestSubPath = "nix-support" / "eris-manifest.json" jsonManifestSubPath = "nix-support" / "eris-manifest.json"
dhallManifestSubPath = "nix-support" / "eris-manifest.dhall"
proc isElf(path: string): bool = proc isElf(path: string): bool =
var magic: array[4, char] var magic: array[4, char]
@ -27,7 +38,7 @@ var
failed = false failed = false
for outputName in getEnv("outputs").splitWhitespace: for outputName in getEnv("outputs").splitWhitespace:
let outputRoot = getEnv(outputName) let outputRoot = getEnv(outputName)
if fileExists(outputRoot / manifestSubPath): if fileExists(outputRoot / jsonManifestSubPath):
echo "Not running ERIS patch hook again" echo "Not running ERIS patch hook again"
quit 0 quit 0
outputManifests[outputRoot] = newJObject() outputManifests[outputRoot] = newJObject()
@ -103,7 +114,7 @@ proc fileClosure(filePath: string): TableRef[string, string] =
storePath = p storePath = p
if storePath.startsWith nixStore: if storePath.startsWith nixStore:
# read the closure manifest of the dependency # read the closure manifest of the dependency
let manifestPath = storePath / manifestSubPath let manifestPath = storePath / jsonManifestSubPath
if fileExists(manifestPath): if fileExists(manifestPath):
let let
manifest = parseFile(manifestPath) manifest = parseFile(manifestPath)
@ -117,7 +128,7 @@ proc fileClosure(filePath: string): TableRef[string, string] =
closureCache[filePath] = result closureCache[filePath] = result
for outputRoot in outputManifests.keys: for outputRoot in outputManifests.keys:
let manifestPath = outputRoot / manifestSubPath let manifestPath = outputRoot / jsonManifestSubPath
if fileExists manifestPath: continue if fileExists manifestPath: continue
for filePath in walkDirRec(outputRoot, relative = false): for filePath in walkDirRec(outputRoot, relative = false):
# Populate the queue of files to patch # Populate the queue of files to patch
@ -185,5 +196,8 @@ if failed:
quit -1 quit -1
for outputRoot, manifest in outputManifests: for outputRoot, manifest in outputManifests:
createDir(outputRoot / "nix-support") let supportDir = outputRoot / "nix-support"
writeFile(outputRoot / manifestSubPath, $manifest) createDir(supportDir)
writeFile(outputRoot / jsonManifestSubPath, $manifest)
for path, attrs in manifest.pairs:
writeFile(supportDir / path.extractFilename & ".eris.dhall", $(attrs.toDhall))