diff options
author | Vincent Ambo <mail@tazj.in> | 2022-01-30T16·06+0300 |
---|---|---|
committer | tazjin <tazjin@tvl.su> | 2022-01-31T16·11+0000 |
commit | aa122cbae78ce97d60c0c98ba14df753d97e40b1 (patch) | |
tree | 12b98d85c4b18fe870feb26de70db9ba61837bd7 /third_party/overlays | |
parent | 2d10d60fac0fd00a71b65cfdcb9fba0477b2086c (diff) |
style: format entire depot with nixpkgs-fmt r/3723
This CL can be used to compare the style of nixpkgs-fmt against other formatters (nixpkgs, alejandra). Change-Id: I87c6abff6bcb546b02ead15ad0405f81e01b6d9e Reviewed-on: https://cl.tvl.fyi/c/depot/+/4397 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org> Reviewed-by: lukegb <lukegb@tvl.fyi> Reviewed-by: wpcarro <wpcarro@gmail.com> Reviewed-by: Profpatsch <mail@profpatsch.de> Reviewed-by: kanepyork <rikingcoding@gmail.com> Reviewed-by: tazjin <tazjin@tvl.su> Reviewed-by: cynthia <cynthia@tvl.fyi> Reviewed-by: edef <edef@edef.eu> Reviewed-by: eta <tvl@eta.st> Reviewed-by: grfn <grfn@gws.fyi>
Diffstat (limited to 'third_party/overlays')
-rw-r--r-- | third_party/overlays/emacs.nix | 3 | ||||
-rw-r--r-- | third_party/overlays/haskell/default.nix | 3 | ||||
-rw-r--r-- | third_party/overlays/tvl.nix | 10 |
3 files changed, 9 insertions, 7 deletions
diff --git a/third_party/overlays/emacs.nix b/third_party/overlays/emacs.nix index 895c45a9bcee..1dba4a739303 100644 --- a/third_party/overlays/emacs.nix +++ b/third_party/overlays/emacs.nix @@ -8,4 +8,5 @@ let url = "https://github.com/nix-community/emacs-overlay/archive/${commit}.tar.gz"; sha256 = "1b7rmshf1wc9wcml7jlzggdzilj644brk5m49fry6lv53vqmykjq"; }; -in import src +in +import src diff --git a/third_party/overlays/haskell/default.nix b/third_party/overlays/haskell/default.nix index 6e1ec2d0d1e5..8ea57f209662 100644 --- a/third_party/overlays/haskell/default.nix +++ b/third_party/overlays/haskell/default.nix @@ -11,7 +11,8 @@ let generic-arbitrary = appendPatch hsSuper.generic-arbitrary [ ./patches/generic-arbitrary-export-garbitrary.patch ]; }; -in { +in +{ haskellPackages = super.haskellPackages.override { inherit overrides; }; diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index e6e97b834785..1b2f2b9792f6 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -28,14 +28,14 @@ self: super: { notmuch = super.notmuch.emacs; # Build EXWM with the depot sources instead. - exwm = esuper.exwm.overrideAttrs(_: { + exwm = esuper.exwm.overrideAttrs (_: { src = depot.path.origSrc + "/third_party/exwm"; }); }) ); # dottime support for notmuch - notmuch = super.notmuch.overrideAttrs(old: { + notmuch = super.notmuch.overrideAttrs (old: { passthru = old.passthru // { patches = old.patches ++ [ ./patches/notmuch-dottime.patch ]; }; @@ -46,13 +46,13 @@ self: super: { nix-serve = super.nix-serve.override { nix = super.nix_2_3; }; # Avoid builds of mkShell derivations in CI. - mkShell = super.lib.makeOverridable(args: (super.mkShell args) // { + mkShell = super.lib.makeOverridable (args: (super.mkShell args) // { meta.ci.skip = true; }); # bump nixpkgs-fmt to a version that doesn't touch whitespace in # strings - nixpkgs-fmt = super.nixpkgs-fmt.overrideAttrs(old: rec { + nixpkgs-fmt = super.nixpkgs-fmt.overrideAttrs (old: rec { src = self.fetchFromGitHub { owner = "nix-community"; repo = "nixpkgs-fmt"; @@ -60,7 +60,7 @@ self: super: { sha256 = "0hjkbcgz62793hzfzlaxyah8a2c1k79n1k891lg7kfw8mkbq0w4p"; }; - cargoDeps = old.cargoDeps.overrideAttrs(_: { + cargoDeps = old.cargoDeps.overrideAttrs (_: { inherit src; outputHash = "10if2lmv8d95j3walq3ggx3y423yfy4yl9vplw3apd0s671bly8b"; }); |