style: Apply nixfmt to trivial Nix files
ALl the ones except for build-image.nix are considered trivial. On the latter, nixfmt makes some useful changes but by-and-large it is not ready for that code yet.
This commit is contained in:
parent
6285cd8dbf
commit
3939722063
5 changed files with 21 additions and 27 deletions
|
@ -1,12 +1,10 @@
|
|||
# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
|
||||
[
|
||||
{
|
||||
goPackagePath = "gonum.org/v1/gonum";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/gonum/gonum";
|
||||
rev = "ced62fe5104b907b6c16cb7e575c17b2e62ceddd";
|
||||
sha256 = "1b7q6haabnp53igpmvr6a2414yralhbrldixx4kbxxg1apy8jdjg";
|
||||
};
|
||||
}
|
||||
]
|
||||
[{
|
||||
goPackagePath = "gonum.org/v1/gonum";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/gonum/gonum";
|
||||
rev = "ced62fe5104b907b6c16cb7e575c17b2e62ceddd";
|
||||
sha256 = "1b7q6haabnp53igpmvr6a2414yralhbrldixx4kbxxg1apy8jdjg";
|
||||
};
|
||||
}]
|
||||
|
|
|
@ -11,8 +11,7 @@
|
|||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
{ pkgs ? import <nixpkgs> {}
|
||||
, preLaunch ? "" }:
|
||||
{ pkgs ? import <nixpkgs> { }, preLaunch ? "" }:
|
||||
|
||||
with pkgs;
|
||||
|
||||
|
@ -23,7 +22,7 @@ rec {
|
|||
# Users will usually not want to use this directly, instead see the
|
||||
# 'nixery' derivation below, which automatically includes runtime
|
||||
# data dependencies.
|
||||
nixery-server = callPackage ./server {};
|
||||
nixery-server = callPackage ./server { };
|
||||
|
||||
# Implementation of the image building & layering logic
|
||||
nixery-build-image = (import ./build-image { inherit pkgs; }).wrapper;
|
||||
|
@ -31,7 +30,7 @@ rec {
|
|||
# Use mdBook to build a static asset page which Nixery can then
|
||||
# serve. This is primarily used for the public instance at
|
||||
# nixery.dev.
|
||||
nixery-book = callPackage ./docs {};
|
||||
nixery-book = callPackage ./docs { };
|
||||
|
||||
# Wrapper script running the Nixery server with the above two data
|
||||
# dependencies configured.
|
||||
|
@ -76,7 +75,7 @@ rec {
|
|||
'';
|
||||
in dockerTools.buildLayeredImage {
|
||||
name = "nixery";
|
||||
config.Cmd = ["${nixery-launch-script}/bin/nixery"];
|
||||
config.Cmd = [ "${nixery-launch-script}/bin/nixery" ];
|
||||
maxLayers = 96;
|
||||
contents = [
|
||||
cacert
|
||||
|
|
|
@ -40,12 +40,12 @@ let
|
|||
};
|
||||
|
||||
nix-1p = fetchFromGitHub {
|
||||
owner = "tazjin";
|
||||
repo = "nix-1p";
|
||||
rev = "3cd0f7d7b4f487d04a3f1e3ca8f2eb1ab958c49b";
|
||||
owner = "tazjin";
|
||||
repo = "nix-1p";
|
||||
rev = "3cd0f7d7b4f487d04a3f1e3ca8f2eb1ab958c49b";
|
||||
sha256 = "02lpda03q580gyspkbmlgnb2cbm66rrcgqsv99aihpbwyjym81af";
|
||||
};
|
||||
in runCommand "nixery-book" {} ''
|
||||
in runCommand "nixery-book" { } ''
|
||||
mkdir -p $out
|
||||
cp -r ${./.}/* .
|
||||
chmod -R a+w src
|
||||
|
|
|
@ -15,9 +15,9 @@
|
|||
{ buildGoPackage, lib }:
|
||||
|
||||
buildGoPackage {
|
||||
name = "nixery-server";
|
||||
name = "nixery-server";
|
||||
goDeps = ./go-deps.nix;
|
||||
src = ./.;
|
||||
src = ./.;
|
||||
|
||||
goPackagePath = "github.com/google/nixery";
|
||||
|
||||
|
|
|
@ -14,14 +14,11 @@
|
|||
|
||||
# Configures a shell environment that builds required local packages to
|
||||
# run Nixery.
|
||||
{pkgs ? import <nixpkgs> {} }:
|
||||
{ pkgs ? import <nixpkgs> { } }:
|
||||
|
||||
let nixery = import ./default.nix { inherit pkgs; };
|
||||
in pkgs.stdenv.mkDerivation {
|
||||
name = "nixery-dev-shell";
|
||||
|
||||
buildInputs = with pkgs;[
|
||||
jq
|
||||
nixery.nixery-build-image
|
||||
];
|
||||
buildInputs = with pkgs; [ jq nixery.nixery-build-image ];
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue