diff options
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/cdo/default.nix | 16 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/ktexteditor.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/lmdb/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/symengine/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/unicap/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/xapian/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/zimg/default.nix | 4 |
7 files changed, 20 insertions, 18 deletions
diff --git a/pkgs/development/libraries/cdo/default.nix b/pkgs/development/libraries/cdo/default.nix index af69e23ca1f4..2a3dbc7a2d13 100644 --- a/pkgs/development/libraries/cdo/default.nix +++ b/pkgs/development/libraries/cdo/default.nix @@ -5,15 +5,15 @@ }: stdenv.mkDerivation rec { - version = "1.9.0"; - name = "cdo-${version}"; + pname = "cdo"; + version = "1.9.7.1"; # Dependencies buildInputs = [ curl netcdf hdf5 ]; src = fetchurl { - url = "https://code.mpimet.mpg.de/attachments/download/15187/${name}.tar.gz"; - sha256 = "024hsr6qfg2dicwvm0vvkg3fr998bchf0qgwpj2v0jmz7a67ydnz"; + url = "https://code.mpimet.mpg.de/attachments/download/20124/${pname}-${version}.tar.gz"; + sha256 = "0b4n8dwxfsdbz4jflsx0b75hwapdf1rp14p48dfr7ksv0qp9aw9p"; }; # Configure phase @@ -23,15 +23,15 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (enable_all_static) "--enable-all-static" ++ stdenv.lib.optional (enable_cxx) "--enable-cxx"; - meta = { + meta = with stdenv.lib; { description = "Collection of command line Operators to manipulate and analyse Climate and NWP model Data"; longDescription = '' Supported data formats are GRIB 1/2, netCDF 3/4, SERVICE, EXTRA and IEG. There are more than 600 operators available. ''; homepage = https://code.mpimet.mpg.de/projects/cdo/; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.ltavard ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = licenses.gpl2; + maintainers = [ maintainers.ltavard ]; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix index c633aee30a1b..98f9b3f82ca2 100644 --- a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix +++ b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix @@ -2,7 +2,8 @@ mkDerivation, lib, extra-cmake-modules, perl, karchive, kconfig, kguiaddons, ki18n, kiconthemes, kio, kparts, libgit2, - qtscript, qtxmlpatterns, sonnet, syntax-highlighting, qtquickcontrols + qtscript, qtxmlpatterns, sonnet, syntax-highlighting, qtquickcontrols, + editorconfig-core-c }: mkDerivation { @@ -12,6 +13,7 @@ mkDerivation { buildInputs = [ karchive kconfig kguiaddons ki18n kiconthemes kio libgit2 qtscript qtxmlpatterns sonnet syntax-highlighting qtquickcontrols + editorconfig-core-c ]; propagatedBuildInputs = [ kparts ]; } diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index 9d57d4721820..690a42cfb306 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "lmdb-${version}"; - version = "0.9.23"; + version = "0.9.24"; src = fetchFromGitHub { owner = "LMDB"; repo = "lmdb"; rev = "LMDB_${version}"; - sha256 = "0ag7l5180ajvm73y59m7sn3p52xm8m972d08cshxhpwgwa4v35k6"; + sha256 = "088q6m8fvr12w43s461h7cvpg5hj8csaqj6n9pci150dz7bk5lxm"; }; postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb"; diff --git a/pkgs/development/libraries/symengine/default.nix b/pkgs/development/libraries/symengine/default.nix index 40e1a280aa24..424dc116c7e9 100644 --- a/pkgs/development/libraries/symengine/default.nix +++ b/pkgs/development/libraries/symengine/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { name = "symengine-${version}"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "symengine"; repo = "symengine"; rev = "v${version}"; - sha256 = "1kz893p3pmsw3gfwickk2nliw8p63yp89xriad7kpw4kmhvgr8gb"; + sha256 = "0qqxr7l5lr81k6fs2h5isr43x0dw07rwg3ivl6vd8zmmcgsp9ygd"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/unicap/default.nix b/pkgs/development/libraries/unicap/default.nix index 1aa5e6717021..a902b6f84514 100644 --- a/pkgs/development/libraries/unicap/default.nix +++ b/pkgs/development/libraries/unicap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libusb, libraw1394, dcraw, intltool, perl, v4l_utils }: +{ stdenv, fetchurl, libusb, libraw1394, dcraw, intltool, perl, v4l-utils }: stdenv.mkDerivation rec { name = "libunicap-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "05zcnnm4dfc6idihfi0fq5xka6x86zi89wip2ca19yz768sd33s9"; }; - buildInputs = [ libusb libraw1394 dcraw intltool perl v4l_utils ]; + buildInputs = [ libusb libraw1394 dcraw intltool perl v4l-utils ]; patches = [ # Debian has a patch that fixes the build. diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index c10dfdaa961c..271c7adf3d98 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -38,5 +38,5 @@ let in { # xapian-ruby needs 1.2.22 as of 2017-05-06 xapian_1_2_22 = generic "1.2.22" "0zsji22n0s7cdnbgj0kpil05a6bgm5cfv0mvx12d8ydg7z58g6r6"; - xapian_1_4 = generic "1.4.11" "01xwqljnp5afjf9097lyfbqc6x5bcqszfdkn9l1j86imwbrv45lz"; + xapian_1_4 = generic "1.4.12" "0z5c1y9vp519h2x2igjq39v6j615nppry0wasd0xn4hphgd3d2jg"; } diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix index d22292669fae..75f10f94fb38 100644 --- a/pkgs/development/libraries/zimg/default.nix +++ b/pkgs/development/libraries/zimg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zimg"; - version = "2.9.1"; + version = "2.9.2"; src = fetchFromGitHub { owner = "sekrit-twc"; repo = "zimg"; rev = "release-${version}"; - sha256 = "0q9migrxyp5wc6lcl6gnfs1zwn1ncqna6cm7vz3c993vvmgdf1p9"; + sha256 = "0jlgrlfs9maixd8mx7gk2kfawz8ixnihkxi7vhyzfy1gq49vmxm2"; }; nativeBuildInputs = [ autoreconfHook ]; |