commit 360f420ac7df37e8987473f49e00175ef70732b8 · pyrox.dev/nixpkgs

+16 -15

doc/functions.xml

···

       523
       523
        
           <callout arearefs='ex-dockerTools-buildImage-2'>

     

       524
       524
        
            <para>

     

       525
       525
        
             <varname>tag</varname> specifies the tag of the resulting image. By

     

       526
       526
       -
             default it's <literal>null</literal>, which indicates that the nix output hash will be used as tag.

     

       526
       526
       +
             default it's <literal>null</literal>, which indicates that the nix output

     

       527
       527
       +
             hash will be used as tag.

     

       527
       528
        
            </para>

     

       528
       529
        
           </callout>

     

       529
       530
        
           <callout arearefs='ex-dockerTools-buildImage-3'>

     
···

       669
       670
        
            <para>

     

       670
       671
        
             <varname>imageDigest</varname> specifies the digest of the image to be

     

       671
       672
        
             downloaded. Skopeo can be used to get the digest of an image, with its

     

       672
       672
       -
             <varname>inspect</varname> subcommand.  Since a given <varname>imageName</varname>

     

       673
       673
       -
             may transparently refer to a manifest list of images which support

     

       674
       674
       -
             multiple architectures and/or operating systems, supply the `--override-os`

     

       675
       675
       -
             and `--override-arch` arguments to specify exactly which image you

     

       676
       676
       -
             want.  By default it will match the OS and architecture of the host the

     

       677
       677
       -
             command is run on.

     

       673
       673
       +
             <varname>inspect</varname> subcommand. Since a given

     

       674
       674
       +
             <varname>imageName</varname> may transparently refer to a manifest list

     

       675
       675
       +
             of images which support multiple architectures and/or operating systems,

     

       676
       676
       +
             supply the `--override-os` and `--override-arch` arguments to specify

     

       677
       677
       +
             exactly which image you want. By default it will match the OS and

     

       678
       678
       +
             architecture of the host the command is run on.

     

       678
       679
        
       <programlisting>

     

       679
       680
        
         $ nix-shell --packages skopeo jq --command "skopeo --override-os linux --override-arch x86_64 inspect docker://docker.io/nixos/nix:1.11 | jq -r '.Digest'"

     

       680
       681
        
         sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b

     
···

       697
       698
        
            </para>

     

       698
       699
        
           </callout>

     

       699
       700
        
           <callout arearefs='ex-dockerTools-pullImage-5'>

     

       700
       700
       -
             <para>

     

       701
       701
       -
               <varname>os</varname>, if specified, is the operating system of the fetched image.

     

       702
       702
       -
               By default it's <literal>linux</literal>.

     

       703
       703
       -
             </para>

     

       701
       701
       +
            <para>

     

       702
       702
       +
             <varname>os</varname>, if specified, is the operating system of the

     

       703
       703
       +
             fetched image. By default it's <literal>linux</literal>.

     

       704
       704
       +
            </para>

     

       704
       705
        
           </callout>

     

       705
       706
        
           <callout arearefs='ex-dockerTools-pullImage-6'>

     

       706
       706
       -
             <para>

     

       707
       707
       -
               <varname>arch</varname>, if specified, is the cpu architecture of the fetched image.

     

       708
       708
       -
               By default it's <literal>x86_64</literal>.

     

       709
       709
       -
             </para>

     

       707
       707
       +
            <para>

     

       708
       708
       +
             <varname>arch</varname>, if specified, is the cpu architecture of the

     

       709
       709
       +
             fetched image. By default it's <literal>x86_64</literal>.

     

       710
       710
       +
            </para>

     

       710
       711
        
           </callout>

     

       711
       712
        
          </calloutlist>

     

       712
       713
        
         </section>

+11 -13

doc/languages-frameworks/java.xml

