Merge branch 'staging' into make-perl-pathd

pkgs/tools/text/popfile/default.nix

@@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
     perl
     DBI
     DBDSQLite
-    DigestMD5
     HTMLTagset
     TimeDate # == DateParse
     HTMLTemplate

pkgs/tools/text/schema2ldif/default.nix

@@ -18,7 +18,7 @@
     gzip -c man/ldap-schema-manager.1 > $out/share/man/man1/ldap-schema-manager.1.gz
 
     wrapProgram $out/bin/schema2ldif \
-       --prefix PERL5PATH : "${perlPackages.makePerlPath [ perlPackages.GetoptLong perlPackages.PodUsage ]}"
+       --prefix PERL5PATH : "${perlPackages.makePerlPath [ perlPackages.GetoptLong ]}"
   '';
 
   meta = with stdenv.lib; {

pkgs/tools/text/xurls/default.nix

@@ -1,30 +1,18 @@
-{ stdenv, fetchFromGitHub, go }:
+{ buildGoPackage, stdenv, fetchFromGitHub }:
 
-stdenv.mkDerivation rec {
-  version = "1.1.0";
+buildGoPackage rec {
+  version = "2.0.0";
   name = "xurls-${version}";
 
   src = fetchFromGitHub {
     owner = "mvdan";
     repo = "xurls";
     rev = "v${version}";
-    sha256 = "05q4nqbpgfb0a35sn22rn9mlag2ks4cgwb54dx925hipp6zgj1hx";
+    sha256 = "1jdjwlp19r8cb7vycyrjmpwf8dz2fzrqphq4lkvy9x2v7x0kksx8";
   };
 
-  buildInputs = [ go ];
-
-  buildPhase = ''
-    mkdir -p src/github.com/mvdan
-    ln -s $(pwd) src/github.com/mvdan/xurls
-    export GOPATH=$(pwd)
-    cd cmd/xurls
-    go build -v
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    mv xurls $out/bin
-  '';
+  goPackagePath = "mvdan.cc/xurls/v2";
+  subPackages = [ "cmd/xurls" ];
 
   meta = with stdenv.lib; {
     description = "Extract urls from text";