[PATCH 0/5] gnu: postgresql-*: Update all versions.

  • Done
  • quality assurance status badge
Details
2 participants
  • Brice Waegeneire
  • Maxim Cournoyer
Owner
unassigned
Submitted by
Brice Waegeneire
Severity
normal
B
B
Brice Waegeneire wrote on 21 Dec 2021 13:57
(address . guix-patches@gnu.org)
878rwejeti.fsf@waegenei.re
Hello Guix,

Those patch update all postgresql version and deprecate postgresql-9.6 in
favor of postgresql-10, as the former is EOL. For this deprecation to be
obvious for the end user, I have updated the 'supersede' procedure to display
the package versions.

I suggest we keep either keep the last EOL version of postgresql (ATM 9.6)
along or just drop support for the EOL version all together. There was a

Cheers,
- Brice

Brice Waegeneire (5):
packages: Display superseded package version.
gnu: postgresql-9.6: Update to 9.6.24.
gnu: postgresql-10: Update to 10.19.
gnu: postgresql-11: Update to 11.14.
gnu: Add postgresql-14.

gnu/packages.scm | 6 ++++--
gnu/packages/databases.scm | 34 +++++++++++++++++++++++++---------
guix/scripts/package.scm | 24 ++++++++++++++----------
3 files changed, 43 insertions(+), 21 deletions(-)

--
2.34.0
B
B
Brice Waegeneire wrote on 21 Dec 2021 14:05
[PATCH 1/5] packages: Display superseded package version.
(address . 52701@debbugs.gnu.org)
20211221130543.6891-1-brice@waegenei.re
* gnu/packages.scm (%find-package): Display package versions in warning
message.
* guix/scripts/package.scm (transaction-upgrade-entry): Display package
versions in warning message.
---
gnu/packages.scm | 6 ++++--
guix/scripts/package.scm | 24 ++++++++++++++----------
2 files changed, 18 insertions(+), 12 deletions(-)

