Format

Evertras · Feb 2, 2024 · 1a0b77f · 1a0b77f
1 parent 27d04e1
commit 1a0b77f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 36 deletions.
diff --git a/default.nix b/default.nix
@@ -1,14 +1,9 @@
-{ pkgs ? (
-  let
-    inherit (builtins) fetchTree fromJSON readFile;
-    inherit ((fromJSON (readFile ./flake.lock)).nodes) nixpkgs gomod2nix;
-  in
-  import (fetchTree nixpkgs.locks) {
-    overlays = [
-      (import "${fetchTree gomod2nix.locked}/overlay.nix")
-    ];
-  }
-), buildGoApplication ? pkgs.buildGoApplication }:
+{ pkgs ? (let
+  inherit (builtins) fetchTree fromJSON readFile;
+  inherit ((fromJSON (readFile ./flake.lock)).nodes) nixpkgs gomod2nix;
+in import (fetchTree nixpkgs.locks) {
+  overlays = [ (import "${fetchTree gomod2nix.locked}/overlay.nix") ];
+}), buildGoApplication ? pkgs.buildGoApplication }:
 buildGoApplication {
   pname = "yakdash";
   version = "0.1";

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -18,7 +18,8 @@
 
         # The current default sdk for macOS fails to compile go projects, so we use a newer one for now.
         # This has no effect on other platforms.
-        callPackage = pkgs.darwin.apple_sdk_11_0.callPackage or pkgs.callPackage;
+        callPackage =
+          pkgs.darwin.apple_sdk_11_0.callPackage or pkgs.callPackage;
       in {
         packages.default = callPackage ./default.nix {
           inherit (gomod2nix.legacyPackages.${system}) buildGoApplication;

diff --git a/shell.nix b/shell.nix
@@ -1,22 +1,12 @@
-{ pkgs ? (
-    let
-      inherit (builtins) fetchTree fromJSON readFile;
-      inherit ((fromJSON (readFile ./flake.lock)).nodes) nixpkgs gomod2nix;
-    in
-    import (fetchTree nixpkgs.locked) {
-      overlays = [
-        (import "${fetchTree gomod2nix.locked}/overlay.nix")
-      ];
-    }
-  )
-, mkGoEnv ? pkgs.mkGoEnv
-, gomod2nix ? pkgs.gomod2nix
-}:
+{ pkgs ? (let
+  inherit (builtins) fetchTree fromJSON readFile;
+  inherit ((fromJSON (readFile ./flake.lock)).nodes) nixpkgs gomod2nix;
+in import (fetchTree nixpkgs.locked) {
+  overlays = [ (import "${fetchTree gomod2nix.locked}/overlay.nix") ];
+}), mkGoEnv ? pkgs.mkGoEnv, gomod2nix ? pkgs.gomod2nix }:
 
-let
-  goEnv = mkGoEnv { pwd = ./.; };
-in
-pkgs.mkShell {
+let goEnv = mkGoEnv { pwd = ./.; };
+in pkgs.mkShell {
   packages = with pkgs; [
     goEnv
     gomod2nix