lol
fork

Configure Feed

Select the types of activity you want to include in your feed.

icu: make 58.2 coexists with 59.1

taku0 821e3c29 ddfcc15b

+27 -3
+14
pkgs/development/libraries/icu/58.nix
··· 1 + args @ { stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }: 2 + let 3 + keywordFix = fetchurl { 4 + url = "http://bugs.icu-project.org/trac/changeset/39484?format=diff"; 5 + name = "icu-changeset-39484.diff"; 6 + sha256 = "0hxhpgydalyxacaaxlmaddc1sjwh65rsnpmg0j414mnblq74vmm8"; 7 + }; 8 + in 9 + import ./base.nix { 10 + version = "58.2"; 11 + sha256 = "036shcb3f8bm1lynhlsb4kpjm9s9c2vdiir01vg216rs2l8482ib"; 12 + patches = [ keywordFix ]; 13 + patchFlags = "-p4"; 14 + } args
+4
pkgs/development/libraries/icu/59.nix
··· 1 + import ./base.nix { 2 + version = "59.1"; 3 + sha256 = "1zkmbg2932ggvpgjp8pys0cj6z8bw087y8858009shkrjfpzscki"; 4 + }
+4 -2
pkgs/development/libraries/icu/default.nix pkgs/development/libraries/icu/base.nix
··· 1 + { version, sha256, patches ? [], patchFlags ? "" }: 1 2 { stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }: 2 3 3 4 let 4 5 pname = "icu4c"; 5 - version = "59.1"; 6 6 in 7 7 stdenv.mkDerivation { 8 8 name = pname + "-" + version; ··· 10 10 src = fetchurl { 11 11 url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-" 12 12 + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz"; 13 - sha256 = "1zkmbg2932ggvpgjp8pys0cj6z8bw087y8858009shkrjfpzscki"; 13 + inherit sha256; 14 14 }; 15 15 16 16 outputs = [ "out" "dev" ]; ··· 24 24 sourceRoot=''${sourceRoot}/source 25 25 echo Source root reset to ''${sourceRoot} 26 26 ''; 27 + 28 + inherit patchFlags patches; 27 29 28 30 preConfigure = '' 29 31 sed -i -e "s|/bin/sh|${stdenv.shell}|" configure
+5 -1
pkgs/top-level/all-packages.nix
··· 8634 8634 8635 8635 hyena = callPackage ../development/libraries/hyena { }; 8636 8636 8637 - icu = callPackage ../development/libraries/icu { }; 8637 + icu58 = callPackage ../development/libraries/icu/58.nix { }; 8638 + icu59 = callPackage ../development/libraries/icu/59.nix { }; 8639 + 8640 + icu = icu59; 8638 8641 8639 8642 id3lib = callPackage ../development/libraries/id3lib { }; 8640 8643 ··· 14544 14547 libpng = libpng_apng; 14545 14548 python = python2; 14546 14549 gnused = gnused_422; 14550 + icu = icu59; 14547 14551 }; 14548 14552 }); 14549 14553