commit a65e3b66cbe1d030f00764d764e67fa906ccbfcf · pyrox.dev/nixpkgs

+17

doc/builders/packages/etc-files.section.md

···

       1
       1
       +
       # /etc files {#etc}

     

       2
       2
       +
       

     

       3
       3
       +
       Certain calls in glibc require access to runtime files found in /etc such as `/etc/protocols` or `/etc/services` -- [getprotobyname](https://linux.die.net/man/3/getprotobyname) is one such function.

     

       4
       4
       +
       

     

       5
       5
       +
       On non-NixOS distributions these files are typically provided by packages (i.e. [netbase](https://packages.debian.org/sid/netbase)) if not already pre-installed in your distribution. This can cause non-reproducibility for code if they rely on these files being present.

     

       6
       6
       +
       

     

       7
       7
       +
       If [iana-etc](https://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.iana-etc.x86_64-linux) is part of your _buildInputs_ then it will set the environment varaibles `NIX_ETC_PROTOCOLS` and `NIX_ETC_SERVICES` to the corresponding files in the package through a _setup-hook_.

     

       8
       8
       +
       

     

       9
       9
       +
       ```bash

     

       10
       10
       +
       ❯ nix-shell -p iana-etc

     

       11
       11
       +
       

     

       12
       12
       +
       [nix-shell:~]$ env | grep NIX_ETC

     

       13
       13
       +
       NIX_ETC_SERVICES=/nix/store/aj866hr8fad8flnggwdhrldm0g799ccz-iana-etc-20210225/etc/services

     

       14
       14
       +
       NIX_ETC_PROTOCOLS=/nix/store/aj866hr8fad8flnggwdhrldm0g799ccz-iana-etc-20210225/etc/protocols

     

       15
       15
       +
       ```

     

       16
       16
       +
       

     

       17
       17
       +
       Nixpkg's version of [glibc](https://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.glibc.x86_64-linux) has been patched to check for the existence of these environment variables. If the environment variable are *not set*, then it will attempt to find the files at the default location within _/etc_.

doc/builders/packages/index.xml

···

       17
       17
        
        <xi:include href="kakoune.section.xml" />

     

       18
       18
        
        <xi:include href="linux.section.xml" />

     

       19
       19
        
        <xi:include href="locales.section.xml" />

     

       20
       20
       +
        <xi:include href="etc-files.section.xml" />

     

       20
       21
        
        <xi:include href="nginx.section.xml" />

     

       21
       22
        
        <xi:include href="opengl.section.xml" />

     

       22
       23
        
        <xi:include href="shell-helpers.section.xml" />

+12 -6

pkgs/data/misc/iana-etc/default.nix

···

       1
       1
       -
       { lib, fetchzip }:

     

       1
       1
       +
       { lib, fetchzip, stdenvNoCC, writeText }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         version = "20210225";

     

       5
       5
       -
       in fetchzip {

     

       5
       5
       +
       in stdenvNoCC.mkDerivation {

     

       6
       6
        
         name = "iana-etc-${version}";

     

       7
       7
       -
         url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz";

     

       8
       8
       -
         sha256 = "sha256-NVvZG3EJEYOXFDTBXD5m9sg/8msyMiBMkiZr+ZxWZ/g=";

     

       7
       7
       +
         src = fetchzip {

     

       8
       8
       +
           url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz";

     

       9
       9
       +
           sha256 = "sha256:1bbbnj2ya0apyyhnw37521yl1hrz3zy3l8dw6sacmir0y6pmx9gi";

     

       10
       10
       +
         };

     

       9
       11
        
       

     

       10
       10
       -
         postFetch = ''

     

       11
       11
       -
           tar -xzvf $downloadedFile --strip-components=1

     

       12
       12
       +
         installPhase = ''

     

       12
       13
        
           install -D -m0644 -t $out/etc services protocols

     

       14
       14
       +
         '';

     

       15
       15
       +
       

     

       16
       16
       +
         setupHook = writeText "setup-hook" ''

     

       17
       17
       +
           export NIX_ETC_PROTOCOLS=@out@/etc/protocols

     

       18
       18
       +
           export NIX_ETC_SERVICES=@out@/etc/services

     

       13
       19
        
         '';

     

       14
       20
        
       

     

       15
       21
        
         meta = with lib; {

pkgs/development/libraries/glibc/common.nix

···

       120
       120
        
             })

     

       121
       121
        
       

     

       122
       122
        
             ./fix-x64-abi.patch

     

       123
       123
       +
       

     

       124
       124
       +
             /* https://github.com/NixOS/nixpkgs/pull/137601 */

     

       125
       125
       +
             ./nix-nss-open-files.patch

     

       123
       126
        
           ]

     

       124
       127
        
           ++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch

     

       125
       128
        
           ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch;

+51

pkgs/development/libraries/glibc/nix-nss-open-files.patch

···

       1
       1
       +
       diff --git a/nss/nss_files/files-XXX.c b/nss/nss_files/files-XXX.c

     

       2
       2
       +
       index 1db9e46127..3a567e0224 100644

     

       3
       3
       +
       --- a/nss/nss_files/files-XXX.c

     

       4
       4
       +
       +++ b/nss/nss_files/files-XXX.c

     

       5
       5
       +
       @@ -75,8 +75,20 @@ internal_setent (FILE **stream)

     

       6
       6
       +
        

     

       7
       7
       +
          if (*stream == NULL)

     

       8
       8
       +
            {

     

       9
       9
       +
       -      *stream = __nss_files_fopen (DATAFILE);

     

       10
       10
       +
       -

     

       11
       11
       +
       +      const char *file = DATAFILE;

     

       12
       12
       +
       +

     

       13
       13
       +
       +      #ifdef NIX_DATAFILE

     

       14
       14
       +
       +      // use the Nix environment variable such as `NIX_ETC_PROTOCOLS`

     

       15
       15
       +
       +      char *path = secure_getenv (NIX_DATAFILE);

     

       16
       16
       +
       +

     

       17
       17
       +
       +      // if the environment variable is set, then read from the /nix/store entry instead

     

       18
       18
       +
       +      if (path && path[0]) {

     

       19
       19
       +
       +        file = path;

     

       20
       20
       +
       +      }

     

       21
       21
       +
       +      #endif

     

       22
       22
       +
       +      

     

       23
       23
       +
       +      *stream = __nss_files_fopen (file);

     

       24
       24
       +
       +    

     

       25
       25
       +
              if (*stream == NULL)

     

       26
       26
       +
        	status = errno == EAGAIN ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL;

     

       27
       27
       +
            }

     

       28
       28
       +
       diff --git a/nss/nss_files/files-proto.c b/nss/nss_files/files-proto.c

     

       29
       29
       +
       index c30bedc0aa..b321e68d3c 100644

     

       30
       30
       +
       --- a/nss/nss_files/files-proto.c

     

       31
       31
       +
       +++ b/nss/nss_files/files-proto.c

     

       32
       32
       +
       @@ -23,6 +23,7 @@ NSS_DECLARE_MODULE_FUNCTIONS (files)

     

       33
       33
       +
        

     

       34
       34
       +
        #define ENTNAME		protoent

     

       35
       35
       +
        #define DATABASE	"protocols"

     

       36
       36
       +
       +#define NIX_DATAFILE "NIX_ETC_PROTOCOLS"

     

       37
       37
       +
        

     

       38
       38
       +
        struct protoent_data {};

     

       39
       39
       +
        

     

       40
       40
       +
       diff --git a/nss/nss_files/files-service.c b/nss/nss_files/files-service.c

     

       41
       41
       +
       index bfc2590699..0bff36aee5 100644

     

       42
       42
       +
       --- a/nss/nss_files/files-service.c

     

       43
       43
       +
       +++ b/nss/nss_files/files-service.c

     

       44
       44
       +
       @@ -24,6 +24,7 @@ NSS_DECLARE_MODULE_FUNCTIONS (files)

     

       45
       45
       +
        

     

       46
       46
       +
        #define ENTNAME		servent

     

       47
       47
       +
        #define DATABASE	"services"

     

       48
       48
       +
       +#define NIX_DATAFILE "NIX_ETC_SERVICES"

     

       49
       49
       +
        

     

       50
       50
       +
        struct servent_data {};

     

       51
       51
       +