nix: add openssl shell utilities

[sourcephile-nix.git] / Makefile

diff --git a/Makefile b/Makefile
index c56beb7281bbc340b571be2966193674b7ab467f..b1fd7b6e2c7cd69e7ba85e1761ef737921acad17 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,82 +1,17 @@
+all: init
+
+include .lib/nix/Makefile.make
+include .lib/nixops/Makefile.make
+
 #
 ## init
 ###
 .PHONY: build
 build:
-       nix $(NIX) build -f build \
+       nix $(NIX_FLAGS) build -f build \
         --out-link result \
-        --show-trace $(NIX_BUILD)
+        --show-trace $(NIX_BUILD_FLAGS)
        tree result/
 
 init: build
        result/bin/init
-
-#
-## vmdk
-###
-vmdk: var/virtualbox/nixops.vmdk
-.PHONY: var/virtualbox/nixops.vmdk
-
-var/virtualbox/nixops.vmdk:
-       # NOTE: user's TMPDIR may be too small
-       TMPDIR=/tmp \
-       time nix $(NIX) build \
-        --out-link var/virtualbox \
-        --argstr system x86_64-linux \
-        -f "<nixpkgs-commonsoft/build/pkgs/installer/nixops-virtualbox>"
-
-#
-## create
-###
-create: $(dir $(NIXOPS_STATE))
-       $(if $(filter $(NIXOPS_DEPLOYMENT),$(deployment)),,\
-       nixops create \
-        $(NIXOPS_CREATE) \
-        install/logical.nix \
-        install/physical.nix)
-modify: $(NIXOPS_STATE)
-       nixops modify \
-        $(NIXOPS_MODIFY) \
-        install/logical.nix \
-        install/physical.nix
-
-$(dir $(NIXOPS_STATE)):
-       mkdir -p $@
-
-deployment = $(shell \
-       test ! -f $(NIXOPS_STATE) || \
-       sqlite3 $(NIXOPS_STATE) \
-         "select value from DeploymentAttrs \
-          where name='name' and value='$(NIXOPS_DEPLOYMENT)';")
-
-#
-## deploy
-###
-deploy: create
-       time nixops deploy $(NIXOPS_OPTS) $(NIXOPS_DEPLOY)
-       #TMPDIR=/tmp \
-       #time disnixos-env --use-nixops \
-       # -s install/disnix/services.nix \
-       # -d install/disnix/distribution.nix \
-       # -n install/logical.nix \
-       # -n install/physical.nix
-%/offline: NIX_BUILD+=--option substituters ""
-%/offline: NIXOPS_DEPLOY+=--option substituters ""
-%/offline: %
-       
-%/verbose: NIX+=-v -v -v
-%/verbose: %
-       
-
-stop:
-       nixops stop
-
-#
-## state
-###
-state: $(NIXOPS_STATE)
-       sqlite3 $(NIXOPS_STATE) .dump
-
-privateIpv4:
-       sqlite3 $(NIXOPS_STATE) \
-        'update ResourceAttrs set value = "$(IPv4)" where name="privateIpv4"'