aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFuwn <[email protected]>2021-04-26 13:28:06 +0000
committerFuwn <[email protected]>2021-04-26 13:28:06 +0000
commit8942a936f1fa23be6b82d9d198600ed6720d04e7 (patch)
treead7cd6d366d84ee703987cca99c03445944fec04
parentetc: Remove legacy server module (diff)
downloadwhirl-8942a936f1fa23be6b82d9d198600ed6720d04e7.tar.xz
whirl-8942a936f1fa23be6b82d9d198600ed6720d04e7.zip
fmt: Fix whitespace
-rw-r--r--default.nix28
-rw-r--r--nix/rust.nix12
-rw-r--r--shell.nix8
-rw-r--r--whirl.nix20
4 files changed, 34 insertions, 34 deletions
diff --git a/default.nix b/default.nix
index 5691a41..1b279f4 100644
--- a/default.nix
+++ b/default.nix
@@ -1,20 +1,20 @@
- { system ? builtins.currentSystem }:
+{ system ? builtins.currentSystem }:
- let
- sources = import ./nix/sources.nix;
- pkgs = import sources.nixpkgs { };
- whirl = import ./whirl.nix { inherit sources pkgs; };
+let
+ sources = import ./nix/sources.nix;
+ pkgs = import sources.nixpkgs { };
+ whirl = import ./whirl.nix { inherit sources pkgs; };
- name = "Whirlsplash/whirl";
- tag = "latest";
+ name = "Whirlsplash/whirl";
+ tag = "latest";
in pkgs.dockerTools.buildLayeredImage {
- inherit name tag;
- contents = [ whirl ];
+ inherit name tag;
+ contents = [ whirl ];
- config = {
- Cmd = [ "/bin/whirl" ];
- Env = [ ];
- WorkingDir = "/";
- };
+ config = {
+ Cmd = [ "/bin/whirl" ];
+ Env = [ ];
+ WorkingDir = "/";
+ };
}
diff --git a/nix/rust.nix b/nix/rust.nix
index c6e8c2a..5066437 100644
--- a/nix/rust.nix
+++ b/nix/rust.nix
@@ -1,10 +1,10 @@
{ sources ? import ./sources.nix }:
let
- pkgs =
- import sources.nixpkgs { overlays = [ (import sources.nixpkgs-mozilla) ]; };
- channel = "nightly";
- date = "2021-02-20";
- targets = [ ];
- chan = pkgs.rustChannelOfTargets channel date targets;
+ pkgs =
+ import sources.nixpkgs { overlays = [ (import sources.nixpkgs-mozilla) ]; };
+ channel = "nightly";
+ date = "2021-02-20";
+ targets = [ ];
+ chan = pkgs.rustChannelOfTargets channel date targets;
in chan
diff --git a/shell.nix b/shell.nix
index 1c5327d..4873647 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,8 +1,8 @@
let
- sources = import ./nix/sources.nix;
- rust = import ./nix/rust.nix { inherit sources; };
- pkgs = import sources.nixpkgs { };
+ sources = import ./nix/sources.nix;
+ rust = import ./nix/rust.nix { inherit sources; };
+ pkgs = import sources.nixpkgs { };
in
pkgs.mkShell {
- buildInputs = with pkgs; [ rust ];
+ buildInputs = with pkgs; [ rust ];
}
diff --git a/whirl.nix b/whirl.nix
index 9e37ba8..a08a9b2 100644
--- a/whirl.nix
+++ b/whirl.nix
@@ -1,17 +1,17 @@
{ sources ? import ./nix/sources.nix, pkgs ? import sources.nixpkgs { } }:
let
- rust = import ./nix/rust.nix { inherit sources; };
+ rust = import ./nix/rust.nix { inherit sources; };
- naersk = pkgs.callPackage sources.naersk {
- rustc = rust;
- cargo = rust;
- };
+ naersk = pkgs.callPackage sources.naersk {
+ rustc = rust;
+ cargo = rust;
+ };
- src = builtins.filterSource
- (path: type: type != "directory" || builtins.baseNameOf path != "target")
- ./.;
+ src = builtins.filterSource
+ (path: type: type != "directory" || builtins.baseNameOf path != "target")
+ ./.;
in naersk.buildPackage {
- inherit src;
- remapPathPrefix = true;
+ inherit src;
+ remapPathPrefix = true;
}