diff --git a/Makefile b/Makefile index fcf75a3..0e70650 100644 --- a/Makefile +++ b/Makefile @@ -368,6 +368,11 @@ DEVCONTAINER_IMAGE ?= ghcr.io/sciexp/flytezendev drundc: ## Run devcontainer. make drundc DEVCONTAINER_IMAGE= docker run --rm -it $(DEVCONTAINER_IMAGE) +adhocpkgs: ## Install adhoc nix packages. make adhocpkgs ADHOC_NIX_PKGS="gnugrep fzf" + nix profile list + $(foreach pkg, $(ADHOC_NIX_PKGS), nix profile install nixpkgs#$(pkg);) + nix profile list + .PHONY: jupyter jupyter: ## Run jupyter lab in devcontainer. make jupyter DEVCONTAINER_IMAGE=ghcr.io/sciexp/flytezendev@sha256:055bb57be472144bb140e20870320da8d9fa39daf69a57d2464596b974d34138 @echo "Attempting to start jupyter lab in" diff --git a/flake.nix b/flake.nix index d640e26..6a0ad41 100644 --- a/flake.nix +++ b/flake.nix @@ -249,9 +249,9 @@ url = "https://github.com/${gitHubOrg}/${packageName}.git"; # the ref is not strictly required when specifying a rev but it should # be included whenever possible or it may be necessary to include - # ref = "main"; + ref = "main"; # allRefs = true; - ref = "26-nix-profile"; + # ref = "NN-feature"; # the rev can be omitted transiently in development to track the HEAD # of a ref but doing so requires `--impure` image builds (this may # already be required for other reasons, e.g. `builtins.getEnv`)