build: removes herb from top-level Makefile, shell.nix

This commit is contained in:
Joe Bryan 2022-06-03 12:58:41 -04:00
parent ace6ca12ff
commit 0018d2c33b
2 changed files with 3 additions and 3 deletions

View File

@ -1,10 +1,10 @@
.PHONY: build build-all install cross release test pills ropsten-pills clean .PHONY: build build-all install cross release test pills ropsten-pills clean
build: build:
nix-build -A urbit -A herb --no-out-link nix-build -A urbit --no-out-link
install: install:
nix-env -f . -iA urbit -iA herb nix-env -f . -iA urbit
release: release:
sh/release sh/release

View File

@ -22,7 +22,7 @@ let
# #
# Typically the inputs listed here also have a shell.nix in their respective # Typically the inputs listed here also have a shell.nix in their respective
# source directory you can use directly. # source directory you can use directly.
inputsFrom = with pkgsLocal; [ ent herb urbit urcrypt ]; inputsFrom = with pkgsLocal; [ ent urbit urcrypt ];
# Collect the named attribute from all dependencies listed in inputsFrom. # Collect the named attribute from all dependencies listed in inputsFrom.
mergeFrom = name: pkgs.lib.concatLists (pkgs.lib.catAttrs name inputsFrom); mergeFrom = name: pkgs.lib.concatLists (pkgs.lib.catAttrs name inputsFrom);