From 445d4cf12128cb6193a5743e59c38540def5cfda Mon Sep 17 00:00:00 2001
From: os <os@OS MacBook Pro>
Date: Mon, 25 Nov 2024 22:29:37 +0100
Subject: [PATCH] Update nixpkgs (2024-11-25)

Pull upstream NixOS changes, security fixes and package updates:

- Merge: matrix-synapse: 1.118.0 -> 1.119.0, (#355692)
- Merge: nodejs_18: 18.20.4 -> 18.20.5, (#355530)
- Merge: postgresql: improve passthru.tests (#352966)
- Merge: postgresql_17: fix build (#354571)
- Merge: strace: enable debug info (#354017)
- binutils: make patches unconditional
- binutils: make patches unconditional (#350297)
- bundler: 2.5.21 -> 2.5.22
- calibre: 7.20.0 -> 7.21.0
- ceph: patch to pick up upstream arrow 18 s3select fix
- chromium: fetch src from git instead of using release tarball
- chromium: remove "channel" argument
- chromium: use cached dependencies from other attributes in update script
- cmake: 3.30.4 -> 3.30.5
- cmake: 3.30.4 -> 3.30.5, (#349465)
- cmake: Fix the FindCURL module
- cmake: Fix the FindCURL module (#351573)
- curl: 8.10.1 -> 8.11.0
- curl: 8.10.1 -> 8.11.0, (#353968)
- docker-compose: 2.29.7 -> 2.30.0
- docker-compose: 2.29.7 -> 2.30.0, (#352342)
- docker: use lib.versionOlder in literalExpression
- element-web: passthru conf to allow extending it via modules without discarding already set config
- element-web: passthru conf to allow extending it via modules without discarding already set config (#355225)
- ffmpeg: add kvazaar option
- ffmpeg: add kvazaar option (#351176)
- ffmpeg: add lc3 option
- ffmpeg: add lcevcdec option
- ffmpeg: add librist
- ffmpeg: add librist (#353473)
- ffmpeg: add missing variant requirements for amf
- ffmpeg: add missing variant requirements for amf (#353118)
- ffmpeg: add new external libs added in 7.1 (#348798)
- ffmpeg: add vvenc option
- github-runner: 2.320.0 -> 2.321.0
- gitlab: 17.3.6 -> 17.3.7
- gitlab: update bundler version
- go_1_22: 1.22.8 -> 1.22.9
- go_1_22: 1.22.8 -> 1.22.9, (#354123)
- grafana: 11.3.0 -> 11.3.0+security-01, fix CVE-2024-9476
- grafana: 11.3.0 -> 11.3.1, fix CVE-2024-9476 (#355481)
- imagemagick: 7.1.1-39 -> 7.1.1-40
- imagemagick: 7.1.1-39 -> 7.1.1-40, (#354898)
- imagemagick: fix build on Darwin
- imagemagick: fix build on Darwin (#355536)
- kubernetes-helm: 3.16.2 -> 3.16.3
- libffi: move label before .cfi_starproc
- libjpeg: 3.0.3 -> 3.0.4
- libjpeg: 3.0.3 -> 3.0.4, (#341943)
- libjpeg: drop freeimage from passthru tests
- mariadb: 10.5.27, 10.6.20, 10.11.10, 11.4.4
- mariadb: 10.5.27, 10.6.20, 10.11.10, 11.4.4 (#353661)
- matrix-synapse: 1.118.0 -> 1.119.0
- memcached: 1.6.29 -> 1.6.31
- memcached: 1.6.29 -> 1.6.31, (#349258)
- mysql80: 8.0.39 -> 8.0.40
- mysql80: 8.0.39 -> 8.0.40, (#350248)
- nginx: upgrade pcre to pcre2
- nix: switch to darwinMinVersionHook
- nodejs_18: 18.20.4 -> 18.20.5
- nspr: 4.35 -> 4.36
- nspr: 4.35 -> 4.36, (#350454)
- nss_latest: 3.105 -> 3.106
- nss_latest: 3.105 -> 3.106, (#350999)
- postgresql: add passthru.tests.postgresql
- postgresql: add passthru.tests.postgresql-tls-client-cert
- postgresqlPackages.postgis: move nixosTests.postgis into package
- postgresql_13: 13.16 -> 13.17
- postgresql_14: 14.13 -> 14.14
- postgresql_15: 15.8 -> 15.9
- postgresql_17: 17.0 -> 17.1
- postgresql_17: fix build
- rclone: 1.68.1 -> 1.68.2
- ruby: fix cross build (#348566)
- strace: 6.11 -> 6.12
- strace: enable debug info
- sudo: 1.9.15p5 -> 1.9.16
- sudo: 1.9.15p5 -> 1.9.16, (#354374)
- sudo: fix cross-compilation linking error
- sudo: fix cross-compilation linking error (#354576)
- telegraf: 1.32.1 -> 1.32.2
- vim: 9.1.0765 -> 9.1.0787
- vim: 9.1.0765 -> 9.1.0787, (#349214)
- wget: 1.24.5 -> 1.25.0
- wget: enable parallel building
- wget: use nuke-refs to avoid runtime depeneds
---
 flake.lock                    |   6 +-
 release/package-versions.json | 206 ++++++++++++++++------------------
 release/versions.json         |   4 +-
 3 files changed, 103 insertions(+), 113 deletions(-)

diff --git a/flake.lock b/flake.lock
index 652b69c5f..90f124b46 100644
--- a/flake.lock
+++ b/flake.lock
@@ -410,11 +410,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1731086579,
-        "narHash": "sha256-H7+8HHDK38BkoPWkPV45vGSWhkFm2qDxDQk5t7EvtyM=",
+        "lastModified": 1732569117,
+        "narHash": "sha256-Y9rSDxryHQRS+gGUkKDicU6BWfHKNC0uMXdqjzFgRd8=",
         "owner": "flyingcircusio",
         "repo": "nixpkgs",
-        "rev": "9206e6d83ba821c66f536eebe5856e97257ccf97",
+        "rev": "fc529f2fde74a3ebfd5f14699725c14b6412e8c2",
         "type": "github"
       },
       "original": {
diff --git a/release/package-versions.json b/release/package-versions.json
index e33ac854a..4c40a3a87 100644
--- a/release/package-versions.json
+++ b/release/package-versions.json
@@ -55,9 +55,9 @@
     "version": "4.1.0"
   },
   "bundler": {
-    "name": "bundler-2.5.16",
+    "name": "bundler-2.5.22",
     "pname": "bundler",
-    "version": "2.5.16"
+    "version": "2.5.22"
   },
   "cacert": {
     "name": "nss-cacert-3.104",
@@ -65,9 +65,9 @@
     "version": "3.104"
   },
   "calibre": {
-    "name": "calibre-7.20.0",
+    "name": "calibre-7.21.0",
     "pname": "calibre",
-    "version": "7.20.0"
+    "version": "7.21.0"
   },
   "ceph": {
     "name": "ceph-19.2.0",
@@ -75,14 +75,14 @@
     "version": "19.2.0"
   },
   "chromedriver": {
-    "name": "chromedriver-unwrapped-130.0.6723.91",
+    "name": "chromedriver-unwrapped-131.0.6778.85",
     "pname": "chromedriver-unwrapped",
-    "version": "130.0.6723.91"
+    "version": "131.0.6778.85"
   },
   "chromium": {
-    "name": "chromium-130.0.6723.91",
+    "name": "chromium-131.0.6778.85",
     "pname": "chromium",
-    "version": "130.0.6723.91"
+    "version": "131.0.6778.85"
   },
   "cifs-utils": {
     "name": "cifs-utils-7.1",
@@ -95,9 +95,9 @@
     "version": "1.4.1"
   },
   "cmake": {
-    "name": "cmake-3.30.4",
+    "name": "cmake-3.30.5",
     "pname": "cmake",
-    "version": "3.30.4"
+    "version": "3.30.5"
   },
   "consul": {
     "name": "consul-1.20.1",
@@ -120,9 +120,9 @@
     "version": "4.6.2"
   },
   "curl": {
-    "name": "curl-8.10.1",
+    "name": "curl-8.11.0",
     "pname": "curl",
-    "version": "8.10.1"
+    "version": "8.11.0"
   },
   "cyrus_sasl": {
     "name": "cyrus-sasl-2.1.28",
@@ -150,9 +150,9 @@
     "version": "24.0.9"
   },
   "docker-compose": {
-    "name": "docker-compose-2.29.7",
+    "name": "docker-compose-2.30.0",
     "pname": "docker-compose",
-    "version": "2.29.7"
+    "version": "2.30.0"
   },
   "dovecot": {
     "name": "dovecot-2.3.21.1",
@@ -160,9 +160,9 @@
     "version": "2.3.21.1"
   },
   "element-web": {
-    "name": "element-web-1.11.82",
+    "name": "element-web-1.11.85",
     "pname": "element-web",
-    "version": "1.11.82"
+    "version": "1.11.85"
   },
   "erlang": {
     "name": "erlang-25.3.2.15",
@@ -195,9 +195,9 @@
     "version": "7.17.16"
   },
   "firefox": {
-    "name": "firefox-132.0.1",
+    "name": "firefox-132.0.2",
     "pname": "firefox",
-    "version": "132.0.1"
+    "version": "132.0.2"
   },
   "gcc": {
     "name": "gcc-wrapper-13.3.0",
@@ -225,34 +225,34 @@
     "version": "2.47.0"
   },
   "gitaly": {
-    "name": "gitaly-17.3.6",
+    "name": "gitaly-17.3.7",
     "pname": "gitaly",
-    "version": "17.3.6"
+    "version": "17.3.7"
   },
   "github-runner": {
-    "name": "github-runner-2.320.0",
+    "name": "github-runner-2.321.0",
     "pname": "github-runner",
-    "version": "2.320.0"
+    "version": "2.321.0"
   },
   "gitlab": {
-    "name": "gitlab-17.3.6",
+    "name": "gitlab-17.3.7",
     "pname": "gitlab",
-    "version": "17.3.6"
+    "version": "17.3.7"
   },
   "gitlab-container-registry": {
-    "name": "gitlab-container-registry-4.11.0",
+    "name": "gitlab-container-registry-4.13.0",
     "pname": "gitlab-container-registry",
-    "version": "4.11.0"
+    "version": "4.13.0"
   },
   "gitlab-ee": {
-    "name": "gitlab-ee-17.3.6",
+    "name": "gitlab-ee-17.3.7",
     "pname": "gitlab-ee",
-    "version": "17.3.6"
+    "version": "17.3.7"
   },
   "gitlab-pages": {
-    "name": "gitlab-pages-17.3.6",
+    "name": "gitlab-pages-17.3.7",
     "pname": "gitlab-pages",
-    "version": "17.3.6"
+    "version": "17.3.7"
   },
   "gitlab-runner": {
     "name": "gitlab-runner-17.2.0",
@@ -260,9 +260,9 @@
     "version": "17.2.0"
   },
   "gitlab-workhorse": {
-    "name": "gitlab-workhorse-17.3.6",
+    "name": "gitlab-workhorse-17.3.7",
     "pname": "gitlab-workhorse",
-    "version": "17.3.6"
+    "version": "17.3.7"
   },
   "glibc": {
     "name": "glibc-2.40-36",
@@ -280,19 +280,19 @@
     "version": "2.4.5"
   },
   "go": {
-    "name": "go-1.23.2",
+    "name": "go-1.23.3",
     "pname": "go",
-    "version": "1.23.2"
+    "version": "1.23.3"
   },
   "go_1_22": {
-    "name": "go-1.22.8",
+    "name": "go-1.22.9",
     "pname": "go",
-    "version": "1.22.8"
+    "version": "1.22.9"
   },
   "grafana": {
-    "name": "grafana-11.3.0",
+    "name": "grafana-11.3.1",
     "pname": "grafana",
-    "version": "11.3.0"
+    "version": "11.3.1"
   },
   "grub2": {
     "name": "grub-2.12",
@@ -305,9 +305,9 @@
     "version": "3.0.5"
   },
   "imagemagick": {
-    "name": "imagemagick-7.1.1-39",
+    "name": "imagemagick-7.1.1-40",
     "pname": "imagemagick",
-    "version": "7.1.1-39"
+    "version": "7.1.1-40"
   },
   "imagemagick6": {
     "name": "imagemagick-6.9.13-10",
@@ -320,9 +320,9 @@
     "version": "2.5"
   },
   "jdk": {
-    "name": "openjdk-21.0.4+7",
+    "name": "openjdk-21.0.5+11",
     "pname": "openjdk",
-    "version": "21.0.4+7"
+    "version": "21.0.5+11"
   },
   "jetbrains.jdk": {
     "name": "jetbrains-jdk-jcef-21.0.4-b598.4",
@@ -350,9 +350,9 @@
     "version": "1.7.1"
   },
   "jre": {
-    "name": "openjdk-21.0.4+7",
+    "name": "openjdk-21.0.5+11",
     "pname": "openjdk",
-    "version": "21.0.4+7"
+    "version": "21.0.5+11"
   },
   "k3s": {
     "name": "k3s-1.31.1+k3s1",
@@ -380,9 +380,9 @@
     "version": "26.0.5"
   },
   "kubernetes-helm": {
-    "name": "kubernetes-helm-3.16.2",
+    "name": "kubernetes-helm-3.16.3",
     "pname": "kubernetes-helm",
-    "version": "3.16.2"
+    "version": "3.16.3"
   },
   "libffi": {
     "name": "libffi-3.4.6",
@@ -395,9 +395,9 @@
     "version": "1.10.3"
   },
   "libjpeg": {
-    "name": "libjpeg-turbo-3.0.3",
+    "name": "libjpeg-turbo-3.0.4",
     "pname": "libjpeg-turbo",
-    "version": "3.0.3"
+    "version": "3.0.4"
   },
   "libmodsecurity": {
     "name": "libmodsecurity-3.0.12",
@@ -439,10 +439,15 @@
     "pname": "libyaml",
     "version": "0.2.5"
   },
-  "linux_5_15": {
-    "name": "linux-5.15.170",
+  "linuxKernelStable": {
+    "name": "linux-5.15.173",
     "pname": "linux",
-    "version": "5.15.170"
+    "version": "5.15.173"
+  },
+  "linuxKernelVerify": {
+    "name": "linux-6.12.1",
+    "pname": "linux",
+    "version": "6.12.1"
   },
   "logrotate": {
     "name": "logrotate-3.22.0",
@@ -460,9 +465,9 @@
     "version": "3.17"
   },
   "mariadb": {
-    "name": "mariadb-server-10.11.9",
+    "name": "mariadb-server-10.11.10",
     "pname": "mariadb-server",
-    "version": "10.11.9"
+    "version": "10.11.10"
   },
   "mariadb-connector-c": {
     "name": "mariadb-connector-c-3.3.5",
@@ -485,9 +490,9 @@
     "version": "5.1.1"
   },
   "matrix-synapse": {
-    "name": "matrix-synapse-wrapped-1.118.0",
+    "name": "matrix-synapse-wrapped-1.119.0",
     "pname": "matrix-synapse-wrapped",
-    "version": "1.118.0"
+    "version": "1.119.0"
   },
   "mcpp": {
     "name": "mcpp-2.7.2.1",
@@ -495,9 +500,9 @@
     "version": "2.7.2.1"
   },
   "memcached": {
-    "name": "memcached-1.6.29",
+    "name": "memcached-1.6.31",
     "pname": "memcached",
-    "version": "1.6.29"
+    "version": "1.6.31"
   },
   "mongodb": {
     "name": "mongodb-7.0.14",
@@ -515,14 +520,14 @@
     "version": "2.4.0"
   },
   "mysql": {
-    "name": "mariadb-server-10.11.9",
+    "name": "mariadb-server-10.11.10",
     "pname": "mariadb-server",
-    "version": "10.11.9"
+    "version": "10.11.10"
   },
   "mysql80": {
-    "name": "mysql-8.0.39",
+    "name": "mysql-8.0.40",
     "pname": "mysql",
-    "version": "8.0.39"
+    "version": "8.0.40"
   },
   "nfs-utils": {
     "name": "nfs-utils-2.7.1",
@@ -555,9 +560,9 @@
     "version": "20.18.0"
   },
   "nodejs_18": {
-    "name": "nodejs-18.20.4",
+    "name": "nodejs-18.20.5",
     "pname": "nodejs",
-    "version": "18.20.4"
+    "version": "18.20.5"
   },
   "nodejs_20": {
     "name": "nodejs-20.18.0",
@@ -570,9 +575,9 @@
     "version": "22.10.0"
   },
   "nspr": {
-    "name": "nspr-4.35",
+    "name": "nspr-4.36",
     "pname": "nspr",
-    "version": "4.35"
+    "version": "4.36"
   },
   "nss_latest": {
     "name": "nss-3.106",
@@ -580,9 +585,9 @@
     "version": "3.106"
   },
   "openjdk": {
-    "name": "openjdk-21.0.4+7",
+    "name": "openjdk-21.0.5+11",
     "pname": "openjdk",
-    "version": "21.0.4+7"
+    "version": "21.0.5+11"
   },
   "openjpeg": {
     "name": "openjpeg-2.5.2",
@@ -610,9 +615,9 @@
     "version": "2.14.0"
   },
   "openssh": {
-    "name": "openssh-9.8p1",
+    "name": "openssh-9.9p1",
     "pname": "openssh",
-    "version": "9.8p1"
+    "version": "9.9p1"
   },
   "openssl": {
     "name": "openssl-3.3.2",
@@ -730,9 +735,9 @@
     "version": "8.2.25"
   },
   "php83": {
-    "name": "php-with-extensions-8.3.12",
+    "name": "php-with-extensions-8.3.13",
     "pname": "php-with-extensions",
-    "version": "8.3.12"
+    "version": "8.3.13"
   },
   "phpPackages.composer": {
     "name": "composer-2.8.1",
@@ -769,16 +774,6 @@
     "pname": "postgresql",
     "version": "16.4"
   },
-  "postgresql12Packages.postgis": {
-    "name": "postgis-3.5.0",
-    "pname": "postgis",
-    "version": "3.5.0"
-  },
-  "postgresql12Packages.temporal_tables": {
-    "name": "temporal_tables-1.2.2",
-    "pname": "temporal_tables",
-    "version": "1.2.2"
-  },
   "postgresql13Packages.postgis": {
     "name": "postgis-3.5.0",
     "pname": "postgis",
@@ -839,25 +834,20 @@
     "pname": "temporal_tables",
     "version": "1.2.2"
   },
-  "postgresql_12": {
-    "name": "postgresql-12.20",
-    "pname": "postgresql",
-    "version": "12.20"
-  },
   "postgresql_13": {
-    "name": "postgresql-13.16",
+    "name": "postgresql-13.17",
     "pname": "postgresql",
-    "version": "13.16"
+    "version": "13.17"
   },
   "postgresql_14": {
-    "name": "postgresql-14.13",
+    "name": "postgresql-14.14",
     "pname": "postgresql",
-    "version": "14.13"
+    "version": "14.14"
   },
   "postgresql_15": {
-    "name": "postgresql-15.8",
+    "name": "postgresql-15.9",
     "pname": "postgresql",
-    "version": "15.8"
+    "version": "15.9"
   },
   "postgresql_16": {
     "name": "postgresql-16.4",
@@ -865,9 +855,9 @@
     "version": "16.4"
   },
   "postgresql_17": {
-    "name": "postgresql-17.0",
+    "name": "postgresql-17.1",
     "pname": "postgresql",
-    "version": "17.0"
+    "version": "17.1"
   },
   "powerdns": {
     "name": "pdns-4.9.2",
@@ -926,9 +916,9 @@
     "version": "5.3.0"
   },
   "python3Packages.pillow": {
-    "name": "python3.12-pillow-10.4.0",
+    "name": "python3.12-pillow-11.0.0",
     "pname": "pillow",
-    "version": "10.4.0"
+    "version": "11.0.0"
   },
   "python3Packages.pip": {
     "name": "python3.12-pip-24.0",
@@ -1001,9 +991,9 @@
     "version": "4.0.2"
   },
   "rclone": {
-    "name": "rclone-1.68.1",
+    "name": "rclone-1.68.2",
     "pname": "rclone",
-    "version": "1.68.1"
+    "version": "1.68.2"
   },
   "re2c": {
     "name": "re2c-3.1",
@@ -1062,9 +1052,9 @@
     "version": "8.11.2"
   },
   "strace": {
-    "name": "strace-6.11",
+    "name": "strace-6.12",
     "pname": "strace",
-    "version": "6.11"
+    "version": "6.12"
   },
   "strongswan": {
     "name": "strongswan-5.9.14",
@@ -1077,9 +1067,9 @@
     "version": "1.14.4"
   },
   "sudo": {
-    "name": "sudo-1.9.15p5",
+    "name": "sudo-1.9.16",
     "pname": "sudo",
-    "version": "1.9.15p5"
+    "version": "1.9.16"
   },
   "sysstat": {
     "name": "sysstat-12.7.4",
@@ -1097,9 +1087,9 @@
     "version": "4.99.5"
   },
   "telegraf": {
-    "name": "telegraf-1.32.1",
+    "name": "telegraf-1.32.2",
     "pname": "telegraf",
-    "version": "1.32.1"
+    "version": "1.32.2"
   },
   "tmux": {
     "name": "tmux-3.5a",
@@ -1137,9 +1127,9 @@
     "version": "7.5.0"
   },
   "vim": {
-    "name": "vim-9.1.0765",
+    "name": "vim-9.1.0787",
     "pname": "vim",
-    "version": "9.1.0765"
+    "version": "9.1.0787"
   },
   "webkitgtk": {
     "name": "webkitgtk-2.46.3+abi=4.0",
@@ -1147,9 +1137,9 @@
     "version": "2.46.3"
   },
   "wget": {
-    "name": "wget-1.24.5",
+    "name": "wget-1.25.0",
     "pname": "wget",
-    "version": "1.24.5"
+    "version": "1.25.0"
   },
   "wireguard-tools": {
     "name": "wireguard-tools-1.0.20210914",
diff --git a/release/versions.json b/release/versions.json
index 3c78966bd..fcb8e0f40 100644
--- a/release/versions.json
+++ b/release/versions.json
@@ -8,9 +8,9 @@
     "url": "https://gitlab.flyingcircus.io/flyingcircus/nixos-mailserver.git/"
   },
   "nixpkgs": {
-    "hash": "sha256-H7+8HHDK38BkoPWkPV45vGSWhkFm2qDxDQk5t7EvtyM=",
+    "hash": "sha256-Y9rSDxryHQRS+gGUkKDicU6BWfHKNC0uMXdqjzFgRd8=",
     "owner": "flyingcircusio",
     "repo": "nixpkgs",
-    "rev": "9206e6d83ba821c66f536eebe5856e97257ccf97"
+    "rev": "fc529f2fde74a3ebfd5f14699725c14b6412e8c2"
   }
 }