diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-05-13 12:13:25 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-05-13 12:13:25 +0200 |
| commit | 658b7c3f2ebb7d04d950b95ce81cd5fea2a03141 (patch) | |
| tree | fdcfa83f21b9c98315a3a751ef4d27772976589a /pkgs/applications | |
| parent | f14841f3ce734b27988a605fc9775a035d313d23 (diff) | |
| parent | a2981671523416ad5c9a49de8c16ac8fccb2306b (diff) | |
| download | nixlib-658b7c3f2ebb7d04d950b95ce81cd5fea2a03141.tar nixlib-658b7c3f2ebb7d04d950b95ce81cd5fea2a03141.tar.gz nixlib-658b7c3f2ebb7d04d950b95ce81cd5fea2a03141.tar.bz2 nixlib-658b7c3f2ebb7d04d950b95ce81cd5fea2a03141.tar.lz nixlib-658b7c3f2ebb7d04d950b95ce81cd5fea2a03141.tar.xz nixlib-658b7c3f2ebb7d04d950b95ce81cd5fea2a03141.tar.zst nixlib-658b7c3f2ebb7d04d950b95ce81cd5fea2a03141.zip | |
Merge master into staging
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/editors/neovim/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/applications/misc/plover/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/misc/rtl-sdr/default.nix | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 149f7804a799..480b749d201c 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -75,6 +75,7 @@ let cmakeFlags = [ "-DLUA_PRG=${luaPackages.lua}/bin/lua" + "-DGPERF_PRG=${gperf}/bin/gperf" ]; # triggers on buffer overflow bug while running tests diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index 09558ff4c47f..b9323ece1f44 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -24,7 +24,7 @@ dev = with python36Packages; buildPythonPackage rec { name = "plover-${version}"; - version = "4.0.0.dev6"; + version = "4.0.0.dev8"; meta = with stdenv.lib; { description = "OpenSteno Plover stenography software"; @@ -34,14 +34,14 @@ src = fetchurl { url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz"; - sha256 = "067rkpqnjjxwyv9cwh9i925ndba6fvj6q0r56lizy0l26b4jc8rp"; + sha256 = "1wxkmik1zyw5gqig5r0cas5v6f5408fbnximzw610rdisqy09rxp"; }; # I'm not sure why we don't find PyQt5 here but there's a similar # sed on many of the platforms Plover builds for postPatch = "sed -i /PyQt5/d setup.cfg"; - buildInputs = [ pytest mock ]; - propagatedBuildInputs = [ Babel pyqt5 xlib pyserial appdirs ]; + checkInputs = [ pytest mock ]; + propagatedBuildInputs = [ Babel pyqt5 xlib pyserial appdirs wcwidth ]; }; } diff --git a/pkgs/applications/misc/rtl-sdr/default.nix b/pkgs/applications/misc/rtl-sdr/default.nix index f1c3cbc55577..92e96a7fb5ee 100644 --- a/pkgs/applications/misc/rtl-sdr/default.nix +++ b/pkgs/applications/misc/rtl-sdr/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "rtl-sdr-${version}"; - version = "0.5.3"; + version = "0.5.4"; src = fetchgit { url = "git://git.osmocom.org/rtl-sdr.git"; rev = "refs/tags/v${version}"; - sha256 = "1dh52xcvxkjb3mj80wlm20grz8cqf5wipx2ksi91ascz12b5pym6"; + sha256 = "0c56a9dhlqgs6y15ns0mn4r5giz0x6y7x151jcq755f711pc3y01"; }; nativeBuildInputs = [ pkgconfig ]; |