Toggle diff (68 lines)
diff --git a/gnu/packages.scm b/gnu/packages.scm
index ccfc83dd11..ad0d75db94 100644
--- a/gnu/packages.scm
+++ b/gnu/packages.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016, 2017 Alex Kost <alezost@gmail.com>
;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
+;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -483,8 +484,9 @@ (define* (%find-package spec name version)
(location->string (package-location pkg))))
(match (package-superseded pkg)
((? package? new)
- (info (G_ "package '~a' has been superseded by '~a'~%")
- (package-name pkg) (package-name new))
+ (info (G_ "package '~a@~a' has been superseded by '~a@~a'~%")
+ (package-name pkg) (package-version pkg)
+ (package-name new) (package-version new))
new)
(#f
pkg)))
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm
index 4b9c5f210d..d6a8333ac6 100644
--- a/guix/scripts/package.scm
+++ b/guix/scripts/package.scm
@@ -10,6 +10,7 @@
;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2018 Steve Sprang <scs@stevesprang.com>
+;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -213,16 +214,19 @@ (define (lower-manifest-entry* entry)
(lower-manifest-entry entry (%current-system))))
(define (supersede old new)
- (info (G_ "package '~a' has been superseded by '~a'~%")
- (manifest-entry-name old) (package-name new))
- (manifest-transaction-install-entry
- (package->manifest-entry* new (manifest-entry-output old))
- (manifest-transaction-remove-pattern
- (manifest-pattern
- (name (manifest-entry-name old))
- (version (manifest-entry-version old))
- (output (manifest-entry-output old)))
- transaction)))
+ (let ((old-name (manifest-entry-name old))
+ (old-version (manifest-entry-version old)))
+ (info (G_ "package '~a@~a' has been superseded by '~a@~a'~%")
+ old-name old-version
+ (package-name new) (package-version new))
+ (manifest-transaction-install-entry
+ (package->manifest-entry* new (manifest-entry-output old))
+ (manifest-transaction-remove-pattern
+ (manifest-pattern
+ (name old-name)
+ (version old-version)
+ (output (manifest-entry-output old)))
+ transaction))))
(define (upgrade entry transform)
(match entry
--
2.34.0
B
B
Brice Waegeneire wrote on 21 Dec 2021 14:05
[PATCH 3/5] gnu: postgresql-10: Update to 10.19.
(address . 52701@debbugs.gnu.org)
20211221130543.6891-3-brice@waegenei.re
* gnu/packages/databases.scm (postgresql-10): Update to 10.19.
---
gnu/packages/databases.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (23 lines)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index db5978a603..2b15876a1f 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1174,14 +1174,14 @@ (define-public postgresql-11
(define-public postgresql-10
(package
(inherit postgresql-11)
- (version "10.18")
+ (version "10.19")
(source (origin
(inherit (package-source postgresql-11))
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2"))
(sha256
(base32
- "009qpb02bq0rx0aaw5ck70gk07xwparhfxvlfimgihw2vhp7qisp"))))))
+ "0fa22gcnf30vwk0axrrb438dki3rwsy3c172hyp883mn52s31f3f"))))))
;; NOTE This version is in EOL and not supported by upstream since 2021-11-11
(define-public postgresql-9.6
--
2.34.0
B
B
Brice Waegeneire wrote on 21 Dec 2021 14:05
[PATCH 2/5] gnu: postgresql-9.6: Update to 9.6.24.
(address . 52701@debbugs.gnu.org)
20211221130543.6891-2-brice@waegenei.re
* gnu/packages/databases.scm (postgresql-9.6): Update to 9.6.26. Mark
it as superseded by postgresql-10.
---
gnu/packages/databases.scm | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

Toggle diff (28 lines)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 290c465c5b..db5978a603 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1183,17 +1183,19 @@ (define-public postgresql-10
(base32
"009qpb02bq0rx0aaw5ck70gk07xwparhfxvlfimgihw2vhp7qisp"))))))
+;; NOTE This version is in EOL and not supported by upstream since 2021-11-11
(define-public postgresql-9.6
(package
(inherit postgresql-10)
- (version "9.6.23")
+ (version "9.6.24")
(source (origin
(inherit (package-source postgresql-10))
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2"))
(sha256
(base32
- "1fa735lrmv2vrfiixg73nh024gxlagcbrssklvgwdf0s82cgfjd8"))))))
+ "1kiak2pgri79kd4afzflil87q612jzrnbxbf8ykx3giypsba3dxf"))))
+ (properties `((superseded . ,postgresql-10)))))
(define-public postgresql postgresql-13)
--
2.34.0
B
B
Brice Waegeneire wrote on 21 Dec 2021 14:05
[PATCH 5/5] gnu: Add postgresql-14.
(address . 52701@debbugs.gnu.org)
20211221130543.6891-5-brice@waegenei.re
* gnu/packages/databases.scm (postgresql-14): New procedure, renamed
from postgresql-13.
* gnu/packages/databases.scm (postgresql-13): Inherit from
postgresql-14.
---
gnu/packages/databases.scm | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)

Toggle diff (48 lines)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 8e4c046392..669b585751 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1096,17 +1096,17 @@ (define-public galera
(license license:gpl2))) ;'COPYING' says "version 2" only
;; Don't forget to update the other postgresql packages when upgrading this one.
-(define-public postgresql-13
+(define-public postgresql-14
(package
(name "postgresql")
- (version "13.4")
+ (version "14.1")
(source (origin
(method url-fetch)
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2"))
(sha256
(base32
- "1kf0gcsrl5n25rjlvkh87aywmn28kbwvakm5c7j1qpr4j01y34za"))
+ "07x45iycqpps0qh3ingc09jgn9rpnmc3gixx0qprhf5flwg10g2d"))
(patches (search-patches "postgresql-disable-resolve_symlinks.patch"))))
(build-system gnu-build-system)
(arguments
@@ -1158,6 +1158,20 @@ (define-public postgresql-13
pictures, sounds, or video.")
(license (license:x11-style "file://COPYRIGHT"))))
+(define-public postgresql-13
+ (package
+ (inherit postgresql-14)
+ (name "postgresql")
+ (version "13.5")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://ftp.postgresql.org/pub/source/v"
+ version "/postgresql-" version ".tar.bz2"))
+ (sha256
+ (base32
+ "1czn2dnfm9hm0sq615a94wl68xw4vmbz9kma332apfpdamx0d0cv"))
+ ))))
+
(define-public postgresql-11
(package
(inherit postgresql-13)
--
2.34.0
B
B
Brice Waegeneire wrote on 21 Dec 2021 14:05
[PATCH 4/6] gnu: postgresql-10: Update to 10.19.
(address . 52701@debbugs.gnu.org)
20211221130543.6891-4-brice@waegenei.re
* gnu/packages/databases.scm (postgresql-10): Update to 10.19.
---
gnu/packages/databases.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (23 lines)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index db5978a603..2b15876a1f 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1174,14 +1174,14 @@ (define-public postgresql-11
(define-public postgresql-10
(package
(inherit postgresql-11)
- (version "10.18")
+ (version "10.19")
(source (origin
(inherit (package-source postgresql-11))
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2"))
(sha256
(base32
- "009qpb02bq0rx0aaw5ck70gk07xwparhfxvlfimgihw2vhp7qisp"))))))
+ "0fa22gcnf30vwk0axrrb438dki3rwsy3c172hyp883mn52s31f3f"))))))
;; NOTE This version is in EOL and not supported by upstream since 2021-11-11
(define-public postgresql-9.6
--
2.34.0
B
B
Brice Waegeneire wrote on 21 Dec 2021 20:38
[PATCH 4/5] gnu: postgresql-11: Update to 11.14.
(address . 52701@debbugs.gnu.org)
20211221193832.19415-1-brice@waegenei.re
* gnu/packages/databases.scm (postgresql-11): Update to 11.14.
---
gnu/packages/databases.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (23 lines)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 2b15876a1f..8e4c046392 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1162,14 +1162,14 @@ (define-public postgresql-11
(package
(inherit postgresql-13)
(name "postgresql")
- (version "11.13")
+ (version "11.14")
(source (origin
(inherit (package-source postgresql-13))
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2"))
(sha256
(base32
- "0j5wnscnxa3sx8d39s55654df8aikmvkihfb0a02hrgmyygnihx0"))))))
+ "16grcb0pgryz5cz0yg42mpa14f2wy325hb45h6alzdkgx55pyp4n"))))))
(define-public postgresql-10
(package
--
2.34.0
M
M
Maxim Cournoyer wrote on 18 Mar 2022 05:48
Re: bug#52701: [PATCH 0/5] gnu: postgresql-*: Update all versions.
(name . Brice Waegeneire)(address . brice@waegenei.re)(address . 52701@debbugs.gnu.org)
87h77v6f37.fsf_-_@gmail.com
Hi!

Brice Waegeneire <brice@waegenei.re> writes:

Toggle quote (5 lines)
> * gnu/packages.scm (%find-package): Display package versions in warning
> message.
> * guix/scripts/package.scm (transaction-upgrade-entry): Display package
> versions in warning message.

I'm curious; what is the use case? Superseded packages typically have
different names; same-named packages are simply "upgraded", not
superseded. Am I missing something?

Thanks,

Maxim
M
M
Maxim Cournoyer wrote on 18 Mar 2022 05:53
(name . Brice Waegeneire)(address . brice@waegenei.re)(address . 52701-done@debbugs.gnu.org)
87czij6eua.fsf_-_@gmail.com
Hi,

Brice Waegeneire <brice@waegenei.re> writes:

Toggle quote (27 lines)
> * gnu/packages/databases.scm (postgresql-11): Update to 11.14.
> ---
> gnu/packages/databases.scm | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
> index 2b15876a1f..8e4c046392 100644
> --- a/gnu/packages/databases.scm
> +++ b/gnu/packages/databases.scm
> @@ -1162,14 +1162,14 @@ (define-public postgresql-11
> (package
> (inherit postgresql-13)
> (name "postgresql")
> - (version "11.13")
> + (version "11.14")
> (source (origin
> (inherit (package-source postgresql-13))
> (uri (string-append "https://ftp.postgresql.org/pub/source/v"
> version "/postgresql-" version ".tar.bz2"))
> (sha256
> (base32
> - "0j5wnscnxa3sx8d39s55654df8aikmvkihfb0a02hrgmyygnihx0"))))))
> + "16grcb0pgryz5cz0yg42mpa14f2wy325hb45h6alzdkgx55pyp4n"))))))
>
> (define-public postgresql-10
> (package

Except for the versioned superseded patch (the first one), I pushed all
the others (with the freshest releases), as 93e9712952.

Thank you!

Maxim
Closed
?