···

       16
       16
        
       }

     

       17
       17
        
       </programlisting>

     

       18
       18
        
         Note that <varname>jdk</varname> is an alias for the OpenJDK (self-built

     

       19
       19
       -
         where available, or pre-built via Zulu).

     

       20
       20
       -
         Platforms with OpenJDK not (yet) in Nixpkgs (<literal>Aarch32</literal>,

     

       21
       21
       -
         <literal>Aarch64</literal>) point to the (unfree)

     

       22
       22
       -
         <literal>oraclejdk</literal>.

     

       23
       23
       -
       </para>

     

       19
       19
       +
         where available, or pre-built via Zulu). Platforms with OpenJDK not (yet) in

     

       20
       20
       +
         Nixpkgs (<literal>Aarch32</literal>, <literal>Aarch64</literal>) point to the

     

       21
       21
       +
         (unfree) <literal>oraclejdk</literal>.

     

       22
       22
       +
        </para>

     

       24
       23
        
       

     

       25
       24
        
        <para>

     

       26
       25
        
         JAR files that are intended to be used by other packages should be installed

     

       27
       27
       -
         in <filename>$out/share/java</filename>. JDKs have a stdenv setup hook

     

       28
       28
       -
         that add any JARs in the <filename>share/java</filename> directories of the

     

       29
       29
       -
         build inputs to the <envar>CLASSPATH</envar> environment variable. For

     

       30
       30
       -
         instance, if the package <literal>libfoo</literal> installs a JAR named

     

       26
       26
       +
         in <filename>$out/share/java</filename>. JDKs have a stdenv setup hook that

     

       27
       27
       +
         add any JARs in the <filename>share/java</filename> directories of the build

     

       28
       28
       +
         inputs to the <envar>CLASSPATH</envar> environment variable. For instance, if

     

       29
       29
       +
         the package <literal>libfoo</literal> installs a JAR named

     

       31
       30
        
         <filename>foo.jar</filename> in its <filename>share/java</filename>

     

       32
       31
        
         directory, and another package declares the attribute

     

       33
       32
        
       <programlisting>

     
···

       61
       60
        
         <literal>${jre}/bin/java</literal> instead of

     

       62
       61
        
         <literal>${jdk}/bin/java</literal>, you prevent your package from depending

     

       63
       62
        
         on the JDK at runtime.

     

       64
       64
       -
       </para>

     

       63
       63
       +
        </para>

     

       65
       64
        
       

     

       66
       66
       -
       <para>

     

       65
       65
       +
        <para>

     

       67
       66
        
         Note all JDKs passthru <literal>home</literal>, so if your application

     

       68
       67
        
         requires environment variables like <envar>JAVA_HOME</envar> being set, that

     

       69
       68
        
         can be done in a generic fashion with the <literal>--set</literal> argument

     

       70
       69
        
         of <literal>makeWrapper</literal>:

     

       71
       71
       -
       

     

       72
       70
        
       <programlisting>

     

       73
       71
        
         --set JAVA_HOME ${jdk.home}

     

       74
       72
        
       </programlisting>

     

       75
       75
       -
       </para>

     

       73
       73
       +
        </para>

     

       76
       74
        
       

     

       77
       75
        
        <para>

     

       78
       76
        
         It is possible to use a different Java compiler than <command>javac</command>

+29 -19

doc/package-notes.xml

