diff options
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/caddy/xcaddy/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/calibre-web/default.nix | 17 | ||||
-rw-r--r-- | pkgs/servers/code-server/default.nix | 14 | ||||
-rw-r--r-- | pkgs/servers/code-server/remove-cloud-agent-download.patch | 17 | ||||
-rw-r--r-- | pkgs/servers/monitoring/grafana/default.nix | 13 | ||||
-rw-r--r-- | pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/openafs/1.8/module.nix | 10 | ||||
-rw-r--r-- | pkgs/servers/sql/mysql/8.0.x.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/traefik/default.nix | 6 |
9 files changed, 38 insertions, 51 deletions
diff --git a/pkgs/servers/caddy/xcaddy/default.nix b/pkgs/servers/caddy/xcaddy/default.nix index c20a0e325ec90..952261703a3ef 100644 --- a/pkgs/servers/caddy/xcaddy/default.nix +++ b/pkgs/servers/caddy/xcaddy/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "xcaddy"; - version = "0.3.2"; + version = "0.3.3"; subPackages = [ "cmd/xcaddy" ]; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "caddyserver"; repo = pname; rev = "v${version}"; - hash = "sha256-M0eMI/TtUNVqE4F1ifizVb0e4ACGa+yLkG3pJLaaDNs="; + hash = "sha256-HDyHvHa8yCz59AifHxQ0LAuC/xPXQInuUYURx7bL3oE="; }; patches = [ diff --git a/pkgs/servers/calibre-web/default.nix b/pkgs/servers/calibre-web/default.nix index e52685f1a2087..699c33c2d43d4 100644 --- a/pkgs/servers/calibre-web/default.nix +++ b/pkgs/servers/calibre-web/default.nix @@ -21,13 +21,13 @@ let in python.pkgs.buildPythonApplication rec { pname = "calibre-web"; - version = "0.6.19"; + version = "0.6.20"; src = fetchFromGitHub { owner = "janeczku"; repo = "calibre-web"; rev = version; - hash = "sha256-mNYLQ+3u6xRaoZ5oH6HdylFfgz1fq1ZB86AWk9vULWQ="; + hash = "sha256-0lArY1aTpO4sgIVDSqClYMGlip92f9hE/L2UouTLK8Q="; }; propagatedBuildInputs = with python.pkgs; [ @@ -38,9 +38,10 @@ python.pkgs.buildPythonApplication rec { flask-login flask_principal flask-wtf + flask-limiter iso-639 lxml - pypdf3 + pypdf requests sqlalchemy tornado @@ -58,12 +59,6 @@ python.pkgs.buildPythonApplication rec { # and exit. This is gonna be used to configure calibre-web declaratively, as most of its configuration parameters # are stored in the DB. ./db-migrations.patch - # Handle version 3.0 of flask-babel - (fetchpatch { - url = "https://github.com/janeczku/calibre-web/commit/94a6931d48d347ae6c07e2b5f0301e8cf97cf53d.patch"; - excludes = [ "requirements.txt" ]; - hash = "sha256-0DQ+LbIOOwjBXQh+b1w8dYQ3s+xZ6nFoH5GvgJdBAFI="; - }) ]; # calibre-web doesn't follow setuptools directory structure. The following is taken from the script @@ -81,12 +76,12 @@ python.pkgs.buildPythonApplication rec { --replace "APScheduler>=3.6.3,<3.10.0" "APScheduler>=3.6.3" \ --replace "chardet>=3.0.0,<4.1.0" "chardet>=3.0.0,<6" \ --replace "Flask>=1.0.2,<2.1.0" "Flask>=1.0.2" \ - --replace "Flask-Babel>=0.11.1,<2.1.0" "Flask-Babel>=0.11.1" \ + --replace "Flask-Babel>=0.11.1,<3.1.0" "Flask-Babel>=0.11.1" \ --replace "Flask-Login>=0.3.2,<0.6.2" "Flask-Login>=0.3.2" \ --replace "flask-wtf>=0.14.2,<1.1.0" "flask-wtf>=0.14.2" \ --replace "lxml>=3.8.0,<4.9.0" "lxml>=3.8.0" \ --replace "tornado>=4.1,<6.2" "tornado>=4.1,<7" \ - --replace "PyPDF3>=1.0.0,<1.0.7" "PyPDF3>=1.0.0" \ + --replace "PyPDF>=3.0.0,<3.6.0" "PyPDF>=3.0.0" \ --replace "requests>=2.11.1,<2.28.0" "requests" \ --replace "unidecode>=0.04.19,<1.4.0" "unidecode>=0.04.19" \ --replace "werkzeug<2.1.0" "" diff --git a/pkgs/servers/code-server/default.nix b/pkgs/servers/code-server/default.nix index 8f0416c6ad323..008becc6fed76 100644 --- a/pkgs/servers/code-server/default.nix +++ b/pkgs/servers/code-server/default.nix @@ -34,14 +34,14 @@ let in stdenv.mkDerivation rec { pname = "code-server"; - version = "4.8.3"; + version = "4.12.0"; src = fetchFromGitHub { owner = "coder"; repo = "code-server"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "1h5ng60wf3gpsydfkv20x30xsw1f5zcvv77l1mzrqz1mhcw93lvz"; + hash = "sha256-PQp5dji2Ynp+LJRWBka41umwe1/IR76C+at/wyOWGcI="; }; cloudAgent = buildGoModule rec { @@ -88,7 +88,7 @@ in stdenv.mkDerivation rec { outputHashAlgo = "sha256"; # to get hash values use nix-build -A code-server.prefetchYarnCache - outputHash = "0jzzbmmgv1nfq975mi9ii9l6c4f1wy10fyy117xgm4s6vxana7qn"; + outputHash = "sha256-4Vr9u3+W/IhbbTc39jyDyDNQODlmdF+M/N8oJn0Z4+w="; }; nativeBuildInputs = [ @@ -101,8 +101,6 @@ in stdenv.mkDerivation rec { ]; patches = [ - # remove download of coder-cloud agent - ./remove-cloud-agent-download.patch # remove git calls from vscode build script ./build-vscode-nogit.patch ]; @@ -129,10 +127,6 @@ in stdenv.mkDerivation rec { # set offline mirror to yarn cache we created in previous steps yarn --offline config set yarn-offline-mirror "${yarnCache}" - # link coder-cloud agent from nix store - mkdir -p lib - ln -s "${cloudAgent}/bin/cloud-agent" ./lib/coder-cloud-agent - # skip unnecessary electron download export ELECTRON_SKIP_BINARY_DOWNLOAD=1 @@ -221,7 +215,7 @@ in stdenv.mkDerivation rec { yarn build # build vscode - yarn build:vscode + VERSION=${version} yarn build:vscode # create release yarn release diff --git a/pkgs/servers/code-server/remove-cloud-agent-download.patch b/pkgs/servers/code-server/remove-cloud-agent-download.patch deleted file mode 100644 index 94590bbcd43e2..0000000000000 --- a/pkgs/servers/code-server/remove-cloud-agent-download.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- ./ci/build/npm-postinstall.sh -+++ ./ci/build/npm-postinstall.sh -@@ -102,14 +102,6 @@ - ;; - esac - -- mkdir -p ./lib -- -- if curl -fsSL "https://github.com/coder/cloud-agent/releases/latest/download/cloud-agent-$OS-$ARCH" -o ./lib/coder-cloud-agent; then -- chmod +x ./lib/coder-cloud-agent -- else -- echo "Failed to download cloud agent; --link will not work" -- fi -- - if ! vscode_install; then - echo "You may not have the required dependencies to build the native modules." - echo "Please see https://github.com/coder/code-server/blob/main/docs/npm.md" diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index ef1fab4cb9930..068154b601d1d 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests, tzdata, wire }: +{ lib, buildGoModule, fetchurl, fetchFromGitHub, fetchpatch, nixosTests, tzdata, wire }: buildGoModule rec { pname = "grafana"; @@ -18,6 +18,14 @@ buildGoModule rec { sha256 = "sha256-HiKr1ier13xUlrwsJrxo60wwqmiPcza2oOLIfMgFWc0="; }; + patches = [ + (fetchpatch { # https://github.com/grafana/grafana/pull/65790 + name = "fix-TestIntegrationAMConfigAccess.patch"; + url = "https://github.com/grafana/grafana/commit/8500eb1c180b4d49a8e17bfd6df675d821d038a4.diff"; + sha256 = "sha256-TWPn9fLjmCbXGXkxAc3NLTN+0XXjsaspaV4gYKg3+Mk="; + }) + ]; + vendorSha256 = "sha256-sUvjZTg2/6UGjc2Qv8YO4IWlS4Y/FzGRVOQ9I/wp/aM="; nativeBuildInputs = [ wire ]; @@ -48,9 +56,6 @@ buildGoModule rec { sed -i -e '/it should change folder successfully and return correct result/{N;s/$/\nt.Skip();/}'\ pkg/services/libraryelements/libraryelements_patch_test.go - # TODO: investigate? - substituteInPlace pkg/tests/api/alerting/api_alertmanager_test.go \ - --replace TestIntegrationAMConfigAccess DontTestIntegrationAMConfigAccess # main module (github.com/grafana/grafana) does not contain package github.com/grafana/grafana/scripts/go rm -r scripts/go diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index 629bf2e3b7a5e..7aa41d77146a4 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.64.0"; + version = "2.66.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "v${version}"; - hash = "sha256-/5ozeabGqFpEfBi2WVRHUpaSwQjvuq8RRw2hNDp8j34="; + hash = "sha256-sk0t/oy8YsTcYSMKtSsC3apGp8LNa9AUggHrHKd75pw="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index cd1f71b77ec8a..4485f86c7f761 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -73,6 +73,16 @@ stdenv.mkDerivation { url = "https://git.openafs.org/?p=openafs.git;a=patch;h=cba2b88851c3ae0ab1b18ea3ce77f7f5e8200b2f"; hash = "sha256-suj7n0U0odHXZHLPqeB/k96gyBh52uoS3AuHvOzPyd8="; }) + # Linux 6.3: Include linux/filelock.h if available + (fetchBase64Patch { + url = "https://gerrit.openafs.org/changes/15388/revisions/ddb99d32012c43c76ae37f6a7563f1ca32f0e964/patch"; + hash = "sha256-0Cql4+0ISfW4J4D7PhlSYNfIKAeDVWEz57PHOu5TRXg="; + }) + # Linux 6.3: Use mnt_idmap for inode op functions + (fetchBase64Patch { + url = "https://gerrit.openafs.org/changes/15389/revisions/ff0d53d2fb38fc3b262f02fb1c5f49b286ff13dd/patch"; + hash = "sha256-KyVAI/A+/lNrLyKY6O8DgMKzgnF6P5sOfSq3qcs6Qq0="; + }) ]; hardeningDisable = [ "pic" ]; diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix index 2958cebfc9fdc..1c8722c49e897 100644 --- a/pkgs/servers/sql/mysql/8.0.x.nix +++ b/pkgs/servers/sql/mysql/8.0.x.nix @@ -6,11 +6,11 @@ let self = stdenv.mkDerivation rec { pname = "mysql"; - version = "8.0.32"; + version = "8.0.33"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${self.mysqlVersion}/${pname}-${version}.tar.gz"; - sha256 = "sha256-Hw2SojeJgkRxbdWB95k1bgc8LaY8Oy5KAeEDLL7VDig="; + hash = "sha256-liAC9dkG9C9AsnejnS25OTEkjB8H/49DEsKI5jgD3RI="; }; nativeBuildInputs = [ bison cmake pkg-config ] diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 1f8bded409f5f..852260fb40969 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "traefik"; - version = "2.9.10"; + version = "2.10.0"; # Archive with static assets for webui src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "sha256-Mrdlu2SdOiMTkBXeStZaex3bVyw7vfidgOeCmhfB5Tc="; + sha256 = "sha256-KeV7JOIbQoCwmulMzKpse7GA+/p5uPRR8UpMYizuGYU="; stripRoot = false; }; - vendorSha256 = "sha256-11OYVeEuo/Fl6qlRLITzi7qmM2M8puHk5Y0X0sgLius="; + vendorSha256 = "sha256-o+xri6vyUbInwmk+hhi6YDRo8ICASMj+ah3nBqQWnO8="; subPackages = [ "cmd/traefik" ]; |