public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #70363 from marsam/init-postgresql-12

Browse Source 
postgresql_12: init at 12.0
This commit is contained in:
Robin Gloster 2019-10-08 03:08:40 +02:00 committed by GitHub
commit 6a7f0ccd90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/servers/sql/postgresql/default.nix
View File

@ -81,8 +81,8 @@ let
postInstall = postInstall =
'' ''
moveToOutput "lib/pgxs" "$out" # looks strange, but not deleting it moveToOutput "lib/pgxs" "$out" # looks strange, but not deleting it
moveToOutput "lib/libpgcommon.a" "$out" moveToOutput "lib/libpgcommon*.a" "$out"
moveToOutput "lib/libpgport.a" "$out" moveToOutput "lib/libpgport*.a" "$out"
moveToOutput "lib/libecpg*" "$out" moveToOutput "lib/libecpg*" "$out"
# Prevent a retained dependency on gcc-wrapper. # Prevent a retained dependency on gcc-wrapper.
@ -200,4 +200,12 @@ in self: {
inherit self; inherit self;
}; };
postgresql_12 = self.callPackage generic {
version = "12.0";
psqlSchema = "12";
sha256 = "1ijm13gx1d9ai09n26nbdc77n9b8akh6pj21yy9vfn7p2mr3k8nd";
this = self.postgresql_12;
inherit self;
};
} }

1
pkgs/top-level/all-packages.nix
View File

@ -15080,6 +15080,7 @@ in
postgresql_9_6 postgresql_9_6
postgresql_10 postgresql_10
postgresql_11 postgresql_11
postgresql_12
; ;
postgresql = postgresql_11.override { this = postgresql; }; postgresql = postgresql_11.override { this = postgresql; };
postgresqlPackages = recurseIntoAttrs postgresql.pkgs; postgresqlPackages = recurseIntoAttrs postgresql.pkgs;