From db373a8c727cad91d375b40a6c70b11ed73bdafb Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Mon, 1 Apr 2024 13:30:45 -0400 Subject: Add nixfmt to Lint.hs nixfmt is the soon-to-be official formatter for Nix code, as per the NixOS GitHub group. So I figure I should just adopt it without worrying too much about the specifics of the formatting. I just formatted everything in one go, hence the huge diff, oh well. --- Biz/Bild.nix | 326 +++++++++++++++++++++++++++++++---------------------------- 1 file changed, 170 insertions(+), 156 deletions(-) (limited to 'Biz/Bild.nix') diff --git a/Biz/Bild.nix b/Biz/Bild.nix index 097a089..04be55f 100644 --- a/Biz/Bild.nix +++ b/Biz/Bild.nix @@ -3,161 +3,175 @@ let constants = import ./Bild/Constants.nix; lib = nixpkgs.lib; -# put all of our stuff in the 'bild' namespace -in nixpkgs // { bild = rec { - # provided by .envrc - root = builtins.getEnv "CODEROOT"; - - inherit (nixpkgs) sources; - - haskell = rec { - inherit (constants) ghcCompiler; - - # all available packages - deps = import ./Bild/Deps/Haskell.nix; - packages = lib.attrsets.getAttrs deps nixpkgs.haskellPackages; - - # make a ghc with dependencies - ghcWith = nixpkgs.haskell.packages.${ghcCompiler}.ghcWithHoogle; - - # ghc with all packages, used for generating bild's package database - ghcPackageSetFull = ghcWith (p: lib.attrsets.attrVals deps p); - - # bild's dependencies, needs to be hand-written - ghcPackageSetBild = ghcWith (hpkgs: with hpkgs; [ - aeson async base bytestring conduit conduit-extra containers directory - docopt filepath process protolude rainbow regex-applicative split tasty - tasty-hunit tasty-quickcheck text hostname - wai # can remove when removed from Biz.Log - ]); - }; - - lisp = { - sbclWith = nixpkgs.lispPackages_new.sbclWithPackages; - }; - - python = { - packages = nixpkgs.python3Packages; - pythonWith = nixpkgs.python3.withPackages; - buildPythonApplication = nixpkgs.python3.pkgs.buildPythonApplication; + # put all of our stuff in the 'bild' namespace +in nixpkgs // { + bild = rec { + # provided by .envrc + root = builtins.getEnv "CODEROOT"; + + inherit (nixpkgs) sources; + + haskell = rec { + inherit (constants) ghcCompiler; + + # all available packages + deps = import ./Bild/Deps/Haskell.nix; + packages = lib.attrsets.getAttrs deps nixpkgs.haskellPackages; + + # make a ghc with dependencies + ghcWith = nixpkgs.haskell.packages.${ghcCompiler}.ghcWithHoogle; + + # ghc with all packages, used for generating bild's package database + ghcPackageSetFull = ghcWith (p: lib.attrsets.attrVals deps p); + + # bild's dependencies, needs to be hand-written + ghcPackageSetBild = ghcWith (hpkgs: + with hpkgs; [ + aeson + async + base + bytestring + conduit + conduit-extra + containers + directory + docopt + filepath + process + protolude + rainbow + regex-applicative + split + tasty + tasty-hunit + tasty-quickcheck + text + hostname + wai # can remove when removed from Biz.Log + ]); + }; + + lisp = { sbclWith = nixpkgs.lispPackages_new.sbclWithPackages; }; + + python = { + packages = nixpkgs.python3Packages; + pythonWith = nixpkgs.python3.withPackages; + buildPythonApplication = nixpkgs.python3.pkgs.buildPythonApplication; + }; + + # c packages are just nixpkgs, filtered to just the list of deps i want + c.packages = lib.attrsets.getAttrs (import ./Bild/Deps/C.nix) nixpkgs.pkgs; + + # expose some packages for inclusion in os/image builds + pkgs = with nixpkgs.pkgs; { + inherit black deadnix git hlint indent ormolu ruff shellcheck nixfmt; + }; + + # a standard nix build for bild, for bootstrapping. this should be the only + # hand-written builder we need + bild = nixpkgs.stdenv.mkDerivation { + name = "bild"; + src = ../.; + nativeBuildInputs = [ haskell.ghcPackageSetBild ]; + buildInputs = [ nixpkgs.makeWrapper ]; + propagatedBuildInputs = with nixpkgs; [ + pkg-config + git + # this is just to get access to ghc-pkg in bild + (haskell.ghcWith (_: [ ])) + + # lisp deps, remove this when i implement nix builds for lisp + guile + (lisp.sbclWith + (p: with p; [ asdf alexandria ])) # just enough to build Example.lisp + ]; + strictDeps = true; + buildPhase = '' + mkdir -p $out/bin $out/lib/ghc-${haskell.ghcPackageSetFull.version} + cp -r \ + ${haskell.ghcPackageSetFull}/lib/ghc-${haskell.ghcPackageSetFull.version}/package.conf.d \ + $out/lib/ghc-${haskell.ghcPackageSetFull.version} + ghc \ + -threaded \ + -Werror \ + -i. \ + --make Biz/Bild.hs \ + -main-is Biz.Bild \ + -o $out/bin/bild + ''; + installPhase = '' + wrapProgram $out/bin/bild \ + --prefix PATH : ${ + lib.makeBinPath [ haskell.ghcPackageSetBild pkgs.git ] + } \ + --set GHC_PACKAGE_PATH \ + $out/lib/ghc-${haskell.ghcPackageSetFull.version}/package.conf.d + ''; + }; + + # wrapper around bild + runBildAnalyze = target: + nixpkgs.stdenv.mkDerivation rec { + name = "bild-analysis"; + src = ../.; + USER = "nixbld"; + HOSTNAME = "nix-sandbox"; + # this is the default sandbox path where bild will be working: + CODEROOT = "/build/omni"; + # we need to remove the $src root because bild expects paths relative to the + # working directory: + TARGET = "." + + lib.strings.removePrefix (toString src) (toString target); + buildPhase = '' + mkdir $out + ${bild}/bin/bild --plan "$TARGET" 1> $out/analysis.json \ + 2> >(tee -a $out/stderr >&2) + ''; + installPhase = "exit 0"; + }; + + # gather data needed for compiling by analyzing the main module. returns the + # json object of the build + analyze = target: + builtins.readFile (runBildAnalyze target + "/analysis.json"); + + # this does a bild build for the given target, but entirely in nix. its kinda + # like IFD, but not as costly, i think + run = target: import ./Bild/Builder.nix { analysisJSON = analyze target; }; + + # the main development environment + env = nixpkgs.pkgs.mkShell { + name = "bizdev"; + # this should just be dev tools + buildInputs = with nixpkgs.pkgs; [ + bat + bc + bild + black + ctags + fd + figlet + fzf + git + git-branchless + gitlint + jq + lolcat + nixpkgs.haskell.packages.${constants.ghcCompiler}.fast-tags + ormolu + ripgrep + tree + wemux + ]; + shellHook = '' + export GHC_PACKAGE_PATH=${bild}/lib/ghc-${haskell.ghcPackageSetFull.version}/package.conf.d + ''; + }; + + # build an operating system. 'cfg' is the NixOS config + os = cfg: (nixpkgs.nixos (_args: cfg)).toplevel; + + # build a docker image + image = nixpkgs.pkgs.dockerTools.buildImage; }; - - # c packages are just nixpkgs, filtered to just the list of deps i want - c.packages = lib.attrsets.getAttrs (import ./Bild/Deps/C.nix) nixpkgs.pkgs; - - # expose some packages for inclusion in os/image builds - pkgs = with nixpkgs.pkgs; { - inherit - black - deadnix - git - hlint - indent - ormolu - ruff - shellcheck - ; - }; - - # a standard nix build for bild, for bootstrapping. this should be the only - # hand-written builder we need - bild = nixpkgs.stdenv.mkDerivation { - name = "bild"; - src = ../.; - nativeBuildInputs = [ haskell.ghcPackageSetBild ]; - buildInputs = [ nixpkgs.makeWrapper ]; - propagatedBuildInputs = with nixpkgs; [ - pkg-config - git - # this is just to get access to ghc-pkg in bild - (haskell.ghcWith (_: [])) - - # lisp deps, remove this when i implement nix builds for lisp - guile - (lisp.sbclWith (p: with p; [asdf alexandria])) # just enough to build Example.lisp - ]; - strictDeps = true; - buildPhase = '' - mkdir -p $out/bin $out/lib/ghc-${haskell.ghcPackageSetFull.version} - cp -r \ - ${haskell.ghcPackageSetFull}/lib/ghc-${haskell.ghcPackageSetFull.version}/package.conf.d \ - $out/lib/ghc-${haskell.ghcPackageSetFull.version} - ghc \ - -threaded \ - -Werror \ - -i. \ - --make Biz/Bild.hs \ - -main-is Biz.Bild \ - -o $out/bin/bild - ''; - installPhase = '' - wrapProgram $out/bin/bild \ - --prefix PATH : ${lib.makeBinPath [ haskell.ghcPackageSetBild pkgs.git ]} \ - --set GHC_PACKAGE_PATH \ - $out/lib/ghc-${haskell.ghcPackageSetFull.version}/package.conf.d - ''; - }; - - # wrapper around bild - runBildAnalyze = target: nixpkgs.stdenv.mkDerivation rec { - name = "bild-analysis"; - src = ../.; - USER = "nixbld"; - HOSTNAME = "nix-sandbox"; - # this is the default sandbox path where bild will be working: - CODEROOT = "/build/omni"; - # we need to remove the $src root because bild expects paths relative to the - # working directory: - TARGET = "." + lib.strings.removePrefix (toString src) (toString target); - buildPhase = '' - mkdir $out - ${bild}/bin/bild --plan "$TARGET" 1> $out/analysis.json \ - 2> >(tee -a $out/stderr >&2) - ''; - installPhase = "exit 0"; - }; - - # gather data needed for compiling by analyzing the main module. returns the - # json object of the build - analyze = target: builtins.readFile (runBildAnalyze target + "/analysis.json"); - - # this does a bild build for the given target, but entirely in nix. its kinda - # like IFD, but not as costly, i think - run = target: import ./Bild/Builder.nix { analysisJSON = analyze target; }; - - # the main development environment - env = nixpkgs.pkgs.mkShell { - name = "bizdev"; - # this should just be dev tools - buildInputs = with nixpkgs.pkgs; [ - bat - bc - bild - black - ctags - fd - figlet - fzf - git - git-branchless - gitlint - jq - lolcat - nixpkgs.haskell.packages.${constants.ghcCompiler}.fast-tags - ormolu - ripgrep - tree - wemux - ]; - shellHook = '' - export GHC_PACKAGE_PATH=${bild}/lib/ghc-${haskell.ghcPackageSetFull.version}/package.conf.d - ''; - }; - - # build an operating system. 'cfg' is the NixOS config - os = cfg: (nixpkgs.nixos (_args: cfg)).toplevel; - - # build a docker image - image = nixpkgs.pkgs.dockerTools.buildImage; -}; } -- cgit v1.2.3