From 42a0fd4e6501af08ea3880ca549b18dffa26a9bd Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 24 Jun 2015 20:49:39 +0200 Subject: ... and it's not called "new-"nixos-build^_^ --- bin/copy-secrets | 8 ++++---- bin/nixos-build | 4 ++-- infest-cac-CentOS-7-64bit.sh | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bin/copy-secrets b/bin/copy-secrets index 27b41bdc4..74b9301a6 100755 --- a/bin/copy-secrets +++ b/bin/copy-secrets @@ -22,11 +22,11 @@ NIX_PATH=$NIX_PATH:nixos-config=$PWD/modules/$system_name NIX_PATH=$NIX_PATH:secrets=$PWD/secrets/$system_name/nix export NIX_PATH -retiolum_secret=$(new-nixos-query tv.retiolum.privateKeyFile) -retiolum_uid=$(new-nixos-query users.extraUsers.retiolum-tinc.uid) +retiolum_secret=$(nixos-query tv.retiolum.privateKeyFile) +retiolum_uid=$(nixos-query users.extraUsers.retiolum-tinc.uid) -ejabberd_secret=$(new-nixos-query services.ejabberd-cd.certFile) -ejabberd_uid=$(new-nixos-query users.extraUsers.ejabberd.uid) +ejabberd_secret=$(nixos-query services.ejabberd-cd.certFile) +ejabberd_uid=$(nixos-query users.extraUsers.ejabberd.uid) (set -x rsync \ diff --git a/bin/nixos-build b/bin/nixos-build index 94f3dc1f4..200f99e4a 100755 --- a/bin/nixos-build +++ b/bin/nixos-build @@ -21,8 +21,8 @@ secrets_rsync=$secrets_root/$host/rsync NIX_PATH=$NIX_PATH:secrets=$secrets_nix export NIX_PATH - rev=$(new-nixos-query nixpkgs.rev) - url=$(new-nixos-query nixpkgs.url) + rev=$(nixos-query nixpkgs.rev) + url=$(nixos-query nixpkgs.url) fetchgit "$rev" "$url" tmp/nixpkgs/$host ) diff --git a/infest-cac-CentOS-7-64bit.sh b/infest-cac-CentOS-7-64bit.sh index 6cc39440a..207c403de 100755 --- a/infest-cac-CentOS-7-64bit.sh +++ b/infest-cac-CentOS-7-64bit.sh @@ -14,8 +14,8 @@ systemname=$2 NIX_PATH=$NIX_PATH:secrets=$PWD/secrets/$systemname/nix export NIX_PATH - rev=$(new-nixos-query nixpkgs.rev) - url=$(new-nixos-query nixpkgs.url) + rev=$(nixos-query nixpkgs.rev) + url=$(nixos-query nixpkgs.url) fetchgit "$rev" "$url" tmp/nixpkgs/$systemname ) -- cgit v1.2.3