Format legacy nix files

sebastiaanvisser · Jan 8, 2025 · 0b844de · 0b844de
1 parent fb21fcb
commit 0b844de
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 23 deletions.
diff --git a/all-ghcs.nix b/all-ghcs.nix
@@ -3,4 +3,5 @@ let
   getGHCVersionFromEnvAssignment = envAssignment: builtins.elemAt (builtins.split "=" envAssignment) 2;
   supportedGHCVersions = builtins.map getGHCVersionFromEnvAssignment travisJobEnvAssignments;
   buildClayWith = version: import ./default.nix { compiler = version; };
-in builtins.map buildClayWith supportedGHCVersions
+in
+builtins.map buildClayWith supportedGHCVersions
diff --git a/default.nix b/default.nix
@@ -3,4 +3,5 @@
 let
   compilerWithDefault = if compiler == "" then "ghc884" else compiler;
   release = import ./release.nix { compiler = compilerWithDefault; };
-in { inherit (release) clay examples; }
+in
+{ inherit (release) clay examples; }
diff --git a/release.nix b/release.nix
@@ -16,28 +16,27 @@ let
   generatedOverrides = haskellPackagesNew: haskellPackagesOld:
     let
       toPackage = file: _: {
-        name  = builtins.replaceStrings [ ".nix" ] [ "" ] file;
+        name = builtins.replaceStrings [ ".nix" ] [ "" ] file;
         value = haskellPackagesNew.callPackage (./. + "/nix/${file}") { };
       };
     in
-      pkgs.lib.mapAttrs' toPackage (builtins.readDir ./nix);
+    pkgs.lib.mapAttrs' toPackage (builtins.readDir ./nix);
 
   makeOverrides =
     function: names: haskellPackagesNew: haskellPackagesOld:
-      let
-        toPackage = name: {
-          inherit name;
-          value = function haskellPackagesOld.${name};
-        };
-      in
-        builtins.listToAttrs (map toPackage names);
+    let
+      toPackage = name: {
+        inherit name;
+        value = function haskellPackagesOld.${name};
+      };
+    in
+    builtins.listToAttrs (map toPackage names);
 
   composeExtensionsList =
-    pkgs.lib.fold pkgs.lib.composeExtensions (_: _: {});
+    pkgs.lib.fold pkgs.lib.composeExtensions (_: _: { });
 
   # More exotic overrides go here
-  manualOverrides = haskellPackagesNew: haskellPackagesOld: {
-  };
+  manualOverrides = haskellPackagesNew: haskellPackagesOld: { };
 
   config = {
     packageOverrides = pkgs: rec {
@@ -46,7 +45,7 @@ let
           "${compiler}" = pkgs.haskell.packages."${compiler}".override {
             overrides = composeExtensionsList [
               generatedOverrides
-              (makeOverrides pkgs.haskell.lib.dontCheck   dontCheckPackages  )
+              (makeOverrides pkgs.haskell.lib.dontCheck dontCheckPackages)
               (makeOverrides pkgs.haskell.lib.doJailbreak doJailbreakPackages)
               (makeOverrides pkgs.haskell.lib.dontHaddock dontHaddockPackages)
               manualOverrides
@@ -60,8 +59,9 @@ let
   pkgs = import (builtins.fetchTarball (import ./nix/nixpkgs.nix)) { inherit config; };
 
 in
-  { clay = pkgs.haskell.packages.${compiler}.clay;
-    examples = pkgs.haskell.packages.${compiler}.callCabal2nix "examples" ./examples {};
-    cabal = pkgs.haskellPackages.cabal-install;
-    pkgs = pkgs;
-  }
+{
+  clay = pkgs.haskell.packages.${compiler}.clay;
+  examples = pkgs.haskell.packages.${compiler}.callCabal2nix "examples" ./examples { };
+  cabal = pkgs.haskellPackages.cabal-install;
+  pkgs = pkgs;
+}
diff --git a/shell.nix b/shell.nix
@@ -1,9 +1,10 @@
 { compiler ? "ghc884" }:
 
 let
-  release = (import ./release.nix {inherit compiler;});
-in release.pkgs.lib.overrideDerivation release.clay.env (oldAttrs: rec {
-  nativeBuildInputs = (oldAttrs.nativeBuildInputs or []) ++ [
+  release = (import ./release.nix { inherit compiler; });
+in
+release.pkgs.lib.overrideDerivation release.clay.env (oldAttrs: rec {
+  nativeBuildInputs = (oldAttrs.nativeBuildInputs or [ ]) ++ [
     release.cabal
     release.pkgs.haskellPackages.cabal2nix
   ];