commit 61b7cab4811e0e90937bcc8b4c1ca32b387c895c · pyrox.dev/nixpkgs

+2 -4

nixos/modules/config/users-groups.nix

···

       556
       556
        
               install -m 0700 -d /root

     

       557
       557
        
               install -m 0755 -d /home

     

       558
       558
        
       

     

       559
       559
       -
               ${pkgs.perl}/bin/perl -w \

     

       560
       560
       -
                 -I${pkgs.perlPackages.FileSlurp}/${pkgs.perl.libPrefix} \

     

       561
       561
       -
                 -I${pkgs.perlPackages.JSON}/${pkgs.perl.libPrefix} \

     

       562
       562
       -
                 ${./update-users-groups.pl} ${spec}

     

       559
       559
       +
               ${pkgs.perl.withPackages (p: [ p.FileSlurp p.JSON ])}/bin/perl \

     

       560
       560
       +
               -w ${./update-users-groups.pl} ${spec}

     

       563
       561
        
             '';

     

       564
       562
        
       

     

       565
       563
        
           # for backwards compatibility

+1 -1

nixos/modules/installer/tools/tools.nix

···

       34
       34
        
           name = "nixos-generate-config";

     

       35
       35
        
           src = ./nixos-generate-config.pl;

     

       36
       36
        
           path = lib.optionals (lib.elem "btrfs" config.boot.supportedFilesystems) [ pkgs.btrfs-progs ];

     

       37
       37
       -
           perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/${pkgs.perl.libPrefix}";

     

       37
       37
       +
           perl = "${pkgs.perl.withPackages (p: [ p.FileSlurp ])}/bin/perl";

     

       38
       38
        
           inherit (config.system.nixos-generate-config) configuration desktopConfiguration;

     

       39
       39
        
           xserverEnabled = config.services.xserver.enable;

     

       40
       40
        
         };

+1 -3

nixos/modules/programs/command-not-found/command-not-found.nix

···

       14
       14
        
           dir = "bin";

     

       15
       15
        
           src = ./command-not-found.pl;

     

       16
       16
        
           isExecutable = true;

     

       17
       17
       -
           inherit (pkgs) perl;

     

       18
       17
        
           inherit (cfg) dbPath;

     

       19
       19
       -
           perlFlags = concatStrings (map (path: "-I ${path}/${pkgs.perl.libPrefix} ")

     

       20
       20
       -
             [ pkgs.perlPackages.DBI pkgs.perlPackages.DBDSQLite pkgs.perlPackages.StringShellQuote ]);

     

       18
       18
       +
           perl = pkgs.perl.withPackages (p: [ p.DBDSQLite p.StringShellQuote ]);

     

       21
       19
        
         };

     

       22
       20
        
       

     

       23
       21
        
       in

+1 -1

nixos/modules/programs/command-not-found/command-not-found.pl

···

       1
       1
       -
       #! @perl@/bin/perl -w @perlFlags@

     

       1
       1
       +
       #! @perl@/bin/perl -w

     

       2
       2
        
       

     

       3
       3
        
       use strict;

     

       4
       4
        
       use DBI;

+1 -1

nixos/modules/system/activation/switch-to-configuration.pl

···

       1
       1
       -
       #! @perl@

     

       1
       1
       +
       #! @perl@/bin/perl

     

       2
       2
        
       

     

       3
       3
        
       use strict;

     

       4
       4
        
       use warnings;

+1 -2

nixos/modules/system/activation/top-level.nix

···

       113
       113
        
           configurationName = config.boot.loader.grub.configurationName;

     

       114
       114
        
       

     

       115
       115
        
           # Needed by switch-to-configuration.

     

       116
       116
       -
       

     

       117
       117
       -
           perl = "${pkgs.perl}/bin/perl " + (concatMapStringsSep " " (lib: "-I${lib}/${pkgs.perl.libPrefix}") (with pkgs.perlPackages; [ FileSlurp NetDBus XMLParser XMLTwig ]));

     

       116
       116
       +
           perl = pkgs.perl.withPackages (p: with p; [ FileSlurp NetDBus XMLParser XMLTwig ]);

     

       118
       117
        
         };

     

       119
       118
        
       

     

       120
       119
        
         # Handle assertions and warnings

+6 -2

nixos/modules/system/boot/loader/grub/grub.nix

