Unverified Commit 45fecba9 authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

Revert "`postgresql`: fix overrides being forgotten on `withPackages`" (#490513)

parents 4ebf35ed 6681cb54

pkgs/servers/sql/postgresql/generic.nix

+53 −53
Original line number Diff line number Diff line
@@ -555,17 +555,17 @@ let 
          (withBlocksize == null && withWalBlocksize == null);

      installCheckTarget = "check-world";



      passthru = {

      passthru =

        let

          this = self.callPackage generic args;

        in

        {

          inherit dlSuffix;



          psqlSchema = lib.versions.major version;



        withJIT =

          if jitSupport then

            finalAttrs.finalPackage.withPackages (_: [ finalAttrs.finalPackage.jit ])

          else

            null;

        withoutJIT = finalAttrs.finalPackage;

          withJIT = if jitSupport then this.withPackages (_: [ this.jit ]) else null;

          withoutJIT = this;



          pkgs =

            let
@@ -577,21 +577,21 @@ let 
                  tclSupport

                  ;

                inherit (llvmPackages) llvm;

              postgresql = finalAttrs.finalPackage;

                postgresql = this;

                stdenv = stdenv';

                postgresqlTestExtension = newSuper.callPackage ./postgresqlTestExtension.nix { };

                postgresqlBuildExtension = newSuper.callPackage ./postgresqlBuildExtension.nix { };

              };

              newSelf = self // scope;

              newSuper = {

              callPackage = newScope (scope // finalAttrs.finalPackage.pkgs);

                callPackage = newScope (scope // this.pkgs);

              };

            in

            import ./ext.nix newSelf newSuper;



          withPackages = postgresqlWithPackages {

            inherit buildEnv lib makeBinaryWrapper;

          postgresql = finalAttrs.finalPackage;

            postgresql = this;

          };



          pg_config = buildPackages.callPackage ./pg_config.nix {