--- /dev/null
+subrecipes = setup ssh-eldiron info debug dry-run build upload deploy reboot push pull pull-deployment list-generations delete-generations cleanup
+${subrecipes}:
+ @$(MAKE) --no-print-directory -C nixops/ $@
+
+env:
+ ./scripts/make-env
+
+env-dry-run:
+ ./scripts/make-env --dry-run
+
+nix-info:
+ NIXOPS_DEPLOYMENT="" ./scripts/nix_infos
+
+nix-info-nixops:
+ NIXOPS_DEPLOYMENT="n" ./scripts/nix_infos
+
+nur:
+ ./scripts/make-nur
+
+.PHONY: env env-dry-run nix-info nix-info-nixops
mypkgs = import ./pkgs { pkgs = pkgs_; };
in
{
- lib = import ./libs.nix { pkgs = pkgs_; };
+ lib = import ./lib { pkgs = pkgs_; };
modules = import ./modules;
overlays = import ./overlays;
pkgs = mypkgs;
in
(callPackage src {}) // { inherit src; };
- nodeEnv = import ./lib/node-env.nix;
+ nodeEnv = import ./node-env.nix;
fetchedGithub = path:
let
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops"
export NIXOPS_DEPLOYMENT="$DeploymentUuid"
-source $(dirname $(dirname $DIR))/nix_path_env
+source $(dirname $(dirname $DIR))/scripts/nix_env
TEMP=$(mktemp -d /tmp/XXXXXX-nixops-files)
chmod go-rwx $TEMP
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops"
export NIXOPS_DEPLOYMENT="$DeploymentUuid"
-source $(dirname $(dirname $DIR))/nix_path_env
+source $(dirname $(dirname $DIR))/scripts/nix_env
export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops"
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops"
export NIXOPS_DEPLOYMENT="$DeploymentUuid"
-source $(dirname $(dirname $DIR))/nix_path_env
+source $(dirname $(dirname $DIR))/scripts/nix_env
nixops_custom export | pass insert -m $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/Deployment
fi
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-source $(dirname $(dirname $DIR))/nix_path_env
+source $(dirname $(dirname $DIR))/scripts/nix_env
export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops"
export NIXOPS_DEPLOYMENT="$DeploymentUuid"
if [ "$y" = "y" -o "$y" = "Y" ]; then
deployment=$(pass show $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/Deployment)
echo "$deployment" | nixops_custom import
-
- nixops_custom modify "$(dirname $DIR)/eldiron.nix"
else
echo "Aborting"
exit 1
fi
fi
+nixops_custom modify "$(dirname $DIR)/default.nix"
+
cat <<-EOF
All set up.
Please make sure you’re using scripts/nixops_wrap when deploying
{
- mylibs = self: super: { mylibs = import ../libs.nix { pkgs = self; }; };
+ mylibs = self: super: { mylibs = import ../lib { pkgs = self; }; };
mypkgs = self: super: import ../pkgs { pkgs = self; };
bitlbee = import ./bitlbee;
{ pkgs }:
with pkgs;
let
- mylibs = import ../libs.nix { inherit pkgs; };
+ mylibs = import ../lib { inherit pkgs; };
in
rec {
boinctui = callPackage ../pkgs/boinctui {};
{ pkgs }:
with pkgs;
let
- mylibs = import ../../libs.nix { inherit pkgs; };
+ mylibs = import ../../lib { inherit pkgs; };
in
rec {
webapps = callPackage ./webapps {
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-source $(dirname $DIR)/nix_path_env
+source $DIR/nix_env
nix-env -r -i -A myEnvironments.immae-eu -f "<nixpkgs>" "$@"
+result=$?
cat >> $(dirname $DIR)/versions_log <<EOF
-# Ran $(date) with args "$@"
-$($DIR/nix_infos | sed -e "s/^/# /")
+Ran $(date) with args "$@" and returned "$result"
+$($DIR/nix_infos | sed -e "s/^/ /")
EOF
nixops_custom () {
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
- d=$(nix-build --no-out-link -E "with import <nixpkgs> { overlays = builtins.attrValues (import $DIR/overlays); }; nixops")
+ d=$(nix-build --no-out-link -E "with import <nixpkgs> { overlays = builtins.attrValues (import $(dirname $DIR)/overlays); }; nixops")
${d}/bin/nixops "$@"
}
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-source $(dirname $DIR)/nix_path_env
+source $DIR/nix_env
version=$(nix eval --raw nixpkgs.lib.version)
mainversion=$(echo $version | cut -d"." -f -2)