···

       728
       728
        
                   utillinux = pkgs.util-linux;

     

       729
       729
        
                   btrfsprogs = pkgs.btrfs-progs;

     

       730
       730
        
                 };

     

       731
       731
       +
                 perl = pkgs.perl.withPackages (p: with p; [

     

       732
       732
       +
                   FileSlurp FileCopyRecursive

     

       733
       733
       +
                   XMLLibXML XMLSAX XMLSAXBase

     

       734
       734
       +
                   ListCompare JSON

     

       735
       735
       +
                 ]);

     

       731
       736
        
               in pkgs.writeScript "install-grub.sh" (''

     

       732
       737
        
               #!${pkgs.runtimeShell}

     

       733
       738
        
               set -e

     

       734
       734
       -
               export PERL5LIB=${with pkgs.perlPackages; makePerlPath [ FileSlurp FileCopyRecursive XMLLibXML XMLSAX XMLSAXBase ListCompare JSON ]}

     

       735
       739
        
               ${optionalString cfg.enableCryptodisk "export GRUB_ENABLE_CRYPTODISK=y"}

     

       736
       740
        
             '' + flip concatMapStrings cfg.mirroredBoots (args: ''

     

       737
       737
       -
               ${pkgs.perl}/bin/perl ${install-grub-pl} ${grubConfig args} $@

     

       741
       741
       +
               ${perl}/bin/perl ${install-grub-pl} ${grubConfig args} $@

     

       738
       742
        
             '') + cfg.extraInstallCommands);

     

       739
       743
        
       

     

       740
       744
        
             system.build.grub = grub;

+1 -1

nixos/modules/system/etc/etc.nix

···

       154
       154
        
             ''

     

       155
       155
        
               # Set up the statically computed bits of /etc.

     

       156
       156
        
               echo "setting up /etc..."

     

       157
       157
       -
               ${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/${pkgs.perl.libPrefix} ${./setup-etc.pl} ${etc}/etc

     

       157
       157
       +
               ${pkgs.perl.withPackages (p: [ p.FileSlurp ])}/bin/perl ${./setup-etc.pl} ${etc}/etc

     

       158
       158
        
             '';

     

       159
       159
        
       

     

       160
       160
        
         };

+1 -1

nixos/modules/testing/service-runner.nix

···

       6
       6
        
       

     

       7
       7
        
         makeScript = name: service: pkgs.writeScript "${name}-runner"

     

       8
       8
        
           ''

     

       9
       9
       -
             #! ${pkgs.perl}/bin/perl -w -I${pkgs.perlPackages.FileSlurp}/${pkgs.perl.libPrefix}

     

       9
       9
       +
             #! ${pkgs.perl.withPackages (p: [ p.FileSlurp ])}/bin/perl -w

     

       10
       10
        
       

     

       11
       11
        
             use File::Slurp;

     

       12
       12

+2 -9

pkgs/applications/graphics/feh/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, makeWrapper

     

       2
       2
        
       , xorg, imlib2, libjpeg, libpng

     

       3
       3
       -
       , curl, libexif, jpegexiforient, perlPackages

     

       3
       3
       +
       , curl, libexif, jpegexiforient, perl

     

       4
       4
        
       , enableAutoreload ? !stdenv.hostPlatform.isDarwin }:

     

       5
       5
        
       

     

       6
       6
        
       with lib;

     
