From a140780ccd752f92954d0cf94c1b87ae359c553a Mon Sep 17 00:00:00 2001 From: Sven Slootweg Date: Wed, 12 Jul 2017 16:37:47 +0200 Subject: [PATCH] Fix up args --- applications/pastebin-stream.nix | 4 ++-- lib/node-application.nix | 2 +- networks/default.nix | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/applications/pastebin-stream.nix b/applications/pastebin-stream.nix index 4d4b567..af3af13 100644 --- a/applications/pastebin-stream.nix +++ b/applications/pastebin-stream.nix @@ -1,5 +1,5 @@ -{pkgs, ...}: - (import ../lib/node-application.nix) { inherit pkgs; } { +{pkgs, ...}@args: + (import ../lib/node-application.nix) args { tarball = "https://git.cryto.net/joepie91/pastebin-stream/archive/master.tar.gz"; name = "pastebin-stream"; hasErrorReporting = true; diff --git a/lib/node-application.nix b/lib/node-application.nix index 9e4e692..3f4db0a 100644 --- a/lib/node-application.nix +++ b/lib/node-application.nix @@ -1,4 +1,4 @@ -{pkgs}: {tarball, name, mainBinaryPath, serviceOptions ? {}, serviceConfig ? {}, hasErrorReporting ? false}: +{pkgs, config, ...}: {tarball, name, mainBinaryPath, serviceOptions ? {}, serviceConfig ? {}, hasErrorReporting ? false}: with pkgs.stdenv.lib; let diff --git a/networks/default.nix b/networks/default.nix index 63ea210..78e302e 100644 --- a/networks/default.nix +++ b/networks/default.nix @@ -1,7 +1,7 @@ { network.description = "Cryto"; - osmium = { config, lib, pkgs, ... }: let + osmium = { config, lib, pkgs, ... }@args: let proxiedApplications = [{ hostname = "pastebin-stream.cryto.net"; tls = false; @@ -23,7 +23,7 @@ pastebinStream = (import ../applications/pastebin-stream.nix); in { imports = [ - pastebinStream { inherit pkgs; } + pastebinStream args ]; services.caddy = {