diff --git a/images/cachix/default.nix b/images/cachix/default.nix index bc188ad..59fcdee 100644 --- a/images/cachix/default.nix +++ b/images/cachix/default.nix @@ -6,7 +6,7 @@ nix = nix; extraContents = [ cachix ]; }).overrideAttrs (prev: { - meta = (prev.meta or {}) // { + meta = (prev.meta or { }) // { description = "Nix and Cachix image"; }; }) diff --git a/images/devcontainer/default.nix b/images/devcontainer/default.nix index 337f24c..8b1257f 100644 --- a/images/devcontainer/default.nix +++ b/images/devcontainer/default.nix @@ -25,7 +25,7 @@ , mkUserEnvironment }: let - channel = builtins.getEnv("NIXPKGS_CHANNEL"); + channel = builtins.getEnv ("NIXPKGS_CHANNEL"); # generate a user profile for the image profile = mkUserEnvironment { diff --git a/images/nix/default.nix b/images/nix/default.nix index 168052b..2f469c4 100644 --- a/images/nix/default.nix +++ b/images/nix/default.nix @@ -10,7 +10,7 @@ , nix , openssh , xz -, extraContents ? [] +, extraContents ? [ ] }: let image = dockerTools.buildImageWithNixDb { diff --git a/images/nix/fake_nixpkgs/default.nix b/images/nix/fake_nixpkgs/default.nix index 55e2369..3001f60 100644 --- a/images/nix/fake_nixpkgs/default.nix +++ b/images/nix/fake_nixpkgs/default.nix @@ -1,10 +1,10 @@ _: throw '' -This container doesn't include nixpkgs. + This container doesn't include nixpkgs. -The best way to work around that is to pin your dependencies. See - https://nix.dev/tutorials/towards-reproducibility-pinning-nixpkgs.html + The best way to work around that is to pin your dependencies. See + https://nix.dev/tutorials/towards-reproducibility-pinning-nixpkgs.html -Or if you must, override the NIX_PATH environment variable with eg: - "NIX_PATH=nixpkgs=channel:nixos-unstable" + Or if you must, override the NIX_PATH environment variable with eg: + "NIX_PATH=nixpkgs=channel:nixos-unstable" '' diff --git a/lib/buildCLIImage.nix b/lib/buildCLIImage.nix index b5109a1..454e43d 100644 --- a/lib/buildCLIImage.nix +++ b/lib/buildCLIImage.nix @@ -5,7 +5,7 @@ { drv # derivation to build the image for # Name of the binary to run by default , binName ? (builtins.parseDrvName drv.name).name -, extraContents ? [] +, extraContents ? [ ] , meta ? drv.meta }: let diff --git a/overlay.nix b/overlay.nix index e864878..b480eb3 100644 --- a/overlay.nix +++ b/overlay.nix @@ -1,17 +1,18 @@ -_: pkgs: let +_: pkgs: +let importDir = import ./lib/importDir.nix { inherit (pkgs) lib; }; in { # builder stuff can be in the top-level - buildCLIImage = pkgs.callPackage ./lib/buildCLIImage.nix {}; + buildCLIImage = pkgs.callPackage ./lib/buildCLIImage.nix { }; # docker images must be lower-cased - docker-nixpkgs = importDir (path: pkgs.callPackage path {}) ./images; + docker-nixpkgs = importDir (path: pkgs.callPackage path { }) ./images; # used to build nix-env compatible user environments - mkUserEnvironment = pkgs.callPackage ./lib/mkUserEnvironment.nix {}; + mkUserEnvironment = pkgs.callPackage ./lib/mkUserEnvironment.nix { }; # gitMinimal still ships with perl and python gitReallyMinimal = ( diff --git a/pkgs.nix b/pkgs.nix index f6a8f72..62e5716 100644 --- a/pkgs.nix +++ b/pkgs.nix @@ -1,7 +1,7 @@ import { # docker images run on Linux system = "x86_64-linux"; - config = {}; + config = { }; overlays = [ (import ./overlay.nix) ]; diff --git a/shell.nix b/shell.nix index 407ae45..9f06818 100644 --- a/shell.nix +++ b/shell.nix @@ -1,6 +1,6 @@ let nixpkgs = builtins.fetchTarball "channel:nixos-20.09"; - pkgs = import nixpkgs { config = {}; overlays = []; }; + pkgs = import nixpkgs { config = { }; overlays = [ ]; }; in with pkgs; mkShell {