From 74bff93dbea3c2b8ef1d9f5c2fe7976a1b0df6d3 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 15 Aug 2017 21:54:15 +0200 Subject: rsync-filter: protect .version-suffix This reduces rsync noice in populate. --- .rsync-filter | 1 + 1 file changed, 1 insertion(+) diff --git a/.rsync-filter b/.rsync-filter index d7657cd0..364a7986 100644 --- a/.rsync-filter +++ b/.rsync-filter @@ -1,2 +1,3 @@ - /.git - /.graveyard +P /.version-suffix -- cgit v1.2.3 From f8762c3ce88ed3881cabcaa06c43da4a11cbf698 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 15 Aug 2017 21:46:49 +0200 Subject: shell: restyle --force-populate --- shell.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell.nix b/shell.nix index bc14fe7d..196a53aa 100644 --- a/shell.nix +++ b/shell.nix @@ -166,7 +166,7 @@ let eval set -- "$args" force_populate=false while :; do case $1 in - --force-populate) force_populate=true; shift;; + --force-populate) force_populate=true; shift;; -Q|--quiet) quiet=true; shift;; -s|--system) system=$2; shift 2;; -t|--target) target=$2; shift 2;; -- cgit v1.2.3 From 28cc576852cf5acfc910c6b556edde6d15f40718 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 15 Aug 2017 21:42:40 +0200 Subject: shell: add --source= flag --- shell.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/shell.nix b/shell.nix index 196a53aa..6d32a6fc 100644 --- a/shell.nix +++ b/shell.nix @@ -9,6 +9,7 @@ let # usage: deploy # [--force-populate] # [--quiet] + # [--source=PATH] # --system=SYSTEM # [--target=TARGET] # [--user=USER] @@ -20,6 +21,7 @@ let \test -n "''${quiet-}" || quiet=false \test -n "''${target-}" || target=$system \test -n "''${user-}" || user=$LOGNAME + \test -n "''${source_file}" || source_file=$user/1systems/$system/source.nix . ${init.env} . ${init.proxy} @@ -29,6 +31,7 @@ let # usage: install # [--force-populate] # [--quiet] + # [--source=PATH] # --system=SYSTEM # --target=TARGET # [--user=USER] @@ -39,6 +42,7 @@ let . ${init.args} \test -n "''${quiet-}" || quiet=false \test -n "''${user-}" || user=$LOGNAME + \test -n "''${source_file}" || source_file=$user/1systems/$system/source.nix . ${init.env} if \test "''${using_proxy-}" != true; then @@ -76,6 +80,7 @@ let # usage: test # [--force-populate] # [--quiet] + # [--source=PATH] # --system=SYSTEM # --target=TARGET # [--user=USER] @@ -88,6 +93,7 @@ let . ${init.args} \test -n "''${quiet-}" || quiet=false \test -n "''${user-}" || user=$LOGNAME + \test -n "''${source_file}" || source_file=$user/1systems/$system/source.nix . ${init.env} . ${init.proxy} @@ -160,14 +166,16 @@ let init.args = pkgs.writeText "init.args" /* sh */ '' args=$(${pkgs.utillinux}/bin/getopt -n "$command" -s sh \ -o Qs:t:u: \ - -l force-populate,quiet,system:,target:,user: \ + -l force-populate,quiet,source:,system:,target:,user: \ -- "$@") if \test $? != 0; then exit 1; fi eval set -- "$args" force_populate=false + source_file= while :; do case $1 in --force-populate) force_populate=true; shift;; -Q|--quiet) quiet=true; shift;; + --source) source_file=$2; shift 2;; -s|--system) system=$2; shift 2;; -t|--target) target=$2; shift 2;; -u|--user) user=$2; shift 2;; @@ -196,7 +204,6 @@ let init.proxy = pkgs.writeText "init.proxy" /* sh */ '' if \test "''${using_proxy-}" != true; then - source_file=$user/1systems/$system/source.nix source=$(get-source "$source_file") qualified_target=$target_user@$target_host:$target_port$target_path if \test "$force_populate" = true; then -- cgit v1.2.3 From 09edff54d1a2a722db86cf0d224e66b9bdc11612 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 15 Aug 2017 23:15:39 +0200 Subject: shell: s@$PWD@./.@ --- shell.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell.nix b/shell.nix index 6d32a6fc..a4ccc318 100644 --- a/shell.nix +++ b/shell.nix @@ -276,7 +276,7 @@ in pkgs.stdenv.mkDerivation { name = "stockholm"; shellHook = /* sh */ '' export OLD_PATH="$PATH" - export NIX_PATH=stockholm=$PWD:nixpkgs=${toString } + export NIX_PATH=stockholm=${toString ./.}:nixpkgs=${toString } if test -e /nix/var/nix/daemon-socket/socket; then export NIX_REMOTE=daemon fi -- cgit v1.2.3 From a48cf7052a176376ec1bfe8da78f0491f6324aa4 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 15 Aug 2017 23:20:58 +0200 Subject: populate: 1.2.2 -> 1.2.3 --- krebs/5pkgs/simple/populate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/krebs/5pkgs/simple/populate/default.nix b/krebs/5pkgs/simple/populate/default.nix index 48afee03..1ed268cf 100644 --- a/krebs/5pkgs/simple/populate/default.nix +++ b/krebs/5pkgs/simple/populate/default.nix @@ -13,12 +13,12 @@ in stdenv.mkDerivation rec { name = "populate"; - version = "1.2.2"; + version = "1.2.3"; src = fetchgit { url = http://cgit.ni.krebsco.de/populate; rev = "refs/tags/v${version}"; - sha256 = "041rpyhss6kby3jm14k7lhvagmg7hwvwxli06b00p76s110is40w"; + sha256 = "14p9v28d5vcr5384qgycmgjh1angi2zx7qvi51651i7nd9qkjzmi"; }; phases = [ -- cgit v1.2.3