summary refs log tree commit diff
path: root/maintainers
diff options
context:
space:
mode:
authorRobert Helgesson <robert@rycee.net>2020-03-15 12:54:12 +0100
committerGitHub <noreply@github.com>2020-03-15 12:54:12 +0100
commit2fc67aca651a7b2b5e77bb41d61747db7801d951 (patch)
treee8535dfae3a15d0c315ec5bacbc57b1fa955db58 /maintainers
parent7566b4f9241d0f4949e579224b1ed769859643c6 (diff)
parent9035381b11412bb5af34f92082ce7611118710f3 (diff)
downloadnixpkgs-2fc67aca651a7b2b5e77bb41d61747db7801d951.tar
nixpkgs-2fc67aca651a7b2b5e77bb41d61747db7801d951.tar.gz
nixpkgs-2fc67aca651a7b2b5e77bb41d61747db7801d951.tar.bz2
nixpkgs-2fc67aca651a7b2b5e77bb41d61747db7801d951.tar.lz
nixpkgs-2fc67aca651a7b2b5e77bb41d61747db7801d951.tar.xz
nixpkgs-2fc67aca651a7b2b5e77bb41d61747db7801d951.tar.zst
nixpkgs-2fc67aca651a7b2b5e77bb41d61747db7801d951.zip
Merge pull request #82541 from ydlr/nix-generate-from-cpan
nix-generate-from-cpan: remove "unkown" license and improve core module detection
Diffstat (limited to 'maintainers')
-rwxr-xr-xmaintainers/scripts/nix-generate-from-cpan.pl13
1 files changed, 4 insertions, 9 deletions
diff --git a/maintainers/scripts/nix-generate-from-cpan.pl b/maintainers/scripts/nix-generate-from-cpan.pl
index e04d3713e9a..f02af4ea669 100755
--- a/maintainers/scripts/nix-generate-from-cpan.pl
+++ b/maintainers/scripts/nix-generate-from-cpan.pl
@@ -6,6 +6,7 @@ use warnings;
 
 use CPAN::Meta();
 use CPANPLUS::Backend();
+use Module::CoreList;
 use Getopt::Long::Descriptive qw( describe_options );
 use JSON::PP qw( encode_json );
 use Log::Log4perl qw(:easy);
@@ -164,7 +165,7 @@ Readonly::Hash my %LICENSE_MAP => (
 
     # License not provided in metadata.
     unknown => {
-        licenses => [qw( unknown )],
+        licenses => [],
         amb      => 1
     }
 );
@@ -278,14 +279,8 @@ sub get_deps {
     foreach my $n ( $deps->required_modules ) {
         next if $n eq "perl";
 
-        # Figure out whether the module is a core module by attempting
-        # to `use` the module in a pure Perl interpreter and checking
-        # whether it succeeded. Note, $^X is a magic variable holding
-        # the path to the running Perl interpreter.
-        if ( system("env -i $^X -M$n -e1 >/dev/null 2>&1") == 0 ) {
-            DEBUG("skipping Perl-builtin module $n");
-            next;
-        }
+        my @core = Module::CoreList->find_modules(qr/^$n$/);
+        next if (@core);
 
         my $pkg = module_to_pkg( $cb, $n );