diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-10-22 08:39:18 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-10-22 08:39:18 +0000 |
| commit | 403acf82248d3cdbc0beda0c5c373c1b46b9b636 (patch) | |
| tree | e3913fd47e374b9525858fa1e61064fd1113e475 /nixpkgs/pkgs/servers | |
| parent | b5faee77a2dceb31545db209ebee1476acb71198 (diff) | |
| parent | 8dfad603247387df1df4826b8bea58efc5d012d8 (diff) | |
| download | nixlib-403acf82248d3cdbc0beda0c5c373c1b46b9b636.tar nixlib-403acf82248d3cdbc0beda0c5c373c1b46b9b636.tar.gz nixlib-403acf82248d3cdbc0beda0c5c373c1b46b9b636.tar.bz2 nixlib-403acf82248d3cdbc0beda0c5c373c1b46b9b636.tar.lz nixlib-403acf82248d3cdbc0beda0c5c373c1b46b9b636.tar.xz nixlib-403acf82248d3cdbc0beda0c5c373c1b46b9b636.tar.zst nixlib-403acf82248d3cdbc0beda0c5c373c1b46b9b636.zip | |
Merge commit '8dfad603247387df1df4826b8bea58efc5d012d8'
Diffstat (limited to 'nixpkgs/pkgs/servers')
| -rw-r--r-- | nixpkgs/pkgs/servers/http/nginx/modules.nix | 4 | ||||
| -rw-r--r-- | nixpkgs/pkgs/servers/soft-serve/default.nix | 8 | ||||
| -rw-r--r-- | nixpkgs/pkgs/servers/sql/pgbouncer/default.nix | 1 |
3 files changed, 9 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/servers/http/nginx/modules.nix b/nixpkgs/pkgs/servers/http/nginx/modules.nix index 13c8bd7e7c75..2ffb65a3a9f1 100644 --- a/nixpkgs/pkgs/servers/http/nginx/modules.nix +++ b/nixpkgs/pkgs/servers/http/nginx/modules.nix @@ -1022,8 +1022,8 @@ let self = { name = "zstd"; owner = "tokers"; repo = "zstd-nginx-module"; - rev = "25d88c262be47462cf90015ee7ebf6317b6848f9"; - sha256 = "sha256-YRluKekhx1tb6e5IL1FPK05jPtzfQPaHI47cdada928="; + rev = "0.1.0"; + hash = "sha256-8SBU9hJnKtNrwbpioy+Z/mfiVuqAx+U1t64m5tfEy6o="; }; inputs = [ zstd ]; diff --git a/nixpkgs/pkgs/servers/soft-serve/default.nix b/nixpkgs/pkgs/servers/soft-serve/default.nix index 5072869c39b6..2cfd41f7caf8 100644 --- a/nixpkgs/pkgs/servers/soft-serve/default.nix +++ b/nixpkgs/pkgs/servers/soft-serve/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, git }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, nixosTests, git, bash }: buildGoModule rec { pname = "soft-serve"; @@ -20,10 +20,14 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper ]; postInstall = '' + # Soft-serve generates git-hooks at run-time. + # The scripts require git and bash inside the path. wrapProgram $out/bin/soft \ - --prefix PATH : "${lib.makeBinPath [ git ]}" + --prefix PATH : "${lib.makeBinPath [ git bash ]}" ''; + passthru.tests = nixosTests.soft-serve; + meta = with lib; { description = "A tasty, self-hosted Git server for the command line"; homepage = "https://github.com/charmbracelet/soft-serve"; diff --git a/nixpkgs/pkgs/servers/sql/pgbouncer/default.nix b/nixpkgs/pkgs/servers/sql/pgbouncer/default.nix index 7f6cfa0f898a..dd47de907576 100644 --- a/nixpkgs/pkgs/servers/sql/pgbouncer/default.nix +++ b/nixpkgs/pkgs/servers/sql/pgbouncer/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.pgbouncer.org/"; + mainProgram = "pgbouncer"; description = "Lightweight connection pooler for PostgreSQL"; changelog = "https://github.com/pgbouncer/pgbouncer/releases/tag/pgbouncer_${replaceStrings ["."] ["_"] version}"; license = licenses.isc; |