From 0018d2c33b37e69f830ad66dbc77bdb566cb2ef5 Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Fri, 3 Jun 2022 12:58:41 -0400 Subject: [PATCH] build: removes herb from top-level Makefile, shell.nix --- Makefile | 4 ++-- shell.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index a06eac1c8..dbadd5cd7 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ .PHONY: build build-all install cross release test pills ropsten-pills clean build: - nix-build -A urbit -A herb --no-out-link + nix-build -A urbit --no-out-link install: - nix-env -f . -iA urbit -iA herb + nix-env -f . -iA urbit release: sh/release diff --git a/shell.nix b/shell.nix index b1858df93..c6d03692a 100644 --- a/shell.nix +++ b/shell.nix @@ -22,7 +22,7 @@ let # # Typically the inputs listed here also have a shell.nix in their respective # 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. mergeFrom = name: pkgs.lib.concatLists (pkgs.lib.catAttrs name inputsFrom);