From 993dde135fa5cc3622b6f4293f80acc3e6dc4de0 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 11 Aug 2022 23:36:01 +0200 Subject: [PATCH 1/6] postgresql: sha256 -> hash --- pkgs/servers/sql/postgresql/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 83bdcec73970..3d9b7758e05e 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -14,7 +14,7 @@ let , this, self, newScope, buildEnv # source specification - , version, sha256, psqlSchema, + , version, hash, psqlSchema, # for tests nixosTests, thisAttr @@ -30,7 +30,7 @@ let src = fetchurl { url = "mirror://postgresql/source/v${version}/${pname}-${version}.tar.bz2"; - inherit sha256; + inherit hash; }; hardeningEnable = lib.optionals (!stdenv.cc.isClang) [ "pie" ]; @@ -203,7 +203,7 @@ in self: { postgresql_10 = self.callPackage generic { version = "10.21"; psqlSchema = "10.0"; # should be 10, but changing it is invasive - sha256 = "sha256-0yGYhW1Sqab11QZC74ZoesBYvW78pcntV754CElvRdE="; + hash = "sha256-0yGYhW1Sqab11QZC74ZoesBYvW78pcntV754CElvRdE="; this = self.postgresql_10; thisAttr = "postgresql_10"; inherit self; @@ -213,7 +213,7 @@ in self: { postgresql_11 = self.callPackage generic { version = "11.16"; psqlSchema = "11.1"; # should be 11, but changing it is invasive - sha256 = "sha256-LdnhEfCllJ7nyswGXOoPshCSkpuuMQzgW/AbT/xRA6U="; + hash = "sha256-LdnhEfCllJ7nyswGXOoPshCSkpuuMQzgW/AbT/xRA6U="; this = self.postgresql_11; thisAttr = "postgresql_11"; inherit self; @@ -222,7 +222,7 @@ in self: { postgresql_12 = self.callPackage generic { version = "12.11"; psqlSchema = "12"; - sha256 = "sha256-ECYkil/Svur0PkxyNqyBflbVi2gaM1hWRl37x1s+gwI="; + hash = "sha256-ECYkil/Svur0PkxyNqyBflbVi2gaM1hWRl37x1s+gwI="; this = self.postgresql_12; thisAttr = "postgresql_12"; inherit self; @@ -231,7 +231,7 @@ in self: { postgresql_13 = self.callPackage generic { version = "13.7"; psqlSchema = "13"; - sha256 = "sha256-G5Bb9PPYNhSjk7PFH9NFkQ/SYeT1Ekpo2aH906KkY5k="; + hash = "sha256-G5Bb9PPYNhSjk7PFH9NFkQ/SYeT1Ekpo2aH906KkY5k="; this = self.postgresql_13; thisAttr = "postgresql_13"; inherit self; @@ -240,7 +240,7 @@ in self: { postgresql_14 = self.callPackage generic { version = "14.4"; psqlSchema = "14"; - sha256 = "sha256-wjtiN8UjHHkVEb3HkJhhfWhS6eO982Dv2LXRWho9j2o="; + hash = "sha256-wjtiN8UjHHkVEb3HkJhhfWhS6eO982Dv2LXRWho9j2o="; this = self.postgresql_14; thisAttr = "postgresql_14"; inherit self; From c9aa86be1159c8a3ac949387dc8c505383c443d4 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 11 Aug 2022 23:36:28 +0200 Subject: [PATCH 2/6] postgresql_14: 14.4 -> 14.5 fixes CVE-2022-2625 --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 3d9b7758e05e..e3021fce54b6 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -238,9 +238,9 @@ in self: { }; postgresql_14 = self.callPackage generic { - version = "14.4"; + version = "14.5"; psqlSchema = "14"; - hash = "sha256-wjtiN8UjHHkVEb3HkJhhfWhS6eO982Dv2LXRWho9j2o="; + hash = "sha256-1PcstfuFfJqfdeyM8JGhdxJygC8hePCy5lt7b/ZPSjA="; this = self.postgresql_14; thisAttr = "postgresql_14"; inherit self; From 4059636757ad2bdc9dcaac3e529cc7006d6ad50e Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 11 Aug 2022 23:37:54 +0200 Subject: [PATCH 3/6] postgresql_13: 13.7 -> 13.8 fixes CVE-2022-2625 --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index e3021fce54b6..77f3dd0fd890 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -229,9 +229,9 @@ in self: { }; postgresql_13 = self.callPackage generic { - version = "13.7"; + version = "13.8"; psqlSchema = "13"; - hash = "sha256-G5Bb9PPYNhSjk7PFH9NFkQ/SYeT1Ekpo2aH906KkY5k="; + hash = "sha256-c4dv3TpRcIc0BFjcpM4VuNKk286zNMBEFCRVGubEze0="; this = self.postgresql_13; thisAttr = "postgresql_13"; inherit self; From 2793fbe755d72d1cc5fa236d0d3764e3367a284b Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 11 Aug 2022 23:39:11 +0200 Subject: [PATCH 4/6] postgresql_12: 12.11 -> 12.12 fixes CVE-2022-2625 --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 77f3dd0fd890..2a601444821b 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -220,9 +220,9 @@ in self: { }; postgresql_12 = self.callPackage generic { - version = "12.11"; + version = "12.12"; psqlSchema = "12"; - hash = "sha256-ECYkil/Svur0PkxyNqyBflbVi2gaM1hWRl37x1s+gwI="; + hash = "sha256-NLPxxpQI4iBowMcbGCdpHxyJFTsK1XbBpE+JIKhYA5w="; this = self.postgresql_12; thisAttr = "postgresql_12"; inherit self; From d1213d3dc8ade1eaa7c369b6c9628393ab2e2842 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 11 Aug 2022 23:40:04 +0200 Subject: [PATCH 5/6] postgresql_11: 11.16 -> 11.17 fixes CVE-2022-2625 --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 2a601444821b..5d08f5051686 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -211,9 +211,9 @@ in self: { }; postgresql_11 = self.callPackage generic { - version = "11.16"; + version = "11.17"; psqlSchema = "11.1"; # should be 11, but changing it is invasive - hash = "sha256-LdnhEfCllJ7nyswGXOoPshCSkpuuMQzgW/AbT/xRA6U="; + hash = "sha256-bphJY64HZeYVd5lRA6fmWU2w8L0BUorBI+DeSmpMtMQ="; this = self.postgresql_11; thisAttr = "postgresql_11"; inherit self; From 6d980c0d8b9e9de643e5a153ef55d013e8746ecb Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 11 Aug 2022 23:40:52 +0200 Subject: [PATCH 6/6] postgresql_10: 10.21 -> 10.22 fixes CVE-2022-2625 --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 5d08f5051686..364f574250bd 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -201,9 +201,9 @@ let in self: { postgresql_10 = self.callPackage generic { - version = "10.21"; + version = "10.22"; psqlSchema = "10.0"; # should be 10, but changing it is invasive - hash = "sha256-0yGYhW1Sqab11QZC74ZoesBYvW78pcntV754CElvRdE="; + hash = "sha256-lVl3VVxp3xpk9EuB1KGYfrdKu9GHBXn1rZ2UYTPdjk0="; this = self.postgresql_10; thisAttr = "postgresql_10"; inherit self;