From 705e29046de5eb5ec21894743835676343ef78cb Mon Sep 17 00:00:00 2001 From: Savanni D'Gerinel Date: Tue, 6 Dec 2016 15:39:34 -0600 Subject: [PATCH] icu: remove icu4c-54.1 Only zoom-us depends on icu4c-54.1. Since we know that version has some vulnerabilities, and zoom-us appears to work with icu4c-57.1, I remove the icu/54.1.nix file, remove icu_54_1 from all-packages.nix, and have zoom-us depend on icu (i.e., icu4c-57.1) --- .../networking/instant-messengers/zoom-us/default.nix | 4 ++-- pkgs/development/libraries/icu/54.1.nix | 11 ----------- pkgs/top-level/all-packages.nix | 1 - 3 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 pkgs/development/libraries/icu/54.1.nix diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index f0243f45b8f..5f4e0ca1ee0 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -4,7 +4,7 @@ , glib , gst_plugins_base , gstreamer -, icu_54_1 +, icu , libpulseaudio , libuuid , libxml2 @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { glib gst_plugins_base gstreamer - icu_54_1 + icu libpulseaudio libuuid libxml2 diff --git a/pkgs/development/libraries/icu/54.1.nix b/pkgs/development/libraries/icu/54.1.nix deleted file mode 100644 index a2465ce930f..00000000000 --- a/pkgs/development/libraries/icu/54.1.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }: - -let - icu = import ./default.nix { inherit stdenv fetchurl fetchpatch fixDarwinDylibNames; }; -in - stdenv.lib.overrideDerivation icu (attrs: { - src = fetchurl { - url = "http://download.icu-project.org/files/icu4c/54.1/icu4c-54_1-src.tgz"; - sha256 = "1cwapgjmvrcv1n2wjspj3vahidg596gjfp4jn1gcb4baralcjayl"; - }; - }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93a04552224..f685175ec41 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7473,7 +7473,6 @@ in hyena = callPackage ../development/libraries/hyena { }; icu = callPackage ../development/libraries/icu { }; - icu_54_1 = callPackage ../development/libraries/icu/54.1.nix { }; id3lib = callPackage ../development/libraries/id3lib { };