From ef6006dbe48a846e9242c306a99fa98967bf3bef Mon Sep 17 00:00:00 2001 From: Sebastian Tunstig Date: Thu, 16 Mar 2023 17:20:01 +0100 Subject: [PATCH 1/2] Reformat nix --- flake.nix | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/flake.nix b/flake.nix index ac4f86b..c346d7f 100644 --- a/flake.nix +++ b/flake.nix @@ -7,15 +7,10 @@ outputs = { self, flake-utils, naersk, nixpkgs }: let - overlay = - (final: prev: - let - naersk' = final.callPackage naersk {}; - in { - git-mob = naersk'.buildPackage {src = ./.;}; - }); - in - flake-utils.lib.eachDefaultSystem (system: + overlay = (final: prev: + let naersk' = final.callPackage naersk { }; + in { git-mob = naersk'.buildPackage { src = ./.; }; }); + in flake-utils.lib.eachDefaultSystem (system: let pkgs = (import nixpkgs) { inherit system; @@ -23,9 +18,7 @@ }; in rec { defaultPackage = pkgs.git-mob; - devShell = pkgs.mkShell { - nativeBuildInputs = with pkgs; [ rustc cargo ]; - }; - } - ); + devShell = + pkgs.mkShell { nativeBuildInputs = with pkgs; [ rustc cargo ]; }; + }); } From 94eb1c84130721f24705a368b8c6117a6e81f4fb Mon Sep 17 00:00:00 2001 From: Sebastian Tunstig Date: Thu, 16 Mar 2023 17:20:29 +0100 Subject: [PATCH 2/2] Include overlay in flake outputs --- flake.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index c346d7f..3615ef1 100644 --- a/flake.nix +++ b/flake.nix @@ -6,15 +6,15 @@ }; outputs = { self, flake-utils, naersk, nixpkgs }: - let - overlay = (final: prev: + { + overlays.default = (final: prev: let naersk' = final.callPackage naersk { }; in { git-mob = naersk'.buildPackage { src = ./.; }; }); - in flake-utils.lib.eachDefaultSystem (system: + } // flake-utils.lib.eachDefaultSystem (system: let pkgs = (import nixpkgs) { inherit system; - overlays = [ overlay ]; + overlays = [ self.overlays.default ]; }; in rec { defaultPackage = pkgs.git-mob;