···

       31
       31
        
                                      --add-flags '--theme=feh'

     

       32
       32
        
         '';

     

       33
       33
        
       

     

       34
       34
       -
         checkInputs = [ perlPackages.perl perlPackages.TestCommand ];

     

       35
       35
       -
         preCheck = ''

     

       36
       36
       -
           export PERL5LIB="${perlPackages.TestCommand}/${perlPackages.perl.libPrefix}"

     

       37
       37
       -
         '';

     

       38
       38
       -
         postCheck = ''

     

       39
       39
       -
           unset PERL5LIB

     

       40
       40
       -
         '';

     

       41
       41
       -
       

     

       34
       34
       +
         checkInputs = lib.singleton (perl.withPackages (p: [ p.TestCommand ]));

     

       42
       35
        
         doCheck = true;

     

       43
       36
        
       

     

       44
       37
        
         meta = {

+3 -12

pkgs/build-support/writers/default.nix

···

       257
       257
        
         #     print "Howdy!\n" if true;

     

       258
       258
        
         #   ''

     

       259
       259
        
         writePerl = name: { libraries ? [] }:

     

       260
       260
       -
         let

     

       261
       261
       -
           perl-env = pkgs.buildEnv {

     

       262
       262
       -
             name = "perl-environment";

     

       263
       263
       -
             paths = libraries;

     

       264
       264
       -
             pathsToLink = [

     

       265
       265
       -
               "/${pkgs.perl.libPrefix}"

     

       266
       266
       -
             ];

     

       267
       267
       -
           };

     

       268
       268
       -
         in

     

       269
       269
       -
         makeScriptWriter {

     

       270
       270
       -
           interpreter = "${pkgs.perl}/bin/perl -I ${perl-env}/${pkgs.perl.libPrefix}";

     

       271
       271
       -
         } name;

     

       260
       260
       +
           makeScriptWriter {

     

       261
       261
       +
             interpreter = "${pkgs.perl.withPackages (p: libraries)}/bin/perl";

     

       262
       262
       +
           } name;

     

       272
       263
        
       

     

       273
       264
        
         # writePerlBin takes the same arguments as writePerl but outputs a directory (like writeScriptBin)

     

       274
       265
        
         writePerlBin = name:

+2 -9

pkgs/development/tools/misc/icon-naming-utils/default.nix

···

       1
       1
       -
       {lib, stdenv, fetchurl, perlPackages, librsvg}:

     

       1
       1
       +
       {lib, stdenv, fetchurl, perl, librsvg}:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "icon-naming-utils-0.8.90";

     
···

       8
       8
        
           sha256 = "071fj2jm5kydlz02ic5sylhmw6h2p3cgrm3gwdfabinqkqcv4jh4";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       -
         buildInputs = [ librsvg ] ++ (with perlPackages; [ perl XMLSimple ]);

     

       12
       12
       -
       

     

       13
       13
       -
         postInstall =

     

       14
       14
       -
           ''

     

       15
       15
       -
             # Add XML::Simple to the runtime search path.

     

       16
       16
       -
             substituteInPlace $out/libexec/icon-name-mapping \

     

       17
       17
       -
                 --replace '/bin/perl' '/bin/perl -I${perlPackages.XMLSimple}/${perlPackages.perl.libPrefix}'

     

       18
       18
       -
           '';

     

       11
       11
       +
         buildInputs = [ librsvg (perl.withPackages (p: [ p.XMLSimple ])) ];

     

       19
       12
        
       

     

       20
       13
        
         meta = with lib; {

     

       21
       14
        
           homepage = "http://tango.freedesktop.org/Standard_Icon_Naming_Specification";

+8 -6

pkgs/misc/screensavers/xscreensaver/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, pkg-config, bc, perl, perlPackages, pam, libXext, libXScrnSaver, libX11

     

       1
       1
       +
       { lib, stdenv, fetchurl, pkg-config, bc, perl, pam, libXext, libXScrnSaver, libX11

     

       2
       2
        
       , libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, libGLU, libGL, gtk2

     

       3
       3
        
       , libxml2, libglade, intltool, xorg, makeWrapper, gle, gdk-pixbuf, gdk-pixbuf-xlib

     

       4
       4
        
       , forceInstallAllHacks ? false

     
···

       38
       38
        
         postInstall = ''

     

       39
       39
        
             wrapProgram $out/bin/xscreensaver-text \

     

       40
       40
        
               --prefix PATH : ${lib.makeBinPath [xorg.appres]}

     

       41
       41
       -
             wrapProgram $out/bin/xscreensaver-getimage-file \

     

       42
       42
       -
               --set PERL5LIB "$out/${perlPackages.perl.libPrefix}:${with perlPackages; makePerlPath [

     

       43
       43
       -
                     EncodeLocale HTTPDate HTTPMessage IOSocketSSL LWP LWPProtocolHttps

     

       44
       44
       -
                     MozillaCA NetHTTP NetSSLeay TryTiny URI

     

       45
       45
       -
                     ]}"

     

       41
       41
       +
       

     

       42
       42
       +
             substituteInPlace $out/bin/xscreensaver-getimage-file \

     

       43
       43
       +
               --replace '${perl}' '${perl.withPackages (p: with p;

     

       44
       44
       +
                 [ EncodeLocale HTTPDate HTTPMessage IOSocketSSL

     

       45
       45
       +
                   LWP LWPProtocolHttps MozillaCA NetHTTP

     

       46
       46
       +
                   NetSSLeay TryTiny URI

     

       47
       47
       +
                 ])}'

     

       46
       48
        
         ''

     

       47
       49
        
         + lib.optionalString forceInstallAllHacks ''

     

       48
       50
        
           make -C hacks/glx dnalogo