···

       709
       709
        
         <title>Citrix Receiver</title>

     

       710
       710
        
       

     

       711
       711
        
         <para>

     

       712
       712
       -
          The <link xlink:href="https://www.citrix.com/products/receiver/">Citrix Receiver</link> is a remote

     

       713
       713
       -
          desktop viewer which provides access to

     

       714
       714
       -
          <link xlink:href="https://www.citrix.com/products/xenapp-xendesktop/">XenDesktop</link> installations.

     

       712
       712
       +
          The <link xlink:href="https://www.citrix.com/products/receiver/">Citrix

     

       713
       713
       +
          Receiver</link> is a remote desktop viewer which provides access to

     

       714
       714
       +
          <link xlink:href="https://www.citrix.com/products/xenapp-xendesktop/">XenDesktop</link>

     

       715
       715
       +
          installations.

     

       715
       716
        
         </para>

     

       716
       717
        
       

     

       717
       718
        
         <section xml:id="sec-citrix-base">

     

       718
       719
        
          <title>Basic usage</title>

     

       720
       720
       +
       

     

       719
       721
        
          <para>

     

       720
       720
       -
           The tarball archive needs to be downloaded manually as the licenses agreements of the vendor

     

       721
       721
       -
           need to be accepted first. This is available at the

     

       722
       722
       -
           <link xlink:href="https://www.citrix.com/downloads/citrix-receiver/">download page at citrix.com</link>.

     

       723
       723
       -
           Then run <literal>nix-prefetch-url file://$PWD/linuxx64-$version.tar.gz</literal>.

     

       724
       724
       -
           With the archive available in the store the package can be built and installed with Nix.

     

       722
       722
       +
           The tarball archive needs to be downloaded manually as the licenses

     

       723
       723
       +
           agreements of the vendor need to be accepted first. This is available at

     

       724
       724
       +
           the

     

       725
       725
       +
           <link xlink:href="https://www.citrix.com/downloads/citrix-receiver/">download

     

       726
       726
       +
           page at citrix.com</link>. Then run <literal>nix-prefetch-url

     

       727
       727
       +
           file://$PWD/linuxx64-$version.tar.gz</literal>. With the archive available

     

       728
       728
       +
           in the store the package can be built and installed with Nix.

     

       725
       729
        
          </para>

     

       726
       730
        
       

     

       727
       731
        
          <para>

     

       728
       728
       -
           <emphasis>Note: it's recommended to install <literal>Citrix Receiver</literal> using

     

       729
       729
       -
           <literal>nix-env -i</literal> or globally to ensure that the <literal>.desktop</literal> files

     

       730
       730
       -
           are installed properly into <literal>$XDG_CONFIG_DIRS</literal>. Otherwise it won't

     

       731
       731
       -
           be possible to open <literal>.ica</literal> files

     

       732
       732
       -
           automatically from the browser to start a Citrix connection.</emphasis>

     

       732
       732
       +
           <emphasis>Note: it's recommended to install <literal>Citrix

     

       733
       733
       +
           Receiver</literal> using <literal>nix-env -i</literal> or globally to

     

       734
       734
       +
           ensure that the <literal>.desktop</literal> files are installed properly

     

       735
       735
       +
           into <literal>$XDG_CONFIG_DIRS</literal>. Otherwise it won't be possible to

     

       736
       736
       +
           open <literal>.ica</literal> files automatically from the browser to start

     

       737
       737
       +
           a Citrix connection.</emphasis>

     

       733
       738
        
          </para>

     

       734
       739
        
         </section>

     

       740
       740
       +
       

     

       735
       741
        
         <section xml:id="sec-citrix-custom-certs">

     

       736
       742
        
          <title>Custom certificates</title>

     

       743
       743
       +
       

     

       737
       744
        
          <para>

     

       738
       738
       -
           The <literal>Citrix Receiver</literal> in <literal>nixpkgs</literal> trusts several certificates

     

       739
       739
       -
           <link xlink:href="https://curl.haxx.se/docs/caextract.html">from the Mozilla database</link> by default.

     

       740
       740
       -
           However several companies using Citrix might require their own corporate certificate. On distros with imperative

     

       745
       745
       +
           The <literal>Citrix Receiver</literal> in <literal>nixpkgs</literal> trusts

     

       746
       746
       +
           several certificates

     

       747
       747
       +
           <link xlink:href="https://curl.haxx.se/docs/caextract.html">from the

     

       748
       748
       +
           Mozilla database</link> by default. However several companies using Citrix

     

       749
       749
       +
           might require their own corporate certificate. On distros with imperative

     

       741
       750
        
           packaging these certs can be stored easily in

     

       742
       751
        
           <link xlink:href="https://developer-docs.citrix.com/projects/receiver-for-linux-command-reference/en/13.7/"><literal>$ICAROOT</literal></link>,

     

       743
       743
       -
           however this directory is a store path in <literal>nixpkgs</literal>. In order to work around this issue the package provides a simple

     

       744
       744
       -
           mechanism to add custom certificates without rebuilding the entire package using <literal>symlinkJoin</literal>:

     

       745
       745
       -
       

     

       752
       752
       +
           however this directory is a store path in <literal>nixpkgs</literal>. In

     

       753
       753
       +
           order to work around this issue the package provides a simple mechanism to

     

       754
       754
       +
           add custom certificates without rebuilding the entire package using

     

       755
       755
       +
           <literal>symlinkJoin</literal>:

     

       746
       756
        
       <programlisting>

     

       747
       757
        
       <![CDATA[with import <nixpkgs> { config.allowUnfree = true; };

     

       748
       758
        
       let extraCerts = [ ./custom-cert-1.pem ./custom-cert-2.pem /* ... */ ]; in

+3 -5

doc/platform-notes.xml

···

       29
       29
        
             }

     

       30
       30
        
           </programlisting>

     

       31
       31
        
          </listitem>

     

       32
       32
       -
       

     

       33
       32
        
          <listitem>

     

       34
       33
        
           <para>

     

       35
       34
        
            On darwin libraries are linked using absolute paths, libraries are

     
···

       47
       46
        
             }

     

       48
       47
        
           </programlisting>

     

       49
       48
        
          </listitem>

     

       50
       50
       -
       

     

       51
       49
        
          <listitem>

     

       52
       50
        
           <para>

     

       53
       51
        
            Even if the libraries are linked using absolute paths and resolved via

     

       54
       52
        
            their <literal>install_name</literal> correctly, tests can sometimes fail

     

       55
       55
       -
            to run binaries.  This happens because the <varname>checkPhase</varname>

     

       53
       53
       +
            to run binaries. This happens because the <varname>checkPhase</varname>

     

       56
       54
        
            runs before the libraries are installed.

     

       57
       55
        
           </para>

     

       58
       56
        
           <para>

     

       59
       57
        
            This can usually be solved by running the tests after the

     

       60
       58
        
            <varname>installPhase</varname> or alternatively by using

     

       61
       59
        
            <varname>DYLD_LIBRARY_PATH</varname>. More information about this variable

     

       62
       62
       -
            can be found in the <citerefentry><refentrytitle>dyld</refentrytitle>

     

       60
       60
       +
            can be found in the <citerefentry>

     

       61
       61
       +
            <refentrytitle>dyld</refentrytitle>

     

       63
       62
        
            <manvolnum>1</manvolnum></citerefentry> manpage.

     

       64
       63
        
           </para>

     

       65
       64
        
       <programlisting>

     
