diff --git a/flake.lock b/flake.lock index 45863c4..54b0fb1 100644 --- a/flake.lock +++ b/flake.lock @@ -15,6 +15,21 @@ "type": "github" } }, + "blank_2": { + "locked": { + "lastModified": 1625557891, + "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", + "owner": "divnix", + "repo": "blank", + "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "blank", + "type": "github" + } + }, "cells-lab": { "inputs": { "latest": "latest", @@ -24,11 +39,11 @@ "std": "std" }, "locked": { - "lastModified": 1666456127, - "narHash": "sha256-uA+Qy8Zww1xeGWaWJpV9dsUIUg+3y3KVirmC3hOhdak=", + "lastModified": 1666684664, + "narHash": "sha256-qamrxh7oNUPrhWpsIOxa6cgWP6KmfpljlFPCcI2LHcM=", "owner": "gtrunsec", "repo": "cells-lab", - "rev": "8482738bd522e38cd03d44d47d82a9f8b6f1e6e6", + "rev": "89c6fb20e159e464bf5152c22e652147377cf163", "type": "github" }, "original": { @@ -53,6 +68,31 @@ "type": "github" } }, + "dataflow2nix": { + "inputs": { + "cells-lab": [ + "cells-lab" + ], + "nixpkgs": "nixpkgs_3", + "std": [ + "std" + ], + "tullia": "tullia" + }, + "locked": { + "lastModified": 1666685551, + "narHash": "sha256-rYVWCX2MwUOyaqeaOHPEgwbfyDjaWdOZyVQ3uS9eFrE=", + "owner": "gtrunsec", + "repo": "dataflow2nix", + "rev": "8e710d5b204b4423a37dec172442b1816ec0c2e3", + "type": "github" + }, + "original": { + "owner": "gtrunsec", + "repo": "dataflow2nix", + "type": "github" + } + }, "devshell": { "inputs": { "flake-utils": [ @@ -80,6 +120,35 @@ "type": "github" } }, + "devshell_2": { + "inputs": { + "flake-utils": [ + "dataflow2nix", + "tullia", + "std", + "flake-utils" + ], + "nixpkgs": [ + "dataflow2nix", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1663445644, + "narHash": "sha256-+xVlcK60x7VY1vRJbNUEAHi17ZuoQxAIH4S4iUFUGBA=", + "owner": "numtide", + "repo": "devshell", + "rev": "e3dc3e21594fe07bdb24bdf1c8657acaa4cb8f66", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, "dmerge": { "inputs": { "nixlib": [ @@ -107,6 +176,35 @@ "type": "github" } }, + "dmerge_2": { + "inputs": { + "nixlib": [ + "dataflow2nix", + "tullia", + "std", + "nixpkgs" + ], + "yants": [ + "dataflow2nix", + "tullia", + "std", + "yants" + ] + }, + "locked": { + "lastModified": 1659548052, + "narHash": "sha256-fzI2gp1skGA8mQo/FBFrUAtY0GQkAIAaV/V127TJPyY=", + "owner": "divnix", + "repo": "data-merge", + "rev": "d160d18ce7b1a45b88344aa3f13ed1163954b497", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "data-merge", + "type": "github" + } + }, "emacs-overlay": { "inputs": { "flake-utils": "flake-utils", @@ -142,6 +240,22 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -187,6 +301,70 @@ "type": "github" } }, + "flake-utils_4": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_6": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "gomod2nix": { + "inputs": { + "nixpkgs": "nixpkgs_4", + "utils": "utils" + }, + "locked": { + "lastModified": 1655245309, + "narHash": "sha256-d/YPoQ/vFn1+GTmSdvbSBSTOai61FONxB4+Lt6w/IVI=", + "owner": "tweag", + "repo": "gomod2nix", + "rev": "40d32f82fc60d66402eb0972e6e368aeab3faf58", + "type": "github" + }, + "original": { + "owner": "tweag", + "repo": "gomod2nix", + "type": "github" + } + }, "latest": { "locked": { "lastModified": 1665426037, @@ -219,6 +397,22 @@ "type": "github" } }, + "mdbook-kroki-preprocessor_2": { + "flake": false, + "locked": { + "lastModified": 1661755005, + "narHash": "sha256-1TJuUzfyMycWlOQH67LR63/ll2GDZz25I3JfScy/Jnw=", + "owner": "JoelCourtney", + "repo": "mdbook-kroki-preprocessor", + "rev": "93adb5716d035829efed27f65f2f0833a7d3e76f", + "type": "github" + }, + "original": { + "owner": "JoelCourtney", + "repo": "mdbook-kroki-preprocessor", + "type": "github" + } + }, "n2c": { "inputs": { "flake-utils": [ @@ -246,6 +440,30 @@ "type": "github" } }, + "n2c_2": { + "inputs": { + "flake-utils": "flake-utils_6", + "nixpkgs": [ + "dataflow2nix", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1665039323, + "narHash": "sha256-SAh3ZjFGsaCI8FRzXQyp56qcGdAqgKEfJWPCQ0Sr7tQ=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "b008fe329ffb59b67bf9e7b08ede6ee792f2741a", + "type": "github" + }, + "original": { + "owner": "nlewo", + "repo": "nix2container", + "type": "github" + } + }, "nix-filter": { "locked": { "lastModified": 1661201956, @@ -276,6 +494,60 @@ "type": "github" } }, + "nix-nomad": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-utils": [ + "dataflow2nix", + "tullia", + "nix2container", + "flake-utils" + ], + "gomod2nix": "gomod2nix", + "nixpkgs": [ + "dataflow2nix", + "tullia", + "nixpkgs" + ], + "nixpkgs-lib": [ + "dataflow2nix", + "tullia", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1658277770, + "narHash": "sha256-T/PgG3wUn8Z2rnzfxf2VqlR1CBjInPE0l1yVzXxPnt0=", + "owner": "tristanpemble", + "repo": "nix-nomad", + "rev": "054adcbdd0a836ae1c20951b67ed549131fd2d70", + "type": "github" + }, + "original": { + "owner": "tristanpemble", + "repo": "nix-nomad", + "type": "github" + } + }, + "nix2container": { + "inputs": { + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1658567952, + "narHash": "sha256-XZ4ETYAMU7XcpEeAFP3NOl9yDXNuZAen/aIJ84G+VgA=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "60bb43d405991c1378baf15a40b5811a53e32ffa", + "type": "github" + }, + "original": { + "owner": "nlewo", + "repo": "nix2container", + "type": "github" + } + }, "nixago": { "inputs": { "flake-utils": [ @@ -308,6 +580,41 @@ "type": "github" } }, + "nixago_2": { + "inputs": { + "flake-utils": [ + "dataflow2nix", + "tullia", + "std", + "flake-utils" + ], + "nixago-exts": [ + "dataflow2nix", + "tullia", + "std", + "blank" + ], + "nixpkgs": [ + "dataflow2nix", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1661824785, + "narHash": "sha256-/PnwdWoO/JugJZHtDUioQp3uRiWeXHUdgvoyNbXesz8=", + "owner": "nix-community", + "repo": "nixago", + "rev": "8c1f9e5f1578d4b2ea989f618588d62a335083c3", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixago", + "type": "github" + } + }, "nixos": { "locked": { "lastModified": 1665132027, @@ -355,6 +662,69 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1665634984, + "narHash": "sha256-zwXeMc96BD9iFxSB/SLr3dI8iYpqM+seX9qy6bGV+cw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "cfea568da97a2668ef3cb3fc42eaacfb0e706807", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1653581809, + "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "83658b28fe638a170a19b8933aa008b30640fbd1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1654807842, + "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1665087388, + "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "95fda953f6db2e9496d2682c4fc7b82f959878f7", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { "locked": { "lastModified": 1666659249, "narHash": "sha256-Qbyj7ya2ZTL5Vt5ONMUwgq/shNSqZVbxDInQbmDO5iw=", @@ -416,11 +786,21 @@ "root": { "inputs": { "cells-lab": "cells-lab", + "dataflow2nix": "dataflow2nix", + "n2c": [ + "cells-lab", + "std", + "n2c" + ], "nix-filter": "nix-filter_2", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_7", "std": [ "cells-lab", "std" + ], + "tullia": [ + "dataflow2nix", + "tullia" ] } }, @@ -463,6 +843,84 @@ "type": "github" } }, + "std_2": { + "inputs": { + "blank": "blank_2", + "devshell": "devshell_2", + "dmerge": "dmerge_2", + "flake-utils": "flake-utils_5", + "makes": [ + "dataflow2nix", + "tullia", + "std", + "blank" + ], + "mdbook-kroki-preprocessor": "mdbook-kroki-preprocessor_2", + "microvm": [ + "dataflow2nix", + "tullia", + "std", + "blank" + ], + "n2c": "n2c_2", + "nixago": "nixago_2", + "nixpkgs": "nixpkgs_6", + "yants": "yants_2" + }, + "locked": { + "lastModified": 1665513321, + "narHash": "sha256-D6Pacw9yf/HMs84KYuCxHXnNDL7v43gtcka5URagFqE=", + "owner": "divnix", + "repo": "std", + "rev": "94a90eedb9cfc115b12ae8f6622d9904788559e4", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "std", + "type": "github" + } + }, + "tullia": { + "inputs": { + "nix-nomad": "nix-nomad", + "nix2container": "nix2container", + "nixpkgs": [ + "dataflow2nix", + "nixpkgs" + ], + "std": "std_2" + }, + "locked": { + "lastModified": 1666666481, + "narHash": "sha256-OPa/rVsr5u4orpl0ybHWA3huR0EsMgEHv34yzSHZwHE=", + "owner": "input-output-hk", + "repo": "tullia", + "rev": "42e9bff7304fd6f773eab785d084d0f36292adc4", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "refs/pull/9/head", + "repo": "tullia", + "type": "github" + } + }, + "utils": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "yants": { "inputs": { "nixpkgs": [ @@ -484,6 +942,29 @@ "repo": "yants", "type": "github" } + }, + "yants_2": { + "inputs": { + "nixpkgs": [ + "dataflow2nix", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1660507851, + "narHash": "sha256-BKjq7JnVuUR/xDtcv6Vm9GYGKAblisXrAgybor9hT/s=", + "owner": "divnix", + "repo": "yants", + "rev": "0b895ca02a8fa72bad50b454cb3e7d8a66407c96", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "yants", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 8ea504c..db55db9 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,13 @@ inputs = { cells-lab.url = "github:gtrunsec/cells-lab"; std.follows = "cells-lab/std"; + n2c.follows = "cells-lab/std/n2c"; + + dataflow2nix.url = "github:gtrunsec/dataflow2nix"; + dataflow2nix.inputs.cells-lab.follows = "cells-lab"; + dataflow2nix.inputs.std.follows = "std"; + + tullia.follows = "dataflow2nix/tullia"; }; outputs = { @@ -39,14 +46,17 @@ (functions "overlays") (functions "compiler") - (data "containerJobs") + (containers "containers") ]; } { lib = std.harvest inputs.self ["julia2nix" "lib"]; devShells = std.harvest inputs.self ["julia2nix" "devshells"]; overlays = (std.harvest inputs.self ["julia2nix" "overlays"]).x86_64-linux; - }) + }) (inputs.tullia.fromStd { + tasks = inputs.std.harvest inputs.self ["tullia" "task"]; + actions = inputs.std.harvest inputs.self ["tullia" "action"]; + }) { packages.x86_64-linux = (system: { inherit diff --git a/nix/julia2nix/devshells/default.nix b/nix/julia2nix/devshells/default.nix index 2142dba..d5e1a80 100644 --- a/nix/julia2nix/devshells/default.nix +++ b/nix/julia2nix/devshells/default.nix @@ -75,12 +75,5 @@ in imports = [ cell.devshellProfiles.update ]; - # github CI issue: nvfetcher encoding problem - env = [ - { - name = "LC_ALL"; - value = "en_US.UTF-8"; - } - ]; }; }