+3 -4

pkgs/os-specific/linux/apparmor/default.nix

···

       136
       136
        
               wrapProgram $out/bin/$prog --prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH"

     

       137
       137
        
             done

     

       138
       138
        
       

     

       139
       139
       -
             substituteInPlace $out/bin/aa-notify --replace /usr/bin/notify-send ${libnotify}/bin/notify-send

     

       140
       140
       -
             # aa-notify checks its name and does not work named ".aa-notify-wrapped"

     

       141
       141
       -
             mv $out/bin/aa-notify $out/bin/aa-notify-wrapped

     

       142
       142
       -
             makeWrapper ${perl}/bin/perl $out/bin/aa-notify --set PERL5LIB ${libapparmor}/${perl.libPrefix} --add-flags $out/bin/aa-notify-wrapped

     

       139
       139
       +
             substituteInPlace $out/bin/aa-notify \

     

       140
       140
       +
               --replace /usr/bin/notify-send ${libnotify}/bin/notify-send \

     

       141
       141
       +
               --replace /usr/bin/perl "${perl}/bin/perl -I ${libapparmor}/${perl.libPrefix}"

     

       143
       142
        
           '';

     

       144
       143
        
       

     

       145
       144
        
           inherit doCheck;

+4 -4

pkgs/os-specific/linux/rdma-core/default.nix

···

       1
       1
        
       { lib, stdenv, fetchFromGitHub, cmake, pkg-config, docutils

     

       2
       2
        
       , pandoc, ethtool, iproute, libnl, udev, python3, perl

     

       3
       3
       -
       , makeWrapper

     

       4
       4
       -
       } :

     

       3
       3
       +
       }:

     

       5
       4
        
       

     

       6
       5
        
       let

     

       7
       6
        
         version = "34.0";

     
