diff options
author | William A. Kennington III <william@wkennington.com> | 2015-11-07 15:51:51 -0800 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-11-07 15:51:51 -0800 |
commit | a26c8e9b835647ae39d4259cfd55e8001ee57b93 (patch) | |
tree | 55fe17fed5fc7625146a47e7f0e14b6581c18473 /pkgs/applications/misc | |
parent | fa5ad20922cbc2b4ffbbb74edbc22d650d80441d (diff) | |
parent | 9fd510e95ad8dd2d0e4c92f12fd9249594c30f23 (diff) | |
download | nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.tar nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.tar.gz nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.tar.bz2 nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.tar.lz nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.tar.xz nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.tar.zst nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.zip |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/calibre/default.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/misc/gnuradio/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/gpsbabel/default.nix | 29 |
3 files changed, 21 insertions, 22 deletions
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 9ebcf170e1b4..6bff13665188 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,11 @@ }: stdenv.mkDerivation rec { - name = "calibre-${version}"; - version = "2.42.0"; + name = "calibre-${meta.version}"; src = fetchurl { - url = "https://github.com/kovidgoyal/calibre/releases/download/v${version}/${name}.tar.xz"; - sha256 = "0inmhkrc6jmpa97wjwai9ny8vmwy9z0fbiw8w43s37ad1w9x5sn1"; + url = "https://github.com/kovidgoyal/calibre/releases/download/v${meta.version}/${name}.tar.xz"; + sha256 = "0h8c8w7f63pl1rarr3v6gi82dcsabb3216g7scmjfj50na5cfmhi"; }; inherit python; @@ -59,10 +58,11 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { + version = "2.43.0"; description = "Comprehensive e-book software"; homepage = http://calibre-ebook.com; license = licenses.gpl3; - maintainers = with maintainers; [ viric iElectric pSub ]; + maintainers = with maintainers; [ viric iElectric pSub AndersonTorres ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix index e7817dc5b524..ab02238606ab 100644 --- a/pkgs/applications/misc/gnuradio/default.nix +++ b/pkgs/applications/misc/gnuradio/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { name = "gnuradio-${version}"; - version = "3.7.8"; + version = "3.7.8.1"; src = fetchurl { url = "http://gnuradio.org/releases/gnuradio/${name}.tar.gz"; - sha256 = "0wj1rp8fdrmsfqbcaicvfxk71vkd9hcczmb1vrnvfzypnmacn6gy"; + sha256 = "1ap5gbgisnbny3jbnm2i5wm2sy6qkbhz747av3sjxp2z12fz81l4"; }; buildInputs = [ diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index 6cd50406ed74..0625219c2762 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -1,19 +1,17 @@ -{ fetchurl, stdenv, zlib, expat, which }: +{ stdenv, fetchurl, zlib, qt5, which }: -let version = "1.4.3"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "gpsbabel-${version}"; + version = "1.5.2"; src = fetchurl { # gpgbabel.org makes it hard to get the source tarball automatically, so # get it from elsewhere. url = "mirror://debian/pool/main/g/gpsbabel/gpsbabel_${version}.orig.tar.gz"; - sha256 = "1s31xa36ivf836h89m1f3qiaz3c3znvqjdm0bnh8vr2jjlrz9jdi"; + sha256 = "0xf7wmy2m29g2lm8lqc74yf8rf7sxfl3cfwbk7dpf0yf42pb0b6w"; }; - # FIXME: Would need libxml2 for one of the tests, but that in turns require - # network access for the XML schemas. - buildInputs = [ zlib expat which ]; + buildInputs = [ zlib qt5.base which ]; /* FIXME: Building the documentation, with "make doc", requires this: @@ -25,10 +23,14 @@ stdenv.mkDerivation { configureFlags = [ "--with-zlib=system" ]; doCheck = true; + preCheck = '' + patchShebangs testo + substituteInPlace testo \ + --replace "-x /usr/bin/hexdump" "" + ''; - meta = { + meta = with stdenv.lib; { description = "Convert, upload and download data from GPS and Map programs"; - longDescription = '' GPSBabel converts waypoints, tracks, and routes between popular GPS receivers and mapping programs. It also has powerful @@ -47,12 +49,9 @@ stdenv.mkDerivation { process data that may (or may not be) placed on a map, such as waypoints, tracks, and routes. ''; - homepage = http://www.gpsbabel.org/; - - license = stdenv.lib.licenses.gpl2Plus; - - maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + license = licenses.gpl2Plus; + maintainers = [ maintainers.rycee ]; + platforms = platforms.all; }; } |