about summary refs log tree commit diff
path: root/pkgs/development/libraries/oniguruma
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2017-09-28 13:53:18 +0200
committerFranz Pletz <fpletz@fnordicwalking.de>2017-09-28 14:52:36 +0200
commit41b43b201e23f5f1f2ac943d04b896de7ab860a9 (patch)
treefe34b3ccddef006b2d748feced846c7bf91a90aa /pkgs/development/libraries/oniguruma
parentc02c47d1ebb772e31528bab14fb034c866b71001 (diff)
downloadnixlib-41b43b201e23f5f1f2ac943d04b896de7ab860a9.tar
nixlib-41b43b201e23f5f1f2ac943d04b896de7ab860a9.tar.gz
nixlib-41b43b201e23f5f1f2ac943d04b896de7ab860a9.tar.bz2
nixlib-41b43b201e23f5f1f2ac943d04b896de7ab860a9.tar.lz
nixlib-41b43b201e23f5f1f2ac943d04b896de7ab860a9.tar.xz
nixlib-41b43b201e23f5f1f2ac943d04b896de7ab860a9.tar.zst
nixlib-41b43b201e23f5f1f2ac943d04b896de7ab860a9.zip
oniguruma: 5.9.5 -> 6.6.1 for multiple CVEs
Fixes CVE-2017-9224, CVE-2017-9225, CVE-2017-9226, CVE-2017-9227,
 CVE-2017-9228, CVE-2017-9229.
Diffstat (limited to 'pkgs/development/libraries/oniguruma')
-rw-r--r--pkgs/development/libraries/oniguruma/default.nix17
1 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix
index 62b0080fce0c..eccfccbaf042 100644
--- a/pkgs/development/libraries/oniguruma/default.nix
+++ b/pkgs/development/libraries/oniguruma/default.nix
@@ -1,15 +1,20 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "onig-5.9.5";
+  name = "onig-${version}";
+  version = "6.6.1";
 
-  src = fetchurl {
-    url = http://www.geocities.jp/kosako3/oniguruma/archive/onig-5.9.5.tar.gz;
-    sha256 = "12j3fsdb8hbhnj29hysal9l7i7s71l0ln3lx8hjpxx5535wawjcz";
+  src = fetchFromGitHub {
+    owner = "kkos";
+    repo = "oniguruma";
+    rev = "v${version}";
+    sha256 = "062g5443dyxsraq346panfqvbd6wal6nmb336n4dw1rszx576sxz";
   };
 
+  nativeBuildInputs = [ cmake ];
+
   meta = {
-    homepage = http://www.geocities.jp/kosako3/oniguruma/;
+    homepage = https://github.com/kkos/oniguruma;
     description = "Regular expressions library";
     license = stdenv.lib.licenses.bsd2;
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];