summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
authorlassulus <lass@blue.r>2018-11-10 23:01:10 +0100
committerlassulus <lass@blue.r>2018-11-10 23:01:10 +0100
commit09d09697827d32676c117f8ef492636ced868080 (patch)
tree29b33561e02e9ac89c3e2056540d32271e828cd8 /makefu
parent9536a502706ab73f475ef338675a35d87eadb168 (diff)
parentc823192f10a5977bb2f13a15cdf29a3cdf2be5ed (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu')
-rw-r--r--makefu/0tests/data/secrets/hass/darksky.apikey0
-rw-r--r--makefu/nixpkgs.json8
2 files changed, 4 insertions, 4 deletions
diff --git a/makefu/0tests/data/secrets/hass/darksky.apikey b/makefu/0tests/data/secrets/hass/darksky.apikey
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/makefu/0tests/data/secrets/hass/darksky.apikey
diff --git a/makefu/nixpkgs.json b/makefu/nixpkgs.json
index c5cd0ac30..73798f44d 100644
--- a/makefu/nixpkgs.json
+++ b/makefu/nixpkgs.json
@@ -1,7 +1,7 @@
{
"url": "https://github.com/makefu/nixpkgs",
- "rev": "86fb1e9ae6ba6dfedc814b82abd8db5cfa4f4687",
- "date": "2018-10-07T23:33:42+02:00",
- "sha256": "015yxs3qj299mgqfmz5vgszj2gxqwazifsdsjw6xadris3ri41d3",
- "fetchSubmodules": true
+ "rev": "bf46294e4cf20649182f76fc9200a48436f5874a",
+ "date": "2018-09-18T02:20:45+02:00",
+ "sha256": "13900gack7pgf5a7c11x30rzb3s0kjpbm2z2g8fw4720cr9lkd94",
+ "fetchSubmodules": false
}