cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

allow overriding perl528 and perldevel in overlays

Browse source 
There was a mix of overrideable-in-overlays ```buildPackages.perl528``` & ```buildPackages.perldevel``` and local ```perl528``` & ```perldevel``` which were unaffected by overlays
This commit is contained in:
volth 2019-05-08 14:09:19 +00:00 committed by GitHub
parent 0a64e79596
commit e5d3583be8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/development/interpreters/perl/default.nix
View file

@ -1,4 +1,4 @@
{ config, lib, stdenv, fetchurl, buildPackages, callPackage { config, lib, stdenv, fetchurl, pkgs, buildPackages, callPackage
, enableThreading ? stdenv ? glibc, makeWrapper , enableThreading ? stdenv ? glibc, makeWrapper
}: }:
@ -23,7 +23,7 @@ let
libcLib = lib.getLib libc; libcLib = lib.getLib libc;
crossCompiling = stdenv.buildPlatform != stdenv.hostPlatform; crossCompiling = stdenv.buildPlatform != stdenv.hostPlatform;
common = { self, buildPerl, version, sha256 }: stdenv.mkDerivation (rec { common = { perl, buildPerl, version, sha256 }: stdenv.mkDerivation (rec {
inherit version; inherit version;
name = "perl-${version}"; name = "perl-${version}";
@ -106,15 +106,14 @@ let
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
passthru = rec { passthru = rec {
interpreter = "${self}/bin/perl"; interpreter = "${perl}/bin/perl";
libPrefix = "lib/perl5/site_perl"; libPrefix = "lib/perl5/site_perl";
pkgs = callPackage ../../../top-level/perl-packages.nix { pkgs = callPackage ../../../top-level/perl-packages.nix {
perl = self; inherit perl buildPerl;
inherit buildPerl;
overrides = config.perlPackageOverrides or (p: {}); # TODO: (self: super: {}) like in python overrides = config.perlPackageOverrides or (p: {}); # TODO: (self: super: {}) like in python
}; };
buildEnv = callPackage ./wrapper.nix { buildEnv = callPackage ./wrapper.nix {
perl = self; inherit perl;
inherit (pkgs) requiredPerlModules; inherit (pkgs) requiredPerlModules;
}; };
withPackages = f: buildEnv.override { extraLibs = f pkgs; }; withPackages = f: buildEnv.override { extraLibs = f pkgs; };
@ -191,10 +190,10 @@ let
# TODO merge setup hooks # TODO merge setup hooks
setupHook = ./setup-hook-cross.sh; setupHook = ./setup-hook-cross.sh;
}); });
in rec { in {
# the latest Maint version # the latest Maint version
perl528 = common { perl528 = common {
self = perl528; perl = pkgs.perl528;
buildPerl = buildPackages.perl528; buildPerl = buildPackages.perl528;
version = "5.28.2"; version = "5.28.2";
sha256 = "1iynpsxdym4h76kgndmn3ykvwxhqz444xvaz8z2irsxkvmnlb5da"; sha256 = "1iynpsxdym4h76kgndmn3ykvwxhqz444xvaz8z2irsxkvmnlb5da";
@ -202,7 +201,7 @@ in rec {
# the latest Devel version # the latest Devel version
perldevel = common { perldevel = common {
self = perldevel; perl = pkgs.perldevel;
buildPerl = buildPackages.perldevel; buildPerl = buildPackages.perldevel;
version = "5.29.9"; version = "5.29.9";
sha256 = "017x3nghyc5m8q1yqnrdma96b3d5rlfx87vv5mi64jq0r8k6zppm"; sha256 = "017x3nghyc5m8q1yqnrdma96b3d5rlfx87vv5mi64jq0r8k6zppm";