Merge pull request #7776 from k0ral/rmlint

rmlint: 2.0.0 -> 2.1.0

pkgs/tools/misc/rmlint/default.nix

@@ -4,15 +4,13 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "rmlint-${version}";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchurl {
     url = "https://github.com/sahib/rmlint/archive/v${version}.tar.gz";
-    sha256 = "14jiswagipsmzxclcskn672ws4126p65l6hlzkkvanyv8gmpv90f";
+    sha256 = "17hqkx1ji6rbvliji18my16b23ig9d6v4azgypwl0fam2ar4rm4g";
   };
 
-  patches = [ ./fix-scons.patch ];
-
   configurePhase = "scons config";
 
   buildInputs = [ gettext glib json_glib libelf pkgconfig scons sphinx utillinux ];

pkgs/tools/misc/rmlint/fix-scons.patch

@@ -1,22 +0,0 @@
-diff --git b/SConstruct a/SConstruct
-old mode 100644
-new mode 100755
-index a7fca2e..561007e
---- b/SConstruct
-+++ a/SConstruct
-@@ -404,11 +404,10 @@ options = dict(
-     SHLINKCOMSTR=link_shared_library_message,
-     LINKCOMSTR=link_program_message,
-     PREFIX=GetOption('prefix'),
--    ENV={
--        'PATH': os.environ['PATH'],
--        'TERM': os.environ['TERM'],
--        'HOME': os.environ['HOME']
--    }
-+    ENV = dict([ (key, os.environ[key])
-+                 for key in os.environ
-+                 if key in ['PATH', 'TERM', 'HOME', 'PKG_CONFIG_PATH']
-+              ])
- )
- 
- if ARGUMENTS.get('VERBOSE') == "1":