From 2d9c6679d1f979d62379b6dc8662bd6cc29146c6 Mon Sep 17 00:00:00 2001 From: happysalada Date: Tue, 10 Nov 2020 18:35:45 +0900 Subject: [PATCH 1/4] postgresql: add debug versions --- pkgs/servers/sql/postgresql/default.nix | 57 ++++++++++++++++++++++++- pkgs/top-level/all-packages.nix | 6 +++ 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 31c60303c03..0ba98455fac 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -13,7 +13,7 @@ let , this, self, newScope, buildEnv # source specification - , version, sha256, psqlSchema + , version, sha256, psqlSchema, enableDebug ? false }: let atLeast = lib.versionAtLeast version; @@ -55,6 +55,7 @@ let "--libdir=$(lib)/lib" "--with-system-tzdata=${tzdata}/share/zoneinfo" (lib.optionalString enableSystemd "--with-systemd") + (lib.optionalString enableDebug "--enable-debug") (if stdenv.isDarwin then "--with-uuid=e2fs" else "--with-ossp-uuid") ] ++ lib.optionals icuEnabled [ "--with-icu" ]; @@ -191,6 +192,15 @@ in self: { inherit self; }; + postgresql_9_5_debug = self.callPackage generic { + version = "9.5.23"; + psqlSchema = "9.5"; + sha256 = "0rl31jc3kg2wq6hazyd297gnmx3cibjvivllbsivii2m6dzgl573"; + this = self.postgresql_9_5; + enableDebug = true; + inherit self; + }; + postgresql_9_6 = self.callPackage generic { version = "9.6.19"; psqlSchema = "9.6"; @@ -199,6 +209,15 @@ in self: { inherit self; }; + postgresql_9_6_debug = self.callPackage generic { + version = "9.6.19"; + psqlSchema = "9.6"; + sha256 = "1c2wnl5bbpjs1s1rpzvlnzsqlpb0p823zw7s38nhpgnxrja3myb1"; + this = self.postgresql_9_6; + enableDebug = true; + inherit self; + }; + postgresql_10 = self.callPackage generic { version = "10.14"; psqlSchema = "10.0"; # should be 10, but changing it is invasive @@ -207,6 +226,15 @@ in self: { inherit self; }; + postgresql_10_debug = self.callPackage generic { + version = "10.14"; + psqlSchema = "10.0"; # should be 10, but changing it is invasive + sha256 = "0fxj30jvwq5pqpbj97vhlxgmn2ah59a78s9jyjr7vxyqj7sdh71q"; + this = self.postgresql_10; + enableDebug = true; + inherit self; + }; + postgresql_11 = self.callPackage generic { version = "11.9"; psqlSchema = "11.1"; # should be 11, but changing it is invasive @@ -215,6 +243,15 @@ in self: { inherit self; }; + postgresql_11_debug = self.callPackage generic { + version = "11.9"; + psqlSchema = "11.1"; # should be 11, but changing it is invasive + sha256 = "0db6pfphc5rp12abnkvv2l9pbl7bdyf3hhiwj8ghjwh35skqlq9m"; + this = self.postgresql_11; + enableDebug = true; + inherit self; + }; + postgresql_12 = self.callPackage generic { version = "12.4"; psqlSchema = "12"; @@ -223,6 +260,15 @@ in self: { inherit self; }; + postgresql_12_debug = self.callPackage generic { + version = "12.4"; + psqlSchema = "12"; + sha256 = "1k06wryy8p4s1fim9qafcjlak3f58l0wqaqnrccr9x9j5jz3zsdy"; + this = self.postgresql_12; + enableDebug = true; + inherit self; + }; + postgresql_13 = self.callPackage generic { version = "13.0"; psqlSchema = "13"; @@ -231,4 +277,13 @@ in self: { inherit self; }; + postgresql_13_debug = self.callPackage generic { + version = "13.0"; + psqlSchema = "13"; + sha256 = "15i2b7m9a9430idqdgvrcyx66cpxz0v2d81nfqcm8ss3inz51rw0"; + this = self.postgresql_13; + enableDebug = true; + inherit self; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9254fadb87..5cbc472a4ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17213,11 +17213,17 @@ in inherit (import ../servers/sql/postgresql pkgs) postgresql_9_5 + postgresql_9_5_debug postgresql_9_6 + postgresql_9_6_debug postgresql_10 + postgresql_10_debug postgresql_11 + postgresql_11_debug postgresql_12 + postgresql_12_debug postgresql_13 + postgresql_13_debug ; postgresql = postgresql_11.override { this = postgresql; }; postgresqlPackages = recurseIntoAttrs postgresql.pkgs; From 4c5931efb8c63a575115b6a025b8acfa818ae95b Mon Sep 17 00:00:00 2001 From: happysalada Date: Tue, 10 Nov 2020 20:43:09 +0900 Subject: [PATCH 2/4] postgresql: use separateDebugInfo --- pkgs/servers/sql/postgresql/default.nix | 61 ++----------------------- pkgs/top-level/all-packages.nix | 8 +--- 2 files changed, 5 insertions(+), 64 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 0ba98455fac..6108818de28 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -13,7 +13,7 @@ let , this, self, newScope, buildEnv # source specification - , version, sha256, psqlSchema, enableDebug ? false + , version, sha256, psqlSchema }: let atLeast = lib.versionAtLeast version; @@ -54,8 +54,8 @@ let "--sysconfdir=/etc" "--libdir=$(lib)/lib" "--with-system-tzdata=${tzdata}/share/zoneinfo" + "--enable-debug" (lib.optionalString enableSystemd "--with-systemd") - (lib.optionalString enableDebug "--enable-debug") (if stdenv.isDarwin then "--with-uuid=e2fs" else "--with-ossp-uuid") ] ++ lib.optionals icuEnabled [ "--with-icu" ]; @@ -163,6 +163,8 @@ let ]; buildInputs = [ makeWrapper ]; + separateDebugInfo = true; + # We include /bin to ensure the $out/bin directory is created, which is # needed because we'll be removing the files from that directory in postBuild # below. See #22653 @@ -192,15 +194,6 @@ in self: { inherit self; }; - postgresql_9_5_debug = self.callPackage generic { - version = "9.5.23"; - psqlSchema = "9.5"; - sha256 = "0rl31jc3kg2wq6hazyd297gnmx3cibjvivllbsivii2m6dzgl573"; - this = self.postgresql_9_5; - enableDebug = true; - inherit self; - }; - postgresql_9_6 = self.callPackage generic { version = "9.6.19"; psqlSchema = "9.6"; @@ -209,15 +202,6 @@ in self: { inherit self; }; - postgresql_9_6_debug = self.callPackage generic { - version = "9.6.19"; - psqlSchema = "9.6"; - sha256 = "1c2wnl5bbpjs1s1rpzvlnzsqlpb0p823zw7s38nhpgnxrja3myb1"; - this = self.postgresql_9_6; - enableDebug = true; - inherit self; - }; - postgresql_10 = self.callPackage generic { version = "10.14"; psqlSchema = "10.0"; # should be 10, but changing it is invasive @@ -226,15 +210,6 @@ in self: { inherit self; }; - postgresql_10_debug = self.callPackage generic { - version = "10.14"; - psqlSchema = "10.0"; # should be 10, but changing it is invasive - sha256 = "0fxj30jvwq5pqpbj97vhlxgmn2ah59a78s9jyjr7vxyqj7sdh71q"; - this = self.postgresql_10; - enableDebug = true; - inherit self; - }; - postgresql_11 = self.callPackage generic { version = "11.9"; psqlSchema = "11.1"; # should be 11, but changing it is invasive @@ -243,15 +218,6 @@ in self: { inherit self; }; - postgresql_11_debug = self.callPackage generic { - version = "11.9"; - psqlSchema = "11.1"; # should be 11, but changing it is invasive - sha256 = "0db6pfphc5rp12abnkvv2l9pbl7bdyf3hhiwj8ghjwh35skqlq9m"; - this = self.postgresql_11; - enableDebug = true; - inherit self; - }; - postgresql_12 = self.callPackage generic { version = "12.4"; psqlSchema = "12"; @@ -260,15 +226,6 @@ in self: { inherit self; }; - postgresql_12_debug = self.callPackage generic { - version = "12.4"; - psqlSchema = "12"; - sha256 = "1k06wryy8p4s1fim9qafcjlak3f58l0wqaqnrccr9x9j5jz3zsdy"; - this = self.postgresql_12; - enableDebug = true; - inherit self; - }; - postgresql_13 = self.callPackage generic { version = "13.0"; psqlSchema = "13"; @@ -276,14 +233,4 @@ in self: { this = self.postgresql_13; inherit self; }; - - postgresql_13_debug = self.callPackage generic { - version = "13.0"; - psqlSchema = "13"; - sha256 = "15i2b7m9a9430idqdgvrcyx66cpxz0v2d81nfqcm8ss3inz51rw0"; - this = self.postgresql_13; - enableDebug = true; - inherit self; - }; - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5cbc472a4ef..13d6f9dceb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17213,17 +17213,11 @@ in inherit (import ../servers/sql/postgresql pkgs) postgresql_9_5 - postgresql_9_5_debug postgresql_9_6 - postgresql_9_6_debug postgresql_10 - postgresql_10_debug - postgresql_11 - postgresql_11_debug + postgresql_11_local postgresql_12 - postgresql_12_debug postgresql_13 - postgresql_13_debug ; postgresql = postgresql_11.override { this = postgresql; }; postgresqlPackages = recurseIntoAttrs postgresql.pkgs; From b433c7950584ebac09b28368d622c329abce6de8 Mon Sep 17 00:00:00 2001 From: Raphael Megzari Date: Tue, 10 Nov 2020 20:50:32 +0900 Subject: [PATCH 3/4] postgresql: remove local name change --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13d6f9dceb4..b9254fadb87 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17215,7 +17215,7 @@ in postgresql_9_5 postgresql_9_6 postgresql_10 - postgresql_11_local + postgresql_11 postgresql_12 postgresql_13 ; From ef08d4cf0bf9770389d7d2431f8b8761ecdeef92 Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 11 Nov 2020 09:11:01 +0900 Subject: [PATCH 4/4] postgresql: use separateDebugInfo correctly --- pkgs/servers/sql/postgresql/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 6108818de28..9bfc4e7dca5 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -41,6 +41,8 @@ let enableParallelBuilding = !stdenv.isDarwin; + separateDebugInfo = true; + buildFlags = [ "world" ]; NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; @@ -163,7 +165,6 @@ let ]; buildInputs = [ makeWrapper ]; - separateDebugInfo = true; # We include /bin to ensure the $out/bin directory is created, which is # needed because we'll be removing the files from that directory in postBuild