nix: fix statix hints

This commit is contained in:
monacoremo
2021-11-02 23:10:23 +01:00
committed by Remo
parent 2357961f48
commit d16a4a9a2b
4 changed files with 9 additions and 14 deletions
+4 -6
View File
@@ -80,8 +80,7 @@ let
} }
); );
lib = inherit (pkgs.haskell) lib;
pkgs.haskell.lib;
in in
rec { rec {
inherit nixpkgs pkgs; inherit nixpkgs pkgs;
@@ -104,13 +103,12 @@ rec {
) )
); );
env = inherit (postgrest) env;
postgrest.env;
# Tooling for analyzing Haskell imports and exports. # Tooling for analyzing Haskell imports and exports.
hsie = hsie =
pkgs.callPackage nix/hsie { pkgs.callPackage nix/hsie {
ghcWithPackages = pkgs.haskell.packages."${compiler}".ghcWithPackages; inherit (pkgs.haskell.packages."${compiler}") ghcWithPackages;
}; };
### Tools ### Tools
@@ -147,7 +145,7 @@ rec {
pkgs.callPackage nix/tools/tests.nix { pkgs.callPackage nix/tools/tests.nix {
inherit postgrest devCabalOptions withTools; inherit postgrest devCabalOptions withTools;
ghc = pkgs.haskell.compiler."${compiler}"; ghc = pkgs.haskell.compiler."${compiler}";
hpc-codecov = pkgs.haskell.packages."${compiler}".hpc-codecov; inherit (pkgs.haskell.packages."${compiler}") hpc-codecov;
}; };
withTools = withTools =
+1 -2
View File
@@ -2,8 +2,7 @@
self: super: self: super:
let let
lib = inherit (self.haskell) lib;
self.haskell.lib;
overrides = overrides =
final: prev: final: prev:
+2 -2
View File
@@ -14,13 +14,13 @@ let
"postgrest-nixpkgs-upgrade"; "postgrest-nixpkgs-upgrade";
refUrl = refUrl =
https://api.github.com/repos/nixos/nixpkgs/git/ref/heads/nixpkgs-unstable; "https://api.github.com/repos/nixos/nixpkgs/git/ref/heads/nixpkgs-unstable";
githubV3Header = githubV3Header =
"Accept: application/vnd.github.v3+json"; "Accept: application/vnd.github.v3+json";
tarballUrlBase = tarballUrlBase =
https://github.com/nixos/nixpkgs/archive/; "https://github.com/nixos/nixpkgs/archive/";
upgrade = upgrade =
checkedShellScript checkedShellScript
+2 -4
View File
@@ -13,11 +13,9 @@ let
postgrest = postgrest =
import ./default.nix; import ./default.nix;
pkgs = inherit (postgrest) pkgs;
postgrest.pkgs;
lib = inherit (pkgs) lib;
pkgs.lib;
toolboxes = toolboxes =
[ [