public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge release-21.05 into staging-next-21.05

Browse Source
This commit is contained in:
github-actions[bot] 2021-07-17 18:02:00 +00:00 committed by GitHub
commit 1bf00c66cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/tests/trafficserver.nix
View File

@ -104,6 +104,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
ats.wait_for_open_port(80) ats.wait_for_open_port(80)
httpbin.wait_for_unit("httpbin") httpbin.wait_for_unit("httpbin")
httpbin.wait_for_open_port(80) httpbin.wait_for_open_port(80)
client.wait_for_unit("network-online.target")
with subtest("Traffic Server is running"): with subtest("Traffic Server is running"):
out = ats.succeed("traffic_ctl server status") out = ats.succeed("traffic_ctl server status")

10
pkgs/applications/graphics/fig2dev/default.nix
View File

@ -1,6 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchurl , fetchurl
, fetchpatch
, ghostscript , ghostscript
, libpng , libpng
, makeWrapper , makeWrapper
@ -20,6 +21,15 @@ stdenv.mkDerivation rec {
sha256 = "1bm75lf9j54qpbjx8hzp6ixaayp1x9w4v3yxl6vxyw8g5m4sqdk3"; sha256 = "1bm75lf9j54qpbjx8hzp6ixaayp1x9w4v3yxl6vxyw8g5m4sqdk3";
}; };
patches = [
(fetchpatch {
name = "CVE-2021-3561.patch";
# Using Debian patch since it is not possible to download it directly from Sourceforge
url = "https://sources.debian.org/data/main/f/fig2dev/1:3.2.8-3/debian/patches/33_sanitize-color.patch";
sha256 = "1bppr3li03nj4qjibnddr2f38mpk55pcn5z6k98pf00gabq33fgs";
})
];
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ libpng ]; buildInputs = [ libpng ];

4
pkgs/applications/networking/remote/putty/default.nix
View File

@ -3,7 +3,7 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.74"; version = "0.75";
pname = "putty"; pname = "putty";
src = fetchurl { src = fetchurl {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
"https://the.earth.li/~sgtatham/putty/${version}/${pname}-${version}.tar.gz" "https://the.earth.li/~sgtatham/putty/${version}/${pname}-${version}.tar.gz"
"ftp://ftp.wayne.edu/putty/putty-website-mirror/${version}/${pname}-${version}.tar.gz" "ftp://ftp.wayne.edu/putty/putty-website-mirror/${version}/${pname}-${version}.tar.gz"
]; ];
sha256 = "0zc43g8ycyf712cdrja4k8ih5s3agw1k0nq0jkifdn8xwn4d7mfx"; sha256 = "1xgrr1fbirw79zafspg2b6crzfmlfw910y79md4r7gnxgq1kn5yk";
}; };
# glib-2.62 deprecations # glib-2.62 deprecations

4
pkgs/applications/version-management/gitea/default.nix
View File

@ -16,12 +16,12 @@ with lib;
buildGoPackage rec { buildGoPackage rec {
pname = "gitea"; pname = "gitea";
version = "1.14.4"; version = "1.14.5";
# not fetching directly from the git repo, because that lacks several vendor files for the web UI # not fetching directly from the git repo, because that lacks several vendor files for the web UI
src = fetchurl { src = fetchurl {
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
sha256 = "sha256-sl/Vml8QmwZEAd2PIYWQcP7s6NYeomGJQGKhRiddtoo="; sha256 = "sha256-8nwLVpe/5IjXJqO179lN80B/3WGUL3LKM8OWdh/bYOE=";
}; };
unpackPhase = '' unpackPhase = ''

2
pkgs/development/python-modules/convertdate/2.2.x.nix
View File

@ -15,7 +15,7 @@ buildPythonPackage rec {
owner = "fitnr"; owner = "fitnr";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1xgi7x9b9kxm0q51bqnmwdm5lp8vwhx5yk4d1b23r37spz9dbhw5"; sha256 = "07x1j6jgkmrzdpv2lhpp4n16621mpmlylvwdwsggdjivhzvc3x9q";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

6
pkgs/servers/http/openresty/default.nix
View File

@ -9,11 +9,11 @@
callPackage ../nginx/generic.nix args rec { callPackage ../nginx/generic.nix args rec {
pname = "openresty"; pname = "openresty";
nginxVersion = "1.19.3"; nginxVersion = "1.19.3";
version = "${nginxVersion}.1"; version = "${nginxVersion}.2";
src = fetchurl { src = fetchurl {
url = "https://openresty.org/download/openresty-${version}.tar.gz"; url = "https://openresty.org/download/openresty-${version}.tar.gz";
sha256 = "0p9xn0xgbk6nmjfb25a3d6bwxm8q23igkixqma5fpygla6fcsvzk"; sha256 = "1fav3qykckqcyw9ksi8s61prpwab44zbcvj95rwfpfqgk5jffh6f";
}; };
# generic.nix applies fixPatch on top of every patch defined there. This # generic.nix applies fixPatch on top of every patch defined there. This
@ -44,7 +44,7 @@ callPackage ../nginx/generic.nix args rec {
meta = { meta = {
description = "A fast web application server built on Nginx"; description = "A fast web application server built on Nginx";
homepage = "http://openresty.org"; homepage = "https://openresty.org";
license = lib.licenses.bsd2; license = lib.licenses.bsd2;
platforms = lib.platforms.all; platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ thoughtpolice lblasc emily ]; maintainers = with lib.maintainers; [ thoughtpolice lblasc emily ];

11
pkgs/servers/http/trafficserver/default.nix
View File

@ -49,11 +49,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "trafficserver"; pname = "trafficserver";
version = "9.0.1"; version = "9.0.2";
src = fetchurl { src = fetchurl {
url = "mirror://apache/trafficserver/trafficserver-${version}.tar.bz2"; url = "mirror://apache/trafficserver/trafficserver-${version}.tar.bz2";
sha256 = "1q164pvfmbqh3gzy3bqy96lwd0fdbhz78r06pd92p7rmkqwx005z"; sha256 = "0r05iqmnnjq259nsibncgfrfsr0l4h3hsafizvgfl9zgmrkm6izz";
}; };
patches = [ patches = [
@ -63,13 +63,6 @@ stdenv.mkDerivation rec {
url = "https://github.com/apache/trafficserver/commit/19d3af481cf74c91fbf713fc9d2f8b138ed5fbaf.diff"; url = "https://github.com/apache/trafficserver/commit/19d3af481cf74c91fbf713fc9d2f8b138ed5fbaf.diff";
sha256 = "0z1ikgpp00rzrrcqh97931586yn9wbksgai9xlkcjd5cg8gq0150"; sha256 = "0z1ikgpp00rzrrcqh97931586yn9wbksgai9xlkcjd5cg8gq0150";
}) })
# Fixes a bug in tspush which pushes incorrect contents to cache
# https://github.com/apache/trafficserver/pull/7696
(fetchpatch {
url = "https://github.com/apache/trafficserver/commit/b08215272872f452787915cd3a8e0b0ea0b88385.diff";
sha256 = "0axk8x1xvd8wvpgcxgyqqg7kgxyxwfgwmisq3xnk1da0cqv9cx9f";
})
]; ];
# NOTE: The upstream README indicates that flex is needed for some features, # NOTE: The upstream README indicates that flex is needed for some features,