Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d2c500f05c7b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c30cf6f0f134
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Jun 27, 2017

  1. libunwind: 1.1 -> 1.2.1

    @orivej
    orivej committed Jun 27, 2017
    Copy the full SHA
    8422500 View commit details

  2. Merge pull request #26891 from orivej/libunwind 

    libunwind: 1.1 -> 1.2.1
    @Mic92
    Mic92 authored Jun 27, 2017
    Copy the full SHA
    c30cf6f View commit details
15 changes: 0 additions & 15 deletions pkgs/development/libraries/libunwind/cve-2015-3239.patch
View file

This file was deleted.

30 changes: 6 additions & 24 deletions pkgs/development/libraries/libunwind/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,39 +1,20 @@
{ stdenv, fetchurl, fetchpatch, autoreconfHook, xz }:

stdenv.mkDerivation rec {
name = "libunwind-1.1";
name = "libunwind-${version}";
version = "1.2.1";

src = fetchurl {
url = "mirror://savannah/libunwind/${name}.tar.gz";
sha256 = "16nhx2pahh9d62mvszc88q226q5lwjankij276fxwrm8wb50zzlx";
sha256 = "1jsslwkilwrsj959dc8b479qildawz67r8m4lzxm7glcwa8cngiz";
};

buildInputs = stdenv.lib.optional stdenv.isAarch64 autoreconfHook;

patches = [ ./libunwind-1.1-lzma.patch ./cve-2015-3239.patch
# https://lists.nongnu.org/archive/html/libunwind-devel/2014-04/msg00000.html
(fetchpatch {
url = "https://raw.githubusercontent.com/dropbox/pyston/1b2e676417b0f5f17526ece0ed840aa88c744145/libunwind_patches/0001-Change-the-RBP-validation-heuristic-to-allow-size-0-.patch";
sha256 = "1a0fsgfxmgd218nscswx7pgyb7rcn2gh6566252xhfvzhgn5i4ha";
})
] ++ stdenv.lib.optional stdenv.isAarch64 (fetchpatch {
url = "https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/77709d1c6d5c39e23c1535b1bd584be1455f2551/extra/libunwind/libunwind-aarch64.patch";
sha256 = "1mpjs8izq9wxiaf5rl4gzaxrkz0s51f9qz5qc5dj72pr84mw50w8";
});

postPatch = ''
sed -i -e '/LIBLZMA/s:-lzma:-llzma:' configure
'';
nativeBuildInputs = [ autoreconfHook ];

outputs = [ "out" "dev" ];

propagatedBuildInputs = [ xz ];

preInstall = ''
mkdir -p "$out/lib"
touch "$out/lib/libunwind-generic.so"
'';

postInstall = ''
find $out -name \*.la | while read file; do
sed -i 's,-llzma,${xz.out}/lib/liblzma.la,' $file
@@ -43,7 +24,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = http://www.nongnu.org/libunwind;
description = "A portable and efficient API to determine the call-chain of a program";
maintainers = with maintainers; [ orivej ];
platforms = platforms.linux;
license = licenses.gpl2;
license = licenses.mit;
};
}
63 changes: 0 additions & 63 deletions pkgs/development/libraries/libunwind/libunwind-1.1-lzma.patch
View file

This file was deleted.