···

       77
       76
        
             }

     

       78
       77
        
           </programlisting>

     

       79
       78
        
          </listitem>

     

       80
       80
       -
       

     

       81
       79
        
          <listitem>

     

       82
       80
        
           <para>

     

       83
       81
        
            Some packages assume xcode is available and use <command>xcrun</command>

+21 -18

doc/reviewing-contributions.xml

···

       6
       6
        
        <title>Reviewing contributions</title>

     

       7
       7
        
        <warning>

     

       8
       8
        
         <para>

     

       9
       9
       -
          The following section is a draft, and the policy for reviewing is still being

     

       10
       10
       -
          discussed in issues such as <link

     

       9
       9
       +
          The following section is a draft, and the policy for reviewing is still

     

       10
       10
       +
          being discussed in issues such as

     

       11
       11
       +
          <link

     

       11
       12
        
       	   xlink:href="https://github.com/NixOS/nixpkgs/issues/11166">#11166

     

       12
       12
       -
          </link> and <link

     

       13
       13
       +
          </link> and

     

       14
       14
       +
          <link

     

       13
       15
        
       	   xlink:href="https://github.com/NixOS/nixpkgs/issues/20836">#20836

     

       14
       16
        
          </link>.

     

       15
       17
        
         </para>

     

       16
       18
        
        </warning>

     

       17
       19
        
        <para>

     

       18
       18
       -
         The nixpkgs project receives a fairly high number of contributions via

     

       19
       19
       -
         GitHub pull-requests. Reviewing and approving these is an important task and

     

       20
       20
       -
         a way to contribute to the project.

     

       20
       20
       +
         The nixpkgs project receives a fairly high number of contributions via GitHub

     

       21
       21
       +
         pull-requests. Reviewing and approving these is an important task and a way

     

       22
       22
       +
         to contribute to the project.

     

       21
       23
        
        </para>

     

       22
       24
        
        <para>

     

       23
       25
        
         The high change rate of nixpkgs makes any pull request that remains open for

     
