alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #120020 from marsam/update-icu

Browse source 
icu: 68.2 -> 69.1
This commit is contained in:
Mario Rodas 2021-04-25 20:59:20 -05:00 committed by GitHub
parent 8634c6f7d1 c634d107d0
commit b8b1081666
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/icu/69.nix Normal file
View file

@ -0,0 +1,4 @@
import ./base.nix {
version = "69.1";
sha256 = "0icps0avkwy5df3wwc5kybxcg63hcgk4phdh9g244g0xrmx7pfjc";
}

7
pkgs/top-level/all-packages.nix
View file

@ -15037,8 +15037,13 @@ in
} // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) {
stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
})); }));
icu69 = callPackage ../development/libraries/icu/69.nix ({
nativeBuildRoot = buildPackages.icu69.override { buildRootOnly = true; };
} // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) {
stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
}));
icu = icu68; icu = icu69;
id3lib = callPackage ../development/libraries/id3lib { }; id3lib = callPackage ../development/libraries/id3lib { };