From c85a8a1fad20f95bf60ccb95f562d787ca3a42db Mon Sep 17 00:00:00 2001
From: John Ericson <git@JohnEricson.me>
Date: Sat, 2 Feb 2019 15:56:52 -0500
Subject: postgresql: No need to refer to `super`

self.callPackage works fine for now. If/when that changes, we have a
repo-wide thing to deal with so no reason to do anything now.
---
 pkgs/servers/sql/postgresql/default.nix | 14 +++++++-------
 pkgs/top-level/all-packages.nix         |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 0624998e5deb..842d01a640cb 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -153,9 +153,9 @@ let
     '';
   };
 
-in self: super: {
+in self: {
 
-  postgresql_9_4 = super.callPackage generic {
+  postgresql_9_4 = self.callPackage generic {
     version = "9.4.20";
     psqlSchema = "9.4";
     sha256 = "0zzqjz5jrn624hzh04drpj6axh30a9k6bgawid6rwk45nbfxicgf";
@@ -163,7 +163,7 @@ in self: super: {
     inherit self;
   };
 
-  postgresql_9_5 = super.callPackage generic {
+  postgresql_9_5 = self.callPackage generic {
     version = "9.5.15";
     psqlSchema = "9.5";
     sha256 = "0i2lylgmsmy2g1ixlvl112fryp7jmrd0i2brk8sxb7vzzpg3znnv";
@@ -171,7 +171,7 @@ in self: super: {
     inherit self;
   };
 
-  postgresql_9_6 = super.callPackage generic {
+  postgresql_9_6 = self.callPackage generic {
     version = "9.6.11";
     psqlSchema = "9.6";
     sha256 = "0c55akrkzqd6p6a8hr0338wk246hl76r9j16p4zn3s51d7f0l99q";
@@ -179,7 +179,7 @@ in self: super: {
     inherit self;
   };
 
-  postgresql_10 = super.callPackage generic {
+  postgresql_10 = self.callPackage generic {
     version = "10.6";
     psqlSchema = "10.0";
     sha256 = "0jv26y3f10svrjxzsgqxg956c86b664azyk2wppzpa5x11pjga38";
@@ -187,7 +187,7 @@ in self: super: {
     inherit self;
   };
 
-  postgresql_11 = super.callPackage generic {
+  postgresql_11 = self.callPackage generic {
     version = "11.1";
     psqlSchema = "11.1";
     sha256 = "026v0sicsh7avzi45waf8shcbhivyxmi7qgn9fd1x0vl520mx0ch";
@@ -195,4 +195,4 @@ in self: super: {
     inherit self;
   };
 
-}
\ No newline at end of file
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d81e26abe1de..6b84b21eb0bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13870,7 +13870,7 @@ in
 
   timescaledb-parallel-copy = callPackage ../development/tools/database/timescaledb-parallel-copy { };
 
-  inherit (import ../servers/sql/postgresql pkgs super)
+  inherit (import ../servers/sql/postgresql pkgs)
     postgresql_9_4
     postgresql_9_5
     postgresql_9_6
-- 
cgit 1.4.1