diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-28 12:20:59 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-28 12:20:59 +0100 |
| commit | 57ddc155fcdb5a419860dd4a6ed03deabcc162f2 (patch) | |
| tree | eb44f417d88b209821f8c8522eac90af195a8302 /pkgs/tools | |
| parent | ed01e0ca4f57d8abc8fbb16f7387a4f553d3fc8a (diff) | |
| parent | f0da094b2e2e885e4c2ea7930583c6fa302add0f (diff) | |
| download | nixlib-57ddc155fcdb5a419860dd4a6ed03deabcc162f2.tar nixlib-57ddc155fcdb5a419860dd4a6ed03deabcc162f2.tar.gz nixlib-57ddc155fcdb5a419860dd4a6ed03deabcc162f2.tar.bz2 nixlib-57ddc155fcdb5a419860dd4a6ed03deabcc162f2.tar.lz nixlib-57ddc155fcdb5a419860dd4a6ed03deabcc162f2.tar.xz nixlib-57ddc155fcdb5a419860dd4a6ed03deabcc162f2.tar.zst nixlib-57ddc155fcdb5a419860dd4a6ed03deabcc162f2.zip | |
Merge branch 'master' into staging
Conflicts: pkgs/games/scummvm/default.nix
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/backup/borg/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/misc/blink1-tool/default.nix | 29 | ||||
| -rw-r--r-- | pkgs/tools/misc/hdf5/default.nix | 8 |
3 files changed, 35 insertions, 6 deletions
diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 09683ce4b8ff..9649e35c074b 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "borgbackup-${version}"; - version = "1.0.6"; + version = "1.0.7"; namePrefix = ""; src = fetchurl { url = "https://github.com/borgbackup/borg/releases/download/" + "${version}/${name}.tar.gz"; - sha256 = "1dxn9p4xm0zd32xzzd9hs4a542db34clykrrnnv3hrdnc394895p"; + sha256 = "1l9iw55w5x51yxl3q89cf6avg80lajxvc8qz584hrsmnk6i56cr0"; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/misc/blink1-tool/default.nix b/pkgs/tools/misc/blink1-tool/default.nix new file mode 100644 index 000000000000..29b199e5866b --- /dev/null +++ b/pkgs/tools/misc/blink1-tool/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, libusb1, pkgconfig, ... }: + +stdenv.mkDerivation rec { + name = "blink1-${version}"; + version = "v1.98"; + + src = fetchurl { + url = "https://github.com/todbot/blink1/archive/${version}.tar.gz"; + sha256 = "05hbnp20cdvyyqf6jr01waz1ycis20qzsd8hn27snmn6qd48igrb"; + }; + + buildInputs = [ libusb1 pkgconfig ]; + + configurePhase = '' + cd commandline + ''; + + installPhase = '' + PREFIX=$out make install + ''; + + meta = { + description = "Command line client for the blink(1) notification light"; + homepage = https://blink1.thingm.com/; + license = stdenv.lib.licenses.cc-by-sa-30; + maintainers = [ stdenv.lib.maintainers.cransom ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 0fd33fc3e394..235242a558d4 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -15,12 +15,12 @@ assert !cpp || mpi == null; with { inherit (stdenv.lib) optional optionals; }; stdenv.mkDerivation rec { - version = "1.8.16"; + version = "1.10.0-patch1"; name = "hdf5-${version}"; src = fetchurl { - url = "http://www.hdfgroup.org/ftp/HDF5/releases/${name}/src/${name}.tar.bz2"; - sha256 = "1ilq8pn9lxbf2wj2rdzwqabxismznjj1d23iw6g78w0bl5dsxahk"; - }; + url = "http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/${name}/src/${name}.tar.bz2"; + sha256 = "1fnzdw0ay5mm9v2vjxfhpjkwrkf9ccfah62lhlcfpp2kv16jcwpp"; + }; passthru = { mpiSupport = (mpi != null); |