diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-21 23:51:55 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-21 23:51:55 +0200 |
| commit | 74720a36c75ce74dbafb86a147aecbbdd0c1f6a7 (patch) | |
| tree | 19e0db68b876d7127d083c3733fe40c7016809ce /pkgs/tools/misc | |
| parent | c7b337385140762b16cb30c0442919a040182185 (diff) | |
| parent | 5d4d4df8c0899af2342bfbb4f5c898c2cd3241ce (diff) | |
| download | nixlib-74720a36c75ce74dbafb86a147aecbbdd0c1f6a7.tar nixlib-74720a36c75ce74dbafb86a147aecbbdd0c1f6a7.tar.gz nixlib-74720a36c75ce74dbafb86a147aecbbdd0c1f6a7.tar.bz2 nixlib-74720a36c75ce74dbafb86a147aecbbdd0c1f6a7.tar.lz nixlib-74720a36c75ce74dbafb86a147aecbbdd0c1f6a7.tar.xz nixlib-74720a36c75ce74dbafb86a147aecbbdd0c1f6a7.tar.zst nixlib-74720a36c75ce74dbafb86a147aecbbdd0c1f6a7.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/h5utils/default.nix | 38 | ||||
| -rw-r--r-- | pkgs/tools/misc/lf/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/misc/lf/deps.nix | 4 |
3 files changed, 43 insertions, 5 deletions
diff --git a/pkgs/tools/misc/h5utils/default.nix b/pkgs/tools/misc/h5utils/default.nix new file mode 100644 index 000000000000..db18cae77b1f --- /dev/null +++ b/pkgs/tools/misc/h5utils/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, lib +, hdf5, libpng, libjpeg +, hdf4 ? null +, libmatheval ? null +}: + +stdenv.mkDerivation rec { + version = "1.13.1"; + name = "h5utils-${version}"; + + # fetchurl is used instead of fetchFromGitHub because the git repo version requires + # additional tools to build compared to the tarball release; see the README for details. + src = fetchurl { + url = "https://github.com/stevengj/h5utils/releases/download/${version}/h5utils-${version}.tar.gz"; + sha256 = "0rbx3m8p5am8z5m0f3sryryfc41541hjpkixb1jkxakd9l36z9y5"; + }; + + # libdf is an alternative name for libhdf (hdf4) + preConfigure = lib.optionalString (hdf4 != null) + '' + substituteInPlace configure \ + --replace "-ldf" "-lhdf" \ + ''; + + preBuild = lib.optionalString hdf5.mpiSupport "export CC=${hdf5.mpi}/bin/mpicc"; + + buildInputs = with lib; [ hdf5 libjpeg libpng ] ++ optional hdf5.mpiSupport hdf5.mpi + ++ optional (hdf4 != null) hdf4 + ++ optional (libmatheval != null) libmatheval; + + meta = with lib; { + description = "A set of utilities for visualization and conversion of scientific data in the free, portable HDF5 format"; + homepage = https://github.com/stevengj/h5utils; + license = with licenses; [ mit gpl2 ]; + maintainers = with maintainers; [ sfrijters ]; + }; + +} diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 7e5a464764ab..bed07bc84481 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "lf-unstable-${version}"; - version = "2018-01-11"; + version = "2018-03-19"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; - rev = "58538c802044a3a2590ebe4979f3c85d807ea2d9"; # nightly - sha256 = "0xp5accliwz1d0nbsc6cnsv38czcfqn5nyxfndkpw8jkh8w2pm9p"; + rev = "c76ad181f5753984e39608628ac4def4183b53a4"; # nightly + sha256 = "1wsmljina9n2zij7gzh7b4zbzi7sdsa6hnyaj75nsmqn9lshngap"; }; goPackagePath = "github.com/gokcehan/lf"; diff --git a/pkgs/tools/misc/lf/deps.nix b/pkgs/tools/misc/lf/deps.nix index 6c1e07667b35..ec9dc30e0cd6 100644 --- a/pkgs/tools/misc/lf/deps.nix +++ b/pkgs/tools/misc/lf/deps.nix @@ -4,8 +4,8 @@ fetch = { type = "git"; url = "https://github.com/nsf/termbox-go"; - rev = "aa4a75b1c20a2b03751b1a9f7e41d58bd6f71c43"; # master - sha256 = "1xfd0mq6jkq55dx14nksyyfc66qla7cz0xxscpw07b25qmww9518"; + rev = "e2050e41c8847748ec5288741c0b19a8cb26d084"; # master + sha256 = "181b1df2b6fcn5wizq2qqxl1kwqbih5k15n08rx3bcz36q34n23s"; }; } { |