diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-21 23:51:55 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-21 23:51:55 +0200 |
| commit | 74720a36c75ce74dbafb86a147aecbbdd0c1f6a7 (patch) | |
| tree | 19e0db68b876d7127d083c3733fe40c7016809ce /pkgs/servers | |
| parent | c7b337385140762b16cb30c0442919a040182185 (diff) | |
| parent | 5d4d4df8c0899af2342bfbb4f5c898c2cd3241ce (diff) | |
| download | nixpkgs-74720a36c75ce74dbafb86a147aecbbdd0c1f6a7.tar nixpkgs-74720a36c75ce74dbafb86a147aecbbdd0c1f6a7.tar.gz nixpkgs-74720a36c75ce74dbafb86a147aecbbdd0c1f6a7.tar.bz2 nixpkgs-74720a36c75ce74dbafb86a147aecbbdd0c1f6a7.tar.lz nixpkgs-74720a36c75ce74dbafb86a147aecbbdd0c1f6a7.tar.xz nixpkgs-74720a36c75ce74dbafb86a147aecbbdd0c1f6a7.tar.zst nixpkgs-74720a36c75ce74dbafb86a147aecbbdd0c1f6a7.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/http/nginx/modules.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/mpd/clientlib.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 32d1523547e..95e156f9627 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -5,8 +5,8 @@ src = let gitsrc = pkgs.fetchFromGitHub { owner = "eustas"; repo = "ngx_brotli"; - rev = "8cd9dd5fc232d3a01644584921e52dae99034779"; - sha256 = "0ap1kf51hzb8yvvxjkcj9hnmsmmd5drcay64hd4n7vybf9dqw6g6"; + rev = "6a1174446f5a866d3d13615dd2824177570f0a69"; + sha256 = "148xfh6w1wgql2jj922ryiddrs93dyacs903j2hnil67cpia45p6"; }; in pkgs.runCommandNoCC "ngx_brotli-src" {} '' cp -a ${gitsrc} $out substituteInPlace $out/config \ diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix index dab63a5bad8..478d4372267 100644 --- a/pkgs/servers/mpd/clientlib.nix +++ b/pkgs/servers/mpd/clientlib.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, meson, ninja, fixDarwinDylibNames }: stdenv.mkDerivation rec { - version = "2.13"; + version = "2.14"; name = "libmpdclient-${version}"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "libmpdclient"; rev = "v${version}"; - sha256 = "1g1n6rk8kn87mbjqxxj0vi7haj8xx21xmqlzbrx2fvyp5357zvsq"; + sha256 = "15vn9m4qcsccff5rg7jkzy5503skz6bmqqk6qc2smgvjgwn533sm"; }; nativeBuildInputs = [ meson ninja ] |