Unverified Commit b39924fc authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #179844: staging-next 2022-07-01

parents 0be91cef add0201f

doc/languages-frameworks/perl.section.md

+15 −11
Original line number Diff line number Diff line 
# Perl {#sec-language-perl}



## Running perl programs on the shell {#ssec-perl-running}

## Running Perl programs on the shell {#ssec-perl-running}



When executing a Perl script, it is possible you get an error such as `./myscript.pl: bad interpreter: /usr/bin/perl: no such file or directory`. This happens when the script expects Perl to be installed at `/usr/bin/perl`, which is not the case when using Perl from nixpkgs. You can fix the script by changing the first line to:
@@ -35,15 +35,16 @@ Perl packages from CPAN are defined in [pkgs/top-level/perl-packages.nix](https: 


```nix

ClassC3 = buildPerlPackage rec {

  name = "Class-C3-0.21";

  pname = "Class-C3";

  version = "0.21";

  src = fetchurl {

    url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz";

    url = "mirror://cpan/authors/id/F/FL/FLORA/${pname}-${version}.tar.gz";

    sha256 = "1bl8z095y4js66pwxnm7s853pi9czala4sqc743fdlnk27kq94gz";

  };

};

```



Note the use of `mirror://cpan/`, and the `${name}` in the URL definition to ensure that the name attribute is consistent with the source that we’re actually downloading. Perl packages are made available in `all-packages.nix` through the variable `perlPackages`. For instance, if you have a package that needs `ClassC3`, you would typically write

Note the use of `mirror://cpan/`, and the `pname` and `version` in the URL definition to ensure that the `pname` attribute is consistent with the source that we’re actually downloading. Perl packages are made available in `all-packages.nix` through the variable `perlPackages`. For instance, if you have a package that needs `ClassC3`, you would typically write



```nix

foo = import ../path/to/foo.nix {
@@ -72,10 +73,11 @@ So what does `buildPerlPackage` do? It does the following: 
{ buildPerlPackage, fetchurl, db }:



buildPerlPackage rec {

  name = "BerkeleyDB-0.36";

  pname = "BerkeleyDB";

  version = "0.36";



  src = fetchurl {

    url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";

    url = "mirror://cpan/authors/id/P/PM/PMQS/${pname}-${version}.tar.gz";

    sha256 = "07xf50riarb60l1h6m2dqmql8q5dij619712fsgw7ach04d8g3z1";

  };
@@ -90,9 +92,10 @@ Dependencies on other Perl packages can be specified in the `buildInputs` and `p 


```nix

ClassC3Componentised = buildPerlPackage rec {

  name = "Class-C3-Componentised-1.0004";

  pname = "Class-C3-Componentised";

  version = "1.0004";

  src = fetchurl {

    url = "mirror://cpan/authors/id/A/AS/ASH/${name}.tar.gz";

    url = "mirror://cpan/authors/id/A/AS/ASH/${pname}-${version}.tar.gz";

    sha256 = "0xql73jkcdbq4q9m0b0rnca6nrlvf5hyzy8is0crdk65bynvs8q1";

  };

  propagatedBuildInputs = [
@@ -111,7 +114,7 @@ ImageExifTool = buildPerlPackage { 
  version = "11.50";



  src = fetchurl {

    url = "https://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-11.50.tar.gz";

    url = "https://www.sno.phy.queensu.ca/~phil/exiftool/${pname}-${version}.tar.gz";

    sha256 = "0d8v48y94z8maxkmw1rv7v9m0jg2dc8xbp581njb6yhr7abwqdv3";

  };
@@ -139,9 +142,10 @@ This program takes a Perl module name, looks it up on CPAN, fetches and unpacks 
```ShellSession

$ nix-generate-from-cpan XML::Simple

  XMLSimple = buildPerlPackage rec {

    name = "XML-Simple-2.22";

    pname = "XML-Simple";

    version = "2.22";

    src = fetchurl {

      url = "mirror://cpan/authors/id/G/GR/GRANTM/${name}.tar.gz";

      url = "mirror://cpan/authors/id/G/GR/GRANTM/XML-Simple-2.22.tar.gz";

      sha256 = "b9450ef22ea9644ae5d6ada086dc4300fa105be050a2030ebd4efd28c198eb49";

    };

    propagatedBuildInputs = [ XMLNamespaceSupport XMLSAX XMLSAXExpat ];

pkgs/applications/networking/cluster/kompose/default.nix

+2 −2
Original line number Diff line number Diff line 
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, kompose }:

{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, kompose, git }:



buildGoModule rec {

  pname = "kompose";
@@ -13,7 +13,7 @@ buildGoModule rec { 


  vendorSha256 = "sha256-OR5U2PnebO0a+lwU09Dveh0Yxk91cmSRorTxQIO5lHc=";



  nativeBuildInputs = [ installShellFiles ];

  nativeBuildInputs = [ installShellFiles git ];



  ldflags = [ "-s" "-w" ];

pkgs/applications/version-management/git-and-tools/gitbatch/default.nix

+10 −2
Original line number Diff line number Diff line 
{ lib, buildGoModule, fetchFromGitHub }:

{ lib, buildGoModule, fetchFromGitHub, git }:



buildGoModule rec {

  pname = "gitbatch";
@@ -15,7 +15,15 @@ buildGoModule rec { 


  ldflags = [ "-s" "-w" ];



  checkFlags = [ "-short" ];

  nativeBuildInputs = [

    git # required by unit tests

  ];



  preCheck = ''

    HOME=$(mktemp -d)

    # Disable tests requiring network access to gitlab.com

    buildFlagsArray+=("-run" "[^(Test(Run|Start|(Fetch|Pull)With(Go|)Git))]")

  '';



  meta = with lib; {

    description = "Running git UI commands";

pkgs/data/misc/cacert/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ let 
  blocklist = writeText "cacert-blocklist.txt" (lib.concatStringsSep "\n" blacklist);

  extraCertificatesBundle = writeText "cacert-extra-certificates-bundle.crt" (lib.concatStringsSep "\n\n" extraCertificateStrings);



  srcVersion = "3.77";

  srcVersion = "3.80";

  version = if nssOverride != null then nssOverride.version else srcVersion;

  meta = with lib; {

    homepage = "https://curl.haxx.se/docs/caextract.html";
@@ -35,7 +35,7 @@ let 


    src = if nssOverride != null then nssOverride.src else fetchurl {

      url = "mirror://mozilla/security/nss/releases/NSS_${lib.replaceStrings ["."] ["_"] version}_RTM/src/nss-${version}.tar.gz";

      sha256 = "1pfy33b51914sivqyaxdwfd930hzb77gm07z4f57hnyk5xddypl2";

      sha256 = "sha256-wL8f0sfimmsCswliK6r8RD7skMiTS7FV2ku5iYh4S2o=";

    };



    dontBuild = true;

pkgs/development/compilers/gcc/10/default.nix

+3 −5
Original line number Diff line number Diff line
@@ -53,11 +53,11 @@ with lib; 
with builtins;



let majorVersion = "10";

    version = "${majorVersion}.3.0";

    version = "${majorVersion}.4.0";



    inherit (stdenv) buildPlatform hostPlatform targetPlatform;



    patches = [ ./gcc10-asan-glibc-2.34.patch ]

    patches = [ ]

      ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch

      ++ optional noSysDirs ../no-sys-dirs.patch

      ++ optional (noSysDirs && hostPlatform.isRiscV) ../no-sys-dirs-riscv.patch
@@ -73,8 +73,6 @@ let majorVersion = "10"; 
      # Obtain latest patch with ../update-mcfgthread-patches.sh

      ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch



      ++ [ ../libsanitizer-no-cyclades.patch ]



      ++ optional (buildPlatform.system == "aarch64-darwin" && targetPlatform != buildPlatform) (fetchpatch {

        url = "https://raw.githubusercontent.com/richard-vd/musl-cross-make/5e9e87f06fc3220e102c29d3413fbbffa456fcd6/patches/gcc-${version}/0008-darwin-aarch64-self-host-driver.patch";

        sha256 = "sha256-XtykrPd5h/tsnjY1wGjzSOJ+AyyNLsfnjuOZ5Ryq9vA=";
@@ -95,7 +93,7 @@ stdenv.mkDerivation ({ 


  src = fetchurl {

    url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";

    sha256 = "0i6378ig6h397zkhd7m4ccwjx5alvzrf2hm27p1pzwjhlv0h9x34";

    sha256 = "1wg4xdizkksmwi66mvv2v4pk3ja8x64m7v9gzhykzd3wrmdpsaf9";

  };



  inherit patches;