commit bc5e1e9c271d136869641dfc173945471d0a94f7 · pyrox.dev/nixpkgs

+7

nixos/doc/manual/from_md/release-notes/rl-2111.section.xml

···

       387
       387
        
                 <link xlink:href="options.html#opt-services.seafile.enable">services.seafile</link>.

     

       388
       388
        
               </para>

     

       389
       389
        
             </listitem>

     

       390
       390
       +
             <listitem>

     

       391
       391
       +
               <para>

     

       392
       392
       +
                 <link xlink:href="https://github.com/mchehab/rasdaemon">rasdaemon</link>,

     

       393
       393
       +
                 a hardware error logging daemon. Available as

     

       394
       394
       +
                 <link linkend="opt-hardware.rasdaemon.enable">hardware.rasdaemon</link>.

     

       395
       395
       +
               </para>

     

       396
       396
       +
             </listitem>

     

       390
       397
        
           </itemizedlist>

     

       391
       398
        
         </section>

     

       392
       399
        
         <section xml:id="sec-release-21.11-incompatibilities">

+2

nixos/doc/manual/release-notes/rl-2111.section.md

···

       118
       118
        
       

     

       119
       119
        
       - [seafile](https://www.seafile.com/en/home/), an open source file syncing & sharing software. Available as [services.seafile](options.html#opt-services.seafile.enable).

     

       120
       120
        
       

     

       121
       121
       +
       - [rasdaemon](https://github.com/mchehab/rasdaemon), a hardware error logging daemon. Available as [hardware.rasdaemon](#opt-hardware.rasdaemon.enable).

     

       122
       122
       +
       

     

       121
       123
        
       ## Backward Incompatibilities {#sec-release-21.11-incompatibilities}

     

       122
       124
        
       

     

       123
       125
        
       - The `services.wakeonlan` option was removed, and replaced with `networking.interfaces.<name>.wakeOnLan`.

+1

nixos/modules/module-list.nix

···

       420
       420
        
         ./services/hardware/pcscd.nix

     

       421
       421
        
         ./services/hardware/pommed.nix

     

       422
       422
        
         ./services/hardware/power-profiles-daemon.nix

     

       423
       423
       +
         ./services/hardware/rasdaemon.nix

     

       423
       424
        
         ./services/hardware/ratbagd.nix

     

       424
       425
        
         ./services/hardware/sane.nix

     

       425
       426
        
         ./services/hardware/sane_extra_backends/brscan4.nix

+171

nixos/modules/services/hardware/rasdaemon.nix

···

       1
       1
       +
       { config, lib, pkgs, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

       6
       6
       +
       

     

       7
       7
       +
         cfg = config.hardware.rasdaemon;

     

       8
       8
       +
       

     

       9
       9
       +
       in

     

       10
       10
       +
       {

     

       11
       11
       +
         options.hardware.rasdaemon = {

     

       12
       12
       +
       

     

       13
       13
       +
           enable = mkEnableOption "RAS logging daemon";

     

       14
       14
       +
       

     

       15
       15
       +
           record = mkOption {

     

       16
       16
       +
             type = types.bool;

     

       17
       17
       +
             default = true;

     

       18
       18
       +
             description = "record events via sqlite3, required for ras-mc-ctl";

     

       19
       19
       +
           };

     

       20
       20
       +
       

     

       21
       21
       +
           mainboard = mkOption {

     

       22
       22
       +
             type = types.lines;

     

       23
       23
       +
             default = "";

     

       24
       24
       +
             description = "Custom mainboard description, see <citerefentry><refentrytitle>ras-mc-ctl</refentrytitle><manvolnum>8</manvolnum></citerefentry> for more details.";

     

       25
       25
       +
             example = ''

     

       26
       26
       +
               vendor = ASRock

     

       27
       27
       +
               model = B450M Pro4

     

       28
       28
       +
       

     

       29
       29
       +
               # it should default to such values from

     

       30
       30
       +
               # /sys/class/dmi/id/board_[vendor|name]

     

       31
       31
       +
               # alternatively one can supply a script

     

       32
       32
       +
               # that returns the same format as above

     

       33
       33
       +
       

     

       34
       34
       +
               script = <path to script>

     

       35
       35
       +
             '';

     

       36
       36
       +
           };

     

       37
       37
       +
       

     

       38
       38
       +
           # TODO, accept `rasdaemon.labels = " ";` or `rasdaemon.labels = { dell = " "; asrock = " "; };'

     

       39
       39
       +
       

     

       40
       40
       +
           labels = mkOption {

     

       41
       41
       +
             type = types.lines;

     

       42
       42
       +
             default = "";

     

       43
       43
       +
             description = "Additional memory module label descriptions to be placed in /etc/ras/dimm_labels.d/labels";

     

       44
       44
       +
             example = ''

     

       45
       45
       +
               # vendor and model may be shown by 'ras-mc-ctl --mainboard'

     

       46
       46
       +
               vendor: ASRock

     

       47
       47
       +
                 product: To Be Filled By O.E.M.

     

       48
       48
       +
                 model: B450M Pro4

     

       49
       49
       +
                   # these labels are names for the motherboard slots

     

       50
       50
       +
                   # the numbers may be shown by `ras-mc-ctl --error-count`

     

       51
       51
       +
                   # they are mc:csrow:channel

     

       52
       52
       +
                   DDR4_A1: 0.2.0;  DDR4_B1: 0.2.1;

     

       53
       53
       +
                   DDR4_A2: 0.3.0;  DDR4_B2: 0.3.1;

     

       54
       54
       +
             '';

     

       55
       55
       +
           };

     

       56
       56
       +
       

     

       57
       57
       +
           config = mkOption {

     

       58
       58
       +
             type = types.lines;

     

       59
       59
       +
             default = "";

     

       60
       60
       +
             description = ''

     

       61
       61
       +
               rasdaemon configuration, currently only used for CE PFA

     

       62
       62
       +
               for details, read rasdaemon.outPath/etc/sysconfig/rasdaemon's comments

     

       63
       63
       +
             '';

     

       64
       64
       +
             example = ''

     

       65
       65
       +
               # defaults from included config

     

       66
       66
       +
               PAGE_CE_REFRESH_CYCLE="24h"

     

       67
       67
       +
               PAGE_CE_THRESHOLD="50"

     

       68
       68
       +
               PAGE_CE_ACTION="soft"

     

       69
       69
       +
             '';

     

       70
       70
       +
           };

     

       71
       71
       +
       

     

       72
       72
       +
           extraModules = mkOption {

     

       73
       73
       +
             type = types.listOf types.str;

     

       74
       74
       +
             default = [];

     

       75
       75
       +
             description = "extra kernel modules to load";

     

       76
       76
       +
             example = [ "i7core_edac" ];

     

       77
       77
       +
           };

     

       78
       78
       +
       

     

       79
       79
       +
           testing = mkEnableOption "error injection infrastructure";

     

       80
       80
       +
         };

     

       81
       81
       +
       

     

       82
       82
       +
         config = mkIf cfg.enable {

     

       83
       83
       +
       

     

       84
       84
       +
           environment.etc = {

     

       85
       85
       +
             "ras/mainboard" = {

     

       86
       86
       +
               enable = cfg.mainboard != "";

     

       87
       87
       +
               text = cfg.mainboard;

     

       88
       88
       +
             };

     

       89
       89
       +
           # TODO, handle multiple cfg.labels.brand = " ";

     

       90
       90
       +
             "ras/dimm_labels.d/labels" = {

     

       91
       91
       +
               enable = cfg.labels != "";

     

       92
       92
       +
               text = cfg.labels;

     

       93
       93
       +
             };

     

       94
       94
       +
             "sysconfig/rasdaemon" = {

     

       95
       95
       +
               enable = cfg.config != "";

     

       96
       96
       +
               text = cfg.config;

     

       97
       97
       +
             };

     

       98
       98
       +
           };

     

       99
       99
       +
           environment.systemPackages = [ pkgs.rasdaemon ]

     

       100
       100
       +
             ++ optionals (cfg.testing) (with pkgs.error-inject; [

     

       101
       101
       +
               edac-inject

     

       102
       102
       +
               mce-inject

     

       103
       103
       +
               aer-inject

     

       104
       104
       +
             ]);

     

       105
       105
       +
       

     

       106
       106
       +
           boot.initrd.kernelModules = cfg.extraModules

     

       107
       107
       +
             ++ optionals (cfg.testing) [

     

       108
       108
       +
               # edac_core and amd64_edac should get loaded automatically

     

       109
       109
       +
               # i7core_edac may not be, and may not be required, but should load successfully

     

       110
       110
       +
               "edac_core"

     

       111
       111
       +
               "amd64_edac"

     

       112
       112
       +
               "i7core_edac"

     

       113
       113
       +
               "mce-inject"

     

       114
       114
       +
               "aer-inject"

     

       115
       115
       +
             ];

     

       116
       116
       +
       

     

       117
       117
       +
           boot.kernelPatches = optionals (cfg.testing) [{

     

       118
       118
       +
             name = "rasdaemon-tests";

     

       119
       119
       +
             patch = null;

     

       120
       120
       +
             extraConfig = ''

     

       121
       121
       +
               EDAC_DEBUG y

     

       122
       122
       +
               X86_MCE_INJECT y

     

       123
       123
       +
       

     

       124
       124
       +
               PCIEPORTBUS y

     

       125
       125
       +
               PCIEAER y

     

       126
       126
       +
               PCIEAER_INJECT y

     

       127
       127
       +
             '';

     

       128
       128
       +
           }];

     

       129
       129
       +
       

     

       130
       130
       +
           # i tried to set up a group for this

     

       131
       131
       +
           # but rasdaemon needs higher permissions?

     

       132
       132
       +
           # `rasdaemon: Can't locate a mounted debugfs`

     

       133
       133
       +
       

     

       134
       134
       +
           # most of this taken from src/misc/

     

       135
       135
       +
           systemd.services = {

     

       136
       136
       +
             rasdaemon = {

     

       137
       137
       +
               description = "the RAS logging daemon";

     

       138
       138
       +
               documentation = [ "man:rasdaemon(1)" ];

     

       139
       139
       +
               wantedBy = [ "multi-user.target" ];

     

       140
       140
       +
               after = [ "syslog.target" ];

     

       141
       141
       +
       

     

       142
       142
       +
               serviceConfig = {

     

       143
       143
       +
                 StateDirectory = optionalString (cfg.record) "rasdaemon";

     

       144
       144
       +
       

     

       145
       145
       +
                 ExecStart = "${pkgs.rasdaemon}/bin/rasdaemon --foreground"

     

       146
       146
       +
                   + optionalString (cfg.record) " --record";

     

       147
       147
       +
                 ExecStop = "${pkgs.rasdaemon}/bin/rasdaemon --disable";

     

       148
       148
       +
                 Restart = "on-abort";

     

       149
       149
       +
       

     

       150
       150
       +
                 # src/misc/rasdaemon.service.in shows this:

     

       151
       151
       +
                 # ExecStartPost = ${pkgs.rasdaemon}/bin/rasdaemon --enable

     

       152
       152
       +
                 # but that results in unpredictable existence of the database

     

       153
       153
       +
                 # and everything seems to be enabled without this...

     

       154
       154
       +
               };

     

       155
       155
       +
             };

     

       156
       156
       +
             ras-mc-ctl = mkIf (cfg.labels != "") {

     

       157
       157
       +
               description = "register DIMM labels on startup";

     

       158
       158
       +
               documentation = [ "man:ras-mc-ctl(8)" ];

     

       159
       159
       +
               wantedBy = [ "multi-user.target" ];

     

       160
       160
       +
               serviceConfig = {

     

       161
       161
       +
                 Type = "oneshot";

     

       162
       162
       +
                 ExecStart = "${pkgs.rasdaemon}/bin/ras-mc-ctl --register-labels";

     

       163
       163
       +
                 RemainAfterExit = true;

     

       164
       164
       +
               };

     

       165
       165
       +
             };

     

       166
       166
       +
           };

     

       167
       167
       +
         };

     

       168
       168
       +
       

     

       169
       169
       +
         meta.maintainers = [ maintainers.evils ];

     

       170
       170
       +
       

     

       171
       171
       +
       }

+1 -1

nixos/tests/all-tests.nix

···

       238
       238
        
         locate = handleTest ./locate.nix {};

     

       239
       239
        
         login = handleTest ./login.nix {};

     

       240
       240
        
         loki = handleTest ./loki.nix {};

     

       241
       241
       -
         lsd = handleTest ./lsd.nix {};

     

       242
       241
        
         lxd = handleTest ./lxd.nix {};

     

       243
       242
        
         lxd-nftables = handleTest ./lxd-nftables.nix {};

     

       244
       243
        
         #logstash = handleTest ./logstash.nix {};

     
···

       388
       387
        
         rabbitmq = handleTest ./rabbitmq.nix {};

     

       389
       388
        
         radarr = handleTest ./radarr.nix {};

     

       390
       389
        
         radicale = handleTest ./radicale.nix {};

     

       390
       390
       +
         rasdaemon = handleTest ./rasdaemon.nix {};

     

       391
       391
        
         redis = handleTest ./redis.nix {};

     

       392
       392
        
         redmine = handleTest ./redmine.nix {};

     

       393
       393
        
         restartByActivationScript = handleTest ./restart-by-activation-script.nix {};

-12

nixos/tests/lsd.nix

···

       1
       1
       -
       import ./make-test-python.nix ({ pkgs, ... }: {

     

       2
       2
       -
         name = "lsd";

     

       3
       3
       -
         meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; };

     

       4
       4
       -
       

     

       5
       5
       -
         nodes.lsd = { pkgs, ... }: { environment.systemPackages = [ pkgs.lsd ]; };

     

       6
       6
       -
       

     

       7
       7
       -
         testScript = ''

     

       8
       8
       -
           lsd.succeed('echo "abc" > /tmp/foo')

     

       9
       9
       -
           assert "4 B /tmp/foo" in lsd.succeed('lsd --classic --blocks "size,name" -l /tmp/foo')

     

       10
       10
       -
           assert "lsd ${pkgs.lsd.version}" in lsd.succeed("lsd --version")

     

       11
       11
       -
         '';

     

       12
       12
       -
       })

+34

nixos/tests/rasdaemon.nix

···

       1
       1
       +
       import ./make-test-python.nix ({ pkgs, ... } : {

     

       2
       2
       +
         name = "rasdaemon";

     

       3
       3
       +
         meta = with pkgs.lib.maintainers; {

     

       4
       4
       +
           maintainers = [ evils ];

     

       5
       5
       +
         };

     

       6
       6
       +
       

     

       7
       7
       +
         machine = { pkgs, ... }: {

     

       8
       8
       +
           imports = [ ../modules/profiles/minimal.nix ];

     

       9
       9
       +
           hardware.rasdaemon = {

     

       10
       10
       +
             enable = true;

     

       11
       11
       +
             # should be enabled by default, just making sure

     

       12
       12
       +
             record = true;

     

       13
       13
       +
             # nonsense label

     

       14
       14
       +
             labels = ''

     

       15
       15
       +
               vendor: none

     

       16
       16
       +
                 product: none

     

       17
       17
       +
                 model: none

     

       18
       18
       +
                   DIMM_0: 0.0.0;

     

       19
       19
       +
             '';

     

       20
       20
       +
           };

     

       21
       21
       +
         };

     

       22
       22
       +
       

     

       23
       23
       +
         testScript =

     

       24
       24
       +
           ''

     

       25
       25
       +
             start_all()

     

       26
       26
       +
             machine.wait_for_unit("multi-user.target")

     

       27
       27
       +
             # confirm rasdaemon is running and has a valid database

     

       28
       28
       +
             # some disk errors detected in qemu for some reason ¯\_(ツ)_/¯

     

       29
       29
       +
             machine.succeed("ras-mc-ctl --errors | tee /dev/stderr | grep -q 'No .* errors.'")

     

       30
       30
       +
             # confirm the supplied labels text made it into the system

     

       31
       31
       +
             machine.succeed("grep -q 'vendor: none' /etc/ras/dimm_labels.d/labels >&2")

     

       32
       32
       +
             machine.shutdown()

     

       33
       33
       +
           '';

     

       34
       34
       +
       })

+2 -2

pkgs/applications/graphics/weylus/default.nix

···

       14
       14
        
       

     

       15
       15
        
       stdenv.mkDerivation rec {

     

       16
       16
        
         pname = "weylus";

     

       17
       17
       -
         version = "0.11.2";

     

       17
       17
       +
         version = "0.11.3";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchzip {

     

       20
       20
        
           url = "https://github.com/H-M-H/Weylus/releases/download/v${version}/linux.zip";

     

       21
       21
       -
           sha256 = "sha256-coA8qUpUgRjVBF/0LZgimx61fTTpdck/AO6e+r2uNu0=";

     

       21
       21
       +
           sha256 = "sha256-1nEdn3KKCMWIzYv4ryqTxtQvR9eln9IX1Z4Y6/vuo7o=";

     

       22
       22
        
           stripRoot = false;

     

       23
       23
        
         };

     

       24
       24

+2 -2

pkgs/applications/misc/cherrytree/default.nix

···

       19
       19
        
       

     

       20
       20
        
       stdenv.mkDerivation rec {

     

       21
       21
        
         pname = "cherrytree";

     

       22
       22
       -
         version = "0.99.41";

     

       22
       22
       +
         version = "0.99.42";

     

       23
       23
        
       

     

       24
       24
        
         src = fetchFromGitHub {

     

       25
       25
        
           owner = "giuspen";

     

       26
       26
        
           repo = "cherrytree";

     

       27
       27
        
           rev = version;

     

       28
       28
       -
           sha256 = "sha256-Bhk5xpJiVDSTxP1wAFTL39MgAIOa6Is9NTF1WEh6S1A=";

     

       28
       28
       +
           sha256 = "sha256-PKjl9n6J0iNdcA56CZ/nAzvgRNwqRLTHjwi3HQYWIMU=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         nativeBuildInputs = [

+2 -2

pkgs/applications/networking/flexget/default.nix

···

       2
       2
        
       

     

       3
       3
        
       python3Packages.buildPythonApplication rec {

     

       4
       4
        
         pname = "flexget";

     

       5
       5
       -
         version = "3.1.148";

     

       5
       5
       +
         version = "3.1.149";

     

       6
       6
        
       

     

       7
       7
        
         # Fetch from GitHub in order to use `requirements.in`

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           owner = "flexget";

     

       10
       10
        
           repo = "flexget";

     

       11
       11
        
           rev = "v${version}";

     

       12
       12
       -
           sha256 = "0gf07qa1wsysvl0mckh2r3a40065rxhgszf4767jkbryz8z174bc";

     

       12
       12
       +
           sha256 = "1yrb8cfrc6y7gpfgzn0q6ldx9vk06qp229wjs4q8rccp72p6d6gg";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         postPatch = ''

+4 -8

pkgs/applications/networking/instant-messengers/quaternion/default.nix

···

       3
       3
        
       , lib

     

       4
       4
        
       , fetchFromGitHub

     

       5
       5
        
       , cmake

     

       6
       6
       -
       , qtbase

     

       7
       6
        
       , qtquickcontrols

     

       8
       7
        
       , qtquickcontrols2

     

       9
       8
        
       , qtkeychain

     
···

       15
       14
        
       

     

       16
       15
        
       mkDerivation rec {

     

       17
       16
        
         pname = "quaternion";

     

       18
       18
       -
         version = "0.0.95";

     

       17
       17
       +
         version = "0.0.95.1";

     

       19
       18
        
       

     

       20
       19
        
         src = fetchFromGitHub {

     

       21
       20
        
           owner = "QMatrixClient";

     

       22
       21
        
           repo = "Quaternion";

     

       23
       22
        
           rev = version;

     

       24
       24
       -
           sha256 = "sha256-WqhHqo4ySxufulC+TxS2ko2R5hUiORgdNAkp5Awdcw8=";

     

       23
       23
       +
           sha256 = "sha256-6FLj/hVY13WO7sMgHCHV57eMJu39cwQHXQX7m0lmv4I=";

     

       25
       24
        
         };

     

       26
       25
        
       

     

       27
       26
        
         buildInputs = [

     

       28
       28
       -
           qtbase

     

       29
       27
        
           qtmultimedia

     

       30
       30
       -
           qtquickcontrols

     

       31
       28
        
           qtquickcontrols2

     

       32
       29
        
           qtkeychain

     

       33
       30
        
           libquotient

     
···

       47
       44
        
           '';

     

       48
       45
        
       

     

       49
       46
        
         meta = with lib; {

     

       50
       50
       -
           description =

     

       51
       51
       -
             "Cross-platform desktop IM client for the Matrix protocol";

     

       47
       47
       +
           description = "Cross-platform desktop IM client for the Matrix protocol";

     

       52
       48
        
           homepage = "https://matrix.org/docs/projects/client/quaternion.html";

     

       53
       49
        
           license = licenses.gpl3;

     

       54
       50
        
           maintainers = with maintainers; [ peterhoeg ];

     

       55
       55
       -
           inherit (qtbase.meta) platforms;

     

       51
       51
       +
           inherit (qtquickcontrols2.meta) platforms;

     

       56
       52
        
         };

     

       57
       53
        
       }

+1 -1

pkgs/applications/networking/seafile-client/default.nix

···

       29
       29
        
           description = "Desktop client for Seafile, the Next-generation Open Source Cloud Storage";

     

       30
       30
        
           license = licenses.asl20;

     

       31
       31
        
           platforms = platforms.linux;

     

       32
       32
       -
           maintainers = with maintainers; [ ];

     

       32
       32
       +
           maintainers = with maintainers; [ schmittlauch ];

     

       33
       33
        
         };

     

       34
       34
        
       }

+14 -4

pkgs/applications/radio/dump1090/default.nix

···

       5
       5
        
       , libusb1

     

       6
       6
        
       , ncurses

     

       7
       7
        
       , rtl-sdr

     

       8
       8
       +
       , hackrf

     

       9
       9
       +
       , limesuite

     

       8
       10
        
       }:

     

       9
       11
        
       

     

       10
       12
        
       stdenv.mkDerivation rec {

     

       11
       13
        
         pname = "dump1090";

     

       12
       12
       -
         version = "5.0";

     

       14
       14
       +
         version = "6.1";

     

       13
       15
        
       

     

       14
       16
        
         src = fetchFromGitHub {

     

       15
       17
        
           owner = "flightaware";

     

       16
       18
        
           repo = pname;

     

       17
       19
        
           rev = "v${version}";

     

       18
       18
       -
           sha256 = "1fckfcgypmplzl1lidd04jxiabczlfx9mv21d6rbsfknghsjpn03";

     

       20
       20
       +
           sha256 = "sha256-OLXnT5TD6ZBNJUk4qXOMbr+NWdw3j1rv1xkFPZi4Wo8=";

     

       19
       21
        
         };

     

       20
       22
        
       

     

       21
       23
        
         nativeBuildInputs = [ pkg-config ];

     
···

       25
       27
        
           libusb1

     

       26
       28
        
           ncurses

     

       27
       29
        
           rtl-sdr

     

       28
       28
       -
         ];

     

       30
       30
       +
           hackrf

     

       31
       31
       +
         ] ++ lib.optional stdenv.isLinux limesuite;

     

       32
       32
       +
       

     

       33
       33
       +
         NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang

     

       34
       34
       +
           "-Wno-implicit-function-declaration -Wno-int-conversion";

     

       35
       35
       +
       

     

       36
       36
       +
         buildFlags = [ "dump1090" "view1090" ];

     

       37
       37
       +
       

     

       38
       38
       +
         doCheck = true;

     

       29
       39
        
       

     

       30
       40
        
         installPhase = ''

     

       31
       41
        
           runHook preInstall

     
···

       41
       51
        
           description = "A simple Mode S decoder for RTLSDR devices";

     

       42
       52
        
           homepage = "https://github.com/flightaware/dump1090";

     

       43
       53
        
           license = licenses.gpl2Plus;

     

       44
       44
       -
           platforms = platforms.linux;

     

       54
       54
       +
           platforms = platforms.unix;

     

       45
       55
        
           maintainers = with maintainers; [ earldouglas ];

     

       46
       56
        
         };

     

       47
       57
        
       }

+12 -19

pkgs/desktops/pantheon/apps/elementary-videos/default.nix

···

       1
       1
       -
       { lib, stdenv

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       2
       3
        
       , fetchFromGitHub

     

       3
       3
       -
       , fetchpatch

     

       4
       4
        
       , nix-update-script

     

       5
       5
        
       , pantheon

     

       6
       6
        
       , pkg-config

     
···

       12
       12
        
       , gtk3

     

       13
       13
        
       , granite

     

       14
       14
        
       , libgee

     

       15
       15
       +
       , libhandy

     

       15
       16
        
       , clutter-gst

     

       16
       17
        
       , clutter-gtk

     

       17
       18
        
       , gst_all_1

     
···

       21
       22
        
       

     

       22
       23
        
       stdenv.mkDerivation rec {

     

       23
       24
        
         pname = "elementary-videos";

     

       24
       24
       -
         version = "2.7.3";

     

       25
       25
       +
         version = "2.8.0";

     

       25
       26
        
       

     

       26
       27
        
         repoName = "videos";

     

       27
       28
        
       

     
···

       29
       30
        
           owner = "elementary";

     

       30
       31
        
           repo = repoName;

     

       31
       32
        
           rev = version;

     

       32
       32
       -
           sha256 = "04nl9kn33dysvsg0n5qx1z8qgrifkgfwsm7gh1l308v3n8c69lh7";

     

       33
       33
       -
         };

     

       34
       34
       -
       

     

       35
       35
       -
         patches = [

     

       36
       36
       -
           # Upstream code not respecting our localedir

     

       37
       37
       -
           # https://github.com/elementary/videos/pull/233

     

       38
       38
       -
           (fetchpatch {

     

       39
       39
       -
             url = "https://github.com/elementary/videos/commit/19ba2a9148be09ea521d2e9ac29dede6b9c6fa07.patch";

     

       40
       40
       -
             sha256 = "0ffp7ana98846xi7vxrzfg6dbs4yy28x2i4ky85mqs1gj6fjqin5";

     

       41
       41
       -
           })

     

       42
       42
       -
         ];

     

       43
       43
       -
       

     

       44
       44
       -
         passthru = {

     

       45
       45
       -
           updateScript = nix-update-script {

     

       46
       46
       -
             attrPath = "pantheon.${pname}";

     

       47
       47
       -
           };

     

       33
       33
       +
           sha256 = "sha256-FFCtQ42LygfjowehwZcISWTfv8PBZTH0X8mPrpiG8Ug=";

     

       48
       34
        
         };

     

       49
       35
        
       

     

       50
       36
        
         nativeBuildInputs = [

     
···

       70
       56
        
           gstreamer

     

       71
       57
        
           gtk3

     

       72
       58
        
           libgee

     

       59
       59
       +
           libhandy

     

       73
       60
        
         ];

     

       74
       61
        
       

     

       75
       62
        
         postPatch = ''

     

       76
       63
        
           chmod +x meson/post_install.py

     

       77
       64
        
           patchShebangs meson/post_install.py

     

       78
       65
        
         '';

     

       66
       66
       +
       

     

       67
       67
       +
         passthru = {

     

       68
       68
       +
           updateScript = nix-update-script {

     

       69
       69
       +
             attrPath = "pantheon.${pname}";

     

       70
       70
       +
           };

     

       71
       71
       +
         };

     

       79
       72
        
       

     

       80
       73
        
         meta = with lib; {

     

       81
       74
        
           description = "Video player and library app designed for elementary OS";

+2 -12

pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , stdenv

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
       -
       , fetchpatch

     

       5
       4
        
       , nix-update-script

     

       6
       5
        
       , pantheon

     

       7
       6
        
       , meson

     
···

       17
       16
        
       

     

       18
       17
        
       stdenv.mkDerivation rec {

     

       19
       18
        
         pname = "elementary-default-settings";

     

       20
       20
       -
         version = "6.0.1";

     

       19
       19
       +
         version = "6.0.2";

     

       21
       20
        
       

     

       22
       21
        
         repoName = "default-settings";

     

       23
       22
        
       

     
···

       25
       24
        
           owner = "elementary";

     

       26
       25
        
           repo = repoName;

     

       27
       26
        
           rev = version;

     

       28
       28
       -
           sha256 = "0gqnrm968j4v699yhhiyw5fqjy4zbvvrjci2v1jrlycn09c2yrwf";

     

       27
       27
       +
           sha256 = "sha256-qaPj/Qp7RYzHgElFdM8bHV42oiPUbCMTC9Q+MUj4Q6Y=";

     

       29
       28
        
         };

     

       30
       30
       -
       

     

       31
       31
       -
         patches = [

     

       32
       32
       -
           # Update gtk-theme-name and gtk-font-name for Pantheon 6

     

       33
       33
       -
           # https://github.com/elementary/default-settings/pull/252

     

       34
       34
       -
           (fetchpatch {

     

       35
       35
       -
             url = "https://github.com/elementary/default-settings/commit/be24c151492bb9115c75bd1a7abc88714240294a.patch";

     

       36
       36
       -
             sha256 = "sha256-EglFiN4CLbL8osfNGLvjD220Al35uBXuRNC9Ud3QYBI=";

     

       37
       37
       -
           })

     

       38
       38
       -
         ];

     

       39
       29
        
       

     

       40
       30
        
         nativeBuildInputs = [

     

       41
       31
        
           accountsservice

+19 -22

pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix

···

       1
       1
       -
       { lib, stdenv

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       2
       3
        
       , fetchFromGitHub

     

       3
       3
       -
       , fetchpatch

     

       4
       4
        
       , nix-update-script

     

       5
       5
        
       , substituteAll

     

       6
       6
        
       , pantheon

     
···

       24
       24
        
       

     

       25
       25
        
       stdenv.mkDerivation rec {

     

       26
       26
        
         pname = "wingpanel-indicator-datetime";

     

       27
       27
       -
         version = "2.3.0";

     

       27
       27
       +
         version = "2.3.1";

     

       28
       28
        
       

     

       29
       29
        
         src = fetchFromGitHub {

     

       30
       30
        
           owner = "elementary";

     

       31
       31
        
           repo = pname;

     

       32
       32
        
           rev = version;

     

       33
       33
       -
           sha256 = "1mdm0fsnmmyw8c0ik2jmfri3kas9zkz1hskzf8wvbd51vnazfpgw";

     

       33
       33
       +
           sha256 = "sha256-/kbwZVzOlC3ATCuXVMdf2RIskoGQKG1evaDYO3yFerg=";

     

       34
       34
        
         };

     

       35
       35
        
       

     

       36
       36
       -
         passthru = {

     

       37
       37
       -
           updateScript = nix-update-script {

     

       38
       38
       -
             attrPath = "pantheon.${pname}";

     

       39
       39
       -
           };

     

       40
       40
       -
         };

     

       36
       36
       +
         patches = [

     

       37
       37
       +
           (substituteAll {

     

       38
       38
       +
             src = ./fix-paths.patch;

     

       39
       39
       +
             elementary_calendar = elementary-calendar;

     

       40
       40
       +
           })

     

       41
       41
       +
           # Fix incorrect month shown on re-opening indicator if previously changed month

     

       42
       42
       +
           # https://github.com/elementary/wingpanel-indicator-datetime/pull/284

     

       43
       43
       +
           ./fix-incorrect-month.patch

     

       44
       44
       +
         ];

     

       41
       45
        
       

     

       42
       46
        
         nativeBuildInputs = [

     

       43
       47
        
           libxml2

     
···

       60
       64
        
           libgdata # required by some dependency transitively

     

       61
       65
        
         ];

     

       62
       66
        
       

     

       63
       63
       -
         patches = [

     

       64
       64
       -
           (substituteAll {

     

       65
       65
       -
             src = ./fix-paths.patch;

     

       66
       66
       -
             elementary_calendar = elementary-calendar;

     

       67
       67
       -
           })

     

       68
       68
       -
           # Upstream code not respecting our localedir

     

       69
       69
       -
           # https://github.com/elementary/wingpanel-indicator-datetime/pull/269

     

       70
       70
       -
           (fetchpatch {

     

       71
       71
       -
             url = "https://github.com/elementary/wingpanel-indicator-datetime/commit/f7befa68a9fd6215297c334a366919d3431cae65.patch";

     

       72
       72
       -
             sha256 = "0l997b1pnpjscs886xy28as5yykxamxacvxdv8466zin7zynarfs";

     

       73
       73
       -
           })

     

       74
       74
       -
         ];

     

       75
       75
       -
       

     

       76
       67
        
         postPatch = ''

     

       77
       68
        
           chmod +x meson/post_install.py

     

       78
       69
        
           patchShebangs meson/post_install.py

     

       79
       70
        
         '';

     

       71
       71
       +
       

     

       72
       72
       +
         passthru = {

     

       73
       73
       +
           updateScript = nix-update-script {

     

       74
       74
       +
             attrPath = "pantheon.${pname}";

     

       75
       75
       +
           };

     

       76
       76
       +
         };

     

       80
       77
        
       

     

       81
       78
        
         meta = with lib; {

     

       82
       79
        
           description = "Date & Time Indicator for Wingpanel";

+26

pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-incorrect-month.patch

···

       1
       1
       +
       From 401cb05d7181e69ae8edd347644f2518904e9acb Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Jeremy Paul Wootten <jeremywootten@gmail.com>

     

       3
       3
       +
       Date: Sat, 30 Oct 2021 17:44:12 +0100

     

       4
       4
       +
       Subject: [PATCH] Reset position and relative position after rebuilding

     

       5
       5
       +
        carousel

     

       6
       6
       +
       

     

       7
       7
       +
       ---

     

       8
       8
       +
        src/Widgets/calendar/CalendarView.vala | 4 ++++

     

       9
       9
       +
        1 file changed, 4 insertions(+)

     

       10
       10
       +
       

     

       11
       11
       +
       diff --git a/src/Widgets/calendar/CalendarView.vala b/src/Widgets/calendar/CalendarView.vala

     

       12
       12
       +
       index a41b37a4..f946b91c 100644

     

       13
       13
       +
       --- a/src/Widgets/calendar/CalendarView.vala

     

       14
       14
       +
       +++ b/src/Widgets/calendar/CalendarView.vala

     

       15
       15
       +
       @@ -216,7 +216,11 @@ public class DateTime.Widgets.CalendarView : Gtk.Grid {

     

       16
       16
       +
                    carousel.add (right_grid);

     

       17
       17
       +
                    carousel.scroll_to (start_month_grid);

     

       18
       18
       +
                    label.label = calmodel.month_start.format (_("%OB, %Y"));

     

       19
       19
       +
       +

     

       20
       20
       +
       +            position = 1;

     

       21
       21
       +
       +            rel_postion = 0;

     

       22
       22
       +
                }

     

       23
       23
       +
       +

     

       24
       24
       +
                carousel.no_show_all = false;

     

       25
       25
       +
            }

     

       26
       26
       +

+2 -2

pkgs/development/interpreters/clojure/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "clojure";

     

       5
       5
       -
         version = "1.10.3.998";

     

       5
       5
       +
         version = "1.10.3.1013";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           # https://clojure.org/releases/tools

     

       9
       9
        
           url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";

     

       10
       10
       -
           sha256 = "zvIgswjAGfvaTKRb29KGKETqggjmOToCBzb99/C7chA=";

     

       10
       10
       +
           sha256 = "EmIdcQ7ANbDjOBUX/UQwdd1C+JzeCZaC4XaNdW49E/A=";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         nativeBuildInputs = [

+15 -10

pkgs/development/libraries/arrow-cpp/default.nix

···

       1
       1
        
       { stdenv, lib, fetchurl, fetchFromGitHub, fixDarwinDylibNames

     

       2
       2
        
       , autoconf, boost, brotli, cmake, flatbuffers, gflags, glog, gtest, lz4

     

       3
       3
       -
       , perl, python3, rapidjson, re2, snappy, thrift, utf8proc, which, xsimd

     

       3
       3
       +
       , perl, python3, rapidjson, re2, snappy, thrift, tzdata , utf8proc, which

     

       4
       4
        
       , zlib, zstd

     

       5
       5
        
       , enableShared ? !stdenv.hostPlatform.isStatic

     

       6
       6
        
       }:

     
···

       9
       9
        
         arrow-testing = fetchFromGitHub {

     

       10
       10
        
           owner = "apache";

     

       11
       11
        
           repo = "arrow-testing";

     

       12
       12
       -
           rev = "6d98243093c0b36442da94de7010f3eacc2a9909";

     

       13
       13
       -
           hash = "sha256-n57Fuz2k6sX1o3vYBmC41eRKGnyt9+YL5r3WTHHRRzw=";

     

       12
       12
       +
           rev = "a60b715263d9bbf7e744527fb0c084b693f58043";

     

       13
       13
       +
           hash = "sha256-Dz1dCV0m5Y24qzXdVaqrZ7hK3MRSb4GF0PXrjMAsjZU=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         parquet-testing = fetchFromGitHub {

     

       17
       17
        
           owner = "apache";

     

       18
       18
        
           repo = "parquet-testing";

     

       19
       19
       -
           rev = "ddd898958803cb89b7156c6350584d1cda0fe8de";

     

       20
       20
       -
           hash = "sha256-gK04mj1Fuhkf82NDMrXplFa+cr/3Ij7I9VnYfinuJlg=";

     

       19
       19
       +
           rev = "d4d485956a643c693b5549e1a62d52ca61c170f1";

     

       20
       20
       +
           hash = "sha256-GmOAS8gGhzDI0WzORMkWHRRUl/XBwmNen2d3VefZxxc=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
       in stdenv.mkDerivation rec {

     

       24
       24
        
         pname = "arrow-cpp";

     

       25
       25
       -
         version = "5.0.0";

     

       25
       25
       +
         version = "6.0.0";

     

       26
       26
        
       

     

       27
       27
        
         src = fetchurl {

     

       28
       28
        
           url =

     

       29
       29
        
             "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";

     

       30
       30
       -
           hash = "sha256-w7QxPspZTCD3Yag2cZchqvB2AAGviWuuw6tkQg/5kQo=";

     

       30
       30
       +
           hash = "sha256-adJo+egtPr71la0b3IPUywKyDBgZRqaGMfZkXXwfepA=";

     

       31
       31
        
         };

     

       32
       32
        
         sourceRoot = "apache-arrow-${version}/cpp";

     

       33
       33
        
       

     
···

       81
       81
        
       

     

       82
       82
        
         preConfigure = ''

     

       83
       83
        
           patchShebangs build-support/

     

       84
       84
       +
           substituteInPlace "src/arrow/vendored/datetime/tz.cpp" \

     

       85
       85
       +
             --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"

     

       84
       86
        
         '';

     

       85
       87
        
       

     

       86
       88
        
         cmakeFlags = [

     
···

       117
       119
        
           "-DCMAKE_INSTALL_RPATH=@loader_path/../lib" # needed for tools executables

     

       118
       120
        
         ] ++ lib.optional (!stdenv.isx86_64) "-DARROW_USE_SIMD=OFF";

     

       119
       121
        
       

     

       120
       120
       -
         ARROW_XSIMD_URL = xsimd.src;

     

       122
       122
       +
         ARROW_XSIMD_URL = fetchurl {

     

       123
       123
       +
           url = "https://github.com/xtensor-stack/xsimd/archive/aeec9c872c8b475dedd7781336710f2dd2666cb2.tar.gz";

     

       124
       124
       +
           sha256 = "09kvl962c6b0wnb7pb2n9dhvkflzwalgq6gwwi8628fgi9n1x10a";

     

       125
       125
       +
         };

     

       121
       126
        
       

     

       122
       127
        
         doInstallCheck = true;

     

       123
       128
        
         ARROW_TEST_DATA =

     
···

       148
       153
        
         '';

     

       149
       154
        
       

     

       150
       155
        
         meta = with lib; {

     

       151
       151
       -
           description = "A  cross-language development platform for in-memory data";

     

       156
       156
       +
           description = "A cross-language development platform for in-memory data";

     

       152
       157
        
           homepage = "https://arrow.apache.org/";

     

       153
       158
        
           license = licenses.asl20;

     

       154
       159
        
           platforms = platforms.unix;

     

       155
       155
       -
           maintainers = with maintainers; [ tobim veprbl ];

     

       160
       160
       +
           maintainers = with maintainers; [ tobim veprbl cpcloud ];

     

       156
       161
        
         };

     

       157
       162
        
       }

+9 -4

pkgs/development/libraries/libquotient/default.nix

···

       1
       1
       -
       { mkDerivation, lib, fetchFromGitHub, cmake, qtbase, qtmultimedia }:

     

       1
       1
       +
       { mkDerivation, lib, fetchFromGitHub, cmake, qtmultimedia }:

     

       2
       2
        
       

     

       3
       3
        
       mkDerivation rec {

     

       4
       4
        
         pname = "libquotient";

     

       5
       5
       -
         version = "0.6.9";

     

       5
       5
       +
         version = "0.6.11";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "quotient-im";

     

       9
       9
        
           repo = "libQuotient";

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-1YiS2b4lYknNSB+8LKB/s6AcF0yQVsakrkp6/Sjkczo=";

     

       11
       11
       +
           sha256 = "sha256-FPtxeZOfChIPi4e/h/eZkByH1QL3Fn0OJxe0dnMcTRw=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ qtbase qtmultimedia ];

     

       14
       14
       +
         buildInputs = [ qtmultimedia ];

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ cmake ];

     

       17
       17
       +
       

     

       18
       18
       +
         cmakeFlags = [

     

       19
       19
       +
           # we need libqtolm for this

     

       20
       20
       +
           "-DQuotient_ENABLE_E2EE=OFF"

     

       21
       21
       +
         ];

     

       17
       22
        
       

     

       18
       23
        
         meta = with lib; {

     

       19
       24
        
           description = "A Qt5 library to write cross-platform clients for Matrix";

+3 -3

pkgs/development/libraries/opendkim/default.nix

···

       1
       1
        
       { lib, stdenv, fetchFromGitHub, pkg-config, libbsd, openssl, libmilter

     

       2
       2
       -
       , autoreconfHook, perl, makeWrapper }:

     

       2
       2
       +
       , autoreconfHook, perl, makeWrapper, unbound }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         pname = "opendkim";

     
···

       16
       16
        
           "--with-milter=${libmilter}"

     

       17
       17
        
           "ac_cv_func_malloc_0_nonnull=yes"

     

       18
       18
        
           "ac_cv_func_realloc_0_nonnull=yes"

     

       19
       19
       -
         ];

     

       19
       19
       +
         ] ++ lib.optional stdenv.isDarwin "--with-unbound=${unbound}";

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ];

     

       22
       22
        
       

     

       23
       23
       -
         buildInputs = [ libbsd openssl libmilter perl ];

     

       23
       23
       +
         buildInputs = [ libbsd openssl libmilter perl ] ++ lib.optional stdenv.isDarwin unbound;

     

       24
       24
        
       

     

       25
       25
        
         postInstall = ''

     

       26
       26
        
           wrapProgram $out/sbin/opendkim-genkey \

+2 -2

pkgs/development/python-modules/zstandard/default.nix

···

       7
       7
        
       

     

       8
       8
        
       buildPythonPackage rec {

     

       9
       9
        
         pname = "zstandard";

     

       10
       10
       -
         version = "0.15.2";

     

       10
       10
       +
         version = "0.16.0";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchPypi {

     

       13
       13
        
           inherit pname version;

     

       14
       14
       -
           sha256 = "52de08355fd5cfb3ef4533891092bb96229d43c2069703d4aff04fdbedf9c92f";

     

       14
       14
       +
           sha256 = "eaae2d3e8fdf8bfe269628385087e4b648beef85bb0c187644e7df4fb0fe9046";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         propagatedNativeBuildInputs = [ cffi ];

+6

pkgs/development/tools/devpi-client/default.nix

···

       32
       32
        
           sha256 = "24ac6d94108996efad4ff5185dabb1e5120ae238134b8175d6de2ca9e766cd92";

     

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
       +
         postPatch = ''

     

       36
       36
       +
           # can be removed after 5.2.2, updated upstream

     

       37
       37
       +
           substituteInPlace setup.py \

     

       38
       38
       +
             --replace "pluggy>=0.6.0,<1.0" "pluggy"

     

       39
       39
       +
         '';

     

       40
       40
       +
       

     

       35
       41
        
         buildInputs = [ glibcLocales ];

     

       36
       42
        
       

     

       37
       43
        
         propagatedBuildInputs = [ py devpi-common pluggy setuptools check-manifest pkginfo ];

+68

pkgs/os-specific/linux/error-inject/default.nix

···

       1
       1
       +
       { lib, stdenv, fetchgit

     

       2
       2
       +
       , bison, flex, rasdaemon

     

       3
       3
       +
       }:

     

       4
       4
       +
       

     

       5
       5
       +
       {

     

       6
       6
       +
         edac-inject = rasdaemon.inject;

     

       7
       7
       +
       

     

       8
       8
       +
         mce-inject = stdenv.mkDerivation rec {

     

       9
       9
       +
           pname = "mce-inject";

     

       10
       10
       +
           version = "4cbe46321b4a81365ff3aafafe63967264dbfec5";

     

       11
       11
       +
       

     

       12
       12
       +
           src = fetchgit {

     

       13
       13
       +
             url = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-inject.git";

     

       14
       14
       +
             rev = version;

     

       15
       15
       +
             sha256 = "0gjapg2hrlxp8ssrnhvc19i3r1xpcnql7xv0zjgbv09zyha08g6z";

     

       16
       16
       +
           };

     

       17
       17
       +
       

     

       18
       18
       +
           nativeBuildInputs = [ bison flex ];

     

       19
       19
       +
       

     

       20
       20
       +
           makeFlags = [ "destdir=${placeholder "out"}" ];

     

       21
       21
       +
       

     

       22
       22
       +
           postInstall = ''

     

       23
       23
       +
             mkdir $out/sbin

     

       24
       24
       +
             mv $out/usr/sbin/mce-inject $out/sbin/mce-inject

     

       25
       25
       +
       

     

       26
       26
       +
             mkdir $out/test

     

       27
       27
       +
             cp test/* $out/test/.

     

       28
       28
       +
           '';

     

       29
       29
       +
       

     

       30
       30
       +
           meta = with lib; {

     

       31
       31
       +
             description = "MCE error injection tool";

     

       32
       32
       +
             license = licenses.gpl2Only;

     

       33
       33
       +
             platforms = platforms.linux;

     

       34
       34
       +
             maintainers = [ maintainers.evils ];

     

       35
       35
       +
           };

     

       36
       36
       +
         };

     

       37
       37
       +
       

     

       38
       38
       +
         aer-inject = stdenv.mkDerivation rec {

     

       39
       39
       +
           pname = "aer-inject";

     

       40
       40
       +
           version = "9bd5e2c7886fca72f139cd8402488a2235957d41";

     

       41
       41
       +
       

     

       42
       42
       +
           src = fetchgit {

     

       43
       43
       +
             url = "git://git.kernel.org/pub/scm/linux/kernel/git/gong.chen/aer-inject.git";

     

       44
       44
       +
             rev = version;

     

       45
       45
       +
             sha256 = "0bh6mzpk2mr4xidkammmkfk21b4dbq793qjg25ryyxd1qv0c6cg4";

     

       46
       46
       +
           };

     

       47
       47
       +
       

     

       48
       48
       +
           nativeBuildInputs = [ bison flex ];

     

       49
       49
       +
       

     

       50
       50
       +
           # how is this necessary?

     

       51
       51
       +
           makeFlags = [ "DESTDIR=${placeholder "out"}" ];

     

       52
       52
       +
       

     

       53
       53
       +
           postInstall = ''

     

       54
       54
       +
             mkdir $out/bin

     

       55
       55
       +
             mv $out/usr/local/aer-inject $out/bin/aer-inject

     

       56
       56
       +
       

     

       57
       57
       +
             mkdir -p $out/examples

     

       58
       58
       +
             cp examples/* $out/examples/.

     

       59
       59
       +
           '';

     

       60
       60
       +
       

     

       61
       61
       +
           meta = with lib; {

     

       62
       62
       +
             description = "PCIE AER error injection tool";

     

       63
       63
       +
             license = licenses.gpl2Only;

     

       64
       64
       +
             platforms = platforms.linux;

     

       65
       65
       +
             maintainers = [ maintainers.evils ];

     

       66
       66
       +
           };

     

       67
       67
       +
         };

     

       68
       68
       +
       }

+111

pkgs/os-specific/linux/rasdaemon/default.nix

···

       1
       1
       +
       { lib, stdenv, fetchFromGitHub

     

       2
       2
       +
       , autoreconfHook

     

       3
       3
       +
       , glibcLocales, kmod, coreutils, perl

     

       4
       4
       +
       , dmidecode, hwdata, sqlite

     

       5
       5
       +
       , nixosTests

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       stdenv.mkDerivation rec {

     

       9
       9
       +
         pname = "rasdaemon";

     

       10
       10
       +
         version = "0.6.7";

     

       11
       11
       +
       

     

       12
       12
       +
         src = fetchFromGitHub {

     

       13
       13
       +
           owner = "mchehab";

     

       14
       14
       +
           repo = "rasdaemon";

     

       15
       15
       +
           rev = "v${version}";

     

       16
       16
       +
           sha256 = "sha256-vyUDwqDe+HD4mka6smdQuVSM5U9uMv/TrfHkyqVJMIo=";

     

       17
       17
       +
         };

     

       18
       18
       +
       

     

       19
       19
       +
         nativeBuildInputs = [ autoreconfHook ];

     

       20
       20
       +
       

     

       21
       21
       +
         buildInputs = [

     

       22
       22
       +
           coreutils

     

       23
       23
       +
           glibcLocales

     

       24
       24
       +
           hwdata

     

       25
       25
       +
           kmod

     

       26
       26
       +
           sqlite

     

       27
       27
       +
           (perl.withPackages (ps: with ps; [ DBI DBDSQLite ]))

     

       28
       28
       +
         ]

     

       29
       29
       +
         ++ lib.optionals (!stdenv.isAarch64) [ dmidecode ];

     

       30
       30
       +
       

     

       31
       31
       +
         configureFlags = [

     

       32
       32
       +
           "--sysconfdir=/etc"

     

       33
       33
       +
           "--localstatedir=/var"

     

       34
       34
       +
           "--with-sysconfdefdir=${placeholder "out"}/etc/sysconfig"

     

       35
       35
       +
           "--enable-sqlite3"

     

       36
       36
       +
           "--enable-aer"

     

       37
       37
       +
           "--enable-mce"

     

       38
       38
       +
           "--enable-extlog"

     

       39
       39
       +
           "--enable-non-standard"

     

       40
       40
       +
           "--enable-abrt-report"

     

       41
       41
       +
           "--enable-hisi-ns-decode"

     

       42
       42
       +
           "--enable-devlink"

     

       43
       43
       +
           "--enable-diskerror"

     

       44
       44
       +
           "--enable-memory-failure"

     

       45
       45
       +
           "--enable-memory-ce-pfa"

     

       46
       46
       +
           "--enable-amp-ns-decode"

     

       47
       47
       +
         ]

     

       48
       48
       +
         ++ lib.optionals (stdenv.isAarch64) [ "--enable-arm" ];

     

       49
       49
       +
       

     

       50
       50
       +
         # The installation attempts to create the following directories:

     

       51
       51
       +
         # /var/lib/rasdaemon

     

       52
       52
       +
         #   location of the RAS event log generated by rasdaemon -r

     

       53
       53
       +
         # /etc/ras/dimm_labels.d

     

       54
       54
       +
         #   location of the DIMM labels generated by ras-mc-ctl

     

       55
       55
       +
         # /etc/sysconfig/rasdaemon

     

       56
       56
       +
         #   location of rasdaemon config file, currently only used for CE PFA config

     

       57
       57
       +
       

     

       58
       58
       +
         # these are optional (for logging, DIMM label storage and user config)

     

       59
       59
       +
         # /var/lib/rasdaemon should be created by the NixOS module

     

       60
       60
       +
         # /etc/ras/dimm_labels.d should probably be generated,

     

       61
       61
       +
         # from user supplied content, in the NixOS module

     

       62
       62
       +
         # /etc/sysconfig/rasdaemon should be generated if there is user supplied content

     

       63
       63
       +
         # and default to $out/etc/sysconfig/rasdaemon which should hold the supplied default

     

       64
       64
       +
       

     

       65
       65
       +
         # therefore, stripping these from the generated Makefile

     

       66
       66
       +
         # (needed in the config flags because those set where the tools look for these)

     

       67
       67
       +
       

     

       68
       68
       +
       # easy way out, ends up installing /nix/store/...rasdaemon/bin in $out

     

       69
       69
       +
       

     

       70
       70
       +
         postConfigure = ''

     

       71
       71
       +
           substituteInPlace Makefile \

     

       72
       72
       +
             --replace '"$(DESTDIR)/etc/ras/dimm_labels.d"' '"$(prefix)/etc/ras/dimm_labels.d"'

     

       73
       73
       +
         '';

     

       74
       74
       +
       

     

       75
       75
       +
         outputs = [ "out" "dev" "man" "inject" ];

     

       76
       76
       +
       

     

       77
       77
       +
         postInstall = ''

     

       78
       78
       +
           install -Dm 0755 contrib/edac-fake-inject $inject/bin/edac-fake-inject

     

       79
       79
       +
           install -Dm 0755 contrib/edac-tests $inject/bin/edac-tests

     

       80
       80
       +
         '';

     

       81
       81
       +
       

     

       82
       82
       +
         postFixup = ''

     

       83
       83
       +
           # Fix dmidecode and modprobe paths

     

       84
       84
       +
           substituteInPlace $out/bin/ras-mc-ctl \

     

       85
       85
       +
             --replace 'find_prog ("modprobe")  or exit (1)' '"${kmod}/bin/modprobe"'

     

       86
       86
       +
         ''

     

       87
       87
       +
         + lib.optionalString (!stdenv.isAarch64) ''

     

       88
       88
       +
           substituteInPlace $out/bin/ras-mc-ctl \

     

       89
       89
       +
             --replace 'find_prog ("dmidecode")' '"${dmidecode}/bin/dmidecode"'

     

       90
       90
       +
         '';

     

       91
       91
       +
       

     

       92
       92
       +
         passthru.tests = nixosTests.rasdaemon;

     

       93
       93
       +
       

     

       94
       94
       +
         meta = with lib; {

     

       95
       95
       +
           description = ''

     

       96
       96
       +
             A Reliability, Availability and Serviceability (RAS) logging tool using EDAC kernel tracing events

     

       97
       97
       +
           '';

     

       98
       98
       +
           longDescription = ''

     

       99
       99
       +
             Rasdaemon is a RAS (Reliability, Availability and Serviceability) logging

     

       100
       100
       +
             tool. It records memory errors, using the EDAC tracing events. EDAC is a

     

       101
       101
       +
             Linux kernel subsystem with handles detection of ECC errors from memory

     

       102
       102
       +
             controllers for most chipsets on i386 and x86_64 architectures. EDAC

     

       103
       103
       +
             drivers for other architectures like arm also exists.

     

       104
       104
       +
           '';

     

       105
       105
       +
           homepage = "https://github.com/mchehab/rasdaemon";

     

       106
       106
       +
           license = licenses.gpl2Plus;

     

       107
       107
       +
           platforms = platforms.linux;

     

       108
       108
       +
           changelog = "https://github.com/mchehab/rasdaemon/blob/v${version}/ChangeLog";

     

       109
       109
       +
           maintainers = with maintainers; [ evils ];

     

       110
       110
       +
         };

     

       111
       111
       +
       }

+16

pkgs/os-specific/linux/vm-tools/default.nix

···

       1
       1
       +
       { lib, stdenv, linux }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation {

     

       4
       4
       +
         pname = "vm-tools";

     

       5
       5
       +
         inherit (linux) version src;

     

       6
       6
       +
       

     

       7
       7
       +
         makeFlags = [ "sbindir=${placeholder "out"}/bin" ];

     

       8
       8
       +
       

     

       9
       9
       +
         preConfigure = "cd tools/vm";

     

       10
       10
       +
       

     

       11
       11
       +
         meta = with lib; {

     

       12
       12
       +
           inherit (linux.meta) license platforms;

     

       13
       13
       +
           description = "Set of virtual memory tools";

     

       14
       14
       +
           maintainers = [ maintainers.evils ];

     

       15
       15
       +
         };

     

       16
       16
       +
       }

+12 -2

pkgs/tools/misc/lsd/default.nix

···

       1
       1
        
       { lib

     

       2
       2
       -
       , nixosTests

     

       3
       2
        
       , fetchFromGitHub

     

       4
       3
        
       , rustPlatform

     

       5
       4
        
       , installShellFiles

     
···

       26
       25
        
         # Found argument '--test-threads' which wasn't expected, or isn't valid in this context

     

       27
       26
        
         doCheck = false;

     

       28
       27
        
       

     

       29
       29
       -
         passthru.tests = { inherit (nixosTests) lsd; };

     

       28
       28
       +
         doInstallCheck = true;

     

       29
       29
       +
         installCheckPhase = ''

     

       30
       30
       +
           runHook preInstallCheck

     

       31
       31
       +
       

     

       32
       32
       +
           testFile=$(mktemp /tmp/lsd-test.XXXX)

     

       33
       33
       +
           echo 'abc' > $testFile

     

       34
       34
       +
           $out/bin/lsd --classic --blocks "size,name" -l $testFile | grep "4 B $testFile"

     

       35
       35
       +
           $out/bin/lsd --version | grep "${version}"

     

       36
       36
       +
           rm $testFile

     

       37
       37
       +
       

     

       38
       38
       +
           runHook postInstallCheck

     

       39
       39
       +
         '';

     

       30
       40
        
       

     

       31
       41
        
         meta = with lib; {

     

       32
       42
        
           homepage = "https://github.com/Peltoche/lsd";

+2 -2

pkgs/tools/misc/qt5ct/default.nix

···

       4
       4
        
       

     

       5
       5
        
       mkDerivation rec {

     

       6
       6
        
         pname = "qt5ct";

     

       7
       7
       -
         version = "1.3";

     

       7
       7
       +
         version = "1.5";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";

     

       11
       11
       -
           sha256 = "sha256-3UQ7FOWQr/dqFuExbVbmiIguMkjEcN9PcbyVJWnzw7w=";

     

       11
       11
       +
           sha256 = "sha256-1j0M4W4CQnIH2GUx9wpxxbnIUARN1bLcsihVMfQW5JA=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ qmake qttools ];

+4

pkgs/top-level/all-packages.nix

···

       21742
       21742
        
       

     

       21743
       21743
        
         ebtables = callPackage ../os-specific/linux/ebtables { };

     

       21744
       21744
        
       

     

       21745
       21745
       +
         error-inject = callPackages ../os-specific/linux/error-inject { };

     

       21746
       21746
       +
       

     

       21745
       21747
        
         extrace = callPackage ../os-specific/linux/extrace { };

     

       21746
       21748
        
       

     

       21747
       21749
        
         facetimehd-firmware = callPackage ../os-specific/linux/firmware/facetimehd-firmware { };

     
···

       22381
       22383
        
         radeontools = callPackage ../os-specific/linux/radeontools { };

     

       22382
       22384
        
       

     

       22383
       22385
        
         radeontop = callPackage ../os-specific/linux/radeontop { };

     

       22386
       22386
       +
       

     

       22387
       22387
       +
         rasdaemon = callPackage ../os-specific/linux/rasdaemon { };

     

       22384
       22388
        
       

     

       22385
       22389
        
         raspberrypifw = callPackage ../os-specific/linux/firmware/raspberrypi {};

     

       22386
       22390
        
         raspberrypiWirelessFirmware = callPackage ../os-specific/linux/firmware/raspberrypi-wireless { };

+2

pkgs/top-level/linux-kernels.nix

···

       432
       432
        
             virtualbox = pkgs.virtualboxHardened;

     

       433
       433
        
           };

     

       434
       434
        
       

     

       435
       435
       +
           vm-tools = callPackage ../os-specific/linux/vm-tools { };

     

       436
       436
       +
       

     

       435
       437
        
           wireguard = if lib.versionOlder kernel.version "5.6" then callPackage ../os-specific/linux/wireguard { } else null;

     

       436
       438
        
       

     

       437
       439
        
           x86_energy_perf_policy = callPackage ../os-specific/linux/x86_energy_perf_policy { };