commit 818ef4d7acf937acf589fea6e7ae2125f433c581 · pyrox.dev/nixpkgs

-1

nixos/modules/module-list.nix

···

       355
       355
        
         ./programs/xonsh.nix

     

       356
       356
        
         ./programs/xss-lock.nix

     

       357
       357
        
         ./programs/xwayland.nix

     

       358
       358
       -
         ./programs/yabar.nix

     

       359
       358
        
         ./programs/yazi.nix

     

       360
       359
        
         ./programs/ydotool.nix

     

       361
       360
        
         ./programs/yubikey-touch-detector.nix

-187

nixos/modules/programs/yabar.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         pkgs,

     

       4
       4
       -
         config,

     

       5
       5
       -
         ...

     

       6
       6
       -
       }:

     

       7
       7
       -
       

     

       8
       8
       -
       let

     

       9
       9
       -
         cfg = config.programs.yabar;

     

       10
       10
       -
       

     

       11
       11
       -
         mapExtra =

     

       12
       12
       -
           v:

     

       13
       13
       -
           lib.concatStringsSep "\n" (

     

       14
       14
       -
             lib.mapAttrsToList (

     

       15
       15
       -
               key: val:

     

       16
       16
       -
               "${key} = ${if (builtins.isString val) then "\"${val}\"" else "${builtins.toString val}"};"

     

       17
       17
       -
             ) v

     

       18
       18
       -
           );

     

       19
       19
       -
       

     

       20
       20
       -
         listKeys = r: builtins.concatStringsSep "," (builtins.map (n: "\"${n}\"") (builtins.attrNames r));

     

       21
       21
       -
       

     

       22
       22
       -
         configFile =

     

       23
       23
       -
           let

     

       24
       24
       -
             bars = lib.mapAttrsToList (name: cfg: ''

     

       25
       25
       -
               ${name}: {

     

       26
       26
       -
                 font: "${cfg.font}";

     

       27
       27
       -
                 position: "${cfg.position}";

     

       28
       28
       -
       

     

       29
       29
       -
                 ${mapExtra cfg.extra}

     

       30
       30
       -
       

     

       31
       31
       -
                 block-list: [${listKeys cfg.indicators}]

     

       32
       32
       -
       

     

       33
       33
       -
                 ${builtins.concatStringsSep "\n" (

     

       34
       34
       -
                   lib.mapAttrsToList (name: cfg: ''

     

       35
       35
       -
                     ${name}: {

     

       36
       36
       -
                       exec: "${cfg.exec}";

     

       37
       37
       -
                       align: "${cfg.align}";

     

       38
       38
       -
                       ${mapExtra cfg.extra}

     

       39
       39
       -
                     };

     

       40
       40
       -
                   '') cfg.indicators

     

       41
       41
       -
                 )}

     

       42
       42
       -
               };

     

       43
       43
       -
             '') cfg.bars;

     

       44
       44
       -
           in

     

       45
       45
       -
           pkgs.writeText "yabar.conf" ''

     

       46
       46
       -
             bar-list = [${listKeys cfg.bars}];

     

       47
       47
       -
             ${builtins.concatStringsSep "\n" bars}

     

       48
       48
       -
           '';

     

       49
       49
       -
       in

     

       50
       50
       -
       {

     

       51
       51
       -
         options.programs.yabar = {

     

       52
       52
       -
           enable = lib.mkEnableOption "yabar, a status bar for X window managers";

     

       53
       53
       -
       

     

       54
       54
       -
           package = lib.mkOption {

     

       55
       55
       -
             default = pkgs.yabar-unstable;

     

       56
       56
       -
             defaultText = lib.literalExpression "pkgs.yabar-unstable";

     

       57
       57
       -
             example = lib.literalExpression "pkgs.yabar";

     

       58
       58
       -
             type = lib.types.package;

     

       59
       59
       -
       

     

       60
       60
       -
             # `yabar-stable` segfaults under certain conditions.

     

       61
       61
       -
             # remember to update yabar.passthru.tests if nixos switches back to it!

     

       62
       62
       -
             apply =

     

       63
       63
       -
               x:

     

       64
       64
       -
               if x == pkgs.yabar-unstable then

     

       65
       65
       -
                 x

     

       66
       66
       -
               else

     

       67
       67
       -
                 lib.flip lib.warn x ''

     

       68
       68
       -
                   It's not recommended to use `yabar' with `programs.yabar', the (old) stable release

     

       69
       69
       -
                   tends to segfault under certain circumstances:

     

       70
       70
       -
       

     

       71
       71
       -
                   * https://github.com/geommer/yabar/issues/86

     

       72
       72
       -
                   * https://github.com/geommer/yabar/issues/68

     

       73
       73
       -
                   * https://github.com/geommer/yabar/issues/143

     

       74
       74
       -
       

     

       75
       75
       -
                   Most of them don't occur on master anymore, until a new release is published, it's recommended

     

       76
       76
       -
                   to use `yabar-unstable'.

     

       77
       77
       -
                 '';

     

       78
       78
       -
       

     

       79
       79
       -
             description = ''

     

       80
       80
       -
               The package which contains the `yabar` binary.

     

       81
       81
       -
       

     

       82
       82
       -
               Nixpkgs offers both a stable (`yabar`) and unstable (`yabar-unstable`) version of Yabar.

     

       83
       83
       -
             '';

     

       84
       84
       -
           };

     

       85
       85
       -
       

     

       86
       86
       -
           bars = lib.mkOption {

     

       87
       87
       -
             default = { };

     

       88
       88
       -
             type = lib.types.attrsOf (

     

       89
       89
       -
               lib.types.submodule {

     

       90
       90
       -
                 options = {

     

       91
       91
       -
                   font = lib.mkOption {

     

       92
       92
       -
                     default = "sans bold 9";

     

       93
       93
       -
                     example = "Droid Sans, FontAwesome Bold 9";

     

       94
       94
       -
                     type = lib.types.str;

     

       95
       95
       -
       

     

       96
       96
       -
                     description = ''

     

       97
       97
       -
                       The font that will be used to draw the status bar.

     

       98
       98
       -
                     '';

     

       99
       99
       -
                   };

     

       100
       100
       -
       

     

       101
       101
       -
                   position = lib.mkOption {

     

       102
       102
       -
                     default = "top";

     

       103
       103
       -
                     example = "bottom";

     

       104
       104
       -
                     type = lib.types.enum [

     

       105
       105
       -
                       "top"

     

       106
       106
       -
                       "bottom"

     

       107
       107
       -
                     ];

     

       108
       108
       -
       

     

       109
       109
       -
                     description = ''

     

       110
       110
       -
                       The position where the bar will be rendered.

     

       111
       111
       -
                     '';

     

       112
       112
       -
                   };

     

       113
       113
       -
       

     

       114
       114
       -
                   extra = lib.mkOption {

     

       115
       115
       -
                     default = { };

     

       116
       116
       -
                     type = lib.types.attrsOf lib.types.str;

     

       117
       117
       -
       

     

       118
       118
       -
                     description = ''

     

       119
       119
       -
                       An attribute set which contains further attributes of a bar.

     

       120
       120
       -
                     '';

     

       121
       121
       -
                   };

     

       122
       122
       -
       

     

       123
       123
       -
                   indicators = lib.mkOption {

     

       124
       124
       -
                     default = { };

     

       125
       125
       -
                     type = lib.types.attrsOf (

     

       126
       126
       -
                       lib.types.submodule {

     

       127
       127
       -
                         options.exec = lib.mkOption {

     

       128
       128
       -
                           example = "YABAR_DATE";

     

       129
       129
       -
                           type = lib.types.str;

     

       130
       130
       -
                           description = ''

     

       131
       131
       -
                             The type of the indicator to be executed.

     

       132
       132
       -
                           '';

     

       133
       133
       -
                         };

     

       134
       134
       -
       

     

       135
       135
       -
                         options.align = lib.mkOption {

     

       136
       136
       -
                           default = "left";

     

       137
       137
       -
                           example = "right";

     

       138
       138
       -
                           type = lib.types.enum [

     

       139
       139
       -
                             "left"

     

       140
       140
       -
                             "center"

     

       141
       141
       -
                             "right"

     

       142
       142
       -
                           ];

     

       143
       143
       -
       

     

       144
       144
       -
                           description = ''

     

       145
       145
       -
                             Whether to align the indicator at the left or right of the bar.

     

       146
       146
       -
                           '';

     

       147
       147
       -
                         };

     

       148
       148
       -
       

     

       149
       149
       -
                         options.extra = lib.mkOption {

     

       150
       150
       -
                           default = { };

     

       151
       151
       -
                           type = lib.types.attrsOf (lib.types.either lib.types.str lib.types.int);

     

       152
       152
       -
       

     

       153
       153
       -
                           description = ''

     

       154
       154
       -
                             An attribute set which contains further attributes of a indicator.

     

       155
       155
       -
                           '';

     

       156
       156
       -
                         };

     

       157
       157
       -
                       }

     

       158
       158
       -
                     );

     

       159
       159
       -
       

     

       160
       160
       -
                     description = ''

     

       161
       161
       -
                       Indicators that should be rendered by yabar.

     

       162
       162
       -
                     '';

     

       163
       163
       -
                   };

     

       164
       164
       -
                 };

     

       165
       165
       -
               }

     

       166
       166
       -
             );

     

       167
       167
       -
       

     

       168
       168
       -
             description = ''

     

       169
       169
       -
               List of bars that should be rendered by yabar.

     

       170
       170
       -
             '';

     

       171
       171
       -
           };

     

       172
       172
       -
         };

     

       173
       173
       -
       

     

       174
       174
       -
         config = lib.mkIf cfg.enable {

     

       175
       175
       -
           systemd.user.services.yabar = {

     

       176
       176
       -
             description = "yabar service";

     

       177
       177
       -
             wantedBy = [ "graphical-session.target" ];

     

       178
       178
       -
             partOf = [ "graphical-session.target" ];

     

       179
       179
       -
       

     

       180
       180
       -
             script = ''

     

       181
       181
       -
               ${cfg.package}/bin/yabar -c ${configFile}

     

       182
       182
       -
             '';

     

       183
       183
       -
       

     

       184
       184
       -
             serviceConfig.Restart = "always";

     

       185
       185
       -
           };

     

       186
       186
       -
         };

     

       187
       187
       -
       }