···

       40
       42
        
         to respect every community member and their work.

     

       41
       43
        
        </para>

     

       42
       44
        
        <para>

     

       43
       43
       -
         GitHub provides reactions as a simple and quick way to provide

     

       44
       44
       -
         feedback to pull-requests or any comments. The thumb-down reaction should be

     

       45
       45
       -
         used with care and if possible accompanied with some explanation so the

     

       46
       46
       -
         submitter has directions to improve their contribution.

     

       45
       45
       +
         GitHub provides reactions as a simple and quick way to provide feedback to

     

       46
       46
       +
         pull-requests or any comments. The thumb-down reaction should be used with

     

       47
       47
       +
         care and if possible accompanied with some explanation so the submitter has

     

       48
       48
       +
         directions to improve their contribution.

     

       47
       49
        
        </para>

     

       48
       50
        
        <para>

     

       49
       51
        
         Pull-request reviews should include a list of what has been reviewed in a

     
···

       117
       119
        
           <itemizedlist>

     

       118
       120
        
            <listitem>

     

       119
       121
        
             <para>

     

       120
       120
       -
              License can change with version updates, so it should be checked to match

     

       121
       121
       -
              the upstream license.

     

       122
       122
       +
              License can change with version updates, so it should be checked to

     

       123
       123
       +
              match the upstream license.

     

       122
       124
        
             </para>

     

       123
       125
        
            </listitem>

     

       124
       126
        
            <listitem>

     
···

       143
       145
        
            <listitem>

     

       144
       146
        
             <para>

     

       145
       147
        
              Pull-requests are often targeted to the master or staging branch, and

     

       146
       146
       -
              building the pull-request locally when it is submitted can trigger

     

       147
       147
       -
              many source builds.

     

       148
       148
       +
              building the pull-request locally when it is submitted can trigger many

     

       149
       149
       +
              source builds.

     

       148
       150
        
             </para>

     

       149
       151
        
             <para>

     

       150
       152
        
              It is possible to rebase the changes on nixos-unstable or

     
···

       605
       607
        
       -->

     

       606
       608
        
       

     

       607
       609
        
         <para>

     

       608
       608
       -
          In a case a contributor leaves definitively the Nix community, he

     

       609
       609
       -
          should create an issue or post on <link

     

       610
       610
       +
          In a case a contributor leaves definitively the Nix community, he should

     

       611
       611
       +
          create an issue or post on

     

       612
       612
       +
          <link

     

       610
       613
        
          xlink:href="https://discourse.nixos.org">Discourse</link> with

     

       611
       611
       -
          references of packages and modules he maintains so the

     

       612
       612
       -
          maintainership can be taken over by other contributors.

     

       614
       614
       +
          references of packages and modules he maintains so the maintainership can be

     

       615
       615
       +
          taken over by other contributors.

     

       613
       616
        
         </para>

     

       614
       617
        
        </section>

     

       615
       618
        
       </chapter>