From ee2d23e97ff86738aa9b82abd57006427d7e3836 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robin=20B=C3=A4rtschi?= Date: Sun, 9 Mar 2025 14:46:47 +0100 Subject: [PATCH] formatted --- flake.nix | 82 ++++++++++++++++++++++++++----------------------- nix/default.nix | 3 +- nix/package.nix | 6 +++- 3 files changed, 50 insertions(+), 41 deletions(-) diff --git a/flake.nix b/flake.nix index 164ea10..4eccdc3 100644 --- a/flake.nix +++ b/flake.nix @@ -1,53 +1,59 @@ # ml2 ts=2 sts=2 sw=2 - { description = "A simple Go package"; # Nixpkgs / NixOS version to use. inputs.nixpkgs.url = "nixpkgs/nixos-unstable"; - outputs = { self, nixpkgs }: - let + outputs = { + self, + nixpkgs, + }: let + # to work with older version of flakes + lastModifiedDate = self.lastModifiedDate or self.lastModified or "19700101"; - # to work with older version of flakes - lastModifiedDate = self.lastModifiedDate or self.lastModified or "19700101"; + # Generate a user-friendly version number. + version = builtins.substring 0 8 lastModifiedDate; - # Generate a user-friendly version number. - version = builtins.substring 0 8 lastModifiedDate; + # System types to support. + supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"]; - # System types to support. - supportedSystems = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; - - # Helper function to generate an attrset '{ x86_64-linux = f "x86_64-linux"; ... }'. - forAllSystems = nixpkgs.lib.genAttrs supportedSystems; - - # Nixpkgs instantiated for supported system types. - nixpkgsFor = forAllSystems (system: import nixpkgs { inherit system; }); + # Helper function to generate an attrset '{ x86_64-linux = f "x86_64-linux"; ... }'. + forAllSystems = nixpkgs.lib.genAttrs supportedSystems; + # Nixpkgs instantiated for supported system types. + nixpkgsFor = forAllSystems (system: import nixpkgs {inherit system;}); + in { + # Provide some binary packages for selected system types. + packages = forAllSystems (system: let + pkgs = nixpkgsFor.${system}; in { - # Provide some binary packages for selected system types. - packages = forAllSystems (system: - let - pkgs = nixpkgsFor.${system}; - in - { - tt = pkgs.callPackage ./nix/package.nix { version = version; }; - }); + tt = pkgs.callPackage ./nix/package.nix {version = version;}; + }); - # Add dependencies that are only needed for development - devShells = forAllSystems (system: - let - pkgs = nixpkgsFor.${system}; - in - { - default = pkgs.mkShell { - buildInputs = with pkgs; [ go gopls gotools go-tools qbe (if system == "x86_64-linux" then [fasm] else []) ]; - }; - }); + # Add dependencies that are only needed for development + devShells = forAllSystems (system: let + pkgs = nixpkgsFor.${system}; + in { + default = pkgs.mkShell { + buildInputs = with pkgs; [ + go + gopls + gotools + go-tools + qbe + ( + if system == "x86_64-linux" + then [fasm] + else [] + ) + ]; + }; + }); - # The default package for 'nix build'. This makes sense if the - # flake provides only one package or there is a clear "main" - # package. - defaultPackage = forAllSystems (system: self.packages.${system}.tt); - }; + # The default package for 'nix build'. This makes sense if the + # flake provides only one package or there is a clear "main" + # package. + defaultPackage = forAllSystems (system: self.packages.${system}.tt); + }; } diff --git a/nix/default.nix b/nix/default.nix index dd12bb1..2f2c931 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -1,4 +1,3 @@ # ml2 ts=2 sts=2 sw=2 - with import {}; -{version ? "HEAD"}: callPackage ./package.nix {inherit version;} + {version ? "HEAD"}: callPackage ./package.nix {inherit version;} diff --git a/nix/package.nix b/nix/package.nix index 4404d39..c689b52 100644 --- a/nix/package.nix +++ b/nix/package.nix @@ -1,5 +1,9 @@ # ml2 ts=2 sts=2 sw=2 -{buildGoModule, version ? "HEAD"}: buildGoModule { +{ + buildGoModule, + version ? "HEAD", +}: +buildGoModule { pname = "tt"; inherit version;