Unverified Commit 57af37a3 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into haskell-updates

parents 92ce1123 b90f2b68

doc/languages-frameworks/gnome.section.md

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ To avoid costly file system access when locating icons, GTK, [as well as Qt](htt 


### Packaging icon themes {#ssec-icon-theme-packaging}



Icon themes may inherit from other icon themes. The inheritance is specified using the `Inherits` key in the `index.theme` file distributed with the icon theme. According to the [icon theme specification](https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html), icons not provided by the theme are looked for in its parent icon themes. Therefore the parent themes should be installed as dependencies for a more complete experience regarding the icon sets used.

Icon themes may inherit from other icon themes. The inheritance is specified using the `Inherits` key in the `index.theme` file distributed with the icon theme. According to the [icon theme specification](https://specifications.freedesktop.org/icon-theme-spec/latest), icons not provided by the theme are looked for in its parent icon themes. Therefore the parent themes should be installed as dependencies for a more complete experience regarding the icon sets used.



The package `hicolor-icon-theme` provides a setup hook which makes symbolic links for the parent themes into the directory `share/icons` of the current theme directory in the nix store, making sure they can be found at runtime. For that to work the packages providing parent icon themes should be listed as propagated build dependencies, together with `hicolor-icon-theme`.

maintainers/maintainer-list.nix

+11 −0
Original line number Diff line number Diff line
@@ -12193,6 +12193,11 @@ 
    github = "lenivaya";

    githubId = 49302467;

  };

  lenny = {

    name = "Lenny.";

    matrix = "lenny@flipdot.org";

    keys = [ { fingerprint = "6D63 2D4D 0CFE 8D53 F5FD  C7ED 738F C800 6E9E A634"; } ];

  };

  leo248 = {

    github = "leo248";

    githubId = 95365184;
@@ -15580,6 +15585,12 @@ 
    githubId = 3159451;

    name = "Nicolas Schneider";

  };

  nipeharefa = {

    name = "Nipe Harefa";

    email = "nipeharefa@gmail.com";

    github = "nipeharefa";

    githubId = 12620257;

  };

  NIS = {

    name = "NSC IT Solutions";

    github = "dev-nis";

nixos/lib/systemd-lib.nix

+3 −2
Original line number Diff line number Diff line
@@ -99,8 +99,9 @@ in rec { 
      l = reverseList (stringToCharacters s);

      suffix = head l;

      nums = tail l;

    in elem suffix (["K" "M" "G" "T"] ++ digits)

      && all (num: elem num digits) nums;

    in builtins.isInt s

      || (elem suffix (["K" "M" "G" "T"] ++ digits)

          && all (num: elem num digits) nums);



  assertByteFormat = name: group: attr:

    optional (attr ? ${name} && ! isByteFormat attr.${name})

nixos/modules/config/xdg/autostart.nix

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
      default = true;

      description = ''

        Whether to install files to support the

        [XDG Autostart specification](https://specifications.freedesktop.org/autostart-spec/autostart-spec-latest.html).

        [XDG Autostart specification](https://specifications.freedesktop.org/autostart-spec/latest).

      '';

    };

  };

nixos/modules/config/xdg/icons.nix

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
      default = true;

      description = ''

        Whether to install files to support the

        [XDG Icon Theme specification](https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html).

        [XDG Icon Theme specification](https://specifications.freedesktop.org/icon-theme-spec/latest).

      '';

    };

    xdg.icons.fallbackCursorThemes = lib.mkOption {