Skip to content

Commit

Permalink
postgresql: No need to refer to super
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Ericson2314 committed Feb 2, 2019
1 parent 3ec0eb4 commit c85a8a1
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
14 changes: 7 additions & 7 deletions pkgs/servers/sql/postgresql/default.nix
Expand Up @@ -153,46 +153,46 @@ 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";
this = self.postgresql_9_4;
inherit self;
};

postgresql_9_5 = super.callPackage generic {
postgresql_9_5 = self.callPackage generic {
version = "9.5.15";
psqlSchema = "9.5";
sha256 = "0i2lylgmsmy2g1ixlvl112fryp7jmrd0i2brk8sxb7vzzpg3znnv";
this = self.postgresql_9_5;
inherit self;
};

postgresql_9_6 = super.callPackage generic {
postgresql_9_6 = self.callPackage generic {
version = "9.6.11";
psqlSchema = "9.6";
sha256 = "0c55akrkzqd6p6a8hr0338wk246hl76r9j16p4zn3s51d7f0l99q";
this = self.postgresql_9_6;
inherit self;
};

postgresql_10 = super.callPackage generic {
postgresql_10 = self.callPackage generic {
version = "10.6";
psqlSchema = "10.0";
sha256 = "0jv26y3f10svrjxzsgqxg956c86b664azyk2wppzpa5x11pjga38";
this = self.postgresql_10;
inherit self;
};

postgresql_11 = super.callPackage generic {
postgresql_11 = self.callPackage generic {
version = "11.1";
psqlSchema = "11.1";
sha256 = "026v0sicsh7avzi45waf8shcbhivyxmi7qgn9fd1x0vl520mx0ch";
this = self.postgresql_11;
inherit self;
};

}
}
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
Expand Up @@ -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
Expand Down

0 comments on commit c85a8a1

Please sign in to comment.