nixos/modules/rename.nix

···

       75
       75
        
             "way-cooler is abandoned by its author: "

     

       76
       76
        
             + "https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"

     

       77
       77
        
           ))

     

       78
       78
       +
           (mkRemovedOptionModule [ "programs" "yabar" ]

     

       79
       79
       +
             "programs.yabar has been removed from NixOS. This is because the yabar repository has been archived upstream."

     

       80
       80
       +
           )

     

       78
       81
        
           (mkRemovedOptionModule [ "security" "hideProcessInformation" ] ''

     

       79
       82
        
             The hidepid module was removed, since the underlying machinery

     

       80
       83
        
             is broken when using cgroups-v2.

-1

nixos/tests/all-tests.nix

···

       1508
       1508
        
         xss-lock = runTest ./xss-lock.nix;

     

       1509
       1509
        
         xterm = runTest ./xterm.nix;

     

       1510
       1510
        
         xxh = runTest ./xxh.nix;

     

       1511
       1511
       -
         yabar = runTest ./yabar.nix;

     

       1512
       1511
        
         yarr = runTest ./yarr.nix;

     

       1513
       1512
        
         ydotool = handleTest ./ydotool.nix { };

     

       1514
       1513
        
         yggdrasil = runTest ./yggdrasil.nix;

-30

nixos/tests/yabar.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         name = "yabar";

     

       3
       3
       -
         meta.maintainers = [ ];

     

       4
       4
       -
       

     

       5
       5
       -
         nodes.machine = {

     

       6
       6
       -
           imports = [

     

       7
       7
       -
             ./common/x11.nix

     

       8
       8
       -
             ./common/user-account.nix

     

       9
       9
       -
           ];

     

       10
       10
       -
       

     

       11
       11
       -
           test-support.displayManager.auto.user = "bob";

     

       12
       12
       -
       

     

       13
       13
       -
           programs.yabar.enable = true;

     

       14
       14
       -
           programs.yabar.bars = {

     

       15
       15
       -
             top.indicators.date.exec = "YABAR_DATE";

     

       16
       16
       -
           };

     

       17
       17
       -
         };

     

       18
       18
       -
       

     

       19
       19
       -
         testScript = ''

     

       20
       20
       -
           machine.start()

     

       21
       21
       -
           machine.wait_for_x()

     

       22
       22
       -
       

     

       23
       23
       -
           # confirm proper startup

     

       24
       24
       -
           machine.wait_for_unit("yabar.service", "bob")

     

       25
       25
       -
           machine.sleep(10)

     

       26
       26
       -
           machine.wait_for_unit("yabar.service", "bob")

     

       27
       27
       -
       

     

       28
       28
       -
           machine.screenshot("top_bar")

     

       29
       29
       -
         '';

     

       30
       30
       -
       }

