diff --git a/default.nix b/default.nix
index f11e18454..1162a0fc1 100644
--- a/default.nix
+++ b/default.nix
@@ -80,8 +80,7 @@ let
       }
     );
 
-  lib =
-    pkgs.haskell.lib;
+  inherit (pkgs.haskell) lib;
 in
 rec {
   inherit nixpkgs pkgs;
@@ -104,13 +103,12 @@ rec {
       )
     );
 
-  env =
-    postgrest.env;
+  inherit (postgrest) env;
 
   # Tooling for analyzing Haskell imports and exports.
   hsie =
     pkgs.callPackage nix/hsie {
-      ghcWithPackages = pkgs.haskell.packages."${compiler}".ghcWithPackages;
+      inherit (pkgs.haskell.packages."${compiler}") ghcWithPackages;
     };
 
   ### Tools
@@ -147,7 +145,7 @@ rec {
     pkgs.callPackage nix/tools/tests.nix {
       inherit postgrest devCabalOptions withTools;
       ghc = pkgs.haskell.compiler."${compiler}";
-      hpc-codecov = pkgs.haskell.packages."${compiler}".hpc-codecov;
+      inherit (pkgs.haskell.packages."${compiler}") hpc-codecov;
     };
 
   withTools =
diff --git a/nix/overlays/haskell-packages.nix b/nix/overlays/haskell-packages.nix
index f26abeb4e..97d7ba65b 100644
--- a/nix/overlays/haskell-packages.nix
+++ b/nix/overlays/haskell-packages.nix
@@ -2,8 +2,7 @@
 
 self: super:
 let
-  lib =
-    self.haskell.lib;
+  inherit (self.haskell) lib;
 
   overrides =
     final: prev:
diff --git a/nix/tools/nixpkgsTools.nix b/nix/tools/nixpkgsTools.nix
index faab6bfc9..3c938fdac 100644
--- a/nix/tools/nixpkgsTools.nix
+++ b/nix/tools/nixpkgsTools.nix
@@ -14,13 +14,13 @@ let
     "postgrest-nixpkgs-upgrade";
 
   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 =
     "Accept: application/vnd.github.v3+json";
 
   tarballUrlBase =
-    https://github.com/nixos/nixpkgs/archive/;
+    "https://github.com/nixos/nixpkgs/archive/";
 
   upgrade =
     checkedShellScript
diff --git a/shell.nix b/shell.nix
index e8f34199c..d3b343732 100644
--- a/shell.nix
+++ b/shell.nix
@@ -13,11 +13,9 @@ let
   postgrest =
     import ./default.nix;
 
-  pkgs =
-    postgrest.pkgs;
+  inherit (postgrest) pkgs;
 
-  lib =
-    pkgs.lib;
+  inherit (pkgs) lib;
 
   toolboxes =
     [