Commit 679136e2 authored by Frederik Rietdijk's avatar Frederik Rietdijk
Browse files

Merge staging-next into staging

parents 7a3be966 bef20b38

lib/attrsets.nix

+1 −0
Original line number Diff line number Diff line
@@ -469,6 +469,7 @@ rec { 
  getBin = getOutput "bin";

  getLib = getOutput "lib";

  getDev = getOutput "dev";

  getMan = getOutput "man";



  /* Pick the outputs of packages to place in buildInputs */

  chooseDevOutputs = drvs: builtins.map getDev drvs;

lib/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ let 
      genAttrs isDerivation toDerivation optionalAttrs

      zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil

      recursiveUpdate matchAttrs overrideExisting getOutput getBin

      getLib getDev chooseDevOutputs zipWithNames zip

      getLib getDev getMan chooseDevOutputs zipWithNames zip

      recurseIntoAttrs dontRecurseIntoAttrs;

    inherit (lists) singleton forEach foldr fold foldl foldl' imap0 imap1

      concatMap flatten remove findSingle findFirst any all count

nixos/doc/manual/release-notes/rl-2009.xml

+9 −0
Original line number Diff line number Diff line
@@ -110,6 +110,15 @@ systemd.services.mysql.serviceConfig.ReadWritePaths = [ "/var/data" ]; 
</programlisting>

    </para>

   </listitem>

   <listitem>

    <para>

      Two new option <link linkend="opt-documentation.man.generateCaches">documentation.man.generateCaches</link>

      has been added to automatically generate the <literal>man-db</literal> caches, which are needed by utilities

      like <command>whatis</command> and <command>apropos</command>. The caches are generated during the build of

      the NixOS configuration: since this can be expensive when a large number of packages are installed, the

      feature is disabled by default.

    </para>

   </listitem>

  </itemizedlist>

 </section>

nixos/modules/misc/documentation.nix

+37 −1
Original line number Diff line number Diff line
@@ -102,6 +102,16 @@ in 
        '';

      };



      man.generateCaches = mkOption {

        type = types.bool;

        default = false;

        description = ''

          Whether to generate the manual page index caches using

          <literal>mandb(8)</literal>. This allows searching for a page or

          keyword using utilities like <literal>apropos(1)</literal>.

        '';

      };



      info.enable = mkOption {

        type = types.bool;

        default = true;
@@ -187,7 +197,33 @@ in 
      environment.systemPackages = [ pkgs.man-db ];

      environment.pathsToLink = [ "/share/man" ];

      environment.extraOutputsToInstall = [ "man" ] ++ optional cfg.dev.enable "devman";

      environment.etc."man.conf".source = "${pkgs.man-db}/etc/man_db.conf";

      environment.etc."man_db.conf".text =

        let

          manualPages = pkgs.buildEnv {

            name = "man-paths";

            paths = config.environment.systemPackages;

            pathsToLink = [ "/share/man" ];

            extraOutputsToInstall = ["man"];

            ignoreCollisions = true;

          };

          manualCache = pkgs.runCommandLocal "man-cache" { }

          ''

            echo "MANDB_MAP ${manualPages}/share/man $out" > man.conf

            ${pkgs.man-db}/bin/mandb -C man.conf -psc

          '';

        in

        ''

          # Manual pages paths for NixOS

          MANPATH_MAP /run/current-system/sw/bin /run/current-system/sw/share/man

          MANPATH_MAP /run/wrappers/bin          /run/current-system/sw/share/man



          ${optionalString cfg.man.generateCaches ''

          # Generated manual pages cache for NixOS (immutable)

          MANDB_MAP /run/current-system/sw/share/man ${manualCache}

          ''}

          # Manual pages caches for NixOS

          MANDB_MAP /run/current-system/sw/share/man /var/cache/man/nixos

        '';

    })



    (mkIf cfg.info.enable {

pkgs/data/icons/numix-icon-theme/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 


stdenv.mkDerivation rec {

  pname = "numix-icon-theme";

  version = "20.03.20";

  version = "20.06.07";



  src = fetchFromGitHub {

    owner = "numixproject";

    repo = pname;

    rev = version;

    sha256 = "092f8k38xf9yz898nrangm0ia211d41z8kx0v6njfqfgpiad1s7q";

    sha256 = "1yp9parc8ihmai8pswf4qzrqd88qpls87ipq8ylx38yqns7wsn4h";

  };



  nativeBuildInputs = [ gtk3 ];