Merge master into staging-next

7 files changed, 12 insertions, 80 deletions

diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix
index 4da8527208e6..9fc84504f539 100644
--- a/pkgs/tools/misc/bat/default.nix
+++ b/pkgs/tools/misc/bat/default.nix
@@ -4,17 +4,17 @@
 
 rustPlatform.buildRustPackage rec {
   name    = "bat-${version}";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner  = "sharkdp";
     repo   = "bat";
     rev    = "v${version}";
-    sha256 = "13c88h1m9flmx3x2h7xrnb1wy4vgdxsqahw8cqa0x61ay0019a7s";
+    sha256 = "1q22lbyrwh58vhznpjpkiaa8v4qv6a3a8lrxzaypd8wg78p9dca6";
     fetchSubmodules = true;
   };
 
-  cargoSha256 = "1clng4rl7mq50z8d5ipmr9fapjj4qmpf4gmdnfl6vs35pq3wp9j4";
+  cargoSha256 = "0npj2rf4vr45gq3qwqq6kqnv9dh58v5lpx0gsmy2qrq44dxb75rq";
 
   nativeBuildInputs = [ cmake pkgconfig zlib ];
 
diff --git a/pkgs/tools/misc/kalibrate-hackrf/default.nix b/pkgs/tools/misc/kalibrate-hackrf/default.nix
deleted file mode 100644
index 0bd6f573ead0..000000000000
--- a/pkgs/tools/misc/kalibrate-hackrf/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, fftw, hackrf, libusb1 }:
-
-stdenv.mkDerivation rec {
-  name = "kalibrate-hackrf-unstable-20160827";
-
-  # There are no tags/releases, so use the latest commit from git master.
-  # Currently, the latest commit is from 2016-07-03.
-  src = fetchFromGitHub {
-    owner = "scateu";
-    repo = "kalibrate-hackrf";
-    rev = "2492c20822ca6a49dce97967caf394b1d4b2c43e";
-    sha256 = "1jvn1qx7csgycxpx1k804sm9gk5a0c65z9gh8ybp9awq3pziv0nx";
-  };
-
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
-
-  buildInputs = [ fftw hackrf libusb1 ];
-
-  postInstall = ''
-    mv $out/bin/kal $out/bin/kal-hackrf
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Calculate local oscillator frequency offset in hackrf devices";
-    longDescription = ''
-      Kalibrate, or kal, can scan for GSM base stations in a given frequency
-      band and can use those GSM base stations to calculate the local
-      oscillator frequency offset.
-
-      This package is for hackrf devices.
-    '';
-    homepage = https://github.com/scateu/kalibrate-hackrf;
-    license = licenses.bsd2;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.mog ];
-  };
-}
diff --git a/pkgs/tools/misc/kalibrate-rtl/default.nix b/pkgs/tools/misc/kalibrate-rtl/default.nix
deleted file mode 100644
index 19ebd05e23c1..000000000000
--- a/pkgs/tools/misc/kalibrate-rtl/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchgit, autoreconfHook, pkgconfig, fftw, rtl-sdr, libusb1 }:
-
-stdenv.mkDerivation rec {
-  name = "kalibrate-rtl-20131214";
-
-  # There are no tags/releases, so use the latest commit from git master.
-  # Currently, the latest commit is from 2013-12-14.
-  src = fetchgit {
-    url = "https://github.com/steve-m/kalibrate-rtl.git";
-    rev = "aae11c8a8dc79692a94ccfee39ba01e8c8c05d38";
-    sha256 = "1spbfflkqnw9s8317ppsf7b1nnkicqsmaqsnz1zf8i49ix70i6kn";
-  };
-
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
-  buildInputs = [ fftw rtl-sdr libusb1 ];
-
-  meta = with stdenv.lib; {
-    description = "Calculate local oscillator frequency offset in RTL-SDR devices";
-    longDescription = ''
-      Kalibrate, or kal, can scan for GSM base stations in a given frequency
-      band and can use those GSM base stations to calculate the local
-      oscillator frequency offset.
-
-      This package is for RTL-SDR devices.
-    '';
-    homepage = https://github.com/steve-m/kalibrate-rtl;
-    license = licenses.bsd2;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.bjornfor ];
-  };
-}
diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix
index cab1d1b5958b..86826f79b9a7 100644
--- a/pkgs/tools/misc/lf/default.nix
+++ b/pkgs/tools/misc/lf/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   name = "lf-${version}";
-  version = "9";
+  version = "10";
 
   src = fetchFromGitHub {
     owner = "gokcehan";
     repo = "lf";
     rev = "r${version}";
-    sha256 = "08dwnlgw1dcnd2hl5ma6qqzcyjn9wjp28mjbnidyvc5dmmxc87dq";
+    sha256 = "14wddjm6g5smb0s549nd7l2r3fcdd6k5p2cqq94j02n2jhlv0k6h";
   };
 
   goPackagePath = "github.com/gokcehan/lf";
diff --git a/pkgs/tools/misc/papis/default.nix b/pkgs/tools/misc/papis/default.nix
index 8bccfccfeabf..282d64befb7f 100644
--- a/pkgs/tools/misc/papis/default.nix
+++ b/pkgs/tools/misc/papis/default.nix
@@ -1,8 +1,8 @@
 { lib, fetchFromGitHub, fetchpatch
-, python36, xdg_utils
+, python3, xdg_utils
 }:
 
-python36.pkgs.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "papis";
   version = "0.7.5";
 
@@ -20,7 +20,7 @@ python36.pkgs.buildPythonApplication rec {
     sha256 = "0cmagfdaaml1pxhnxggifpb47z5g1p231qywnvnqpd3dm93382w1";
   };
 
-  propagatedBuildInputs = with python36.pkgs; [
+  propagatedBuildInputs = with python3.pkgs; [
     click requests filetype pyparsing configparser
     arxiv2bib pyyaml chardet beautifulsoup4 prompt_toolkit
     bibtexparser python-slugify pyparser pylibgen
@@ -33,7 +33,7 @@ python36.pkgs.buildPythonApplication rec {
     install -Dt "$out/etc/bash_completion.d" scripts/shell_completion/build/bash/papis
   '';
 
-  checkInputs = (with python36.pkgs; [
+  checkInputs = (with python3.pkgs; [
     pytest
   ]) ++ [
     xdg_utils
diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix
index 3d1eedab8c47..87fda19a75fe 100644
--- a/pkgs/tools/misc/snapper/default.nix
+++ b/pkgs/tools/misc/snapper/default.nix
@@ -62,6 +62,6 @@ stdenv.mkDerivation rec {
     homepage = http://snapper.io;
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ tstrobel ];
+    maintainers = with maintainers; [ tstrobel markuskowa ];
   };
 }
diff --git a/pkgs/tools/misc/txr/default.nix b/pkgs/tools/misc/txr/default.nix
index c7ff9e18238f..368b0f908c76 100644
--- a/pkgs/tools/misc/txr/default.nix
+++ b/pkgs/tools/misc/txr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "txr-${version}";
-  version = "208";
+  version = "209";
 
   src = fetchurl {
     url = "http://www.kylheku.com/cgit/txr/snapshot/${name}.tar.bz2";
-    sha256 = "091yki3a24pscwd0lg2ymy86r223amjnz9c71z4a2kxz5brhl5my";
+    sha256 = "1g236bk5ygh3car4kki3w6n0pwny8q4awg8p86fh2khj52qz6mdl";
   };
 
   nativeBuildInputs = [ bison flex ];