Update nixpkgs (2024-09-09)

flake.nix

@@ -23,7 +23,7 @@
  description = "Flying Circus NixOS platform (dev/release tooling)";
 
  inputs = {
- nixpkgs.url = "github:flyingcircusio/nixpkgs/PL-132971-downgrade-kernel-5.15";
+ nixpkgs.url = "github:flyingcircusio/nixpkgs/nixos-24.05";
  nixos-mailserver = {
  url = "gitlab:flyingcircus/nixos-mailserver/nixos-24.05?host=gitlab.flyingcircus.io";
  inputs.nixpkgs.follows = "nixpkgs";

nixpkgs-config.nix

@@ -14,5 +14,6 @@
  "python-2.7.18.8" # Needed for some legacy customer applications.
  "ruby-2.7.8" # EOL 2023-03-31, needed for Sensu checks
  "docker-24.0.9" # Old installs still use storage driver removed in 25.x.
+ "jitsi-meet-1.0.7952" # insecure libolm but this only affects optional e2ee which we don't really support.
  ];
 }

release/package-versions.json

@@ -70,14 +70,14 @@
  "version": "18.2.4"
  },
  "chromedriver": {
- "name": "chromedriver-128.0.6613.84",
+ "name": "chromedriver-128.0.6613.119",
  "pname": "chromedriver",
- "version": "128.0.6613.84"
+ "version": "128.0.6613.119"
  },
  "chromium": {
- "name": "chromium-128.0.6613.84",
+ "name": "chromium-128.0.6613.119",
  "pname": "chromium",
- "version": "128.0.6613.84"
+ "version": "128.0.6613.119"
  },
  "cifs-utils": {
  "name": "cifs-utils-7.0",
@@ -95,9 +95,9 @@
  "version": "3.29.2"
  },
  "consul": {
- "name": "consul-1.18.3",
+ "name": "consul-1.18.4",
  "pname": "consul",
- "version": "1.18.3"
+ "version": "1.18.4"
  },
  "containerd": {
  "name": "containerd-1.7.16",
@@ -155,9 +155,9 @@
  "version": "2.3.21.1"
  },
  "element-web": {
- "name": "element-web-1.11.75",
+ "name": "element-web-1.11.76",
  "pname": "element-web",
- "version": "1.11.75"
+ "version": "1.11.76"
  },
  "erlang": {
  "name": "erlang-25.3.2.12",
@@ -190,9 +190,9 @@
  "version": "7.17.16"
  },
  "firefox": {
- "name": "firefox-129.0.2",
+ "name": "firefox-130.0",
  "pname": "firefox",
- "version": "129.0.2"
+ "version": "130.0"
  },
  "gcc": {
  "name": "gcc-wrapper-13.2.0",
@@ -220,44 +220,44 @@
  "version": "2.44.1"
  },
  "gitaly": {
- "name": "gitaly-17.2.4",
+ "name": "gitaly-17.2.5",
  "pname": "gitaly",
- "version": "17.2.4"
+ "version": "17.2.5"
  },
  "github-runner": {
  "name": "github-runner-2.319.1",
  "pname": "github-runner",
  "version": "2.319.1"
  },
  "gitlab": {
- "name": "gitlab-17.2.4",
+ "name": "gitlab-17.2.5",
  "pname": "gitlab",
- "version": "17.2.4"
+ "version": "17.2.5"
  },
  "gitlab-container-registry": {
- "name": "gitlab-container-registry-4.7.0",
+ "name": "gitlab-container-registry-4.9.0",
  "pname": "gitlab-container-registry",
- "version": "4.7.0"
+ "version": "4.9.0"
  },
  "gitlab-ee": {
- "name": "gitlab-ee-17.2.4",
+ "name": "gitlab-ee-17.2.5",
  "pname": "gitlab-ee",
- "version": "17.2.4"
+ "version": "17.2.5"
  },
  "gitlab-pages": {
- "name": "gitlab-pages-17.2.4",
+ "name": "gitlab-pages-17.2.5",
  "pname": "gitlab-pages",
- "version": "17.2.4"
+ "version": "17.2.5"
  },
  "gitlab-runner": {
  "name": "gitlab-runner-17.1.0",
  "pname": "gitlab-runner",
  "version": "17.1.0"
  },
  "gitlab-workhorse": {
- "name": "gitlab-workhorse-17.2.4",
+ "name": "gitlab-workhorse-17.2.5",
  "pname": "gitlab-workhorse",
- "version": "17.2.4"
+ "version": "17.2.5"
  },
  "glibc": {
  "name": "glibc-2.39-52",
@@ -282,34 +282,34 @@
  "go_1_19": {},
  "go_1_20": {},
  "grafana": {
- "name": "grafana-10.4.7",
+ "name": "grafana-10.4.8",
  "pname": "grafana",
- "version": "10.4.7"
+ "version": "10.4.8"
  },
  "grub2": {
  "name": "grub-2.12",
  "pname": "grub",
  "version": "2.12"
  },
  "haproxy": {
- "name": "haproxy-2.9.7",
+ "name": "haproxy-2.9.10",
  "pname": "haproxy",
- "version": "2.9.7"
+ "version": "2.9.10"
  },
  "imagemagick": {
- "name": "imagemagick-7.1.1-36",
+ "name": "imagemagick-7.1.1-38",
  "pname": "imagemagick",
- "version": "7.1.1-36"
+ "version": "7.1.1-38"
  },
  "imagemagick6": {
  "name": "imagemagick-6.9.13-10",
  "pname": "imagemagick",
  "version": "6.9.13-10"
  },
  "imagemagick7": {
- "name": "imagemagick-7.1.1-36",
+ "name": "imagemagick-7.1.1-38",
  "pname": "imagemagick",
- "version": "7.1.1-36"
+ "version": "7.1.1-38"
  },
  "inetutils": {
  "name": "inetutils-2.5",
@@ -437,9 +437,9 @@
  "version": "0.2.5"
  },
  "linux_5_15": {
- "name": "linux-5.15.165",
+ "name": "linux-5.15.164",
  "pname": "linux",
- "version": "5.15.165"
+ "version": "5.15.164"
  },
  "logrotate": {
  "name": "logrotate-3.21.0",
@@ -477,14 +477,14 @@
  "version": "4.16.1"
  },
  "matomo_5": {
- "name": "matomo_5-5.0.2",
+ "name": "matomo_5-5.1.1",
  "pname": "matomo_5",
- "version": "5.0.2"
+ "version": "5.1.1"
  },
  "matrix-synapse": {
- "name": "matrix-synapse-wrapped-1.113.0",
+ "name": "matrix-synapse-wrapped-1.114.0",
  "pname": "matrix-synapse-wrapped",
- "version": "1.113.0"
+ "version": "1.114.0"
  },
  "mcpp": {
  "name": "mcpp-2.7.2.1",
@@ -577,9 +577,9 @@
  "version": "4.35"
  },
  "nss_latest": {
- "name": "nss-3.102",
+ "name": "nss-3.104",
  "pname": "nss",
- "version": "3.102"
+ "version": "3.104"
  },
  "openjdk": {
  "name": "openjdk-21.0.3+9",
@@ -727,14 +727,14 @@
  "version": "8.1.29"
  },
  "php82": {
- "name": "php-with-extensions-8.2.21",
+ "name": "php-with-extensions-8.2.23",
  "pname": "php-with-extensions",
- "version": "8.2.21"
+ "version": "8.2.23"
  },
  "php83": {
- "name": "php-with-extensions-8.3.9",
+ "name": "php-with-extensions-8.3.11",
  "pname": "php-with-extensions",
- "version": "8.3.9"
+ "version": "8.3.11"
  },
  "phpPackages.composer": {
  "name": "composer-2.7.7",
@@ -802,9 +802,9 @@
  "version": "4.9.1"
  },
  "prometheus": {
- "name": "prometheus-2.53.1",
+ "name": "prometheus-2.54.1",
  "pname": "prometheus",
- "version": "2.53.1"
+ "version": "2.54.1"
  },
  "prosody": {
  "name": "prosody-0.12.4",
@@ -887,6 +887,11 @@
  "pname": "rich",
  "version": "13.7.1"
  },
+ "python3Packages.rich-rst": {
+ "name": "python3.11-rich-rst-1.3.1",
+ "pname": "rich-rst",
+ "version": "1.3.1"
+ },
  "python3Packages.structlog": {
  "name": "python3.11-structlog-24.1.0",
  "pname": "structlog",
@@ -932,10 +937,15 @@
  "pname": "redis",
  "version": "7.2.4"
  },
+ "rich-cli": {
+ "name": "rich-cli-1.8.0",
+ "pname": "rich-cli",
+ "version": "1.8.0"
+ },
  "roundcube": {
- "name": "roundcube-1.6.8",
+ "name": "roundcube-1.6.9",
  "pname": "roundcube",
- "version": "1.6.8"
+ "version": "1.6.9"
  },
  "rsync": {
  "name": "rsync-3.3.0",

release/update-nixpkgs.py

@@ -1,3 +1,4 @@
+import datetime
 import json
 import re
 import subprocess
@@ -35,7 +36,7 @@ def upstream_branch(self) -> str:
  if self == NixOSVersion.NIXOS_UNSTABLE:
  return "nixos-unstable"
 
- return self.value
+ return self.value()
 
 
 def run_on_hydra(*args):
@@ -233,10 +234,12 @@ def filter_and_merge_commit_msgs(msgs):
 
 
 def format_fcio_commit_msg(
- msgs: list[str], ticket_number: Optional[str]
+ msgs: list[str], date: datetime.date, ticket_number: Optional[str]
 ) -> str:
+ datestr = date.isoformat()
+
  commit_msg_lines = [
- "Update nixpkgs",
+ f"Update nixpkgs ({datestr})",
  "",
  "Pull upstream NixOS changes, security fixes and package updates:",
  "",
@@ -283,6 +286,7 @@ def update_fc_nixos(
 
  old_rev = versions_json["nixpkgs"]["rev"]
  new_rev = str(nixpkgs_repo.head.commit)
+ date = datetime.date.today()
 
  interesting_msgs = get_interesting_commit_msgs(
  workdir_path, nixpkgs_repo, old_rev, new_rev
@@ -293,23 +297,26 @@ def update_fc_nixos(
  print(msg)
 
  final_msgs = filter_and_merge_commit_msgs(interesting_msgs)
- commit_msg = format_fcio_commit_msg(final_msgs, ticket_number)
+ commit_msg = format_fcio_commit_msg(final_msgs, date, ticket_number)
  print()
  print("-" * 80)
  print("Commit message:")
  print()
  print(commit_msg)
- feature_branch_name = f"PL-{ticket_number}-update-nixpkgs"
+
+ datestr = date.isoformat()
+ active_branch_name = fc_nixos_repo.active_branch.name
+ feature_branch_name = f"PL-{ticket_number}-update-nixpkgs-{datestr}"
 
  if ticket_number:
  do_commit = confirm(
- f"Create feature branch {feature_branch_name} "
- "and commit fc-nixos now?",
+ f"Create fc-nixos feature branch {feature_branch_name} based "
+ f"on branch {active_branch_name} and commit now?",
  default=True,
  )
  else:
  do_commit = confirm(
- "Commit to current fc-nixos now?",
+ f"Commit to current fc-nixos branch {active_branch_name} now?",
  default=True,
  )
  if do_commit:

release/versions.json

@@ -8,9 +8,9 @@
  "url": "https://gitlab.flyingcircus.io/flyingcircus/nixos-mailserver.git/"
  },
  "nixpkgs": {
- "hash": "sha256-/TWnMQLv73+pcuNiL2DI1m9bgZuItPGDrDANJ4EzY2A=",
+ "hash": "sha256-Pu+odXzikSAkl/39zdvB86hasDrEImixpU3RXi45I74=",
  "owner": "flyingcircusio",
  "repo": "nixpkgs",
- "rev": "8dbeac8e250a79d33ae1eb9ec3d9bba294b7a3a4"
+ "rev": "6ce38e4d52cbb7313f5170903deb4b8b3d3ff022"
  }
 }