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-09-05 18:02:04 +00:00 committed by GitHub
commit 8a634100a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,6 @@
{ lib { lib
, stdenv , stdenv
, fetchurl , fetchurl
, fetchpatch
, ghostscript , ghostscript
, libpng , libpng
, makeWrapper , makeWrapper
@ -14,22 +13,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fig2dev"; pname = "fig2dev";
version = "3.2.8a"; version = "3.2.8b";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/mcj/fig2dev-${version}.tar.xz"; url = "mirror://sourceforge/mcj/fig2dev-${version}.tar.xz";
sha256 = "1bm75lf9j54qpbjx8hzp6ixaayp1x9w4v3yxl6vxyw8g5m4sqdk3"; sha256 = "1jv8rg71dsy00lpg434r5zqs5qrg8mxqvv2gpcjjvmzsm551d2j1";
}; };
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 ];

10
pkgs/applications/version-management/fossil/default.nix
View File

@ -15,15 +15,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fossil"; pname = "fossil";
version = "2.14"; version = "2.14.2";
src = fetchurl { src = fetchurl {
urls = url = "https://www.fossil-scm.org/home/tarball/version-${version}/fossil-${version}.tar.gz";
[ sha256 = "1611xyy70vwymj1wa8hpanyd903dv9gw07r74vrzi5myn0r8kr7z";
"https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz"
];
name = "${pname}-${version}.tar.gz";
sha256 = "sha256-uNDJIBlt2K4pFS+nRI5ROh+nxYiHG3heP7/Ae0KgX7k=";
}; };
nativeBuildInputs = [ installShellFiles tcl ]; nativeBuildInputs = [ installShellFiles tcl ];

6
pkgs/tools/filesystems/ntfs-3g/default.nix
View File

@ -5,7 +5,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ntfs3g"; pname = "ntfs3g";
version = "2017.3.23"; version = "2021.8.22";
outputs = [ "out" "dev" "man" "doc" ]; outputs = [ "out" "dev" "man" "doc" ];
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://tuxera.com/opensource/ntfs-3g_ntfsprogs-${version}.tgz"; url = "https://tuxera.com/opensource/ntfs-3g_ntfsprogs-${version}.tgz";
sha256 = "1mb228p80hv97pgk3myyvgp975r9mxq56c6bdn1n24kngcfh4niy"; sha256 = "55b883aa05d94b2ec746ef3966cb41e66bed6db99f22ddd41d1b8b94bb202efb";
}; };
patchPhase = '' patchPhase = ''
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
''; '';
meta = with lib; { meta = with lib; {
homepage = "https://www.tuxera.com/community/open-source-ntfs-3g/"; homepage = "https://github.com/tuxera/ntfs-3g";
description = "FUSE-based NTFS driver with full write support"; description = "FUSE-based NTFS driver with full write support";
maintainers = with maintainers; [ dezgeg ]; maintainers = with maintainers; [ dezgeg ];
platforms = with platforms; darwin ++ linux; platforms = with platforms; darwin ++ linux;

8
pkgs/tools/networking/inetutils/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, ncurses, perl, help2man { stdenv, lib, fetchurl, fetchpatch, ncurses, perl, help2man
, apparmorRulesFromClosure , apparmorRulesFromClosure
}: }:
@ -13,6 +13,12 @@ stdenv.mkDerivation rec {
outputs = ["out" "apparmor"]; outputs = ["out" "apparmor"];
patches = [ patches = [
(fetchpatch {
name = "CVE-2021-40491.patch";
url = "https://git.savannah.gnu.org/cgit/inetutils.git/patch/?id=58cb043b190fd04effdaea7c9403416b436e50dd";
excludes = [ "NEWS" ];
sha256 = "0001ij7493x14f05zfjk11x1x0363sbbxh08nnfv226pmbaxzbkn";
})
./whois-Update-Canadian-TLD-server.patch ./whois-Update-Canadian-TLD-server.patch
./service-name.patch ./service-name.patch
# https://git.congatec.com/yocto/meta-openembedded/commit/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3 # https://git.congatec.com/yocto/meta-openembedded/commit/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3