diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2019-02-09 10:15:17 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2019-02-09 10:15:17 +0100 |
commit | 7f9e3b8206b8761d98972d08cb7f3bd6d3183337 (patch) | |
tree | 4e592516f6e1f4e8a9b162c696574214cc18ce6d /pkgs/development/libraries | |
parent | 6ae1cc2e624ed7dcc7026b7c134f0e32eca3e1c6 (diff) | |
parent | baf6ba553f729f063359a59ceb54de11328e0aba (diff) | |
download | nixpkgs-7f9e3b8206b8761d98972d08cb7f3bd6d3183337.tar nixpkgs-7f9e3b8206b8761d98972d08cb7f3bd6d3183337.tar.gz nixpkgs-7f9e3b8206b8761d98972d08cb7f3bd6d3183337.tar.bz2 nixpkgs-7f9e3b8206b8761d98972d08cb7f3bd6d3183337.tar.lz nixpkgs-7f9e3b8206b8761d98972d08cb7f3bd6d3183337.tar.xz nixpkgs-7f9e3b8206b8761d98972d08cb7f3bd6d3183337.tar.zst nixpkgs-7f9e3b8206b8761d98972d08cb7f3bd6d3183337.zip |
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1504357
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/appstream/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/hunspell/dictionaries.nix | 38 | ||||
-rw-r--r-- | pkgs/development/libraries/libgnurl/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/libiio/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/libtoxcore/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/libvirt/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/mlt/qt-5.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/openvdb/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/physics/hepmc3/default.nix | 28 | ||||
-rw-r--r-- | pkgs/development/libraries/qpdf/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/vte/ng.nix | 4 |
11 files changed, 87 insertions, 16 deletions
diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index aded6945cb1..5b9b4beed7a 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "appstream-${version}"; - version = "0.12.4"; + version = "0.12.5"; src = fetchFromGitHub { owner = "ximion"; repo = "appstream"; rev = "APPSTREAM_${stdenv.lib.replaceStrings ["."] ["_"] version}"; - sha256 = "1ag00w13fqvv584svcml7cykvgy0mi709qsm5mgy2ygy9d8r2vfw"; + sha256 = "1h68raflp04r79c58vyy3mmcixs5bqffm2d1js7mxfypmi4mvv6r"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index 836d0128a8c..aeb4253826b 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -250,6 +250,35 @@ let }; }; + mkDictFromLibreOffice = + { shortName + , shortDescription + , dictFileName + , license + , readmeFile ? "README_${dictFileName}.txt" + , sourceRoot ? dictFileName }: + mkDict rec { + name = "hunspell-dict-${shortName}-libreoffice-${version}"; + version = "6.2.0.3"; + inherit dictFileName readmeFile; + src = fetchFromGitHub { + owner = "LibreOffice"; + repo = "dictionaries"; + rev = "libreoffice-${version}"; + sha256 = "0rw9ahhynia5wsgyd67lrhinqqn1s1rizgiykb3palbyk0lv72xj"; + }; + buildPhase = '' + cp -a ${sourceRoot}/* . + ''; + meta = with stdenv.lib; { + homepage = https://wiki.documentfoundation.org/Development/Dictionaries; + description = "Hunspell dictionary for ${shortDescription} from LibreOffice"; + license = license; + maintainers = with maintainers; [ vlaci ]; + platforms = platforms.all; + }; + }; + in { /* ENGLISH */ @@ -510,6 +539,15 @@ in { ]; }; + /* HUNGARIAN */ + + hu-hu = mkDictFromLibreOffice { + shortName = "hu-hu"; + dictFileName = "hu_HU"; + shortDescription = "Hungarian (Hungary)"; + license = with stdenv.lib.licenses; [ mpl20 lgpl3 ]; + }; + /* SWEDISH */ sv-se = mkDictFromDSSO rec { diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix index c7cf4a37b98..1a00822f66d 100644 --- a/pkgs/development/libraries/libgnurl/default.nix +++ b/pkgs/development/libraries/libgnurl/default.nix @@ -2,13 +2,13 @@ libidn2, libunistring, nghttp2 }: stdenv.mkDerivation rec { - version = "7.62.0"; + version = "7.63.0"; name = "libgnurl-${version}"; src = fetchurl { url = "mirror://gnu/gnunet/gnurl-${version}.tar.gz"; - sha256 = "15b5fn4na9vzmzp4i0jf7al9v3q0abx51g1sgkrdsvdxhypwji1v"; + sha256 = "15y4yjy67n3c57kp0yszklcrz2nickrvjvd6laizs6kdbpixjdfl"; }; nativeBuildInputs = [ libtool groff perl pkgconfig python2 ]; diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix index 31225730442..ec025d31ce3 100644 --- a/pkgs/development/libraries/libiio/default.nix +++ b/pkgs/development/libraries/libiio/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "libiio-${version}"; - version = "0.16"; + version = "0.17"; src = fetchFromGitHub { owner = "analogdevicesinc"; repo = "libiio"; rev = "refs/tags/v${version}"; - sha256 = "1j27kyizdwawskwg1va894qaw3z5dx5s6cla1rd0ngr9kls88q2h"; + sha256 = "15lghy0zlq667abs1ggbvmb1qiw7vzhhzkw8dm9vzix4ffma2igg"; }; outputs = [ "out" "lib" "dev" "python" ]; diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 026674e44fc..1605abf6efa 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -48,7 +48,7 @@ in rec { }; libtoxcore_0_2 = generic { - version = "0.2.8"; - sha256 = "0xgnraysz25fbws5zwjk92mwnl8k1yih701qam8kgm3rxh50kyhm"; + version = "0.2.9"; + sha256 = "0aljr9hqybla6p61af6fdkv0x8gph7c2wacqqa9hq2z9w0p4fs5j"; }; } diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 9f183365aae..85b8b128d20 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -7,6 +7,7 @@ , curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode , enableXen ? false, xen ? null , enableIscsi ? false, openiscsi +, enableCeph ? false, ceph }: with stdenv.lib; @@ -45,6 +46,8 @@ in stdenv.mkDerivation rec { xen ] ++ optionals enableIscsi [ openiscsi + ] ++ optionals enableCeph [ + ceph ] ++ optionals stdenv.isDarwin [ libiconv gmp ]; @@ -85,6 +88,8 @@ in stdenv.mkDerivation rec { "--with-storage-zfs" ] ++ optionals enableIscsi [ "--with-storage-iscsi" + ] ++ optionals enableCeph [ + "--with-storage-rbd" ] ++ optionals stdenv.isDarwin [ "--with-init-script=none" ]; diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index 804c3f8ed22..1f41696a4e3 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -7,13 +7,13 @@ let inherit (stdenv.lib) getDev; in stdenv.mkDerivation rec { name = "mlt-${version}"; - version = "6.10.0"; + version = "6.12.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "0ki86yslr5ywa6sz8pjrgd9a4rn2rr4mss2zkmqi7pq8prgsm1fr"; + sha256 = "0pzm3mjbbdl2rkbswgyfkx552xlxh2qrwzsi2a4dicfr92rfgq6w"; }; buildInputs = [ diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix index c11a93373dd..8058891615f 100644 --- a/pkgs/development/libraries/openvdb/default.nix +++ b/pkgs/development/libraries/openvdb/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "openvdb-${version}"; - version = "5.2.0"; + version = "6.0.0"; src = fetchFromGitHub { owner = "dreamworksanimation"; repo = "openvdb"; rev = "v${version}"; - sha256 = "1yykrbc3nnnmpmmk0dz4b4y5xl4hl3ayjpqw0baq8yx2614r46b5"; + sha256 = "07m012a966l821f09jmrrhs25cs2rcmhlxcicywibllaac10wk5k"; }; outputs = [ "out" ]; diff --git a/pkgs/development/libraries/physics/hepmc3/default.nix b/pkgs/development/libraries/physics/hepmc3/default.nix new file mode 100644 index 00000000000..972dfdd7ad1 --- /dev/null +++ b/pkgs/development/libraries/physics/hepmc3/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, cmake, coreutils, root }: + +stdenv.mkDerivation rec { + name = "hepmc3-${version}"; + version = "3.1.0"; + + src = fetchurl { + url = "http://hepmc.web.cern.ch/hepmc/releases/HepMC3-${version}.tar.gz"; + sha256 = "12kzdqdbq7md0nn58jvilhh00yddfir65f0q2026k0ym37bfwdyd"; + }; + + buildInputs = [ cmake root ]; + + postInstall = '' + substituteInPlace "$out"/bin/HepMC3-config \ + --replace 'greadlink' '${coreutils}/bin/readlink' + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "The HepMC package is an object oriented, C++ event record for High Energy Physics Monte Carlo generators and simulation"; + license = licenses.gpl3; + homepage = http://hepmc.web.cern.ch/hepmc/; + platforms = platforms.unix; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index 4053afe4bec..30383dda50c 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, fetchpatch, libjpeg, zlib, perl }: -let version = "8.3.0"; +let version = "8.4.0"; in stdenv.mkDerivation rec { name = "qpdf-${version}"; src = fetchurl { url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz"; - sha256 = "1xwiqf6xkl9glpardak97ycy5f2bwjf8x0hwvf0acsxqj03a3hj6"; + sha256 = "1864p952m8vzxk6v500a42psbqj2g2gyli3d3zj6h33hzwxqy09r"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/libraries/vte/ng.nix b/pkgs/development/libraries/vte/ng.nix index 3aee9e9dcdf..6231b8315cd 100644 --- a/pkgs/development/libraries/vte/ng.nix +++ b/pkgs/development/libraries/vte/ng.nix @@ -2,13 +2,13 @@ vte.overrideAttrs (oldAttrs: rec { name = "vte-ng-${version}"; - version = "0.50.2.a"; + version = "0.54.2.a"; src = fetchFromGitHub { owner = "thestinger"; repo = "vte-ng"; rev = version; - sha256 = "0i6hfzw9sq8521kz0l7lld2km56r0bfp1hw6kxq3j1msb8z8svcf"; + sha256 = "1r7d9m07cpdr4f7rw3yx33hmp4jmsk0dn5byq5wgksb2qjbc4ags"; }; preConfigure = oldAttrs.preConfigure + "; NOCONFIGURE=1 ./autogen.sh"; |