diff options
| author | lassulus <lass@aidsballs.de> | 2016-03-15 14:14:18 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-03-15 14:14:18 +0100 |
| commit | 96c866dba804d2760e502525a05d9156b7bdd4ca (patch) | |
| tree | 6c16b73e1f0c6b84a69e698f400083f2fb2ece4d | |
| parent | 4cd2262d6a6449d827e3eb83f2b9c435514f2c86 (diff) | |
| parent | 864603aa04b9d2ad97e313d4d526fc9d050d5b88 (diff) | |
Merge remote-tracking branch 'cd/master'
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | shared/2configs/base.nix | 2 | ||||
| -rw-r--r-- | tv/2configs/git.nix | 1 |
3 files changed, 7 insertions, 5 deletions
@@ -1,16 +1,17 @@ stockholm ?= . +export HOSTNAME ?= $(shell cat /proc/sys/kernel/hostname) + export STOCKHOLM_VERSION ?= $(shell \ version=git.$$(git describe --always --dirty); \ - case $$version in (*-dirty) version=$$version@$$(hostname); esac; \ + case $$version in (*-dirty) version=$$version@$$HOSTNAME; esac; \ date=$$(date +%y.%m); \ printf '%s' "$$date.$$version"; \ ) -ifndef nixos-config $(if $(system),,$(error unbound variable: system)) -nixos-config = ./$(LOGNAME)/1systems/$(system).nix -endif + +nixos-config ?= $(stockholm)/$(LOGNAME)/1systems/$(system).nix # target = [target_user@]target_host[:target_port][/target_path] ifdef target diff --git a/shared/2configs/base.nix b/shared/2configs/base.nix index 9f998b5..f6ec93a 100644 --- a/shared/2configs/base.nix +++ b/shared/2configs/base.nix @@ -18,7 +18,7 @@ with config.krebs.lib; krebs.build.source = { nixpkgs = mkDefault { url = https://github.com/NixOS/nixpkgs; - rev = "77f8f35d57618c1ba456d968524f2fb2c3448295"; # for urlwatch-minidb + rev = "40c586b7ce2c559374df435f46d673baf711c543"; }; secrets = mkDefault "${getEnv "HOME"}/secrets/krebs/${config.krebs.build.host.name}"; stockholm = mkDefault "${getEnv "HOME"}/stockholm"; diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix index 7a42ca9..4c1fba5 100644 --- a/tv/2configs/git.nix +++ b/tv/2configs/git.nix @@ -30,6 +30,7 @@ let load-env = {}; make-snapshot = {}; much = {}; + newsbot-js = {}; nixpkgs = {}; push = {}; regfish = {}; |