···

       17
       16
        
           sha256 = "sha256-2HFtj595sDmWqAewIMwKMaiSDVVWKdQA9l0QsPcw8qA=";

     

       18
       17
        
         };

     

       19
       18
        
       

     

       20
       20
       -
         nativeBuildInputs = [ cmake pkg-config pandoc docutils makeWrapper ];

     

       19
       19
       +
         nativeBuildInputs = [ cmake pkg-config pandoc docutils ];

     

       21
       20
        
         buildInputs = [ libnl ethtool iproute udev python3 perl ];

     

       22
       21
        
       

     

       23
       22
        
         cmakeFlags = [

     
···

       39
       38
        
         postFixup = ''

     

       40
       39
        
           for pls in $out/bin/{ibfindnodesusing.pl,ibidsverify.pl}; do

     

       41
       40
        
             echo "wrapping $pls"

     

       42
       42
       -
             wrapProgram $pls --prefix PERL5LIB : "$out/${perl.libPrefix}"

     

       41
       41
       +
             substituteInPlace $pls --replace \

     

       42
       42
       +
               "${perl}/bin/perl" "${perl}/bin/perl -I $out/${perl.libPrefix}"

     

       43
       43
        
           done

     

       44
       44
        
         '';

     

       45
       45

+3 -5

pkgs/tools/backup/store-backup/default.nix

···

       1
       1
       -
       {lib, stdenv, which, coreutils, perl, fetchurl, perlPackages, makeWrapper, diffutils , writeScriptBin, bzip2}:

     

       1
       1
       +
       {lib, stdenv, which, coreutils, perl, fetchurl, makeWrapper, diffutils , writeScriptBin, bzip2}:

     

       2
       2
        
       

     

       3
       3
        
       # quick usage:

     

       4
       4
        
       # storeBackup.pl --sourceDir /home/user --backupDir /tmp/my_backup_destination

     
···

       37
       37
        
           find $out -name "*.pl" | xargs sed -i \

     

       38
       38
        
             -e 's@/bin/pwd@${coreutils}/bin/pwd@' \

     

       39
       39
        
             -e 's@/bin/sync@${coreutils}/bin/sync@' \

     

       40
       40
       -
             -e '1 s@/usr/bin/env perl@${perl}/bin/perl@'

     

       40
       40
       +
             -e '1 s@/usr/bin/env perl@${perl.withPackages (p: [ p.DBFile ])}/bin/perl@'

     

       41
       41
        
       

     

       42
       42
        
           for p in $out/bin/*

     

       43
       43
       -
             do wrapProgram "$p" \

     

       44
       44
       -
             --prefix PERL5LIB ":" "${perlPackages.DBFile}/${perlPackages.perl.libPrefix}" \

     

       45
       45
       -
             --prefix PATH ":" "${lib.makeBinPath [ which bzip2 ]}"

     

       43
       43
       +
             do wrapProgram "$p" --prefix PATH ":" "${lib.makeBinPath [ which bzip2 ]}"

     

       46
       44
        
           done

     

       47
       45
        
       

     

       48
       46
        
           patchShebangs $out

+6 -25

pkgs/tools/backup/znapzend/default.nix

···

       21
       21
        
           propagatedBuildInputs = [ perlPackages.IOPipely Mojolicious-8-35 ];

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
       +
         perl' = perl.withPackages (p:

     

       25
       25
       +
           [ MojoIOLoopForkCall-0-20

     

       26
       26
       +
             p.TAPParserSourceHandlerpgTAP

     

       27
       27
       +
           ]);

     

       28
       28
       +
       

     

       24
       29
        
         version = "0.20.0";

     

       25
       30
        
         checksum = "15lb5qwksa508m9bj6d3n4rrjpakfaas9qxspg408bcqfp7pqjw3";

     

       26
       31
        
       in

     
···

       35
       40
        
           sha256 = checksum;

     

       36
       41
        
         };

     

       37
       42
        
       

     

       38
       38
       -
         buildInputs = [ wget perl MojoIOLoopForkCall-0-20 perlPackages.TAPParserSourceHandlerpgTAP ];

     

       43
       43
       +
         buildInputs = [ wget perl' ];

     

       39
       44
        
       

     

       40
       45
        
         nativeBuildInputs = [ autoconf automake autoreconfHook ];

     

       41
       46
        
       

     
···

       51
       56
        
         preBuild = ''

     

       52
       57
        
           aclocal

     

       53
       58
        
           automake

     

       54
       54
       -
         '';

     

       55
       55
       -
       

     

       56
       56
       -
         postInstall = ''

     

       57
       57
       -
           substituteInPlace $out/bin/znapzend --replace "${perl}/bin/perl" \

     

       58
       58
       -
             "${perl}/bin/perl \

     

       59
       59
       -
             -I${Mojolicious-8-35}/${perl.libPrefix} \

     

       60
       60
       -
             -I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \

     

       61
       61
       -
             -I${MojoIOLoopForkCall-0-20}/${perl.libPrefix} \

     

       62
       62
       -
             -I${perlPackages.IOPipely}/${perl.libPrefix} \

     

       63
       63
       -
             "

     

       64
       64
       -
           substituteInPlace $out/bin/znapzendzetup --replace "${perl}/bin/perl" \

     

       65
       65
       -
             "${perl}/bin/perl \

     

       66
       66
       -
             -I${Mojolicious-8-35}/${perl.libPrefix} \

     

       67
       67
       -
             -I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \

     

       68
       68
       -
             -I${MojoIOLoopForkCall-0-20}/${perl.libPrefix} \

     

       69
       69
       -
             -I${perlPackages.IOPipely}/${perl.libPrefix} \

     

       70
       70
       -
             "

     

       71
       71
       -
           substituteInPlace $out/bin/znapzendztatz --replace "${perl}/bin/perl" \

     

       72
       72
       -
             "${perl}/bin/perl \

     

       73
       73
       -
             -I${Mojolicious-8-35}/${perl.libPrefix} \

     

       74
       74
       -
             -I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \

     

       75
       75
       -
             -I${MojoIOLoopForkCall-0-20}/${perl.libPrefix} \

     

       76
       76
       -
             -I${perlPackages.IOPipely}/${perl.libPrefix} \

     

       77
       77
       -
             "

     

       78
       59
        
         '';

     

       79
       60
        
       

     

       80
       61
        
         meta = with lib; {

+4 -6

pkgs/tools/filesystems/file-rename/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, perlPackages, makeWrapper }:

     

       1
       1
       +
       { lib, stdenv, fetchurl, perl, perlPackages }:

     

       2
       2
        
       

     

       3
       3
        
       perlPackages.buildPerlPackage {

     

       4
       4
        
         pname = "File-Rename";

     
···

       9
       9
        
           sha256 = "1cf6xx2hiy1xalp35fh8g73j67r0w0g66jpcbc6971x9jbm7bvjy";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         nativeBuildInputs = [ makeWrapper ];

     

       13
       13
       -
       

     

       14
       12
        
         # Fix an incorrect platform test that misidentifies Darwin as Windows

     

       15
       13
        
         postPatch = ''

     

       16
       14
        
           substituteInPlace Makefile.PL \

     

       17
       15
        
             --replace '/win/i' '/MSWin32/'

     

       18
       16
        
         '';

     

       19
       17
        
       

     

       20
       20
       -
         postInstall = ''

     

       21
       21
       -
           wrapProgram $out/bin/rename \

     

       22
       22
       -
             --prefix PERL5LIB : $out/${perlPackages.perl.libPrefix}

     

       18
       18
       +
         postFixup = ''

     

       19
       19
       +
           substituteInPlace $out/bin/rename \

     

       20
       20
       +
             --replace "#!${perl}/bin/perl" "#!${perl}/bin/perl -I $out/${perl.libPrefix}"

     

       23
       21
        
         '';

     

       24
       22
        
       

     

       25
       23
        
         doCheck = !stdenv.isDarwin;

+16 -21

pkgs/tools/misc/lbdb/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, fetchpatch, perl, perlPackages, finger_bsd, makeWrapper

     

       1
       1
       +
       { lib, stdenv, fetchurl, fetchpatch, perl, finger_bsd

     

       2
       2
        
       , abook ? null

     

       3
       3
        
       , gnupg ? null

     

       4
       4
        
       , goobook ? null

     
···

       8
       8
        
       

     

       9
       9
        
       let

     

       10
       10
        
         version = "0.48.1";

     

       11
       11
       +
         perl' = perl.withPackages (p: with p; [ ConvertASN1 perlldap AuthenSASL ]);

     

       11
       12
        
       in

     

       12
       12
       -
       with lib;

     

       13
       13
       -
       with perlPackages;

     

       14
       13
        
       stdenv.mkDerivation {

     

       15
       14
        
         pname = "lbdb";

     

       16
       15
        
         inherit version;

     
···

       19
       18
        
           sha256 = "1gr5l2fr9qbdccga8bhsrpvz6jxigvfkdxrln9wyf2xpps5cdjxh";

     

       20
       19
        
         };

     

       21
       20
        
       

     

       22
       22
       -
         nativeBuildInputs = [ makeWrapper ];

     

       23
       23
       -
         buildInputs = [ goobook perl ConvertASN1 perlldap AuthenSASL ]

     

       24
       24
       -
           ++ optional (!stdenv.isDarwin) finger_bsd

     

       25
       25
       -
           ++ optional   (abook != null) abook

     

       26
       26
       -
           ++ optional   (gnupg != null) gnupg

     

       27
       27
       -
           ++ optional (goobook != null) goobook

     

       28
       28
       -
           ++ optional   (khard != null) khard

     

       29
       29
       -
           ++ optional      (mu != null) mu;

     

       21
       21
       +
         buildInputs = [ goobook perl' ]

     

       22
       22
       +
           ++ lib.optional (!stdenv.isDarwin) finger_bsd

     

       23
       23
       +
           ++ lib.optional   (abook != null) abook

     

       24
       24
       +
           ++ lib.optional   (gnupg != null) gnupg

     

       25
       25
       +
           ++ lib.optional (goobook != null) goobook

     

       26
       26
       +
           ++ lib.optional   (khard != null) khard

     

       27
       27
       +
           ++ lib.optional      (mu != null) mu;

     

       28
       28
       +
       

     

       30
       29
        
         configureFlags = [ ]

     

       31
       31
       -
           ++ optional   (abook != null) "--with-abook"

     

       32
       32
       -
           ++ optional   (gnupg != null) "--with-gpg"

     

       33
       33
       -
           ++ optional (goobook != null) "--with-goobook"

     

       34
       34
       -
           ++ optional   (khard != null) "--with-khard"

     

       35
       35
       -
           ++ optional      (mu != null) "--with-mu";

     

       30
       30
       +
           ++ lib.optional   (abook != null) "--with-abook"

     

       31
       31
       +
           ++ lib.optional   (gnupg != null) "--with-gpg"

     

       32
       32
       +
           ++ lib.optional (goobook != null) "--with-goobook"

     

       33
       33
       +
           ++ lib.optional   (khard != null) "--with-khard"

     

       34
       34
       +
           ++ lib.optional      (mu != null) "--with-mu";

     

       36
       35
        
       

     

       37
       36
        
         patches = [ ./add-methods-to-rc.patch

     

       38
       37
        
           # fix undefined exec_prefix. Remove with the next release

     
···

       42
       41
        
             excludes = [ "debian/changelog" ];

     

       43
       42
        
           })

     

       44
       43
        
         ];

     

       45
       45
       -
         postFixup = "wrapProgram $out/lib/mutt_ldap_query --prefix PERL5LIB : "

     

       46
       46
       -
           + "${AuthenSASL}/${perl.libPrefix}"

     

       47
       47
       -
           + ":${ConvertASN1}/${perl.libPrefix}"

     

       48
       48
       -
           + ":${perlldap}/${perl.libPrefix}";

     

       49
       44
        
       

     

       50
       50
       -
         meta = {

     

       45
       45
       +
         meta = with lib; {

     

       51
       46
        
           homepage = "https://www.spinnaker.de/lbdb/";

     

       52
       47
        
           license = licenses.gpl2;

     

       53
       48
        
           platforms = platforms.all;

+2 -2

pkgs/tools/networking/tgt/default.nix

···

       1
       1
       -
       { stdenv, lib, fetchFromGitHub, libxslt, libaio, systemd, perl, perlPackages

     

       1
       1
       +
       { stdenv, lib, fetchFromGitHub, libxslt, libaio, systemd, perl

     

       2
       2
        
       , docbook_xsl, coreutils, lsof, rdma-core, makeWrapper, sg3_utils, util-linux

     

       3
       3
        
       }:

     

       4
       4
        
       

     
···

       35
       35
        
       

     

       36
       36
        
         postInstall = ''

     

       37
       37
        
           substituteInPlace $out/sbin/tgt-admin \

     

       38
       38
       -
             --replace "#!/usr/bin/perl" "#! ${perl}/bin/perl -I${perlPackages.ConfigGeneral}/${perl.libPrefix}"

     

       38
       38
       +
             --replace "#!/usr/bin/perl" "#! ${perl.withPackages (p: [ p.ConfigGeneral ])}/bin/perl"

     

       39
       39
        
           wrapProgram $out/sbin/tgt-admin --prefix PATH : \

     

       40
       40
        
             ${lib.makeBinPath [ lsof sg3_utils (placeholder "out") ]}

     

       41
       41

+2 -1

pkgs/tools/package-management/dpkg/default.nix

···

       56
       56
        
           ''

     

       57
       57
        
             for i in $out/bin/*; do

     

       58
       58
        
               if head -n 1 $i | grep -q perl; then

     

       59
       59
       -
                 wrapProgram $i --prefix PERL5LIB : $out/${perl.libPrefix}

     

       59
       59
       +
                 substituteInPlace $i --replace \

     

       60
       60
       +
                   "${perl}/bin/perl" "${perl}/bin/perl -I $out/${perl.libPrefix}"

     

       60
       61
        
               fi

     

       61
       62
        
             done

     

       62
       63

+2 -2

pkgs/tools/virtualization/nixos-container/default.nix

···

       1
       1
       -
       { substituteAll, perlPackages, shadow, util-linux }:

     

       1
       1
       +
       { substituteAll, perl, shadow, util-linux }:

     

       2
       2
        
       

     

       3
       3
        
       substituteAll {

     

       4
       4
        
           name = "nixos-container";

     

       5
       5
        
           dir = "bin";

     

       6
       6
        
           isExecutable = true;

     

       7
       7
        
           src = ./nixos-container.pl;

     

       8
       8
       -
           perl = "${perlPackages.perl}/bin/perl -I${perlPackages.FileSlurp}/${perlPackages.perl.libPrefix}";

     

       8
       8
       +
           perl = perl.withPackages (p: [ p.FileSlurp ]);

     

       9
       9
        
           su = "${shadow.su}/bin/su";

     

       10
       10
        
           utillinux = util-linux;

     

       11
       11

+1 -1

pkgs/tools/virtualization/nixos-container/nixos-container.pl

···

       1
       1
       -
       #! @perl@

     

       1
       1
       +
       #! @perl@/bin/perl

     

       2
       2
        
       

     

       3
       3
        
       use strict;

     

       4
       4
        
       use POSIX;