-93

pkgs/applications/window-managers/yabar/build.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         stdenv,

     

       3
       3
       -
         fetchFromGitHub,

     

       4
       4
       -
         cairo,

     

       5
       5
       -
         gdk-pixbuf,

     

       6
       6
       -
         libconfig,

     

       7
       7
       -
         pango,

     

       8
       8
       -
         pkg-config,

     

       9
       9
       -
         xcbutilwm,

     

       10
       10
       -
         alsa-lib,

     

       11
       11
       -
         wirelesstools,

     

       12
       12
       -
         asciidoc,

     

       13
       13
       -
         libxslt,

     

       14
       14
       -
         makeWrapper,

     

       15
       15
       -
         docbook_xsl,

     

       16
       16
       -
         configFile ? null,

     

       17
       17
       -
         lib,

     

       18
       18
       -
         rev,

     

       19
       19
       -
         sha256,

     

       20
       20
       -
         version,

     

       21
       21
       -
         patches ? [ ],

     

       22
       22
       -
       }:

     

       23
       23
       -
       

     

       24
       24
       -
       stdenv.mkDerivation {

     

       25
       25
       -
         pname = "yabar";

     

       26
       26
       -
         inherit version;

     

       27
       27
       -
       

     

       28
       28
       -
         src = fetchFromGitHub {

     

       29
       29
       -
           inherit rev sha256;

     

       30
       30
       -
       

     

       31
       31
       -
           owner = "geommer";

     

       32
       32
       -
           repo = "yabar";

     

       33
       33
       -
         };

     

       34
       34
       -
       

     

       35
       35
       -
         inherit patches;

     

       36
       36
       -
       

     

       37
       37
       -
         hardeningDisable = [ "format" ];

     

       38
       38
       -
       

     

       39
       39
       -
         strictDeps = true;

     

       40
       40
       -
         depsBuildBuild = [

     

       41
       41
       -
           pkg-config

     

       42
       42
       -
         ];

     

       43
       43
       -
         nativeBuildInputs = [

     

       44
       44
       -
           pkg-config

     

       45
       45
       -
           asciidoc

     

       46
       46
       -
           docbook_xsl

     

       47
       47
       -
           libxslt

     

       48
       48
       -
           makeWrapper

     

       49
       49
       -
           libconfig

     

       50
       50
       -
           pango

     

       51
       51
       -
         ];

     

       52
       52
       -
         buildInputs = [

     

       53
       53
       -
           cairo

     

       54
       54
       -
           gdk-pixbuf

     

       55
       55
       -
           libconfig

     

       56
       56
       -
           pango

     

       57
       57
       -
           xcbutilwm

     

       58
       58
       -
           alsa-lib

     

       59
       59
       -
           wirelesstools

     

       60
       60
       -
         ];

     

       61
       61
       -
       

     

       62
       62
       -
         postPatch = ''

     

       63
       63
       -
           substituteInPlace ./Makefile \

     

       64
       64
       -
             --replace "\$(shell git describe)" "${version}" \

     

       65
       65
       -
             --replace "a2x" "a2x --no-xmllint"

     

       66
       66
       -
         '';

     

       67
       67
       -
       

     

       68
       68
       -
         makeFlags = [

     

       69
       69
       -
           "DESTDIR=$(out)"

     

       70
       70
       -
           "PREFIX=/"

     

       71
       71
       -
         ];

     

       72
       72
       -
       

     

       73
       73
       -
         postInstall = ''

     

       74
       74
       -
           mkdir -p $out/share/yabar/examples

     

       75
       75
       -
           cp -v examples/*.config $out/share/yabar/examples

     

       76
       76
       -
       

     

       77
       77
       -
           ${lib.optionalString (configFile != null) ''

     

       78
       78
       -
             wrapProgram "$out/bin/yabar" \

     

       79
       79
       -
               --add-flags "-c ${configFile}"

     

       80
       80
       -
           ''}

     

       81
       81
       -
         '';

     

       82
       82
       -
       

     

       83
       83
       -
         #passthru.tests = { inherit (nixosTests) yabar; }; # nixos currently uses yabar-unstable

     

       84
       84
       -
       

     

       85
       85
       -
         meta = with lib; {

     

       86
       86
       -
           description = "Modern and lightweight status bar for X window managers";

     

       87
       87
       -
           homepage = "https://github.com/geommer/yabar";

     

       88
       88
       -
           license = licenses.mit;

     

       89
       89
       -
           platforms = platforms.linux;

     

       90
       90
       -
           maintainers = [ ];

     

       91
       91
       -
           mainProgram = "yabar";

     

       92
       92
       -
         };

     

       93
       93
       -
       }

-23

pkgs/applications/window-managers/yabar/default.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         callPackage,

     

       3
       3
       -
         attrs ? { },

     

       4
       4
       -
         fetchpatch,

     

       5
       5
       -
       }:

     

       6
       6
       -
       

     

       7
       7
       -
       let

     

       8
       8
       -
         overrides = rec {

     

       9
       9
       -
           version = "0.4.0";

     

       10
       10
       -
       

     

       11
       11
       -
           rev = version;

     

       12
       12
       -
           sha256 = "1nw9dar1caqln5fr0dqk7dg6naazbpfwwzxwlkxz42shsc3w30a6";

     

       13
       13
       -
       

     

       14
       14
       -
           patches = [

     

       15
       15
       -
             (fetchpatch {

     

       16
       16
       -
               url = "https://github.com/geommer/yabar/commit/9779a5e04bd6e8cdc1c9fcf5d7ac31416af85a53.patch";

     

       17
       17
       -
               sha256 = "1szhr3k1kq6ixgnp74wnzgfvgxm6r4zpc3ny2x2wzy6lh2czc07s";

     

       18
       18
       -
             })

     

       19
       19
       -
           ];

     

       20
       20
       -
       

     

       21
       21
       -
         } // attrs;

     

       22
       22
       -
       in

     

       23
       23
       -
       callPackage ./build.nix overrides

-44

pkgs/applications/window-managers/yabar/unstable.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         fetchpatch,

     

       3
       3
       -
         playerctl,

     

       4
       4
       -
         libxkbcommon,

     

       5
       5
       -
         callPackage,

     

       6
       6
       -
         nixosTests,

     

       7
       7
       -
         attrs ? { },

     

       8
       8
       -
       }:

     

       9
       9
       -
       

     

       10
       10
       -
       let

     

       11
       11
       -
         pkg = callPackage ./build.nix (

     

       12
       12
       -
           {

     

       13
       13
       -
             version = "unstable-2018-01-18";

     

       14
       14
       -
       

     

       15
       15
       -
             rev = "c516e8e78d39dd2b339acadc4c175347171150bb";

     

       16
       16
       -
             sha256 = "1p9lx78cayyn7qc2q66id2xfs76jyddnqv2x1ypsvixaxwcvqgdb";

     

       17
       17
       -
           }

     

       18
       18
       -
           // attrs

     

       19
       19
       -
         );

     

       20
       20
       -
       in

     

       21
       21
       -
       pkg.overrideAttrs (o: {

     

       22
       22
       -
         buildInputs = o.buildInputs ++ [

     

       23
       23
       -
           playerctl

     

       24
       24
       -
           libxkbcommon

     

       25
       25
       -
         ];

     

       26
       26
       -
       

     

       27
       27
       -
         makeFlags = o.makeFlags ++ [

     

       28
       28
       -
           "PLAYERCTL=1"

     

       29
       29
       -
         ];

     

       30
       30
       -
       

     

       31
       31
       -
         patches = (o.patches or [ ]) ++ [

     

       32
       32
       -
           (fetchpatch {

     

       33
       33
       -
             url = "https://github.com/geommer/yabar/commit/008dc1420ff684cf12ce2ef3ac9d642e054e39f5.patch";

     

       34
       34
       -
             sha256 = "1q7nd66ai6nr2m6iqxn55gvbr4r5gjc00c8wyjc3riv31qcbqbhv";

     

       35
       35
       -
           })

     

       36
       36
       -
         ];

     

       37
       37
       -
       

     

       38
       38
       -
         passthru = (o.passthru or { }) // {

     

       39
       39
       -
           tests = (o.passthru.tests or { }) // {

     

       40
       40
       -
             inherit (nixosTests) yabar;

     

       41
       41
       -
           };

     

       42
       42
       -
         };

     

       43
       43
       -
       

     

       44
       44
       -
       })

pkgs/top-level/aliases.nix

···

       2121
       2121
        
         yandex-browser-beta = throw "'yandex-browser-beta' has been removed, as it was broken and unmaintained"; # Added 2025-04-17

     

       2122
       2122
        
         yandex-browser-corporate = throw "'yandex-browser-corporate' has been removed, as it was broken and unmaintained"; # Added 2025-04-17

     

       2123
       2123
        
         youtrack_2022_3 = throw "'youtrack_2022_3' has been removed as it was deprecated. Please update to the 'youtrack' package."; # Added 2024-10-17

     

       2124
       2124
       +
         yabar = throw "'yabar' has been removed as the upstream project was archived"; # Added 2025-06-10

     

       2125
       2125
       +
         yabar-unstable = yabar; # Added 2025-06-10

     

       2124
       2126
        
         yrd = throw "'yrd' has been removed, as it was broken and unmaintained"; # added 2024-05-27

     

       2125
       2127
        
         yubikey-manager-qt = throw "'yubikey-manager-qt' has been removed due to being archived upstream. Consider using 'yubioath-flutter' instead."; # Added 2025-06-07

     

       2126
       2128
        
         yubikey-personalization-gui = throw "'yubikey-personalization-gui' has been removed due to being archived upstream. Consider using 'yubioath-flutter' instead."; # Added 2025-06-07

-4

pkgs/top-level/all-packages.nix

···

       14578
       14578
        
       

     

       14579
       14579
        
         xygrib = libsForQt5.callPackage ../applications/misc/xygrib { };

     

       14580
       14580
        
       

     

       14581
       14581
       -
         yabar = callPackage ../applications/window-managers/yabar { };

     

       14582
       14582
       -
       

     

       14583
       14583
       -
         yabar-unstable = callPackage ../applications/window-managers/yabar/unstable.nix { };

     

       14584
       14584
       -
       

     

       14585
       14581
        
         ydiff = with python3.pkgs; toPythonApplication ydiff;

     

       14586
       14582
        
       

     

       14587
       14583
        
         yokadi = python3Packages.callPackage ../applications/misc/yokadi { };