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

Merge branch 'staging-next'

Browse Source 
Almost all *-linux binaries are ready
https://hydra.nixos.org/eval/1707992?filter=linux
so let's get better cpio and hopefully unblock nixos-unstable channel.
This commit is contained in:
Vladimír Čunát 2021-09-26 14:46:18 +02:00
commit 31ffc50c57
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
4 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/misc/texinfo/6.8.nix Normal file
View File

@ -0,0 +1,4 @@
import ./common.nix {
version = "6.8";
sha256 = "1i7yb7mrp3inz25zbzv2pllr4y7d58v818f1as7iz8mw53nm7dwf";
}

6
pkgs/development/tools/misc/texinfo/common.nix
View File

@ -54,6 +54,12 @@ stdenv.mkDerivation {
&& !stdenv.isDarwin
&& !stdenv.isSunOS; # flaky
checkFlagsArray = if version == "6.8" then [
# Test is known to fail on various locales on texinfo-6.8:
# https://lists.gnu.org/r/bug-texinfo/2021-07/msg00012.html
"XFAIL_TESTS=test_scripts/layout_formatting_fr_icons.sh"
] else null;
meta = {
homepage = "https://www.gnu.org/software/texinfo/";
description = "The GNU documentation system";

31
pkgs/tools/archivers/cpio/default.nix
View File

@ -1,27 +1,32 @@
{ lib, stdenv, fetchurl, fetchpatch }:
let
stdenv.mkDerivation rec {
pname = "cpio";
version = "2.13";
name = "cpio-${version}";
in stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "mirror://gnu/cpio/${name}.tar.bz2";
url = "mirror://gnu/cpio/cpio-${version}.tar.bz2";
sha256 = "0vbgnhkawdllgnkdn6zn1f56fczwk0518krakz2qbwhxmv2vvdga";
};
patches = [
(fetchpatch {
name = "CVE-2021-38185.patch";
url = "https://git.savannah.gnu.org/cgit/cpio.git/patch/?id=dd96882877721703e19272fe25034560b794061b";
sha256 = "0vmr0qjwj2ldnzsvccl105ckwgx3ssvn9mp3f27ss0kiyigrzz32";
})
patches = let
fp = suffix: rev: sha256: fetchpatch {
name = "CVE-2021-38185-${suffix}.patch";
url = "https://git.savannah.gnu.org/cgit/cpio.git/patch/?id=${rev}";
inherit sha256;
};
in [
(fp "1" "dd96882877721703e19272fe25034560b794061b"
"0vmr0qjwj2ldnzsvccl105ckwgx3ssvn9mp3f27ss0kiyigrzz32")
(fp "2" "dfc801c44a93bed7b3951905b188823d6a0432c8"
"1qkrhi3lbxk6hflp6w3h4sgssc0wblv8r0qgxqzbjrm36pqwxiwh")
(fp "3" "236684f6deb3178043fe72a8e2faca538fa2aae1"
"0pidkbxalpj5yz4fr95x8h0rizgjij0xgvjgirfkjk460giawwg6")
];
preConfigure = if stdenv.isCygwin then ''
preConfigure = lib.optionalString stdenv.isCygwin ''
sed -i gnu/fpending.h -e 's,include <stdio_ext.h>,,'
'' else null;
'';
enableParallelBuilding = true;

1
pkgs/top-level/all-packages.nix
View File

@ -14878,6 +14878,7 @@ with pkgs;
texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { };
texinfo6_5 = callPackage ../development/tools/misc/texinfo/6.5.nix { }; # needed for allegro
texinfo6 = callPackage ../development/tools/misc/texinfo/6.7.nix { };
texinfo6_8 = callPackage ../development/tools/misc/texinfo/6.8.nix { };
texinfo = texinfo6;
texinfoInteractive = appendToName "interactive" (
texinfo.override { interactive = true; }