From bc77c644ea07da80100a149b392b17abb31d1853 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 7 Jan 2019 16:26:53 -0600
Subject: [PATCH 1/2] libunwind: 1.2.1 -> 1.3.0

https://github.com/libunwind/libunwind/blob/v1.3.0/NEWS

Keep backtrace patch (still needed), but drop the other.
---
 pkgs/development/libraries/libunwind/default.nix    |  9 +++------
 .../libraries/libunwind/version-1.2.1.patch         | 13 -------------
 2 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 100644 pkgs/development/libraries/libunwind/version-1.2.1.patch

diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix
index 2453484cb9c4..ed23aff3c27a 100644
--- a/pkgs/development/libraries/libunwind/default.nix
+++ b/pkgs/development/libraries/libunwind/default.nix
@@ -2,17 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "libunwind-${version}";
-  version = "1.2.1";
+  version = "1.3.0";
 
   src = fetchurl {
     url = "mirror://savannah/libunwind/${name}.tar.gz";
-    sha256 = "1jsslwkilwrsj959dc8b479qildawz67r8m4lzxm7glcwa8cngiz";
+    sha256 = "06jn720nk4qg1nyswlxdq1swn6kbx5a85kc8jw9dw84aqqvxa1zc";
   };
 
-  patches = [
-    ./version-1.2.1.patch
-    ./backtrace-only-with-glibc.patch
-  ];
+  patches = [ ./backtrace-only-with-glibc.patch ];
 
   nativeBuildInputs = [ autoreconfHook ];
 
diff --git a/pkgs/development/libraries/libunwind/version-1.2.1.patch b/pkgs/development/libraries/libunwind/version-1.2.1.patch
deleted file mode 100644
index 63202937084c..000000000000
--- a/pkgs/development/libraries/libunwind/version-1.2.1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index a254bbe..fe0247b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,6 +1,6 @@
- define(pkg_major, 1)
--define(pkg_minor, 2.1)
--define(pkg_extra, )
-+define(pkg_minor, 2)
-+define(pkg_extra, 1)
- define(pkg_maintainer, libunwind-devel@nongnu.org)
- define(mkvers, $1.$2$3)
- dnl Process this file with autoconf to produce a configure script.

From 8ec4bcf1f0bab4277959768f99b206ab875caf8a Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 9 Jan 2019 12:37:56 -0600
Subject: [PATCH 2/2] libunwind: 1.3.0 -> 1.3.1

single-commit release:

workaround issue with clang + static alias

https://github.com/libunwind/libunwind/commits/v1.3.1
---
 pkgs/development/libraries/libunwind/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix
index ed23aff3c27a..9bea14bd8e85 100644
--- a/pkgs/development/libraries/libunwind/default.nix
+++ b/pkgs/development/libraries/libunwind/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libunwind-${version}";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchurl {
     url = "mirror://savannah/libunwind/${name}.tar.gz";
-    sha256 = "06jn720nk4qg1nyswlxdq1swn6kbx5a85kc8jw9dw84aqqvxa1zc";
+    sha256 = "1y0l08k6ak1mqbfj6accf9s5686kljwgsl4vcqpxzk5n74wpm6a3";
   };
 
   patches = [ ./backtrace-only-with-glibc.patch ];