commit c8e29ade643308f4ab4e6fe9ee2817c89c0ca89d · pyrox.dev/nixpkgs

+7 -21

lib/tests/misc.nix

···

       391
       391
        
           expected = 9223372036854775807;

     

       392
       392
        
         };

     

       393
       393
        
       

     

       394
       394
       +
         testFromHexStringLeadingZeroes = {

     

       395
       395
       +
           expr = fromHexString "00ffffffffffffff";

     

       396
       396
       +
           expected = 72057594037927935;

     

       397
       397
       +
         };

     

       398
       398
       +
       

     

       394
       399
        
         testFromHexStringWithPrefix = {

     

       395
       395
       -
           expr = fromHexString "0Xf";

     

       400
       400
       +
           expr = fromHexString "0xf";

     

       396
       401
        
           expected = 15;

     

       397
       402
        
         };

     

       398
       403
        
       

     

       399
       399
       -
         # FIXME: This might be bad and should potentially be deprecated.

     

       400
       400
       -
         testFromHexStringQuestionableMixedCase = {

     

       404
       404
       +
         testFromHexStringMixedCase = {

     

       401
       405
        
           expr = fromHexString "eEeEe";

     

       402
       406
        
           expected = 978670;

     

       403
       403
       -
         };

     

       404
       404
       -
       

     

       405
       405
       -
         # FIXME: This is probably bad and should potentially be deprecated.

     

       406
       406
       -
         testFromHexStringQuestionableUnderscore = {

     

       407
       407
       -
           expr = fromHexString "F_f";

     

       408
       408
       -
           expected = 255;

     

       409
       409
       -
         };

     

       410
       410
       -
       

     

       411
       411
       -
         # FIXME: This is definitely bad and should be deprecated.

     

       412
       412
       -
         testFromHexStringBadComment = {

     

       413
       413
       -
           expr = fromHexString "0 # oops";

     

       414
       414
       -
           expected = 0;

     

       415
       415
       -
         };

     

       416
       416
       -
       

     

       417
       417
       -
         # FIXME: Oh my god.

     

       418
       418
       -
         testFromHexStringAwfulInjection = {

     

       419
       419
       -
           expr = fromHexString "1\nwhoops = {}";

     

       420
       420
       -
           expected = 1;

     

       421
       407
        
         };

     

       422
       408
        
       

     

       423
       409
        
         testToBaseDigits = {

+13 -6

lib/trivial.nix

···

       1119
       1119
        
           ```

     

       1120
       1120
        
         */

     

       1121
       1121
        
         fromHexString =

     

       1122
       1122
       -
           value:

     

       1122
       1122
       +
           str:

     

       1123
       1123
        
           let

     

       1124
       1124
       -
             noPrefix = lib.strings.removePrefix "0x" (lib.strings.toLower value);

     

       1124
       1124
       +
             match = builtins.match "(0x)?([0-7]?[0-9A-Fa-f]{1,15})" str;

     

       1125
       1125
        
           in

     

       1126
       1126
       -
           let

     

       1127
       1127
       -
             parsed = builtins.fromTOML "v=0x${noPrefix}";

     

       1128
       1128
       -
           in

     

       1129
       1129
       -
           parsed.v;

     

       1126
       1126
       +
           if match != null then

     

       1127
       1127
       +
             (builtins.fromTOML "v=0x${builtins.elemAt match 1}").v

     

       1128
       1128
       +
           else

     

       1129
       1129
       +
             # TODO: Turn this into a `throw` in 26.05.

     

       1130
       1130
       +
             assert lib.warn "fromHexString: ${

     

       1131
       1131
       +
               lib.generators.toPretty { } str

     

       1132
       1132
       +
             } is not a valid input and will be rejected in 26.05" true;

     

       1133
       1133
       +
             let

     

       1134
       1134
       +
               noPrefix = lib.strings.removePrefix "0x" (lib.strings.toLower str);

     

       1135
       1135
       +
             in

     

       1136
       1136
       +
             (builtins.fromTOML "v=0x${noPrefix}").v;

     

       1130
       1137
        
       

     

       1131
       1138
        
         /**

     

       1132
       1139
        
           Convert the given positive integer to a string of its hexadecimal

+12

maintainers/maintainer-list.nix

···

       15454
       15454
        
           githubId = 1189862;

     

       15455
       15455
        
           name = "Valter Nazianzeno";

     

       15456
       15456
        
         };

     

       15457
       15457
       +
         mannerbund = {

     

       15458
       15458
       +
           email = "apostalimus@gmail.com";

     

       15459
       15459
       +
           github = "mannerbund";

     

       15460
       15460
       +
           githubId = 110305316;

     

       15461
       15461
       +
           name = "mannerbund";

     

       15462
       15462
       +
         };

     

       15457
       15463
        
         manojkarthick = {

     

       15458
       15464
        
           email = "smanojkarthick@gmail.com";

     

       15459
       15465
        
           github = "manojkarthick";

     
···

       23077
       23083
        
           github = "sestrella";

     

       23078
       23084
        
           githubId = 2049686;

     

       23079
       23085
        
           name = "Sebastián Estrella";

     

       23086
       23086
       +
         };

     

       23087
       23087
       +
         seven_bear = {

     

       23088
       23088
       +
           name = "Edmond Freeman";

     

       23089
       23089
       +
           email = "edmondfreeman7@gmail.com";

     

       23090
       23090
       +
           github = "yueneiqi";

     

       23091
       23091
       +
           githubId = 26707756;

     

       23080
       23092
        
         };

     

       23081
       23093
        
         seylerius = {

     

       23082
       23094
        
           name = "Sable Seyler";

+30 -41

nixos/tests/xmpp/prosody-mysql.nix

···

       2
       2
        
         cert =

     

       3
       3
        
           pkgs:

     

       4
       4
        
           pkgs.runCommand "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } ''

     

       5
       5
       -
             openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=example.com/CN=uploads.example.com/CN=conference.example.com' -days 36500

     

       5
       5
       +
             openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -days 365 \

     

       6
       6
       +
               -subj '/C=GB/CN=example.com' -addext "subjectAltName = DNS:example.com,DNS:uploads.example.com,DNS:conference.example.com"

     

       6
       7
        
             mkdir -p $out

     

       7
       8
        
             cp key.pem cert.pem $out

     

       8
       9
        
           '';

     

       10
       10
       +
         # Creates and set password for the 2 xmpp test users.

     

       11
       11
       +
         #

     

       12
       12
       +
         # Doing that in a bash script instead of doing that in the test

     

       13
       13
       +
         # script allow us to easily provision the users when running that

     

       14
       14
       +
         # test interactively.

     

       9
       15
        
         createUsers =

     

       10
       16
        
           pkgs:

     

       11
       11
       -
           pkgs.writeScriptBin "create-prosody-users" ''

     

       12
       12
       -
             #!${pkgs.bash}/bin/bash

     

       17
       17
       +
           pkgs.writeShellScriptBin "create-prosody-users" ''

     

       13
       18
        
             set -e

     

       14
       14
       -
       

     

       15
       15
       -
             # Creates and set password for the 2 xmpp test users.

     

       16
       16
       -
             #

     

       17
       17
       -
             # Doing that in a bash script instead of doing that in the test

     

       18
       18
       -
             # script allow us to easily provision the users when running that

     

       19
       19
       -
             # test interactively.

     

       20
       20
       -
       

     

       21
       19
        
             prosodyctl register cthon98 example.com nothunter2

     

       22
       20
        
             prosodyctl register azurediamond example.com hunter2

     

       23
       21
        
           '';

     

       22
       22
       +
         # Deletes the test users.

     

       24
       23
        
         delUsers =

     

       25
       24
        
           pkgs:

     

       26
       26
       -
           pkgs.writeScriptBin "delete-prosody-users" ''

     

       27
       27
       -
             #!${pkgs.bash}/bin/bash

     

       25
       25
       +
           pkgs.writeShellScriptBin "delete-prosody-users" ''

     

       28
       26
        
             set -e

     

       29
       29
       -
       

     

       30
       30
       -
             # Deletes the test users.

     

       31
       31
       -
             #

     

       32
       32
       -
             # Doing that in a bash script instead of doing that in the test

     

       33
       33
       -
             # script allow us to easily provision the users when running that

     

       34
       34
       -
             # test interactively.

     

       35
       35
       -
       

     

       36
       27
        
             prosodyctl deluser cthon98@example.com

     

       37
       28
        
             prosodyctl deluser azurediamond@example.com

     

       38
       29
        
           '';

     
···

       49
       40
        
             }:

     

       50
       41
        
             {

     

       51
       42
        
               security.pki.certificateFiles = [ "${cert pkgs}/cert.pem" ];

     

       52
       52
       -
               console.keyMap = "fr-bepo";

     

       53
       43
        
               networking.extraHosts = ''

     

       54
       54
       -
                 ${nodes.server.config.networking.primaryIPAddress} example.com

     

       55
       55
       -
                 ${nodes.server.config.networking.primaryIPAddress} conference.example.com

     

       56
       56
       -
                 ${nodes.server.config.networking.primaryIPAddress} uploads.example.com

     

       44
       44
       +
                 ${nodes.server.networking.primaryIPAddress} example.com

     

       45
       45
       +
                 ${nodes.server.networking.primaryIPAddress} conference.example.com

     

       46
       46
       +
                 ${nodes.server.networking.primaryIPAddress} uploads.example.com

     

       57
       47
        
               '';

     

       58
       48
        
               environment.systemPackages = [

     

       59
       49
        
                 (pkgs.callPackage ./xmpp-sendmessage.nix {

     

       60
       60
       -
                   connectTo = nodes.server.config.networking.primaryIPAddress;

     

       50
       50
       +
                   connectTo = nodes.server.networking.primaryIPAddress;

     

       61
       51
        
                 })

     

       62
       52
        
               ];

     

       63
       53
        
             };

     

       54
       54
       +
       

     

       64
       55
        
           server =

     

       65
       65
       -
             { config, pkgs, ... }:

     

       56
       56
       +
             { nodes, pkgs, ... }:

     

       66
       57
        
             {

     

       67
       58
        
               nixpkgs.overlays = [

     

       68
       59
        
                 (self: super: {

     
···

       72
       63
        
                 })

     

       73
       64
        
               ];

     

       74
       65
        
               security.pki.certificateFiles = [ "${cert pkgs}/cert.pem" ];

     

       75
       75
       -
               console.keyMap = "fr-bepo";

     

       76
       66
        
               networking.extraHosts = ''

     

       77
       77
       -
                 ${config.networking.primaryIPAddress} example.com

     

       78
       78
       -
                 ${config.networking.primaryIPAddress} conference.example.com

     

       79
       79
       -
                 ${config.networking.primaryIPAddress} uploads.example.com

     

       67
       67
       +
                 ${nodes.server.networking.primaryIPAddress} example.com

     

       68
       68
       +
                 ${nodes.server.networking.primaryIPAddress} conference.example.com

     

       69
       69
       +
                 ${nodes.server.networking.primaryIPAddress} uploads.example.com

     

       80
       70
        
               '';

     

       81
       71
        
               networking.firewall.enable = false;

     

       82
       72
        
               environment.systemPackages = [

     
···

       98
       88
        
                     domain = "conference.example.com";

     

       99
       89
        
                   }

     

       100
       90
        
                 ];

     

       101
       101
       -
                 uploadHttp = {

     

       91
       91
       +
                 httpFileShare = {

     

       102
       92
        
                   domain = "uploads.example.com";

     

       103
       93
        
                 };

     

       104
       94
        
                 extraConfig = ''

     
···

       131
       121
        
             };

     

       132
       122
        
         };

     

       133
       123
        
       

     

       134
       134
       -
         testScript =

     

       135
       135
       -
           { nodes, ... }:

     

       136
       136
       -
           ''

     

       137
       137
       -
             # Check with mysql storage

     

       138
       138
       -
             mysql.wait_for_unit("mysql.service")

     

       139
       139
       -
             server.wait_for_unit("prosody.service")

     

       140
       140
       -
             server.succeed('prosodyctl status | grep "Prosody is running"')

     

       124
       124
       +
         testScript = _: ''

     

       125
       125
       +
           # Check with mysql storage

     

       126
       126
       +
           start_all()

     

       127
       127
       +
           mysql.wait_for_unit("mysql.service")

     

       128
       128
       +
           server.wait_for_unit("prosody.service")

     

       129
       129
       +
           server.succeed('prosodyctl status | grep "Prosody is running"')

     

       141
       130
        
       

     

       142
       142
       -
             server.succeed("create-prosody-users")

     

       143
       143
       -
             client.succeed("send-message")

     

       144
       144
       -
             server.succeed("delete-prosody-users")

     

       145
       145
       -
           '';

     

       131
       131
       +
           server.succeed("create-prosody-users")

     

       132
       132
       +
           client.succeed("send-message")

     

       133
       133
       +
           server.succeed("delete-prosody-users")

     

       134
       134
       +
         '';

     

       146
       135
        
       }

+75

pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-map/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         # Basic

     

       3
       3
       +
         lib,

     

       4
       4
       +
         melpaBuild,

     

       5
       5
       +
         fetchFromGitHub,

     

       6
       6
       +
         # Java Script dependency

     

       7
       7
       +
         nodejs,

     

       8
       8
       +
         fetchNpmDeps,

     

       9
       9
       +
         npmHooks,

     

       10
       10
       +
         # Updater

     

       11
       11
       +
         nix-update-script,

     

       12
       12
       +
       }:

     

       13
       13
       +
       

     

       14
       14
       +
       melpaBuild (finalAttrs: {

     

       15
       15
       +
       

     

       16
       16
       +
         pname = "eaf-map";

     

       17
       17
       +
         version = "0-unstable-2025-07-04";

     

       18
       18
       +
       

     

       19
       19
       +
         src = fetchFromGitHub {

     

       20
       20
       +
           owner = "emacs-eaf";

     

       21
       21
       +
           repo = "eaf-map";

     

       22
       22
       +
           rev = "667865a9422ec71e3518833e1a13806d4f03adfb";

     

       23
       23
       +
           hash = "sha256-UgHIzYu/K1NzTDvUn2JkEmiyDEBT9JDmlvp6xG7Nv5k=";

     

       24
       24
       +
         };

     

       25
       25
       +
       

     

       26
       26
       +
         env.npmDeps = fetchNpmDeps {

     

       27
       27
       +
           name = "${finalAttrs.pname}-npm-deps";

     

       28
       28
       +
           inherit (finalAttrs) src;

     

       29
       29
       +
           hash = "sha256-prxCFrKvC2dG9BgO3LIKDCFzjn9vFegpvuMy4Eg6Ghs=";

     

       30
       30
       +
         };

     

       31
       31
       +
       

     

       32
       32
       +
         nativeBuildInputs = [

     

       33
       33
       +
           nodejs

     

       34
       34
       +
           npmHooks.npmConfigHook

     

       35
       35
       +
         ];

     

       36
       36
       +
       

     

       37
       37
       +
         postBuild = ''

     

       38
       38
       +
           npm run build

     

       39
       39
       +
         '';

     

       40
       40
       +
       

     

       41
       41
       +
         files = ''

     

       42
       42
       +
           ("*.el"

     

       43
       43
       +
            "*.py"

     

       44
       44
       +
            "*.js"

     

       45
       45
       +
            "src")

     

       46
       46
       +
         '';

     

       47
       47
       +
       

     

       48
       48
       +
         postInstall = ''

     

       49
       49
       +
           LISPDIR=$out/share/emacs/site-lisp/elpa/${finalAttrs.ename}-${finalAttrs.melpaVersion}

     

       50
       50
       +
           touch node_modules/.nosearch

     

       51
       51
       +
           cp -r node_modules $LISPDIR/

     

       52
       52
       +
           cp -r dist $LISPDIR/

     

       53
       53
       +
         '';

     

       54
       54
       +
       

     

       55
       55
       +
         passthru = {

     

       56
       56
       +
           updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };

     

       57
       57
       +
           eafPythonDeps =

     

       58
       58
       +
             ps: with ps; [

     

       59
       59
       +
               numpy

     

       60
       60
       +
               pycurl

     

       61
       61
       +
               python-tsp

     

       62
       62
       +
             ];

     

       63
       63
       +
           eafOtherDeps = [ ];

     

       64
       64
       +
         };

     

       65
       65
       +
       

     

       66
       66
       +
         meta = {

     

       67
       67
       +
           description = "OpenStreetMap application for the EAF";

     

       68
       68
       +
           homepage = "https://github.com/emacs-eaf/eaf-map";

     

       69
       69
       +
           license = lib.licenses.gpl3Only;

     

       70
       70
       +
           maintainers = with lib.maintainers; [

     

       71
       71
       +
             thattemperature

     

       72
       72
       +
           ];

     

       73
       73
       +
         };

     

       74
       74
       +
       

     

       75
       75
       +
       })

+27

pkgs/applications/editors/emacs/elisp-packages/manual-packages/eglot-booster/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         melpaBuild,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         unstableGitUpdater,

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       melpaBuild {

     

       9
       9
       +
         pname = "eglot-booster";

     

       10
       10
       +
         version = "0-unstable-2025-07-16";

     

       11
       11
       +
       

     

       12
       12
       +
         src = fetchFromGitHub {

     

       13
       13
       +
           owner = "jdtsmith";

     

       14
       14
       +
           repo = "eglot-booster";

     

       15
       15
       +
           rev = "cab7803c4f0adc7fff9da6680f90110674bb7a22";

     

       16
       16
       +
           hash = "sha256-xUBQrQpw+JZxcqT1fy/8C2tjKwa7sLFHXamBm45Fa4Y=";

     

       17
       17
       +
         };

     

       18
       18
       +
       

     

       19
       19
       +
         passthru.updateScript = unstableGitUpdater { };

     

       20
       20
       +
       

     

       21
       21
       +
         meta = {

     

       22
       22
       +
           homepage = "https://github.com/jdtsmith/eglot-booster";

     

       23
       23
       +
           description = "Boost eglot using lsp-booster";

     

       24
       24
       +
           license = lib.licenses.gpl3Only;

     

       25
       25
       +
           maintainers = with lib.maintainers; [ mannerbund ];

     

       26
       26
       +
         };

     

       27
       27
       +
       }

+11

pkgs/applications/editors/vim/plugins/overrides.nix

···

       2767
       2767
        
         };

     

       2768
       2768
        
       

     

       2769
       2769
        
         nvzone-menu = super.nvzone-menu.overrideAttrs {

     

       2770
       2770
       +
           # Plugin managers like Lazy.nvim expect pname to match the name of the git repository

     

       2771
       2771
       +
           pname = "menu";

     

       2770
       2772
        
           checkInputs = with self; [

     

       2771
       2773
        
             # Optional integrations

     

       2772
       2774
        
             nvim-tree-lua

     
···

       2779
       2781
        
         };

     

       2780
       2782
        
       

     

       2781
       2783
        
         nvzone-minty = super.nvzone-minty.overrideAttrs {

     

       2784
       2784
       +
           # Plugin managers like Lazy.nvim expect pname to match the name of the git repository

     

       2785
       2785
       +
           pname = "minty";

     

       2782
       2786
        
           dependencies = [ self.nvzone-volt ];

     

       2783
       2787
        
         };

     

       2784
       2788
        
       

     

       2785
       2789
        
         nvzone-typr = super.nvzone-typr.overrideAttrs {

     

       2790
       2790
       +
           # Plugin managers like Lazy.nvim expect pname to match the name of the git repository

     

       2791
       2791
       +
           pname = "typr";

     

       2786
       2792
        
           dependencies = [ self.nvzone-volt ];

     

       2793
       2793
       +
         };

     

       2794
       2794
       +
       

     

       2795
       2795
       +
         nvzone-volt = super.nvzone-volt.overrideAttrs {

     

       2796
       2796
       +
           # Plugin managers like Lazy.nvim expect pname to match the name of the git repository

     

       2797
       2797
       +
           pname = "volt";

     

       2787
       2798
        
         };

     

       2788
       2799
        
       

     

       2789
       2800
        
         obsidian-nvim = super.obsidian-nvim.overrideAttrs {

+4 -4

pkgs/applications/editors/vscode/extensions/default.nix

···

       3560
       3560
        
               mktplcRef = {

     

       3561
       3561
        
                 name = "veriloghdl";

     

       3562
       3562
        
                 publisher = "mshr-h";

     

       3563
       3563
       -
                 version = "1.16.0";

     

       3564
       3564
       -
                 hash = "sha256-5C9SggdZ3gtYdQhpPFG4wme98b3VgKicXUpPn84gYb4=";

     

       3563
       3563
       +
                 version = "1.16.1";

     

       3564
       3564
       +
                 hash = "sha256-GsUNvBUlGZ5gRk6GnAfT0eUKHK+D+cPtdAhuYtxe3w8=";

     

       3565
       3565
        
               };

     

       3566
       3566
        
               meta = {

     

       3567
       3567
        
                 changelog = "https://marketplace.visualstudio.com/items/mshr-h.VerilogHDL/changelog";

     
···

       4270
       4270
        
               mktplcRef = {

     

       4271
       4271
        
                 publisher = "shd101wyy";

     

       4272
       4272
        
                 name = "markdown-preview-enhanced";

     

       4273
       4273
       -
                 version = "0.8.18";

     

       4274
       4274
       -
                 hash = "sha256-BHLFlhcIXm3mvmjDPu3fuzpJIGHQvT/RDBEE/QFoRvU=";

     

       4273
       4273
       +
                 version = "0.8.19";

     

       4274
       4274
       +
                 hash = "sha256-F87YInLUkPUpB2oifCCq1xWD41LUdqg8cusGw2wEYg0=";

     

       4275
       4275
        
               };

     

       4276
       4276
        
               meta = {

     

       4277
       4277
        
                 description = "Provides a live preview of markdown using either markdown-it or pandoc";

+4 -1

pkgs/applications/networking/protonvpn-gui/default.nix

···

       66
       66
        
       

     

       67
       67
        
         postInstall = ''

     

       68
       68
        
           mkdir -p $out/share/{applications,pixmaps}

     

       69
       69
       -
           install -Dm 644 ${src}/rpmbuild/SOURCES/protonvpn-app.desktop $out/share/applications

     

       69
       69
       +
       

     

       70
       70
       +
           # Fix the desktop file to correctly identify the wrapped app and show the icon during runtime

     

       71
       71
       +
           substitute ${src}/rpmbuild/SOURCES/protonvpn-app.desktop $out/share/applications/protonvpn-app.desktop \

     

       72
       72
       +
             --replace-fail "StartupWMClass=protonvpn-app" "StartupWMClass=.protonvpn-app-wrapped"

     

       70
       73
        
           install -Dm 644 ${src}/rpmbuild/SOURCES/proton-vpn-logo.svg $out/share/pixmaps

     

       71
       74
        
         '';

     

       72
       75

+2 -15

pkgs/applications/networking/remote/citrix-workspace/generic.nix

···

       40
       40
        
         libsecret,

     

       41
       41
        
         libsoup_2_4,

     

       42
       42
        
         libvorbis,

     

       43
       43
       -
         libxml2,

     

       43
       43
       +
         libxml2_13,

     

       44
       44
        
         llvmPackages,

     

       45
       45
        
         more,

     

       46
       46
        
         nspr,

     
···

       89
       89
        
             done

     

       90
       90
        
           '';

     

       91
       91
        
         };

     

       92
       92
       -
       

     

       93
       93
       -
         libxml2' = libxml2.overrideAttrs (oldAttrs: rec {

     

       94
       94
       -
           version = "2.13.8";

     

       95
       95
       -
           src = fetchurl {

     

       96
       96
       -
             url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz";

     

       97
       97
       -
             hash = "sha256-J3KUyzMRmrcbK8gfL0Rem8lDW4k60VuyzSsOhZoO6Eo=";

     

       98
       98
       -
           };

     

       99
       99
       -
           meta = oldAttrs.meta // {

     

       100
       100
       -
             knownVulnerabilities = oldAttrs.meta.knownVulnerabilities or [ ] ++ [

     

       101
       101
       -
               "CVE-2025-6021"

     

       102
       102
       -
             ];

     

       103
       103
       -
           };

     

       104
       104
       -
         });

     

       105
       92
        
       

     

       106
       93
        
       in

     

       107
       94
        
       

     
···

       174
       161
        
           libsecret

     

       175
       162
        
           libsoup_2_4

     

       176
       163
        
           libvorbis

     

       177
       177
       -
           libxml2'

     

       164
       164
       +
           libxml2_13

     

       178
       165
        
           llvmPackages.libunwind

     

       179
       166
        
           nspr

     

       180
       167
        
           nss

+8 -7

pkgs/by-name/_0/_010editor/package.nix

···

       13
       13
        
       

     

       14
       14
        
       stdenv.mkDerivation (finalAttrs: {

     

       15
       15
        
         pname = "010editor";

     

       16
       16
       -
         version = "15.0.2";

     

       16
       16
       +
         version = "16.0";

     

       17
       17
        
       

     

       18
       18
        
         src =

     

       19
       19
        
           if stdenv.hostPlatform.isLinux then

     

       20
       20
        
             fetchzip {

     

       21
       21
        
               url = "https://download.sweetscape.com/010EditorLinux64Installer${finalAttrs.version}.tar.gz";

     

       22
       22
       -
               hash = "sha256-oXwC4criDox8rac7mnJroqxMNKU7k+y7JQqc88XoRFc=";

     

       22
       22
       +
               hash = "sha256-DK+AIk90AC/KjZR0yBMHaRF7ajuX+UvT8rqDVdL678M=";

     

       23
       23
        
             }

     

       24
       24
        
           else

     

       25
       25
        
             fetchurl {

     

       26
       26
        
               url = "https://download.sweetscape.com/010EditorMac64Installer${finalAttrs.version}.dmg";

     

       27
       27
       -
               hash = "sha256-RZtFV3AbE5KfzW18usW0FS/AnX8Uets/RkVayBAODQ4=";

     

       27
       27
       +
               hash = "sha256-TWatSVqm9a+bVLXtJjiWAtkcB7qZqoeJ7Gmr62XUVz4=";

     

       28
       28
        
             };

     

       29
       29
        
       

     

       30
       30
        
         sourceRoot = ".";

     
···

       53
       53
        
               mkdir -p $out/Applications

     

       54
       54
        
               cp -R *.app $out/Applications

     

       55
       55
        
             '';

     

       56
       56
       +
       

     

       56
       57
        
             linuxInstall = ''

     

       57
       58
        
               mkdir -p $out/opt && cp -ar source/* $out/opt

     

       58
       59
        
       

     

       59
       59
       -
               # Unset wrapped QT plugins since they're already included in the package,

     

       60
       60
       -
               # else the program crashes because of the conflict

     

       60
       60
       +
               # Use makeWrapper to clean environment and force xcb

     

       61
       61
        
               makeWrapper $out/opt/010editor $out/bin/010editor \

     

       62
       62
       -
                 --unset QT_PLUGIN_PATH

     

       62
       62
       +
                 --unset QT_PLUGIN_PATH \

     

       63
       63
       +
                 --set QT_QPA_PLATFORM xcb

     

       63
       64
        
       

     

       64
       65
        
               # Copy the icon and generated desktop file

     

       65
       66
        
               install -D $out/opt/010_icon_128x128.png $out/share/icons/hicolor/128x128/apps/010.png

     
···

       84
       85
        
           exec = "010editor %f";

     

       85
       86
        
           icon = "010";

     

       86
       87
        
           desktopName = "010 Editor";

     

       87
       87
       -
           genericName = "Text and hex edtior";

     

       88
       88
       +
           genericName = "Text and hex editor";

     

       88
       89
        
           categories = [ "Development" ];

     

       89
       90
        
           mimeTypes = [

     

       90
       91
        
             "text/html"

+3 -3

pkgs/by-name/al/aliae/package.nix

···

       8
       8
        
       

     

       9
       9
        
       buildGoModule rec {

     

       10
       10
        
         pname = "aliae";

     

       11
       11
       -
         version = "0.26.5";

     

       11
       11
       +
         version = "0.26.6";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "jandedobbeleer";

     

       15
       15
        
           repo = "aliae";

     

       16
       16
        
           tag = "v${version}";

     

       17
       17
       -
           hash = "sha256-F5OteK1D0MCNyiZG6iz3vawkx74WJKst2Yr6ca8TYZw=";

     

       17
       17
       +
           hash = "sha256-W/jj2YQc6M0ro4groCynly2stjv2FLAMvIopnQYCngY=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         vendorHash = "sha256-TsJU1oAc1T+VdUYzrcyflTPYJhG6sPjFNZ7bZKk1KdM=";

     

       20
       20
       +
         vendorHash = "sha256-8YTyhjF0p2l76sowq92ts5TjjcARToOfJN9nlFu19L4=";

     

       21
       21
        
       

     

       22
       22
        
         sourceRoot = "${src.name}/src";

     

       23
       23

+14

pkgs/by-name/am/amdvlk/package.nix

···

       85
       85
        
       

     

       86
       86
        
         cmakeDir = "../drivers/xgl";

     

       87
       87
        
       

     

       88
       88
       +
         cmakeFlags = [

     

       89
       89
       +
           # There is some incredibly cursed issue with

     

       90
       90
       +
           # `directx-shader-compiler` flagging up compiler errors only on

     

       91
       91
       +
           # `i686-linux` and only when it has been compiled with a recent

     

       92
       92
       +
           # GCC. Since few 32‐bit games are going to use ray tracing anyway,

     

       93
       93
       +
           # we just disable it for now. Arch has done this since 2022.

     

       94
       94
       +
           #

     

       95
       95
       +
           # See:

     

       96
       96
       +
           # * <https://github.com/NixOS/nixpkgs/issues/216294>

     

       97
       97
       +
           # * <https://github.com/GPUOpen-Drivers/gpurt/issues/5>

     

       98
       98
       +
           # * <https://gitlab.archlinux.org/archlinux/packaging/packages/lib32-amdvlk/-/commit/905d9bc2cf4a003b3d367537b5e120d9771cce16>

     

       99
       99
       +
           (lib.cmakeBool "VKI_RAY_TRACING" (!(stdenv.hostPlatform.isx86 && stdenv.hostPlatform.is32bit)))

     

       100
       100
       +
         ];

     

       101
       101
       +
       

     

       88
       102
        
         installPhase = ''

     

       89
       103
        
           runHook preInstall

     

       90
       104

+3 -3

pkgs/by-name/ap/apko/package.nix

···

       11
       11
        
       

     

       12
       12
        
       buildGoModule (finalAttrs: {

     

       13
       13
        
         pname = "apko";

     

       14
       14
       -
         version = "0.30.2";

     

       14
       14
       +
         version = "0.30.4";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "chainguard-dev";

     

       18
       18
        
           repo = "apko";

     

       19
       19
        
           tag = "v${finalAttrs.version}";

     

       20
       20
       -
           hash = "sha256-5d/92BrrKfDGtIVp3AAg0cfKooaJH9YtDgmO635gZc4=";

     

       20
       20
       +
           hash = "sha256-4bmfHgtxaoXyx6GAUTtdNr47/Weol4KqO4fnonOCkEM=";

     

       21
       21
        
           # populate values that require us to use git. By doing this in postFetch we

     

       22
       22
        
           # can delete .git afterwards and maintain better reproducibility of the src.

     

       23
       23
        
           leaveDotGit = true;

     
···

       29
       29
        
             find "$out" -name .git -print0 | xargs -0 rm -rf

     

       30
       30
        
           '';

     

       31
       31
        
         };

     

       32
       32
       -
         vendorHash = "sha256-jHvImL22IYaeYhhedN+C/AfJAFkCFN1UqKZOBsNhQnA=";

     

       32
       32
       +
         vendorHash = "sha256-snyfsRyNOx6bsz506Nde2ofcBgVQOlNvYGuwFoHKOzI=";

     

       33
       33
        
       

     

       34
       34
        
         nativeBuildInputs = [ installShellFiles ];

     

       35
       35

+2 -2

pkgs/by-name/aq/aquamarine/package.nix

···

       23
       23
        
       }:

     

       24
       24
        
       stdenv.mkDerivation (finalAttrs: {

     

       25
       25
        
         pname = "aquamarine";

     

       26
       26
       -
         version = "0.9.2";

     

       26
       26
       +
         version = "0.9.3";

     

       27
       27
        
       

     

       28
       28
        
         src = fetchFromGitHub {

     

       29
       29
        
           owner = "hyprwm";

     

       30
       30
        
           repo = "aquamarine";

     

       31
       31
        
           tag = "v${finalAttrs.version}";

     

       32
       32
       -
           hash = "sha256-4izhj1j7J4mE8LgljCXSIUDculqOsxxhdoC81VhqizM=";

     

       32
       32
       +
           hash = "sha256-ZIa0peLluZ0AVT0f6bMW+bRCIxMRUVlN798PE4iHRAw=";

     

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
        
         nativeBuildInputs = [

+14

pkgs/by-name/ch/chow-tape-model/fix-juce-gcc-12.patch

···

       1
       1
       +
       Submodule Plugin/modules/JUCE contains modified content

     

       2
       2
       +
       diff --git a/Plugin/modules/JUCE/modules/juce_gui_basics/windows/juce_ComponentPeer.h b/Plugin/modules/JUCE/modules/juce_gui_basics/windows/juce_ComponentPeer.h

     

       3
       3
       +
       index 06c0a729d..119f146b8 100644

     

       4
       4
       +
       --- a/Plugin/modules/JUCE/modules/juce_gui_basics/windows/juce_ComponentPeer.h

     

       5
       5
       +
       +++ b/Plugin/modules/JUCE/modules/juce_gui_basics/windows/juce_ComponentPeer.h

     

       6
       6
       +
       @@ -23,6 +23,8 @@

     

       7
       7
       +
          ==============================================================================

     

       8
       8
       +
        */

     

       9
       9
       +
        

     

       10
       10
       +
       +#include <utility>

     

       11
       11
       +
       +

     

       12
       12
       +
        namespace juce

     

       13
       13
       +
        {

     

       14
       14
       +

+6 -6

pkgs/by-name/ch/chow-tape-model/package.nix

···

       32
       32
        
         pkg-config,

     

       33
       33
        
         python3,

     

       34
       34
        
         sqlite,

     

       35
       35
       -
         gcc11Stdenv,

     

       35
       35
       +
         stdenv,

     

       36
       36
        
         webkitgtk_4_0,

     

       37
       37
        
       }:

     

       38
       38
       -
       let

     

       39
       39
       -
         # JUCE version in submodules is incompatible with GCC12

     

       40
       40
       -
         # See here: https://forum.juce.com/t/build-fails-on-fedora-wrong-c-version/50902/2

     

       41
       41
       -
         stdenv = gcc11Stdenv;

     

       42
       42
       -
       in

     

       43
       38
        
       stdenv.mkDerivation (finalAttrs: {

     

       44
       39
        
         pname = "chow-tape-model";

     

       45
       40
        
         version = "2.11.4";

     
···

       51
       46
        
           hash = "sha256-WriHi68Y6hAsrwE+74JtVlAKUR9lfTczj6UK9h2FOGM=";

     

       52
       47
        
           fetchSubmodules = true;

     

       53
       48
        
         };

     

       49
       49
       +
       

     

       50
       50
       +
         patches = [

     

       51
       51
       +
           # Fix the old JUCE submodule for GCC ≥ 12

     

       52
       52
       +
           ./fix-juce-gcc-12.patch

     

       53
       53
       +
         ];

     

       54
       54
        
       

     

       55
       55
        
         nativeBuildInputs = [

     

       56
       56
        
           pkg-config

+444

pkgs/by-name/co/collectl/0001-scripts-external-executable-calls.patch

···

       1
       1
       +
       Processing diff for: collectl.conf

     

       2
       2
       +
       --- a/collectl.conf	2025-08-14 08:42:24.434419733 +0000

     

       3
       3
       +
       +++ b/collectl.conf	2025-08-16 07:56:13.806350456 +0000

     

       4
       4
       +
       @@ -43,7 +43,7 @@

     

       5
       5
       +
        #Ps =      /bin/ps

     

       6
       6
       +
        #Rpm =     /bin/rpm

     

       7
       7
       +
        #Lspci =   /sbin/lspci

     

       8
       8
       +
       -#Lctl =    /usr/sbin/lctl

     

       9
       9
       +
       +#Lctl =    /usr/sbin/lctl   # disabled since collectl 4.0.4

     

       10
       10
       +
        

     

       11
       11
       +
        #       I n f i n i b a n d    S u p p o r t

     

       12
       12
       +
        

     

       13
       13
       +
       @@ -55,10 +55,11 @@

     

       14
       14
       +
        # variable below.  PQuery for OFED, PCounter for get_pcounter calls and

     

       15
       15
       +
        # VStat for ALL non-ofed access of any kind.

     

       16
       16
       +
        # can disable either by commenting out the reference to VStat/PQuery below.

     

       17
       17
       +
       -PQuery =   /usr/sbin/perfquery:/usr/bin/perfquery:/usr/local/ofed/bin/perfquery

     

       18
       18
       +
       -PCounter = /usr/mellanox/bin/get_pcounter

     

       19
       19
       +
       -VStat =    /usr/mellanox/bin/vstat:/usr/bin/vstat

     

       20
       20
       +
       -OfedInfo = /usr/bin/ofed_info:/usr/local/ofed/bin/ofed_info

     

       21
       21
       +
       +# Disable the Infiniband support by default

     

       22
       22
       +
       +# PQuery =   /usr/sbin/perfquery:/usr/bin/perfquery:/usr/local/ofed/bin/perfquery

     

       23
       23
       +
       +# PCounter = /usr/mellanox/bin/get_pcounter

     

       24
       24
       +
       +# VStat =    /usr/mellanox/bin/vstat:/usr/bin/vstat

     

       25
       25
       +
       +# OfedInfo = /usr/bin/ofed_info:/usr/local/ofed/bin/ofed_info

     

       26
       26
       +
        

     

       27
       27
       +
        #	D e f a u l t s

     

       28
       28
       +
        

     

       29
       29
       +
       @@ -116,7 +117,7 @@

     

       30
       30
       +
        # size, comment out the Resize line and uncomment TermHeight, setting it to

     

       31
       31
       +
        # what you want.

     

       32
       32
       +
        #TermHeight = 24

     

       33
       33
       +
       -Resize=/usr/bin/resize:/usr/X11R6/bin/resize

     

       34
       34
       +
       +Resize=@resize@

     

       35
       35
       +
        

     

       36
       36
       +
        # To turn off Time:HiRes/glibc incompatibility checking, the following

     

       37
       37
       +
        # should be enabled and set to 0

     

       38
       38
       +
       @@ -125,7 +126,7 @@

     

       39
       39
       +
        # These control environmental monitoring and to use it you MUST have ipmitool

     

       40
       40
       +
        # installed (see http://ipmitool.sourceforge.net/).  If not in the path shown

     

       41
       41
       +
        # below, you must change it.

     

       42
       42
       +
       -Ipmitool =  /usr/bin/ipmitool:/usr/local/bin/ipmitool:/opt/hptc/sbin/ipmitool

     

       43
       43
       +
       +Ipmitool = @ipmitool@

     

       44
       44
       +
        IpmiCache = /var/run/collectl-ipmicache

     

       45
       45
       +
        IpmiTypes = fan,temp,current

     

       46
       46
       +
        

     

       47
       47
       +
       Processing diff for: collectl

     

       48
       48
       +
       --- a/collectl	2025-08-14 08:42:24.434419733 +0000

     

       49
       49
       +
       +++ b/collectl	2025-08-16 09:25:20.238548613 +0000

     

       50
       50
       +
       @@ -69,14 +69,14 @@

     

       51
       51
       +
        use IO::Select;

     

       52
       52
       +
        use Cwd 'abs_path';

     

       53
       53
       +
        

     

       54
       54
       +
       -$Cat=          '/bin/cat';

     

       55
       55
       +
       -$Grep=         '/bin/grep';

     

       56
       56
       +
       -$Egrep=        '/bin/egrep';

     

       57
       57
       +
       -$Ps=           '/bin/ps';

     

       58
       58
       +
       -$Rpm=          '/bin/rpm';

     

       59
       59
       +
       -$Lspci=        '/sbin/lspci';

     

       60
       60
       +
       -$Lctl=         '/usr/sbin/lctl';

     

       61
       61
       +
       -$Dmidecode=    '/usr/sbin/dmidecode';

     

       62
       62
       +
       +$Cat=          '@cat@';

     

       63
       63
       +
       +$Grep=         '@grep@';

     

       64
       64
       +
       +$Egrep=        '@egrep@';

     

       65
       65
       +
       +$Ps=           '@ps@';

     

       66
       66
       +
       +$Rpm=          '@rpm@';

     

       67
       67
       +
       +$Lspci=        '@lspci@';

     

       68
       68
       +
       +$Lctl=         '/usr/sbin/lctl';  # disabled since collectl 4.0.4

     

       69
       69
       +
       +$Dmidecode=    '@dmidecode@';

     

       70
       70
       +
        

     

       71
       71
       +
        %TopProcTypes=qw(vsz '' rss '' syst '' usrt '' time '' accum '' rkb '' wkb '' iokb ''

     

       72
       72
       +
                         rkbc '' wkbc '' iokbc '' ioall '' rsys '' wsys '' iosys  ''

     

       73
       73
       +
       @@ -108,7 +108,7 @@

     

       74
       74
       +
        $syslogFlag=(eval {require "Sys/Syslog.pm" or die}) ? 1 : 0;

     

       75
       75
       +
        

     

       76
       76
       +
        # Always nice to know if we're root

     

       77
       77
       +
       -$rootFlag=(!$PcFlag && `whoami`=~/root/) ? 1 : 0;

     

       78
       78
       +
       +$rootFlag=(!$PcFlag && `@whoami@`=~/root/) ? 1 : 0;

     

       79
       79
       +
        $SrcArch= $Config{"archname"};

     

       80
       80
       +
        

     

       81
       81
       +
        $Version=  '4.3.20';

     

       82
       82
       +
       @@ -126,15 +126,15 @@

     

       83
       83
       +
        # we're in the background.  We also need to know if STDOUT connected to a terminal.

     

       84
       84
       +
        if (!$PcFlag)

     

       85
       85
       +
        {

     

       86
       86
       +
       -  $MyDir=`pwd`;

     

       87
       87
       +
       -  $Cat=  'cat';

     

       88
       88
       +
       +  $MyDir=`@pwd@`;

     

       89
       89
       +
       +  $Cat=  '@cat@';

     

       90
       90
       +
          $Sep=  '/';

     

       91
       91
       +
          $backFlag=(getpgrp()!=tcgetpgrp(0)) ? 1 : 0;

     

       92
       92
       +
          $termFlag= (-t STDOUT) ? 1 : 0;

     

       93
       93
       +
        }

     

       94
       94
       +
        else

     

       95
       95
       +
        {

     

       96
       96
       +
       -  $MyDir=`cd`;

     

       97
       97
       +
       +  $MyDir=`@cd@`;

     

       98
       98
       +
          $Cat=  'type';

     

       99
       99
       +
          $Sep=  '\\';

     

       100
       100
       +
          $backFlag=0;

     

       101
       101
       +
       @@ -148,7 +148,7 @@

     

       102
       102
       +
        # which was recorded with the data file and WILL override in playback mode. 

     

       103
       103
       +
        # We also need our host name before calling initRecord() so we can log it at 

     

       104
       104
       +
        # startup as well as for naming the logfile.

     

       105
       105
       +
       -$myHost=($PcFlag) ? `hostname` : `/bin/hostname`;

     

       106
       106
       +
       +$myHost=($PcFlag) ? `@hostname@` : `@hostname@`;

     

       107
       107
       +
        $myHost=(split(/\./, $myHost))[0];

     

       108
       108
       +
        chomp $myHost;

     

       109
       109
       +
        $Host=$myHost;

     

       110
       110
       +
       @@ -509,12 +509,12 @@

     

       111
       111
       +
        

     

       112
       112
       +
          if ($runasUser!~/^\d+$/)

     

       113
       113
       +
          {

     

       114
       114
       +
       -    $runasUid=(split(/:/, `grep ^$runasUser: /etc/passwd`))[2];

     

       115
       115
       +
       +    $runasUid=(split(/:/, `@grep@ ^$runasUser: /etc/passwd`))[2];

     

       116
       116
       +
            error("can't find '$runasUser' in /etc/passwd.  Consider UID.")    if !defined($runasUid);

     

       117
       117
       +
          }

     

       118
       118
       +
          if (defined($runasGroup) && $runasGroup!~/^\d+$/)

     

       119
       119
       +
          {

     

       120
       120
       +
       -    $runasGid=(split(/:/, `grep ^$runasGroup: /etc/group`))[2];

     

       121
       121
       +
       +    $runasGid=(split(/:/, `@grep@ ^$runasGroup: /etc/group`))[2];

     

       122
       122
       +
            error("can't find '$runasGroup' in /etc/group.  Consider GID.")    if !defined($runasGid);

     

       123
       123
       +
          }

     

       124
       124
       +
          $runasUid=$runasUser     if $runasUser=~/^\d+/;

     

       125
       125
       +
       @@ -1167,19 +1167,19 @@

     

       126
       126
       +
        if (!$PcFlag)

     

       127
       127
       +
        {

     

       128
       128
       +
          # This matches THIS host, but in playback mode will be reset to the target

     

       129
       129
       +
       -  $Kernel=`uname -r`;

     

       130
       130
       +
       +  $Kernel=`@uname@ -r`;

     

       131
       131
       +
          chomp $Kernel;

     

       132
       132
       +
          error("collectl no longer supports 2.4 kernels")    if $Kernel=~/^2\.4/;

     

       133
       133
       +
        

     

       134
       134
       +
       -  $LocalTimeZone=`date +%z`;

     

       135
       135
       +
       +  $LocalTimeZone=`@date@ +%z`;

     

       136
       136
       +
          chomp $LocalTimeZone;

     

       137
       137
       +
        

     

       138
       138
       +
          # Some distros put lspci in /usr/sbin and others in /usr/bin, so take one last look in

     

       139
       139
       +
          # those before complaining, but only if in record mode AND only if looking at interconnects

     

       140
       140
       +
          if (!-e $Lspci && $playback eq '' && $subsys=~/x/i)

     

       141
       141
       +
          {

     

       142
       142
       +
       -    $Lspci=(-e '/usr/sbin/lspci') ? '/usr/sbin/lspci' : '/usr/bin/lspci';

     

       143
       143
       +
       -    if (!-e "/usr/sbin/lspci" && !-e "/usr/bin/lspci")

     

       144
       144
       +
       +    $Lspci='@lspci@';

     

       145
       145
       +
       +    if (!-e "@lspci@")

     

       146
       146
       +
            {

     

       147
       147
       +
              pushmsg('W', "-sx disabled because 'lspci' not in $Lspci or '/usr/sbin' or '/usr/bin'");

     

       148
       148
       +
              pushmsg('W', "If somewhere else, move it or define in collectl.conf");

     

       149
       149
       +
       @@ -1274,7 +1274,7 @@

     

       150
       150
       +
            # it further on so not to worry, but at least record a warning.

     

       151
       151
       +
            $pid=`$Cat $PidFile`;

     

       152
       152
       +
            chomp $pid;

     

       153
       153
       +
       -    @ps=`ps axo pid,command`;

     

       154
       154
       +
       +    @ps=`@ps@ axo pid,command`;

     

       155
       155
       +
            foreach my $line (@ps)

     

       156
       156
       +
            {

     

       157
       157
       +
              $line=~s/^\s+//;    # trim leading whitespace for short pids

     

       158
       158
       +
       @@ -1551,14 +1551,14 @@

     

       159
       159
       +
        }

     

       160
       160
       +
        

     

       161
       161
       +
        # if -N, set priority to 20

     

       162
       162
       +
       -`renice 20 $$`    if $niceFlag;

     

       163
       163
       +
       +`@renice@ 20 $$`    if $niceFlag;

     

       164
       164
       +
        

     

       165
       165
       +
        # Couldn't find anywhere else to put this one...

     

       166
       166
       +
        error("-sT only works with -P for now (too much data)")

     

       167
       167
       +
            if $TFlag && !$plotFlag;

     

       168
       168
       +
        

     

       169
       169
       +
        # get parent pid so we can check later to see it still there

     

       170
       170
       +
       -$stat=`cat /proc/$$/stat`;

     

       171
       171
       +
       +$stat=`@cat@ /proc/$$/stat`;

     

       172
       172
       +
        $myPpid=(split(/\s+/, $stat))[3];

     

       173
       173
       +
        

     

       174
       174
       +
        ###############################

     

       175
       175
       +
       @@ -2311,7 +2311,7 @@

     

       176
       176
       +
            printBriefCounters('T');

     

       177
       177
       +
          }

     

       178
       178
       +
        

     

       179
       179
       +
       -  `stty echo`    if !$PcFlag && $termFlag && !$backFlag;   # in brief mode, we turned it off

     

       180
       180
       +
       +  `@stty@ echo`    if !$PcFlag && $termFlag && !$backFlag;   # in brief mode, we turned it off

     

       181
       181
       +
          my $temp=(!$msgFlag) ? '  Try again with -m.' : '';

     

       182
       182
       +
          print "No files selected contain the selected data.$temp\n"    if !$numProcessed;

     

       183
       183
       +
          exit(0);

     

       184
       184
       +
       @@ -2453,7 +2453,7 @@

     

       185
       185
       +
          open STDIN,  '/dev/null'   or logmsg("F", "Can't read /dev/null: $!");

     

       186
       186
       +
          open STDOUT, '>/dev/null'  or logmsg("F", "Can't write to /dev/null: $!");

     

       187
       187
       +
          open STDERR, '>/dev/null'  or logmsg("F", "Can't write to /dev/null: $!");

     

       188
       188
       +
       -  `echo $$ > $PidFile`;

     

       189
       189
       +
       +  `@echo@ $$ > $PidFile`;

     

       190
       190
       +
        

     

       191
       191
       +
          # Now that we're set up to start, if '--runas' has been sprecified we need to do a

     

       192
       192
       +
          # few things that require privs before actually changing our UID.  Also note the

     

       193
       193
       +
       @@ -2469,8 +2469,8 @@

     

       194
       194
       +
            $logname=(-d $filename) ? $filename : dirname($filename);

     

       195
       195
       +
            $logname.="/$myHost-collectl-$yymm.log";

     

       196
       196
       +
        

     

       197
       197
       +
       -    `chown $runasUid $logname`;

     

       198
       198
       +
       -    `chgrp $runasGid $logname`    if defined($runasGid);

     

       199
       199
       +
       +    `@chown@ $runasUid $logname`;

     

       200
       200
       +
       +    `@chgrp@ $runasGid $logname`    if defined($runasGid);

     

       201
       201
       +
        

     

       202
       202
       +
            # now we can change our process's ownership taking care to do the group first

     

       203
       203
       +
            # since we won't be able to change anything once we change our UID.

     

       204
       204
       +
       @@ -3244,7 +3244,7 @@

     

       205
       205
       +
        # close logs cleanly and turn echo back on because when 'brief' we turned it off.

     

       206
       206
       +
        closeLogs($subsys);

     

       207
       207
       +
        unlink $PidFile       if $daemonFlag;

     

       208
       208
       +
       -`stty echo`           if !$PcFlag && $termFlag && !$backFlag;

     

       209
       209
       +
       +`@stty@ echo`           if !$PcFlag && $termFlag && !$backFlag;

     

       210
       210
       +
        

     

       211
       211
       +
        # clean up when in pure top mode

     

       212
       212
       +
        if ($numTop && !$topVertFlag)

     

       213
       213
       +
       @@ -4350,7 +4350,7 @@

     

       214
       214
       +
          if (!-e $temp)

     

       215
       215
       +
          {

     

       216
       216
       +
            logmsg('W', "Creating directory '$temp'");

     

       217
       217
       +
       -    `mkdir $temp`;

     

       218
       218
       +
       +    `@mkdir@ $temp`;

     

       219
       219
       +
          }

     

       220
       220
       +
        

     

       221
       221
       +
          # track number of times same file processed, primarily for options 'a/c'.  in

     

       222
       222
       +
       @@ -5363,7 +5363,7 @@

     

       223
       223
       +
        

     

       224
       224
       +
            # build up the search list being extra neat and leaving

     

       225
       225
       +
            # off possible duplicate /etc

     

       226
       226
       +
       -    $configFile="$BinDir/$ConfigFile;$etcDir/$ConfigFile";

     

       227
       227
       +
       +    $configFile="$BinDir/../etc/$ConfigFile;$etcDir/$ConfigFile";

     

       228
       228
       +
            $configFile.=";/etc/$ConfigFile"    if $etcDir ne '/etc';

     

       229
       229
       +
          }

     

       230
       230
       +
          print "Config File Search Path: $configFile\n"    if $debug & 1;

     

       231
       231
       +
       @@ -5789,7 +5789,7 @@

     

       232
       232
       +
          # what gets stored in /proc/XXX/stat and to make sure we look at the same 

     

       233
       233
       +
          # values dynamically as well as staticly, we better pull cmd from the stat

     

       234
       234
       +
          # file itself.

     

       235
       235
       +
       -  @ps=`ps axo pid,ppid,uid,comm,user`;

     

       236
       236
       +
       +  @ps=`@ps@ axo pid,ppid,uid,comm,user`;

     

       237
       237
       +
          my $firstFilePass=1;

     

       238
       238
       +
          foreach $process (@ps)

     

       239
       239
       +
          {

     

       240
       240
       +
       @@ -6228,7 +6228,7 @@

     

       241
       241
       +
          $briefFlag=0;

     

       242
       242
       +
          $verboseFlag=1;

     

       243
       243
       +
          intervalPrint(time);

     

       244
       244
       +
       -  `stty echo`    if !$PcFlag && $termFlag && !$backFlag;

     

       245
       245
       +
       +  `@stty@ echo`    if !$PcFlag && $termFlag && !$backFlag;

     

       246
       246
       +
        }

     

       247
       247
       +
        

     

       248
       248
       +
        sub error

     

       249
       249
       +
       @@ -6241,7 +6241,7 @@

     

       250
       250
       +
            # printText() will try to send error over socket and we want it local.

     

       251
       251
       +
            $sockFlag=0    if $serverFlag;

     

       252
       252
       +
        

     

       253
       253
       +
       -    `stty echo`    if !$PcFlag && $termFlag && !$backFlag;

     

       254
       254
       +
       +    `@stty@ echo`    if !$PcFlag && $termFlag && !$backFlag;

     

       255
       255
       +
            logmsg("F", "Error: $text")    if $daemonFlag;

     

       256
       256
       +
        

     

       257
       257
       +
            # we can only call printText() when formatit loaded.

     

       258
       258
       +
       Processing diff for: colmux

     

       259
       259
       +
       --- a/colmux	2025-08-14 08:42:24.438419919 +0000

     

       260
       260
       +
       +++ b/colmux	2025-08-15 07:38:22.003168089 +0000

     

       261
       261
       +
       @@ -78,7 +78,7 @@

     

       262
       262
       +
        my $License="colmux may be copied only under the terms of either the Artistic License\n";

     

       263
       263
       +
        $License.= "or the GNU General Public License, which may be found in the source kit";

     

       264
       264
       +
        

     

       265
       265
       +
       -my $Ping='/bin/ping';

     

       266
       266
       +
       +my $Ping='@ping@';

     

       267
       267
       +
        my $ResizePath='/usr/bin/resize:/usr/X11R6/bin/resize';

     

       268
       268
       +
        my $Route='/sbin/route';

     

       269
       269
       +
        my $Ifconfig='/sbin/ifconfig';

     

       270
       270
       +
       @@ -235,7 +235,7 @@

     

       271
       271
       +
        $Collectl="sudo $Collectl"    if $sudoFlag;

     

       272
       272
       +
        

     

       273
       273
       +
        # ok if host not in known_hosts and when not debugging be sure to turn off motd

     

       274
       274
       +
       -my $Ssh='/usr/bin/ssh -o StrictHostKeyChecking=no -o BatchMode=yes';

     

       275
       275
       +
       +my $Ssh='@ssh@ -o StrictHostKeyChecking=no -o BatchMode=yes';

     

       276
       276
       +
        $Ssh.=" -o ServerAliveInterval=$keepalive"    if $keepalive ne '';

     

       277
       277
       +
        $Ssh.=" -q"    unless $debug;

     

       278
       278
       +
        

     

       279
       279
       +
       @@ -357,7 +357,7 @@

     

       280
       280
       +
        # See if any host specs contain 'username@' & reset 'localhost' and

     

       281
       281
       +
        # adjust maximum hostname length if necessary.

     

       282
       282
       +
        my $hostlen=$hostWidth;

     

       283
       283
       +
       -my $myhost=`hostname`;

     

       284
       284
       +
       +my $myhost=`@hostname@`;

     

       285
       285
       +
        chomp $myhost;

     

       286
       286
       +
        

     

       287
       287
       +
        my (%usernames, %sshswitch, %aliases);

     

       288
       288
       +
       @@ -510,7 +510,7 @@

     

       289
       289
       +
              $line=~s/^\s+//;    # can have leading space

     

       290
       290
       +
              my $pid=(split(/\s+/, $line))[0];

     

       291
       291
       +
              print "Killing ssh with pid: $pid\n"    if $debug & 1;

     

       292
       292
       +
       -      `kill $pid`;

     

       293
       293
       +
       +      `@kill@ $pid`;

     

       294
       294
       +
            }

     

       295
       295
       +
            sleep 1;    # wait a tad for ssh in thread to exit

     

       296
       296
       +
            close PS;

     

       297
       297
       +
       @@ -983,7 +983,7 @@

     

       298
       298
       +
            $line=~s/^\s+//;

     

       299
       299
       +
            my $pid=(split(/\s+/, $line))[0];

     

       300
       300
       +
            print "Killing ssh with pid: $pid\n"    if $debug & 1;

     

       301
       301
       +
       -    `kill $pid`;

     

       302
       302
       +
       +    `@kill@ $pid`;

     

       303
       303
       +
          }

     

       304
       304
       +
        }

     

       305
       305
       +
        

     

       306
       306
       +
       @@ -1179,7 +1179,7 @@

     

       307
       307
       +
        foreach my $host (keys %files)

     

       308
       308
       +
        {

     

       309
       309
       +
            print "Killing pid $files{$host}->{pid} for '$host'\n"    if $debug & 1;

     

       310
       310
       +
       -    `kill -9  $files{$host}->{pid}`;

     

       311
       311
       +
       +    `@kill@ -9  $files{$host}->{pid}`;

     

       312
       312
       +
            #close $files{$host}->{fd} or error("Failed to close playback file for '$host'");

     

       313
       313
       +
        }

     

       314
       314
       +
        

     

       315
       315
       +
       Processing diff for: formatit.ph

     

       316
       316
       +
       --- a/formatit.ph	2025-08-14 08:42:24.438419919 +0000

     

       317
       317
       +
       +++ b/formatit.ph	2025-08-15 07:18:19.548190580 +0000

     

       318
       318
       +
       @@ -20,19 +20,19 @@

     

       319
       319
       +
          $rawPFlag=0;    # always 0 when no files involved

     

       320
       320
       +
        

     

       321
       321
       +
          # In some case, we need to know if we're root.

     

       322
       322
       +
       -  $rootFlag=`whoami`;

     

       323
       323
       +
       +  $rootFlag=`@whoami@`;

     

       324
       324
       +
          $rootFlag=($rootFlag=~/root/) ? 1 : 0;

     

       325
       325
       +
        

     

       326
       326
       +
          # be sure to remove domain portion if present.  also note we keep the hostname in

     

       327
       327
       +
          # two formats, one in it's unaltered form (at least needed by lustre directory 

     

       328
       328
       +
          # parsing) as well as all lc because it displays nicer.

     

       329
       329
       +
       -  $Host=`hostname`;

     

       330
       330
       +
       +  $Host=`@hostname@`;

     

       331
       331
       +
          chomp $Host;

     

       332
       332
       +
          $Host=(split(/\./, $Host))[0];

     

       333
       333
       +
          $HostLC=lc($Host);

     

       334
       334
       +
        

     

       335
       335
       +
          # when was system booted?

     

       336
       336
       +
       -  $uptime=(split(/\s+/, `cat /proc/uptime`))[0];

     

       337
       337
       +
       +  $uptime=(split(/\s+/, `@cat@ /proc/uptime`))[0];

     

       338
       338
       +
          $boottime=time-$uptime;

     

       339
       339
       +
        

     

       340
       340
       +
          $Distro=cat('/etc/redhat-release')    if -e '/etc/redhat-release';

     

       341
       341
       +
       @@ -83,11 +83,11 @@

     

       342
       342
       +
          if ($subsys=~/y/i && $slabinfoFlag || $slubinfoFlag)

     

       343
       343
       +
          {

     

       344
       344
       +
            $message='';

     

       345
       345
       +
       -    $message='/proc/slabinfo'    if $slabinfoFlag && !(eval {`cat /proc/slabinfo 2>/dev/null` or die});

     

       346
       346
       +
       -    $message='/sys/slab'         if $slubinfoFlag && !(eval {`cat /proc/slubinfo 2>/dev/null` or die});

     

       347
       347
       +
       +    $message='/proc/slabinfo'    if $slabinfoFlag && !(eval {`@cat@ /proc/slabinfo 2>/dev/null` or die});

     

       348
       348
       +
       +    $message='/sys/slab'         if $slubinfoFlag && !(eval {`@cat@ /proc/slubinfo 2>/dev/null` or die});

     

       349
       349
       +
            if ($message ne '')

     

       350
       350
       +
            {

     

       351
       351
       +
       -      my $whoami=`whoami`;

     

       352
       352
       +
       +      my $whoami=`@whoami@`;

     

       353
       353
       +
              chomp $whoami;

     

       354
       354
       +
              disableSubsys('y', "/proc/slabinfo is not readable by $whoami");

     

       355
       355
       +
              $interval=~s/(^\d*):\d+/$1:/    if $subsys!~/z/i;    # remove int2 if not needed or we'll get error

     

       356
       356
       +
       @@ -132,7 +132,7 @@

     

       357
       357
       +
        

     

       358
       358
       +
                for (my $i=1; $i<$NumCpus; $i++)

     

       359
       359
       +
                {

     

       360
       360
       +
       -          my $online=`cat /sys/devices/system/cpu/cpu$i/online`;

     

       361
       361
       +
       +          my $online=`@cat@ /sys/devices/system/cpu/cpu$i/online`;

     

       362
       362
       +
                  chomp $online;

     

       363
       363
       +
        

     

       364
       364
       +
                  $cpuEnabled[$i]=$online;

     

       365
       365
       +
       @@ -266,7 +266,7 @@

     

       366
       366
       +
          $ibSpeed='??';

     

       367
       367
       +
          if (-e '/sys/class/infiniband')

     

       368
       368
       +
          {

     

       369
       369
       +
       -    $line=`cat /sys/class/infiniband/*/ports/1/rate 2>&1`;

     

       370
       370
       +
       +    $line=`@cat@ /sys/class/infiniband/*/ports/1/rate 2>&1`;

     

       371
       371
       +
            if ($line=~/\s*(\d+)\s+(\S)/)

     

       372
       372
       +
            {

     

       373
       373
       +
              $ibSpeed=$1;

     

       374
       374
       +
       @@ -669,7 +669,7 @@

     

       375
       375
       +
            {

     

       376
       376
       +
              # Get Luster and SFS Versions before looking at any data structures in the

     

       377
       377
       +
              # 'lustreCheck' routines because things change over time

     

       378
       378
       +
       -      $temp=`cat /proc/fs/lustre/version | grep lustre 2>/dev/null`;

     

       379
       379
       +
       +      $temp=`@cat@ /proc/fs/lustre/version | grep lustre 2>/dev/null`;

     

       380
       380
       +
              $temp=~/lustre: (\d+.*)/;

     

       381
       381
       +
              $cfsVersion=$1;

     

       382
       382
       +
              $sfsVersion='';

     

       383
       383
       +
       @@ -716,7 +716,7 @@

     

       384
       384
       +
                # The first step is to build up a hash of the sizes of all the

     

       385
       385
       +
                # existing partitions.  Since we're only doing this once, a 'cat's

     

       386
       386
       +
                # overhead should be minimal

     

       387
       387
       +
       -        @partitions=`cat /proc/partitions`;

     

       388
       388
       +
       +        @partitions=`@cat@ /proc/partitions`;

     

       389
       389
       +
                foreach $part (@partitions)

     

       390
       390
       +
                {

     

       391
       391
       +
                  # ignore blank lines and header

     

       392
       392
       +
       @@ -778,7 +778,7 @@

     

       393
       393
       +
            $temp=`head -n 1 /proc/slabinfo`;

     

       394
       394
       +
            $temp=~/(\d+\.\d+)/;

     

       395
       395
       +
            $SlabVersion=$1;

     

       396
       396
       +
       -    $NumSlabs=`cat /proc/slabinfo | wc -l`*1;

     

       397
       397
       +
       +    $NumSlabs=`@cat@ /proc/slabinfo | wc -l`*1;

     

       398
       398
       +
            chomp $NumSlabs;

     

       399
       399
       +
            $NumSlabs-=2;

     

       400
       400
       +
        

     

       401
       401
       +
       @@ -4127,7 +4127,7 @@

     

       402
       402
       +
              $netSpeeds{$netName}='??';

     

       403
       403
       +
              if ($line ne '')

     

       404
       404
       +
              {

     

       405
       405
       +
       -        $speed=`cat $line 2>&1`;

     

       406
       406
       +
       +        $speed=`@cat@ $line 2>&1`;

     

       407
       407
       +
                chomp $speed;

     

       408
       408
       +
                $line=~/.*\/(\S+)\/speed/;

     

       409
       409
       +
                my $netName=$1;

     

       410
       410
       +
       Processing diff for: graphite.ph

     

       411
       411
       +
       --- a/graphite.ph	2025-08-14 08:42:24.442420106 +0000

     

       412
       412
       +
       +++ b/graphite.ph	2025-08-14 08:44:07.351625049 +0000

     

       413
       413
       +
       @@ -117,7 +117,7 @@

     

       414
       414
       +
          # behavior for -f logs matches that of -A

     

       415
       415
       +
          $rawtooFlag=1    if $filename ne '' && !$plotFlag;

     

       416
       416
       +
        

     

       417
       417
       +
       -  $graphiteMyHost=(!$graphiteFqdnFlag) ? `hostname` : `hostname -f`;

     

       418
       418
       +
       +  $graphiteMyHost=(!$graphiteFqdnFlag) ? `@hostname@` : `@hostname@ -f`;

     

       419
       419
       +
          chomp $graphiteMyHost;

     

       420
       420
       +
          $graphiteMyHost =~ s/\./$graphiteEscape/g    if $graphiteEscape ne '';

     

       421
       421
       +
        

     

       422
       422
       +
       Processing diff for: vmsum.ph

     

       423
       423
       +
       --- a/vmsum.ph	2025-08-14 08:42:24.442420106 +0000

     

       424
       424
       +
       +++ b/vmsum.ph	2025-08-14 08:44:24.184414112 +0000

     

       425
       425
       +
       @@ -20,8 +20,8 @@

     

       426
       426
       +
        my $oneMB=1024*1024;

     

       427
       427
       +
        my ($debug, $helpFlag, $instMin, $versionFlag, $zeroFlag);

     

       428
       428
       +
        

     

       429
       429
       +
       -my $Ssh= '/usr/bin/ssh';

     

       430
       430
       +
       -my $Ping='/bin/ping';

     

       431
       431
       +
       +my $Ssh= '@ssh@';

     

       432
       432
       +
       +my $Ping='@ping@';

     

       433
       433
       +
        my $PingTimeout=1;

     

       434
       434
       +
        

     

       435
       435
       +
        # these control writing the vm text file

     

       436
       436
       +
       @@ -32,7 +32,7 @@

     

       437
       437
       +
        

     

       438
       438
       +
        my $lexprFlag=0;

     

       439
       439
       +
        my $noNetMsg='';    # if not null, problem with n/w stats (very rare)

     

       440
       440
       +
       -my $hostname=`hostname`;

     

       441
       441
       +
       +my $hostname=`@hostname@`;

     

       442
       442
       +
        chomp $hostname;

     

       443
       443
       +
        

     

       444
       444
       +
        sub vmsumInit

+133

pkgs/by-name/co/collectl/0002-fix-install-script.patch

···

       1
       1
       +
       --- a/INSTALL	2025-08-14 08:46:43.845548078 +0000

     

       2
       2
       +
       +++ b/INSTALL	2025-08-14 08:50:33.771706783 +0000

     

       3
       3
       +
       @@ -1,28 +1,29 @@

     

       4
       4
       +
        #!/bin/sh

     

       5
       5
       +
        

     

       6
       6
       +
       -DESTDIR=${DESTDIR:="/"}

     

       7
       7
       +
       +# Use Nix output directory instead of system paths

     

       8
       8
       +
       +DESTDIR=${out}

     

       9
       9
       +
        

     

       10
       10
       +
       -BINDIR=$DESTDIR/usr/bin

     

       11
       11
       +
       -DOCDIR=$DESTDIR/usr/share/doc/collectl

     

       12
       12
       +
       -SHRDIR=$DESTDIR/usr/share/collectl

     

       13
       13
       +
       -MANDIR=$DESTDIR/usr/share/man/man1

     

       14
       14
       +
       -SYSDDIR=$DESTDIR/usr/lib/systemd/system

     

       15
       15
       +
       -ETCDIR=$DESTDIR/etc

     

       16
       16
       +
       -INITDIR=$ETCDIR/init.d

     

       17
       17
       +
       +BINDIR=$out/bin

     

       18
       18
       +
       +DOCDIR=$out/share/doc/collectl

     

       19
       19
       +
       +SHRDIR=$out/share/collectl

     

       20
       20
       +
       +MANDIR=$out/share/man/man1

     

       21
       21
       +
       +SYSDDIR=$out/lib/systemd/system

     

       22
       22
       +
       +ETCDIR=$out/etc

     

       23
       23
       +
       +INITDIR=$out/etc/init.d

     

       24
       24
       +
        

     

       25
       25
       +
        mkdir -p $BINDIR

     

       26
       26
       +
        mkdir -p $DOCDIR

     

       27
       27
       +
        mkdir -p $SHRDIR

     

       28
       28
       +
        mkdir -p $ETCDIR

     

       29
       29
       +
        mkdir -p $MANDIR

     

       30
       30
       +
       -mkdir -p $INITDIR

     

       31
       31
       +
       +# Skip init.d creation for Nix

     

       32
       32
       +
        mkdir -p $SHRDIR/util

     

       33
       33
       +
        mkdir -p $DESTDIR/var/log/collectl

     

       34
       34
       +
        

     

       35
       35
       +
        cp collectl colmux       $BINDIR

     

       36
       36
       +
        cp collectl.conf         $ETCDIR

     

       37
       37
       +
        cp man1/*                $MANDIR

     

       38
       38
       +
       -cp initd/*               $INITDIR

     

       39
       39
       +
       +# Skip init scripts for Nix

     

       40
       40
       +
        

     

       41
       41
       +
        cp docs/*                $DOCDIR

     

       42
       42
       +
        cp GPL ARTISTIC COPYING  $DOCDIR

     

       43
       43
       +
       @@ -42,87 +43,12 @@

     

       44
       44
       +
        # Force in case redoing the install and files already zipped

     

       45
       45
       +
        gzip -f $MANDIR/collectl*

     

       46
       46
       +
        

     

       47
       47
       +
       -chmod 755 $INITDIR/collectl*

     

       48
       48
       +
       +# Skip chmod on init scripts for Nix

     

       49
       49
       +
        chmod 444 $ETCDIR/collectl.conf

     

       50
       50
       +
        chmod 755 $BINDIR/collectl

     

       51
       51
       +
        chmod 444 $DOCDIR/ARTISTIC $DOCDIR/COPYING $DOCDIR/GPL

     

       52
       52
       +
        chmod 444 $SHRDIR/*ph

     

       53
       53
       +
        chmod 755 $SHRDIR/util/*

     

       54
       54
       +
        

     

       55
       55
       +
       -# remove any stale versions in case the names/numbers used have changed.

     

       56
       56
       +
       -# on new ROCKS installion 'rm' isn't there yet!  [thanks roy]

     

       57
       57
       +
       -if [ -x /bin/rm ] ; then

     

       58
       58
       +
       -  /bin/rm -f $INITDIR/rc*.d/*collectl

     

       59
       59
       +
       -  /bin/rm -f $ETCDIR/rc.d/rc*.d/*collectl

     

       60
       60
       +
       -fi

     

       61
       61
       +
       -

     

       62
       62
       +
       -# only if systemd is supported

     

       63
       63
       +
       -if [ -d $SYSDDIR ]; then

     

       64
       64
       +
       -  cp service/collectl.service $SYSDDIR

     

       65
       65
       +
       -fi

     

       66
       66
       +
       -

     

       67
       67
       +
       -# Try and decide which distro this is based on distro specific files.

     

       68
       68
       +
       -distro=1

     

       69
       69
       +
       -if [ -f /sbin/yast ]; then

     

       70
       70
       +
       -    distro=2

     

       71
       71
       +
       -    mv -f $INITDIR/collectl-suse $INITDIR/collectl

     

       72
       72
       +
       -    rm -f $INITDIR/collectl-debian

     

       73
       73
       +
       -    rm -f $INITDIR/collectl-generic

     

       74
       74
       +
       -fi

     

       75
       75
       +
       -

     

       76
       76
       +
       -# debian

     

       77
       77
       +
       -if [ -f /usr/sbin/update-rc.d ]; then

     

       78
       78
       +
       -    distro=3

     

       79
       79
       +
       -    mv -f $INITDIR/collectl-debian $INITDIR/collectl

     

       80
       80
       +
       -    rm -f $INITDIR/collectl-suse

     

       81
       81
       +
       -    rm -f $INITDIR/collectl-generic

     

       82
       82
       +
       -

     

       83
       83
       +
       -    # only if we're installing under /

     

       84
       84
       +
       -    [ "$DESTDIR" = "/" ] && update-rc.d collectl defaults

     

       85
       85
       +
       -fi

     

       86
       86
       +
       -

     

       87
       87
       +
       -# redhat

     

       88
       88
       +
       -if [ -f /etc/redhat-release ]; then

     

       89
       89
       +
       -    distro=4

     

       90
       90
       +
       -    rm -f $INITDIR/collectl-suse

     

       91
       91
       +
       -    rm -f $INITDIR/collectl-debian

     

       92
       92
       +
       -    rm -f $INITDIR/collectl-generic

     

       93
       93
       +
       -    if [ -f /usr/sbin/chkconfig ]; then

     

       94
       94
       +
       -    	[ "$DESTDIR" = "/" ] && chkconfig --add collectl

     

       95
       95
       +
       -    fi	

     

       96
       96
       +
       -# Not needed for RHEL8 and higher	

     

       97
       97
       +
       -fi

     

       98
       98
       +
       -

     

       99
       99
       +
       -# gentoo

     

       100
       100
       +
       -if [ -f $ETCDIR/gentoo-release ]; then

     

       101
       101
       +
       -    distro=5

     

       102
       102
       +
       -    mv -f $INITDIR/collectl-generic $INITDIR/collectl

     

       103
       103
       +
       -    rm -f $INITDIR/collectl-suse

     

       104
       104
       +
       -    rm -f $INITDIR/collectl-debian

     

       105
       105
       +
       -    [ "$DESTDIR" = "/" ] && rc-update -a collectl default

     

       106
       106
       +
       -fi

     

       107
       107
       +
       -

     

       108
       108
       +
       -# Generic Distros

     

       109
       109
       +
       -# If /etc/init.d doesn't exist and/or there's no way to use chkconfig or 

     

       110
       110
       +
       -# rc-update you're going to have to add some custom code below...

     

       111
       111
       +
       -if [ ${distro} = 1 ]; then

     

       112
       112
       +
       -

     

       113
       113
       +
       -    mv -f $INITDIR/collectl-generic $INITDIR/collectl

     

       114
       114
       +
       -    rm -f $INITDIR/collectl-suse

     

       115
       115
       +
       -    rm -f $INITDIR/collectl-debian

     

       116
       116
       +
       -

     

       117
       117
       +
       -    # If in not installing under / there's nothing extra do

     

       118
       118
       +
       -    [ $DESTDIR != "/" ] && exit 0

     

       119
       119
       +
       -

     

       120
       120
       +
       -    # figure out how to handle reboots

     

       121
       121
       +
       -    if [ -f /sbin/chkconfig ]; then

     

       122
       122
       +
       -        chkconfig --add collectl

     

       123
       123
       +
       -    elif [ -f /sbin/rc-update ]; then

     

       124
       124
       +
       -        rc-update -a collectl default

     

       125
       125
       +
       -# RHEL9 has no chkconfig	

     

       126
       126
       +
       -    elif [ -f /usr/bin/systemctl ]; then

     

       127
       127
       +
       -        systemctl enable collectl

     

       128
       128
       +
       -    else

     

       129
       129
       +
       -        echo "could not figure out how to enable restarting across reboots"

     

       130
       130
       +
       -    fi

     

       131
       131
       +
       -fi

     

       132
       132
       +
       +# Skip all distro-specific service installation for Nix

     

       133
       133
       +
       +# Nix manages services differently through NixOS modules

+126

pkgs/by-name/co/collectl/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         callPackage,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         stdenv,

     

       5
       5
       +
         fetchFromGitHub,

     

       6
       6
       +
         replaceVars,

     

       7
       7
       +
       

     

       8
       8
       +
         # Runtime dependencies

     

       9
       9
       +
         coreutils,

     

       10
       10
       +
         dmidecode,

     

       11
       11
       +
         gnugrep,

     

       12
       12
       +
         inetutils,

     

       13
       13
       +
         openssh,

     

       14
       14
       +
         pciutils,

     

       15
       15
       +
         perl,

     

       16
       16
       +
         procps,

     

       17
       17
       +
         rpm,

     

       18
       18
       +
         util-linux,

     

       19
       19
       +
         xterm,

     

       20
       20
       +
       

     

       21
       21
       +
         # Dependencies

     

       22
       22
       +
         ipmitool,

     

       23
       23
       +
       }:

     

       24
       24
       +
       

     

       25
       25
       +
       let

     

       26
       26
       +
         inherit (lib) getExe getExe' genAttrs;

     

       27
       27
       +
       

     

       28
       28
       +
         # Define tool dependencies for script patches

     

       29
       29
       +
         scriptDeps =

     

       30
       30
       +
           let

     

       31
       31
       +
             mkTools = pkg: tools: genAttrs tools (tool: getExe' pkg tool);

     

       32
       32
       +
           in

     

       33
       33
       +
           # Tools from various packages

     

       34
       34
       +
           (mkTools coreutils [

     

       35
       35
       +
             "cat"

     

       36
       36
       +
             "whoami"

     

       37
       37
       +
             "pwd"

     

       38
       38
       +
             "uname"

     

       39
       39
       +
             "date"

     

       40
       40
       +
             "mkdir"

     

       41
       41
       +
             "chown"

     

       42
       42
       +
             "chgrp"

     

       43
       43
       +
             "echo"

     

       44
       44
       +
             "kill"

     

       45
       45
       +
             "cd"

     

       46
       46
       +
             "stty"

     

       47
       47
       +
           ])

     

       48
       48
       +
           // (mkTools util-linux [ "renice" ])

     

       49
       49
       +
           // (mkTools gnugrep [

     

       50
       50
       +
             "grep"

     

       51
       51
       +
             "egrep"

     

       52
       52
       +
           ])

     

       53
       53
       +
           // (mkTools inetutils [

     

       54
       54
       +
             "hostname"

     

       55
       55
       +
             "ping"

     

       56
       56
       +
           ])

     

       57
       57
       +
           // (mkTools procps [ "ps" ])

     

       58
       58
       +
           // (mkTools pciutils [ "lspci" ])

     

       59
       59
       +
           // (mkTools xterm [ "resize" ])

     

       60
       60
       +
           // (mkTools dmidecode [ "dmidecode" ])

     

       61
       61
       +
           // (mkTools rpm [ "rpm" ])

     

       62
       62
       +
           // {

     

       63
       63
       +
             # Single-tool packages

     

       64
       64
       +
             ssh = getExe openssh;

     

       65
       65
       +
             ipmitool = getExe ipmitool;

     

       66
       66
       +
           };

     

       67
       67
       +
       in

     

       68
       68
       +
       

     

       69
       69
       +
       stdenv.mkDerivation (finalAttrs: {

     

       70
       70
       +
         pname = "collectl";

     

       71
       71
       +
         version = "4.3.20.1";

     

       72
       72
       +
       

     

       73
       73
       +
         src = fetchFromGitHub {

     

       74
       74
       +
           owner = "sharkcz";

     

       75
       75
       +
           repo = "collectl";

     

       76
       76
       +
           rev = finalAttrs.version;

     

       77
       77
       +
           hash = "sha256-OJGCuxWvoId1cQ5Ugiav5/T/NzddwhM+gG3s0BnYYz0=";

     

       78
       78
       +
         };

     

       79
       79
       +
       

     

       80
       80
       +
         strictDeps = true;

     

       81
       81
       +
       

     

       82
       82
       +
         patches = [

     

       83
       83
       +
           (replaceVars ./0001-scripts-external-executable-calls.patch scriptDeps)

     

       84
       84
       +
           ./0002-fix-install-script.patch

     

       85
       85
       +
         ];

     

       86
       86
       +
       

     

       87
       87
       +
         buildInputs = [

     

       88
       88
       +
           perl

     

       89
       89
       +
           dmidecode

     

       90
       90
       +
           ipmitool

     

       91
       91
       +
         ];

     

       92
       92
       +
       

     

       93
       93
       +
         dontBuild = true;

     

       94
       94
       +
       

     

       95
       95
       +
         installPhase = ''

     

       96
       96
       +
           runHook preInstall

     

       97
       97
       +
       

     

       98
       98
       +
           bash ./INSTALL

     

       99
       99
       +
       

     

       100
       100
       +
           runHook postInstall

     

       101
       101
       +
         '';

     

       102
       102
       +
       

     

       103
       103
       +
         passthru.tests.run = callPackage ./test.nix { };

     

       104
       104
       +
       

     

       105
       105
       +
         meta = {

     

       106
       106
       +
           description = "Performance monitoring tool for Linux systems";

     

       107
       107
       +
           longDescription = ''

     

       108
       108
       +
             Collectl is a light-weight performance monitoring tool capable of reporting

     

       109
       109
       +
             interactively as well as logging to disk. It reports statistics on cpu, disk,

     

       110
       110
       +
             infiniband, lustre, memory, network, nfs, process, quadrics, slabs and more

     

       111
       111
       +
             in easy to read format.

     

       112
       112
       +
       

     

       113
       113
       +
             The `--config` option allows specifying a custom configuration file path,

     

       114
       114
       +
             overriding the default configuration file in the package's etc directory.

     

       115
       115
       +
           '';

     

       116
       116
       +
           homepage = "https://github.com/sharkcz/collectl";

     

       117
       117
       +
           downloadPage = "https://github.com/sharkcz/collectl/releases";

     

       118
       118
       +
           license = with lib.licenses; [

     

       119
       119
       +
             artistic1

     

       120
       120
       +
             gpl1Plus

     

       121
       121
       +
           ];

     

       122
       122
       +
           maintainers = with lib.maintainers; [ seven_bear ];

     

       123
       123
       +
           platforms = lib.platforms.linux;

     

       124
       124
       +
           mainProgram = "collectl";

     

       125
       125
       +
         };

     

       126
       126
       +
       })

+44

pkgs/by-name/co/collectl/test.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         runCommand,

     

       3
       3
       +
         collectl,

     

       4
       4
       +
         coreutils,

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       runCommand "collectl-test"

     

       8
       8
       +
         {

     

       9
       9
       +
           nativeBuildInputs = [

     

       10
       10
       +
             collectl

     

       11
       11
       +
             coreutils

     

       12
       12
       +
           ];

     

       13
       13
       +
           meta.timeout = 60;

     

       14
       14
       +
         }

     

       15
       15
       +
         ''

     

       16
       16
       +
           # Test basic functionality - limit to 5 seconds to avoid hanging

     

       17
       17
       +
           timeout 5s collectl -c1 >/dev/null || true

     

       18
       18
       +
       

     

       19
       19
       +
           # Test that explicit config file option still works with original config

     

       20
       20
       +
           timeout 5s collectl --config ${collectl}/etc/collectl.conf -c1 >/dev/null || true

     

       21
       21
       +
       

     

       22
       22
       +
           # Test custom config file path override

     

       23
       23
       +
           custom_config_path=$(mktemp)

     

       24
       24
       +
           cp ${collectl}/etc/collectl.conf "$custom_config_path"

     

       25
       25
       +
       

     

       26
       26
       +
           # Test that collectl uses the custom config file path

     

       27
       27
       +
           config_output=$(timeout 5s collectl --config "$custom_config_path" -c1 -d1 2>&1 | grep -i "Config File Search Path:" | head -1)

     

       28
       28
       +
           expected_output="Config File Search Path: $custom_config_path"

     

       29
       29
       +
       

     

       30
       30
       +
           if [ "$config_output" = "$expected_output" ]; then

     

       31
       31
       +
             echo "✓ Custom config file path test passed"

     

       32
       32
       +
           else

     

       33
       33
       +
             echo "✗ Custom config file path test failed"

     

       34
       34
       +
             echo "Expected: $expected_output"

     

       35
       35
       +
             echo "Got: $config_output"

     

       36
       36
       +
             exit 1

     

       37
       37
       +
           fi

     

       38
       38
       +
       

     

       39
       39
       +
           # Cleanup

     

       40
       40
       +
           rm -f "$custom_config_path"

     

       41
       41
       +
       

     

       42
       42
       +
           # Signal success

     

       43
       43
       +
           touch $out

     

       44
       44
       +
         ''

+3 -3

pkgs/by-name/de/dendrite/package.nix

···

       11
       11
        
       

     

       12
       12
        
       buildGoModule rec {

     

       13
       13
        
         pname = "matrix-dendrite";

     

       14
       14
       -
         version = "0.14.1";

     

       14
       14
       +
         version = "0.15.2";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "element-hq";

     

       18
       18
        
           repo = "dendrite";

     

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

     

       20
       20
       -
           hash = "sha256-b/kybHF9WcP88kQuG7LB0/pgflYUeWNqEHfUyKfUCIU=";

     

       20
       20
       +
           hash = "sha256-VxQ5fuGzkEL371TmnDQ0wNqqmfzupmsTX/v+eFthj8E=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
       -
         vendorHash = "sha256-380xuwMD9gxrjUsLfO8R08wruyWZwjRhiIDmSc/FGwA=";

     

       23
       23
       +
         vendorHash = "sha256-QUztOoOesECAhwh4whzvrc43rJxjtPaEICUHno2DId0=";

     

       24
       24
        
       

     

       25
       25
        
         subPackages = [

     

       26
       26
        
           # The server

+2 -2

pkgs/by-name/dw/dwm/package.nix

···

       18
       18
        
       

     

       19
       19
        
       stdenv.mkDerivation (finalAttrs: {

     

       20
       20
        
         pname = "dwm";

     

       21
       21
       -
         version = "6.5";

     

       21
       21
       +
         version = "6.6";

     

       22
       22
        
       

     

       23
       23
        
         src = fetchzip {

     

       24
       24
        
           url = "https://dl.suckless.org/dwm/dwm-${finalAttrs.version}.tar.gz";

     

       25
       25
       -
           hash = "sha256-Cc4B8evvuRxOjbeOhg3oAs3Nxi/msxWg950/eiq536w=";

     

       25
       25
       +
           hash = "sha256-fD97OpObSOBTAMc3teejS0u2h4hCkMVYJrNZ6F4IaFs=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         nativeBuildInputs = lib.optional stdenv.hostPlatform.isStatic pkg-config;

+2 -2

pkgs/by-name/e1/e16/package.nix

···

       23
       23
        
       

     

       24
       24
        
       stdenv.mkDerivation rec {

     

       25
       25
        
         pname = "e16";

     

       26
       26
       -
         version = "1.0.30";

     

       26
       26
       +
         version = "1.0.31";

     

       27
       27
        
       

     

       28
       28
        
         src = fetchurl {

     

       29
       29
        
           url = "mirror://sourceforge/enlightenment/e16-${version}.tar.xz";

     

       30
       30
       -
           hash = "sha256-JKBmBgC5cN4XO03r0NR78Ly9tpI733/sUEPL0GLU5B0=";

     

       30
       30
       +
           hash = "sha256-ZQTsIy/BiO/xUiCu+bc2n406F0unAinxyYLjVRfUSiQ=";

     

       31
       31
        
         };

     

       32
       32
        
       

     

       33
       33
        
         nativeBuildInputs = [

+3 -3

pkgs/by-name/em/emcee/package.nix

···

       8
       8
        
       

     

       9
       9
        
       buildGoModule (finalAttrs: {

     

       10
       10
        
         pname = "emcee";

     

       11
       11
       -
         version = "0.5.1";

     

       11
       11
       +
         version = "0.6.1";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "loopwork-ai";

     

       15
       15
        
           repo = "emcee";

     

       16
       16
        
           tag = "v${finalAttrs.version}";

     

       17
       17
       -
           hash = "sha256-ri/4Xxc6QgGqsARI5c2JjVeEe5lOmi/c+B3+vUvW6ow=";

     

       17
       17
       +
           hash = "sha256-k8W3kCVF1WuX5nYX75HvfMlxpEcVbuX2lZKlLOf1qGI=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         vendorHash = "sha256-B8shxh1fLdIR7TN0mSugu9wFNShmrb1WBzCArHVVnoU=";

     

       20
       20
       +
         vendorHash = "sha256-e8LPcKue7rhAh03uCRG0VTcwwyj3kDOBoeo3t7Hwvi0=";

     

       21
       21
        
       

     

       22
       22
        
         ldflags = [

     

       23
       23
        
           "-X main.version=${finalAttrs.version}"

pkgs/by-name/en/enblend-enfuse/package.nix

+2 -2

pkgs/by-name/fl/flexget/package.nix

···

       7
       7
        
       

     

       8
       8
        
       python3Packages.buildPythonApplication rec {

     

       9
       9
        
         pname = "flexget";

     

       10
       10
       -
         version = "3.17.6";

     

       10
       10
       +
         version = "3.17.11";

     

       11
       11
        
         pyproject = true;

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "Flexget";

     

       15
       15
        
           repo = "Flexget";

     

       16
       16
        
           tag = "v${version}";

     

       17
       17
       -
           hash = "sha256-E0ytB30tiJgmdfpJ+KCy67enqmfZT7HjoZHlqtRQWsQ=";

     

       17
       17
       +
           hash = "sha256-Qfq6TXSNAnIq8m3I7noFe6pIq6PmUTQKUjN+ZC4NxyU=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         pythonRelaxDeps = true;

+9 -10

pkgs/by-name/ge/gemini-cli/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         buildNpmPackage,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
       -
         fetchpatch,

     

       6
       5
        
         gitUpdater,

     

       7
       6
        
       }:

     

       8
       7
        
       

     

       9
       8
        
       buildNpmPackage (finalAttrs: {

     

       10
       9
        
         pname = "gemini-cli";

     

       11
       11
       -
         version = "0.1.18";

     

       10
       10
       +
         version = "0.1.21";

     

       12
       11
        
       

     

       13
       12
        
         src = fetchFromGitHub {

     

       14
       13
        
           owner = "google-gemini";

     

       15
       14
        
           repo = "gemini-cli";

     

       16
       15
        
           tag = "v${finalAttrs.version}";

     

       17
       17
       -
           hash = "sha256-vO70olSAG6NaZjyERU22lc8MbVivyJFieGcy0xOErrc=";

     

       16
       16
       +
           hash = "sha256-eS83Uwp6LzyQuIx2jirXnJ6Xb2XEaAKLnS9PMKTIvyI=";

     

       18
       17
        
         };

     

       19
       18
        
       

     

       20
       19
        
         patches = [

     

       21
       21
       -
           (fetchpatch {

     

       22
       22
       -
             url = "https://github.com/google-gemini/gemini-cli/pull/5336/commits/c1aef417d559237bf4d147c584449b74d6fbc1f8.patch";

     

       23
       23
       -
             name = "restore-missing-dependencies-fields.patch";

     

       24
       24
       -
             hash = "sha256-euRoLpbv075KIpYF9QPMba5FxG4+h/kxwLRetaay33s=";

     

       25
       25
       -
           })

     

       20
       20
       +
           # FIXME: remove once https://github.com/google-gemini/gemini-cli/pull/5336 is merged

     

       21
       21
       +
           ./restore-missing-dependencies-fields.patch

     

       26
       22
        
         ];

     

       27
       23
        
       

     

       28
       28
       -
         npmDepsHash = "sha256-8dn0i2laR4LFZk/sFDdvblvrHSnraGcLl3WAthCOKc0=";

     

       24
       24
       +
         npmDepsHash = "sha256-5pFnxZFhVNxYLPJClYq+pe4wAX5623Y3hFj8lIq00+E=";

     

       29
       25
        
       

     

       30
       26
        
         preConfigure = ''

     

       31
       27
        
           mkdir -p packages/generated

     
···

       59
       55
        
           description = "AI agent that brings the power of Gemini directly into your terminal";

     

       60
       56
        
           homepage = "https://github.com/google-gemini/gemini-cli";

     

       61
       57
        
           license = lib.licenses.asl20;

     

       62
       62
       -
           maintainers = with lib.maintainers; [ donteatoreo ];

     

       58
       58
       +
           maintainers = with lib.maintainers; [

     

       59
       59
       +
             donteatoreo

     

       60
       60
       +
             taranarmo

     

       61
       61
       +
           ];

     

       63
       62
        
           platforms = lib.platforms.all;

     

       64
       63
        
           mainProgram = "gemini";

     

       65
       64
        
         };

+69

pkgs/by-name/ge/gemini-cli/restore-missing-dependencies-fields.patch

···

       1
       1
       +
       From c1aef417d559237bf4d147c584449b74d6fbc1f8 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: ljxfstorm <ljxf.storm@live.cn>

     

       3
       3
       +
       Date: Fri, 1 Aug 2025 10:23:11 +0800

     

       4
       4
       +
       Subject: [PATCH] build(deps): restore missing `resolved` and `integrity` of

     

       5
       5
       +
        some dependencies

     

       6
       6
       +
       

     

       7
       7
       +
       ---

     

       8
       8
       +
        package-lock.json | 12 ++++++++++++

     

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

     

       10
       10
       +
       

     

       11
       11
       +
       diff --git a/package-lock.json b/package-lock.json

     

       12
       12
       +
       index 3938c5e32b..99590b8a9b 100644

     

       13
       13
       +
       --- a/package-lock.json

     

       14
       14
       +
       +++ b/package-lock.json

     

       15
       15
       +
       @@ -11738,6 +11738,8 @@

     

       16
       16
       +
            },

     

       17
       17
       +
            "packages/cli/node_modules/@testing-library/dom": {

     

       18
       18
       +
              "version": "10.4.0",

     

       19
       19
       +
       +      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.0.tgz",

     

       20
       20
       +
       +      "integrity": "sha512-pemlzrSESWbdAloYml3bAJMEfNh1Z7EduzqPKprCH5S341frlpYnUEW0H72dLxa6IsYr+mPno20GiSm+h9dEdQ==",

     

       21
       21
       +
              "dev": true,

     

       22
       22
       +
              "license": "MIT",

     

       23
       23
       +
              "peer": true,

     

       24
       24
       +
       @@ -11773,6 +11775,8 @@

     

       25
       25
       +
            },

     

       26
       26
       +
            "packages/cli/node_modules/@testing-library/react": {

     

       27
       27
       +
              "version": "16.3.0",

     

       28
       28
       +
       +      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-16.3.0.tgz",

     

       29
       29
       +
       +      "integrity": "sha512-kFSyxiEDwv1WLl2fgsq6pPBbw5aWKrsY2/noi1Id0TK0UParSF62oFQFGHXIyaG4pp2tEub/Zlel+fjjZILDsw==",

     

       30
       30
       +
              "dev": true,

     

       31
       31
       +
              "license": "MIT",

     

       32
       32
       +
              "dependencies": {

     

       33
       33
       +
       @@ -11824,6 +11828,8 @@

     

       34
       34
       +
            },

     

       35
       35
       +
            "packages/cli/node_modules/aria-query": {

     

       36
       36
       +
              "version": "5.3.0",

     

       37
       37
       +
       +      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",

     

       38
       38
       +
       +      "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==",

     

       39
       39
       +
              "dev": true,

     

       40
       40
       +
              "license": "Apache-2.0",

     

       41
       41
       +
              "peer": true,

     

       42
       42
       +
       @@ -11833,6 +11839,8 @@

     

       43
       43
       +
            },

     

       44
       44
       +
            "packages/cli/node_modules/emoji-regex": {

     

       45
       45
       +
              "version": "10.4.0",

     

       46
       46
       +
       +      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",

     

       47
       47
       +
       +      "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==",

     

       48
       48
       +
              "license": "MIT"

     

       49
       49
       +
            },

     

       50
       50
       +
            "packages/cli/node_modules/react-is": {

     

       51
       51
       +
       @@ -11845,6 +11853,8 @@

     

       52
       52
       +
            },

     

       53
       53
       +
            "packages/cli/node_modules/string-width": {

     

       54
       54
       +
              "version": "7.2.0",

     

       55
       55
       +
       +      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",

     

       56
       56
       +
       +      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",

     

       57
       57
       +
              "license": "MIT",

     

       58
       58
       +
              "dependencies": {

     

       59
       59
       +
                "emoji-regex": "^10.3.0",

     

       60
       60
       +
       @@ -11942,6 +11952,8 @@

     

       61
       61
       +
            },

     

       62
       62
       +
            "packages/core/node_modules/ignore": {

     

       63
       63
       +
              "version": "7.0.5",

     

       64
       64
       +
       +      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",

     

       65
       65
       +
       +      "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",

     

       66
       66
       +
              "license": "MIT",

     

       67
       67
       +
              "engines": {

     

       68
       68
       +
                "node": ">= 4"

     

       69
       69
       +

+34 -32

pkgs/by-name/gn/gnome-disk-utility/package.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
       +
         fetchurl,

     

       5
       5
       +
         adwaita-icon-theme,

     

       6
       6
       +
         desktop-file-utils,

     

       7
       7
       +
         docbook-xsl-nons,

     

       4
       8
        
         gettext,

     

       5
       5
       -
         fetchurl,

     

       6
       6
       -
         pkg-config,

     

       7
       7
       -
         udisks2,

     

       8
       8
       -
         libhandy,

     

       9
       9
       -
         libsecret,

     

       10
       10
       -
         libdvdread,

     

       11
       11
       -
         meson,

     

       12
       12
       -
         ninja,

     

       13
       13
       -
         gtk3,

     

       14
       9
        
         glib,

     

       15
       15
       -
         wrapGAppsHook3,

     

       16
       16
       -
         libnotify,

     

       17
       17
       -
         itstool,

     

       18
       10
        
         gnome,

     

       19
       11
        
         gnome-settings-daemon,

     

       20
       20
       -
         adwaita-icon-theme,

     

       21
       21
       -
         libxml2,

     

       22
       12
        
         gsettings-desktop-schemas,

     

       13
       13
       +
         gtk3,

     

       14
       14
       +
         itstool,

     

       23
       15
        
         libcanberra-gtk3,

     

       24
       24
       -
         libxslt,

     

       25
       25
       -
         docbook-xsl-nons,

     

       26
       26
       -
         desktop-file-utils,

     

       16
       16
       +
         libdvdread,

     

       17
       17
       +
         libhandy,

     

       18
       18
       +
         libnotify,

     

       27
       19
        
         libpwquality,

     

       20
       20
       +
         libsecret,

     

       21
       21
       +
         libxml2,

     

       22
       22
       +
         libxslt,

     

       23
       23
       +
         meson,

     

       24
       24
       +
         ninja,

     

       25
       25
       +
         pkg-config,

     

       28
       26
        
         systemd,

     

       27
       27
       +
         udisks2,

     

       28
       28
       +
         wrapGAppsHook3,

     

       29
       29
       +
         xz,

     

       29
       30
        
       }:

     

       30
       31
        
       

     

       31
       32
        
       stdenv.mkDerivation rec {

     
···

       38
       39
        
         };

     

       39
       40
        
       

     

       40
       41
        
         nativeBuildInputs = [

     

       42
       42
       +
           desktop-file-utils

     

       43
       43
       +
           docbook-xsl-nons

     

       44
       44
       +
           gettext

     

       45
       45
       +
           itstool

     

       46
       46
       +
           libxml2

     

       47
       47
       +
           libxslt

     

       41
       48
        
           meson

     

       42
       49
        
           ninja

     

       43
       50
        
           pkg-config

     

       44
       44
       -
           gettext

     

       45
       45
       -
           itstool

     

       46
       46
       -
           libxslt

     

       47
       47
       -
           docbook-xsl-nons

     

       48
       48
       -
           desktop-file-utils

     

       49
       51
        
           wrapGAppsHook3

     

       50
       50
       -
           libxml2

     

       51
       52
        
         ];

     

       52
       53
        
       

     

       53
       54
        
         buildInputs = [

     

       55
       55
       +
           adwaita-icon-theme

     

       56
       56
       +
           glib

     

       57
       57
       +
           gnome-settings-daemon

     

       58
       58
       +
           gsettings-desktop-schemas

     

       54
       59
        
           gtk3

     

       55
       55
       -
           glib

     

       60
       60
       +
           libcanberra-gtk3

     

       61
       61
       +
           libdvdread

     

       56
       62
        
           libhandy

     

       57
       57
       -
           libsecret

     

       58
       58
       -
           libpwquality

     

       59
       63
        
           libnotify

     

       60
       60
       -
           libdvdread

     

       61
       61
       -
           libcanberra-gtk3

     

       62
       62
       -
           udisks2

     

       63
       63
       -
           adwaita-icon-theme

     

       64
       64
       +
           libpwquality

     

       65
       65
       +
           libsecret

     

       64
       66
        
           systemd

     

       65
       65
       -
           gnome-settings-daemon

     

       66
       66
       -
           gsettings-desktop-schemas

     

       67
       67
       +
           udisks2

     

       68
       68
       +
           xz

     

       67
       69
        
         ];

     

       68
       70
        
       

     

       69
       71
        
         passthru = {

+3 -3

pkgs/by-name/go/gollama/package.nix

···

       7
       7
        
       

     

       8
       8
        
       buildGoModule rec {

     

       9
       9
        
         pname = "gollama";

     

       10
       10
       -
         version = "v1.35.1";

     

       10
       10
       +
         version = "v1.35.3";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "sammcj";

     

       14
       14
        
           repo = "gollama";

     

       15
       15
        
           tag = "v${version}";

     

       16
       16
       -
           hash = "sha256-fiCfkCxj/7XTmlqxLwZqnv+tRDF6RC412RthAcpHUUA=";

     

       16
       16
       +
           hash = "sha256-k2SGcsWQi2jC3W2ZO8KXY+WUyh7n7qonLr6BLKZXzdY=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         vendorHash = "sha256-O9uv/oXZKr9060woz/RQ8UEPdbW4Z8vnhXIQXm+ljQ4=";

     

       19
       19
       +
         vendorHash = "sha256-hZx4AsPnlFmJGms0vRKgBV/4Ea8uvHaNc0zNehs2RB8=";

     

       20
       20
        
       

     

       21
       21
        
         doCheck = false;

     

       22
       22

+3 -3

pkgs/by-name/gr/gramps/package.nix

···

       23
       23
        
       }:

     

       24
       24
        
       

     

       25
       25
        
       python3Packages.buildPythonApplication rec {

     

       26
       26
       -
         version = "6.0.3";

     

       26
       26
       +
         version = "6.0.4";

     

       27
       27
        
         pname = "gramps";

     

       28
       28
        
         pyproject = true;

     

       29
       29
        
       

     
···

       31
       31
        
           owner = "gramps-project";

     

       32
       32
        
           repo = "gramps";

     

       33
       33
        
           tag = "v${version}";

     

       34
       34
       -
           hash = "sha256-dmokrAN6ZC7guMYHifNifL9rXqZPW+Z5LudQhIUxMs8=";

     

       34
       34
       +
           hash = "sha256-MBsc4YMbCvzRG6+7/cGQpx7iYvQAdqWYrIMEpf1A7ew=";

     

       35
       35
        
         };

     

       36
       36
        
       

     

       37
       37
        
         patches = [

     
···

       113
       113
        
             pinpox

     

       114
       114
        
             tomasajt

     

       115
       115
        
           ];

     

       116
       116
       -
           changelog = "https://github.com/gramps-project/gramps/blob/${src.rev}/ChangeLog";

     

       116
       116
       +
           changelog = "https://github.com/gramps-project/gramps/blob/${src.tag}/ChangeLog";

     

       117
       117
        
           longDescription = ''

     

       118
       118
        
             Every person has their own story but they are also part of a collective

     

       119
       119
        
             family history. Gramps gives you the ability to record the many details of

+3 -3

pkgs/by-name/gr/gruvbox-gtk-theme/package.nix

···

       68
       68
        
         stdenvNoCC.mkDerivation

     

       69
       69
        
         {

     

       70
       70
        
           inherit pname;

     

       71
       71
       -
           version = "0-unstable-2025-07-28";

     

       71
       71
       +
           version = "0-unstable-2025-08-13";

     

       72
       72
        
       

     

       73
       73
        
           src = fetchFromGitHub {

     

       74
       74
        
             owner = "Fausto-Korpsvart";

     

       75
       75
        
             repo = "Gruvbox-GTK-Theme";

     

       76
       76
       -
             rev = "39aed8f4d09d5ac75162adea1a64212ad4ef9ade";

     

       77
       77
       -
             hash = "sha256-Q2XwcYMz/GsFyd5kjj7OYwa724OUxw8w+nhTBkWo3Z0=";

     

       76
       76
       +
             rev = "f9f56cb51ba06d27f5ee8e7b88e20b0b4de6bf4c";

     

       77
       77
       +
             hash = "sha256-gKJQ2TTh0MJB0SULA2ND8gvZ/YlC1dSxCOr0K2X4So0=";

     

       78
       78
        
           };

     

       79
       79
        
       

     

       80
       80
        
           propagatedUserEnvPkgs = [ gtk-engine-murrine ];

+10 -15

pkgs/by-name/la/lact/package.nix

···

       5
       5
        
         fetchFromGitHub,

     

       6
       6
        
         pkg-config,

     

       7
       7
        
         wrapGAppsHook4,

     

       8
       8
       +
         bashNonInteractive,

     

       8
       9
        
         gdk-pixbuf,

     

       9
       10
        
         gtk4,

     

       10
       11
        
         libdrm,

     
···

       18
       19
        
         hwdata,

     

       19
       20
        
         fuse3,

     

       20
       21
        
         autoAddDriverRunpath,

     

       21
       21
       -
         fetchpatch,

     

       22
       22
        
       }:

     

       23
       23
        
       

     

       24
       24
        
       rustPlatform.buildRustPackage (finalAttrs: {

     

       25
       25
        
         pname = "lact";

     

       26
       26
       -
         version = "0.8.0";

     

       26
       26
       +
         version = "0.8.1";

     

       27
       27
        
       

     

       28
       28
        
         src = fetchFromGitHub {

     

       29
       29
        
           owner = "ilya-zlobintsev";

     

       30
       30
        
           repo = "LACT";

     

       31
       31
        
           tag = "v${finalAttrs.version}";

     

       32
       32
       -
           hash = "sha256-HsDVz9Wd1WoGWIB4Cs/GsvC7RDyHAeXfFGXZDWEmo/c=";

     

       32
       32
       +
           hash = "sha256-bgMQTiNeJR6zPTy/YpQ0oI1oGBzCf+VtBUn6pgADZAY=";

     

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
       -
         cargoHash = "sha256-fgF7gOXxB9sQqA5H1hw6A0Fb5tTBPySAbSxVhcKVhcM=";

     

       35
       35
       +
         cargoHash = "sha256-VxyYnX6AW+AS4NOB1XZXi2Dyrf4rtJzKHXMYwgLY6pQ=";

     

       36
       36
        
       

     

       37
       37
        
         nativeBuildInputs = [

     

       38
       38
        
           pkg-config

     
···

       68
       68
        
           ]

     

       69
       69
        
         );

     

       70
       70
        
       

     

       71
       71
       -
         patches = [

     

       72
       72
       -
           (fetchpatch {

     

       73
       73
       -
             name = "fix-tests::snapshot_everything-due-to-outdated-hwdata-649.patch";

     

       74
       74
       -
             url = "https://github.com/ilya-zlobintsev/LACT/commit/c9a59e48a36d590d7522c22bd15a8f9208bef0ee.patch";

     

       75
       75
       -
             hash = "sha256-Ehq8vRosqyqpRPeabkdpBHBF6ONqSJHOeq3AXw8PXPU=";

     

       76
       76
       -
           })

     

       77
       77
       -
         ];

     

       78
       78
       -
       

     

       79
       71
        
         postPatch = ''

     

       80
       72
        
           substituteInPlace lact-daemon/src/system.rs \

     

       81
       73
        
             --replace-fail 'Command::new("uname")' 'Command::new("${coreutils}/bin/uname")'

     

       82
       74
        
       

     

       83
       75
        
           substituteInPlace lact-daemon/src/server/handler.rs \

     

       84
       76
        
             --replace-fail 'run_command("journalctl",'  'run_command("${systemdMinimal}/bin/journalctl",'

     

       77
       77
       +
       

     

       78
       78
       +
           substituteInPlace lact-daemon/src/server/handler.rs \

     

       79
       79
       +
             --replace-fail 'Command::new("sh")' 'Command::new("${bashNonInteractive}/bin/bash")'

     

       85
       80
        
       

     

       86
       81
        
           substituteInPlace lact-daemon/src/server/vulkan.rs \

     

       87
       82
        
             --replace-fail 'Command::new("vulkaninfo")' 'Command::new("${vulkan-tools}/bin/vulkaninfo")'

     

       88
       83
        
       

     

       84
       84
       +
           substituteInPlace lact-daemon/src/socket.rs \

     

       85
       85
       +
             --replace-fail 'run_command("chown"' 'run_command("${coreutils}/bin/chown"'

     

       86
       86
       +
       

     

       89
       87
        
           substituteInPlace res/lactd.service \

     

       90
       88
        
             --replace-fail ExecStart={lact,$out/bin/lact}

     

       91
       91
       -
       

     

       92
       92
       -
           substituteInPlace res/io.github.ilya_zlobintsev.LACT.desktop \

     

       93
       93
       -
             --replace-fail Exec={lact,$out/bin/lact}

     

       94
       89
        
       

     

       95
       90
        
           # read() looks for the database in /usr/share so we use read_from_file() instead

     

       96
       91
        
           substituteInPlace lact-daemon/src/server/handler.rs \

+2 -2

pkgs/by-name/mi/microsoft-edge/package.nix

···

       178
       178
        
       

     

       179
       179
        
       stdenvNoCC.mkDerivation (finalAttrs: {

     

       180
       180
        
         pname = "microsoft-edge";

     

       181
       181
       -
         version = "139.0.3405.86";

     

       181
       181
       +
         version = "139.0.3405.102";

     

       182
       182
        
       

     

       183
       183
        
         src = fetchurl {

     

       184
       184
        
           url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";

     

       185
       185
       -
           hash = "sha256-S1/RUSwRQsBQno/I31xjw1CGs0tJpl5HRatat+wOqmE=";

     

       185
       185
       +
           hash = "sha256-rY6Q3sMIAGX/ZKOVvwSl6cxq24SB1PiCn7b1pMXMeps=";

     

       186
       186
        
         };

     

       187
       187
        
       

     

       188
       188
        
         # With strictDeps on, some shebangs were not being patched correctly

+2 -2

pkgs/by-name/nv/nvitop/package.nix

···

       7
       7
        
       

     

       8
       8
        
       python3Packages.buildPythonApplication rec {

     

       9
       9
        
         pname = "nvitop";

     

       10
       10
       -
         version = "1.5.2";

     

       10
       10
       +
         version = "1.5.3";

     

       11
       11
        
         pyproject = true;

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "XuehaiPan";

     

       15
       15
        
           repo = "nvitop";

     

       16
       16
        
           tag = "v${version}";

     

       17
       17
       -
           hash = "sha256-kUlKb5L8dzT4ESi0rO2v0kQILjnVy+zcoePwqckyfbk=";

     

       17
       17
       +
           hash = "sha256-cqRvjK3q9fm5HPnZFGSV59FPnAdLkeq/D5wSR5ke7Ok=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         build-system = with python3Packages; [ setuptools ];

+3 -3

pkgs/by-name/pl/plex-desktop/package.nix

···

       12
       12
        
         libpulseaudio,

     

       13
       13
        
         libva,

     

       14
       14
        
         libxkbcommon,

     

       15
       15
       +
         libxml2_13,

     

       15
       16
        
         makeShellWrapper,

     

       16
       17
        
         minizip,

     

       17
       18
        
         nss,

     
···

       56
       57
        
           buildInputs = [

     

       57
       58
        
             elfutils

     

       58
       59
        
             ffmpeg_6-headless

     

       60
       60
       +
             libedit

     

       59
       61
        
             libpulseaudio

     

       60
       62
        
             libva

     

       61
       63
        
             libxkbcommon

     

       64
       64
       +
             libxml2_13

     

       62
       65
        
             minizip

     

       63
       66
        
             nss

     

       64
       67
        
             stdenv.cc.cc

     
···

       104
       107
        
             rm $out/lib/libdrm.so*

     

       105
       108
        
             rm $out/lib/libdrm*

     

       106
       109
        
       

     

       107
       107
       -
             ln -s ${libedit}/lib/libedit.so.0 $out/lib/libedit.so.2

     

       108
       108
       -
       

     

       109
       110
        
             # Keep dependencies where the version from nixpkgs is higher.

     

       110
       111
        
             cp usr/lib/x86_64-linux-gnu/libasound.so.2 $out/lib/libasound.so.2

     

       111
       112
        
             cp usr/lib/x86_64-linux-gnu/libjbig.so.0 $out/lib/libjbig.so.0

     
···

       116
       117
        
             cp usr/lib/x86_64-linux-gnu/libtiff.so.5 $out/lib/libtiff.so.5

     

       117
       118
        
             cp usr/lib/x86_64-linux-gnu/libwebp.so.6 $out/lib/libwebp.so.6

     

       118
       119
        
             cp usr/lib/x86_64-linux-gnu/libxkbfile.so.1.0.2 $out/lib/libxkbfile.so.1

     

       119
       119
       -
             cp usr/lib/x86_64-linux-gnu/libxml2.so.2 $out/lib/libxml2.so.2

     

       120
       120
        
             cp usr/lib/x86_64-linux-gnu/libxslt.so.1.1.34 $out/lib/libxslt.so.1

     

       121
       121
        
       

     

       122
       122
        
             runHook postInstall

+3 -3

pkgs/by-name/st/stackit-cli/package.nix

···

       12
       12
        
       

     

       13
       13
        
       buildGoModule rec {

     

       14
       14
        
         pname = "stackit-cli";

     

       15
       15
       -
         version = "0.38.0";

     

       15
       15
       +
         version = "0.39.1";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "stackitcloud";

     

       19
       19
        
           repo = "stackit-cli";

     

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

     

       21
       21
       -
           hash = "sha256-i6UOgD3C0nq6Z3Gdki8YOZotU1CbC14Jx8d9B1LV7Hk=";

     

       21
       21
       +
           hash = "sha256-6Y71KglFPfecbrXwczsrEdoVECOP8C/Mt021H6nQrvE=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
       -
         vendorHash = "sha256-qzNd1wn3N+EPjXO1gFYKtVNdGwd2D/jf6oJFvloR7HY=";

     

       24
       24
       +
         vendorHash = "sha256-Vz8jcbp3HzzgfzHFeEYPeGg0lmElPbm2hpHWNVhTQa0=";

     

       25
       25
        
       

     

       26
       26
        
         subPackages = [ "." ];

     

       27
       27

+3 -3

pkgs/by-name/te/teams-for-linux/package.nix

···

       16
       16
        
       

     

       17
       17
        
       buildNpmPackage rec {

     

       18
       18
        
         pname = "teams-for-linux";

     

       19
       19
       -
         version = "2.1.4";

     

       19
       19
       +
         version = "2.3.0";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchFromGitHub {

     

       22
       22
        
           owner = "IsmaelMartinez";

     

       23
       23
        
           repo = "teams-for-linux";

     

       24
       24
        
           tag = "v${version}";

     

       25
       25
       -
           hash = "sha256-wzw7GXKehQCYX2RDH5G/SqhBSziVPnXiaPiLrhC2Dfc=";

     

       25
       25
       +
           hash = "sha256-wbkjLPaQFfAQmWtWVZ5U6PslaO7XvuuvU1yjlgaiKwQ=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
       -
         npmDepsHash = "sha256-PWWEFbenAXuYKwFN+C+pQumrYJqgtfAt9EzEiaMddhQ=";

     

       28
       28
       +
         npmDepsHash = "sha256-OesAv8y2FWWJsNS4ms/B65cbJ7jEwnuQLVUb8zm1oSQ=";

     

       29
       29
        
       

     

       30
       30
        
         nativeBuildInputs = [

     

       31
       31
        
           makeWrapper

+2 -2

pkgs/by-name/te/terragrunt/package.nix

···

       8
       8
        
       

     

       9
       9
        
       buildGoModule (finalAttrs: {

     

       10
       10
        
         pname = "terragrunt";

     

       11
       11
       -
         version = "0.84.1";

     

       11
       11
       +
         version = "0.85.0";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "gruntwork-io";

     

       15
       15
        
           repo = "terragrunt";

     

       16
       16
        
           tag = "v${finalAttrs.version}";

     

       17
       17
       -
           hash = "sha256-fdKw0hNUKhOz/L0/ozkZPP/6z+C4i3UIGM2lX3/szr4=";

     

       17
       17
       +
           hash = "sha256-ey3Qbwg036OzWYfw/0lso3CentUXGF0/NB/w3ss3Dp0=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [

+3 -3

pkgs/by-name/wa/wasm-tools/package.nix

···

       6
       6
        
       

     

       7
       7
        
       rustPlatform.buildRustPackage rec {

     

       8
       8
        
         pname = "wasm-tools";

     

       9
       9
       -
         version = "1.236.0";

     

       9
       9
       +
         version = "1.236.1";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "bytecodealliance";

     

       13
       13
        
           repo = "wasm-tools";

     

       14
       14
        
           tag = "v${version}";

     

       15
       15
       -
           hash = "sha256-gw5LIfbrJojsK7g8sMLBGXKJbME8MMtLm1ytVR1Zbmo=";

     

       15
       15
       +
           hash = "sha256-kg8I74i5MlsrmFGeHMFDs+FyuCNqNwj8buJE/apRMkg=";

     

       16
       16
        
           fetchSubmodules = true;

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.

     

       20
       20
        
         auditable = false;

     

       21
       21
        
       

     

       22
       22
       -
         cargoHash = "sha256-/ixFvNTh1loXd3CPzNzGMGDbQPnGUtp/XaoK/7dW48Q=";

     

       22
       22
       +
         cargoHash = "sha256-5QUYWhWfmvvmHxlpPNT3nQmRb2D17XGkcHTzwvdjh6g=";

     

       23
       23
        
         cargoBuildFlags = [

     

       24
       24
        
           "--package"

     

       25
       25
        
           "wasm-tools"

+2 -2

pkgs/by-name/xd/xdp-tools/package.nix

···

       16
       16
        
       }:

     

       17
       17
        
       stdenv.mkDerivation rec {

     

       18
       18
        
         pname = "xdp-tools";

     

       19
       19
       -
         version = "1.5.5";

     

       19
       19
       +
         version = "1.5.6";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchFromGitHub {

     

       22
       22
        
           owner = "xdp-project";

     

       23
       23
        
           repo = "xdp-tools";

     

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

     

       25
       25
       -
           hash = "sha256-dK+ZpD1wv20iU51dsMUiW/Z9jojuwC8P3rrjU3LEB1Y=";

     

       25
       25
       +
           hash = "sha256-ztIatDNp0RXUpNsSoNWGj/kHNsCOlI6mqZvaQdlGbtQ=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         outputs = [

-8

pkgs/development/compilers/llvm/default.nix

···

       5
       5
        
         buildPackages,

     

       6
       6
        
         targetPackages,

     

       7
       7
        
         stdenv,

     

       8
       8
       -
         gcc12Stdenv,

     

       9
       8
        
         pkgs,

     

       10
       9
        
         recurseIntoAttrs,

     

       11
       10
        
         # This is the default binutils, but with *this* version of LLD rather

     
···

       81
       80
        
                     ;

     

       82
       81
        
                 }

     

       83
       82
        
                 // packageSetArgs # Allow overrides.

     

       84
       84
       -
                 // {

     

       85
       85
       -
                   stdenv =

     

       86
       86
       -
                     if (lib.versions.major release_version == "13" && stdenv.cc.cc.isGNU or false) then

     

       87
       87
       -
                       gcc12Stdenv

     

       88
       88
       -
                     else

     

       89
       89
       -
                       stdenv; # does not build with gcc13

     

       90
       90
       -
                 }

     

       91
       83
        
               )

     

       92
       84
        
             )

     

       93
       85
        
           );

+4 -7

pkgs/development/interpreters/falcon/default.nix

···

       11
       11
        
       

     

       12
       12
        
       stdenv.mkDerivation {

     

       13
       13
        
         pname = "falcon";

     

       14
       14
       -
         version = "unstable-2018-10-23";

     

       14
       14
       +
         version = "0-unstable-2023-11-19";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "falconpl";

     

       18
       18
        
           repo = "falcon";

     

       19
       19
       -
           rev = "637e2d5cd950a874496042993c02ab7d17c1b688";

     

       20
       20
       -
           sha256 = "iCyvvZJjXb1CR396EJ6GiP6d4e7iAc6QQlAOQoAfehg=";

     

       19
       19
       +
           rev = "fc403c6e8c1f3d8c2a5a6ebce5db6f1b3e355808";

     

       20
       20
       +
           hash = "sha256-0yLhwDVFNbfiW23hNxrvItCCkyaOvEbFSg1ZQuJvhIs=";

     

       21
       21
        
         };

     

       22
       22
       -
       

     

       23
       23
       -
         # -Wnarrowing is enabled by default in recent GCC versions,

     

       24
       24
       -
         # causing compilation to fail.

     

       25
       25
       -
         env.NIX_CFLAGS_COMPILE = "-Wno-narrowing";

     

       26
       22
        
       

     

       27
       23
        
         nativeBuildInputs = [

     

       28
       24
        
           cmake

     
···

       39
       35
        
           license = licenses.gpl2Only;

     

       40
       36
        
           maintainers = with maintainers; [ pSub ];

     

       41
       37
        
           platforms = with platforms; unix;

     

       38
       38
       +
           broken = stdenv.cc.isClang;

     

       42
       39
        
         };

     

       43
       40
        
       }

+1 -1

pkgs/development/lua-modules/overrides.nix

···

       453
       453
        
           luarocksConfig = lib.recursiveUpdate oa.luarocksConfig {

     

       454
       454
        
             variables = {

     

       455
       455
        
               MYSQL_INCDIR = "${lib.getDev libmysqlclient}/include/";

     

       456
       456
       -
               MYSQL_LIBDIR = "${lib.getLib libmysqlclient}/lib/";

     

       456
       456
       +
               MYSQL_LIBDIR = "${lib.getLib libmysqlclient}/lib//mysql/";

     

       457
       457
        
             };

     

       458
       458
        
           };

     

       459
       459
        
           buildInputs = oa.buildInputs ++ [

+2 -2

pkgs/development/python-modules/ingredient-parser-nlp/default.nix

···

       15
       15
        
       }:

     

       16
       16
        
       buildPythonPackage rec {

     

       17
       17
        
         pname = "ingredient-parser-nlp";

     

       18
       18
       -
         version = "2.1.1";

     

       18
       18
       +
         version = "2.2.0";

     

       19
       19
        
         pyproject = true;

     

       20
       20
        
       

     

       21
       21
        
         src = fetchFromGitHub {

     

       22
       22
        
           owner = "strangetom";

     

       23
       23
        
           repo = "ingredient-parser";

     

       24
       24
        
           tag = version;

     

       25
       25
       -
           hash = "sha256-rmCM3KmsCGrKX5AvfIinkL689+miXII9meGAYQxSqEk=";

     

       25
       25
       +
           hash = "sha256-vv7sNRG2GH1uYy1UMpIx6yGLMIFrFN+dggpoqzhRFRg=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         build-system = [ setuptools ];

+2 -2

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

···

       38
       38
        
       

     

       39
       39
        
       buildPythonPackage rec {

     

       40
       40
        
         pname = "plotly";

     

       41
       41
       -
         version = "6.2.0";

     

       41
       41
       +
         version = "6.3.0";

     

       42
       42
        
         pyproject = true;

     

       43
       43
        
       

     

       44
       44
        
         src = fetchFromGitHub {

     

       45
       45
        
           owner = "plotly";

     

       46
       46
        
           repo = "plotly.py";

     

       47
       47
        
           tag = "v${version}";

     

       48
       48
       -
           hash = "sha256-Vfj5jG0AkBjivExOx7oMoocTopWl0yMc1INpEbtlgTc=";

     

       48
       48
       +
           hash = "sha256-s+kWJy/dOqlNqRD/Ytxy/SSRsFJvp13jSvPMd0LQliQ=";

     

       49
       49
        
         };

     

       50
       50
        
       

     

       51
       51
        
         postPatch = ''

+2 -2

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

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "xmpppy";

     

       12
       12
       -
         version = "0.7.1";

     

       12
       12
       +
         version = "0.7.2";

     

       13
       13
        
         pyproject = true;

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "xmpppy";

     

       17
       17
        
           repo = "xmpppy";

     

       18
       18
        
           tag = version;

     

       19
       19
       -
           hash = "sha256-SnzIjEWSCdiCtD8bmPTH02JprmZhrABB4HCqtt2RBuk=";

     

       19
       19
       +
           hash = "sha256-lemHFPb1oQGL3O5lHOBsyEqTAzKmZ0khBHL73gXh8PA=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         dependencies = [ six ];

+76 -64

pkgs/development/tools/analysis/radare2/default.nix

···

       3
       3
        
         stdenv,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
        
         buildPackages,

     

       6
       6
       -
         pkg-config,

     

       6
       6
       +
         capstone,

     

       7
       7
       +
         file,

     

       8
       8
       +
         gtk2,

     

       9
       9
       +
         gtkdialog,

     

       10
       10
       +
         libewf,

     

       11
       11
       +
         libusb-compat-0_1,

     

       12
       12
       +
         libuv,

     

       13
       13
       +
         libzip,

     

       14
       14
       +
         lua,

     

       15
       15
       +
         lz4,

     

       7
       16
        
         meson,

     

       8
       17
        
         ninja,

     

       9
       9
       -
         libusb-compat-0_1,

     

       10
       10
       -
         readline,

     

       11
       11
       -
         libewf,

     

       18
       18
       +
         openssl,

     

       12
       19
        
         perl,

     

       13
       13
       -
         zlib,

     

       14
       14
       -
         openssl,

     

       15
       15
       -
         libuv,

     

       16
       16
       -
         file,

     

       17
       17
       -
         libzip,

     

       18
       18
       -
         xxHash,

     

       19
       19
       -
         gtk2,

     

       20
       20
       -
         vte,

     

       21
       21
       -
         gtkdialog,

     

       20
       20
       +
         pkg-config,

     

       22
       21
        
         python3,

     

       22
       22
       +
         readline,

     

       23
       23
        
         ruby,

     

       24
       24
       -
         lua,

     

       25
       25
       -
         lz4,

     

       26
       26
       -
         capstone,

     

       24
       24
       +
         vte,

     

       25
       25
       +
         xxHash,

     

       26
       26
       +
         zlib,

     

       27
       27
        
         useX11 ? false,

     

       28
       28
        
         rubyBindings ? false,

     

       29
       29
        
         luaBindings ? false,

     

       30
       30
        
       }:

     

       31
       31
       -
       

     

       32
       31
        
       let

     

       33
       33
       -
         # NOTE: Check these revision changes when updating the package.

     

       34
       34
       -
         # https://github.com/radareorg/radare2/blob/master/libr/arch/p/arm/v35/Makefile#L25-L26

     

       35
       35
       -
         arm64 = fetchFromGitHub {

     

       36
       36
       -
           owner = "radareorg";

     

       37
       37
       -
           repo = "vector35-arch-arm64";

     

       38
       38
       -
           rev = "55d73c6bbb94448a5c615933179e73ac618cf876";

     

       39
       39
       -
           hash = "sha256-pZxxp5xDg8mgkGEx7LaBSoKxNPyggFYA4um9YaO20LU=";

     

       32
       32
       +
         binaryninja = fetchFromGitHub {

     

       33
       33
       +
           owner = "Vector35";

     

       34
       34
       +
           repo = "binaryninja-api";

     

       35
       35
       +
           rev = "c40a5f04deec68d388b2072dc42b29141089f9ce"; # https://github.com/radareorg/radare2/blob/master/subprojects/binaryninja.wrap

     

       36
       36
       +
           hash = "sha256-IfuGgwVI51urQxhaYkYsE45NkScgxKmmEBV6Pllhwmo=";

     

       40
       37
        
         };

     

       41
       41
       -
         armv7 = fetchFromGitHub {

     

       42
       42
       -
           owner = "radareorg";

     

       43
       43
       -
           repo = "vector35-arch-armv7";

     

       44
       44
       -
           rev = "f270a6cc99644cb8e76055b6fa632b25abd26024";

     

       45
       45
       -
           hash = "sha256-YhfgJ7M8ys53jh1clOzj0I2yfJshXQm5zP0L9kMYsmk=";

     

       38
       38
       +
       

     

       39
       39
       +
         sdb = fetchFromGitHub {

     

       40
       40
       +
           owner = "radare";

     

       41
       41
       +
           repo = "sdb";

     

       42
       42
       +
           tag = "2.2.0"; # https://github.com/radareorg/radare2/blob/master/subprojects/sdb.wrap

     

       43
       43
       +
           hash = "sha256-S/aL3F6+Z/rqelfIJaZaBF1IxSmhA1qE9ahFvKARoaE=";

     

       44
       44
       +
         };

     

       45
       45
       +
       

     

       46
       46
       +
         qjs = fetchFromGitHub {

     

       47
       47
       +
           owner = "quickjs-ng";

     

       48
       48
       +
           repo = "quickjs";

     

       49
       49
       +
           rev = "7238ee64dbc2fbdea044555cda8cda78785a93ed"; # https://github.com/radareorg/radare2/blob/master/subprojects/qjs.wrap

     

       50
       50
       +
           hash = "sha256-1ZeLCTmbrlRrZB9El3L497gt3QUA5GIScrFVIBkxA88=";

     

       46
       51
        
         };

     

       47
       52
        
       in

     

       48
       53
        
       stdenv.mkDerivation (finalAttrs: {

     

       49
       54
        
         pname = "radare2";

     

       50
       50
       -
         version = "5.9.8";

     

       55
       55
       +
         version = "6.0.2";

     

       51
       56
        
       

     

       52
       57
        
         src = fetchFromGitHub {

     

       53
       58
        
           owner = "radare";

     

       54
       59
        
           repo = "radare2";

     

       55
       60
        
           tag = finalAttrs.version;

     

       56
       56
       -
           hash = "sha256-XSnv0yWEPlXHUPjf1Qu50AN3Gvgr0o6Q4e0dOyRdO9A=";

     

       61
       61
       +
           hash = "sha256-uCMf+pNqyjRLeNJlE8Kk6PQCIRBjidO/XGHeNV/F1lA=";

     

       57
       62
        
         };

     

       58
       63
        
       

     

       59
       59
       -
         preBuild = ''

     

       60
       60
       -
           pushd ../libr/arch/p/arm/v35

     

       61
       61
       -
           cp -r ${arm64} arch-arm64

     

       62
       62
       -
           chmod -R +w arch-arm64

     

       63
       63
       -
       

     

       64
       64
       -
           cp -r ${armv7} arch-armv7

     

       65
       65
       -
           chmod -R +w arch-armv7

     

       66
       66
       -
           popd

     

       67
       67
       -
         '';

     

       68
       68
       -
       

     

       69
       69
       -
         postFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''

     

       70
       70
       -
           install_name_tool -add_rpath $out/lib $out/lib/libr_io.${finalAttrs.version}.dylib

     

       71
       71
       -
         '';

     

       72
       72
       -
       

     

       73
       64
        
         mesonFlags = [

     

       74
       74
       -
           "-Dr2_gittap=${finalAttrs.version}"

     

       75
       75
       -
           "-Duse_sys_capstone=true"

     

       76
       76
       -
           "-Duse_sys_lz4=true"

     

       77
       77
       -
           "-Duse_sys_magic=true"

     

       78
       78
       -
           "-Duse_sys_openssl=true"

     

       79
       79
       -
           "-Duse_sys_xxhash=true"

     

       80
       80
       -
           "-Duse_sys_zip=true"

     

       81
       81
       -
           "-Duse_sys_zlib=true"

     

       65
       65
       +
           (lib.mesonOption "use_sys_capstone" "true")

     

       66
       66
       +
           (lib.mesonOption "use_sys_lz4" "true")

     

       67
       67
       +
           (lib.mesonOption "use_sys_magic" "true")

     

       68
       68
       +
           (lib.mesonOption "use_sys_openssl" "true")

     

       69
       69
       +
           (lib.mesonOption "use_sys_xxhash" "true")

     

       70
       70
       +
           (lib.mesonOption "use_sys_zip" "true")

     

       71
       71
       +
           (lib.mesonOption "use_sys_zlib" "true")

     

       72
       72
       +
           (lib.mesonOption "r2_gittap" finalAttrs.version)

     

       82
       73
        
         ];

     

       83
       74
        
       

     

       84
       75
        
         enableParallelBuilding = true;

     
···

       97
       88
        
         buildInputs = [

     

       98
       89
        
           capstone

     

       99
       90
        
           file

     

       100
       100
       -
           readline

     

       101
       101
       -
           libusb-compat-0_1

     

       102
       91
        
           libewf

     

       103
       103
       -
           perl

     

       104
       104
       -
           zlib

     

       105
       105
       -
           openssl

     

       92
       92
       +
           libusb-compat-0_1

     

       106
       93
        
           libuv

     

       107
       94
        
           lz4

     

       95
       95
       +
           openssl

     

       96
       96
       +
           perl

     

       97
       97
       +
           readline

     

       98
       98
       +
           zlib

     

       108
       99
        
         ]

     

       109
       100
        
         ++ lib.optionals useX11 [

     

       110
       101
        
           gtkdialog

     
···

       121
       112
        
           xxHash

     

       122
       113
        
         ];

     

       123
       114
        
       

     

       124
       124
       -
         meta = with lib; {

     

       115
       115
       +
         postUnpack = ''

     

       116
       116
       +
           pushd $sourceRoot/subprojects

     

       117
       117
       +
       

     

       118
       118
       +
           cp -r ${binaryninja} binaryninja

     

       119
       119
       +
           chmod -R +w binaryninja

     

       120
       120
       +
           cp packagefiles/binaryninja/meson.build binaryninja

     

       121
       121
       +
       

     

       122
       122
       +
           cp -r ${sdb} sdb

     

       123
       123
       +
           chmod -R +w sdb

     

       124
       124
       +
       

     

       125
       125
       +
           cp -r ${qjs} qjs

     

       126
       126
       +
           chmod -R +w qjs

     

       127
       127
       +
           cp packagefiles/qjs/meson.build qjs

     

       128
       128
       +
       

     

       129
       129
       +
           popd

     

       130
       130
       +
         '';

     

       131
       131
       +
       

     

       132
       132
       +
         postFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''

     

       133
       133
       +
           install_name_tool -add_rpath $out/lib $out/lib/libr_io.${finalAttrs.version}.dylib

     

       134
       134
       +
         '';

     

       135
       135
       +
       

     

       136
       136
       +
         meta = {

     

       125
       137
        
           description = "UNIX-like reverse engineering framework and command-line toolset";

     

       126
       138
        
           longDescription = ''

     

       127
       139
        
             r2 is a complete rewrite of radare. It provides a set of libraries, tools

     
···

       140
       152
        
           '';

     

       141
       153
        
           homepage = "https://radare.org";

     

       142
       154
        
           changelog = "https://github.com/radareorg/radare2/releases/tag/${finalAttrs.version}";

     

       143
       143
       -
           license = with licenses; [

     

       155
       155
       +
           license = with lib.licenses; [

     

       144
       156
        
             gpl3Only

     

       145
       157
        
             lgpl3Only

     

       146
       158
        
           ];

     

       147
       147
       -
           maintainers = with maintainers; [

     

       159
       159
       +
           maintainers = with lib.maintainers; [

     

       160
       160
       +
             arkivm

     

       148
       161
        
             azahi

     

       149
       149
       -
             raskin

     

       150
       162
        
             makefu

     

       151
       163
        
             mic92

     

       152
       152
       -
             arkivm

     

       164
       164
       +
             raskin

     

       153
       165
        
           ];

     

       154
       166
        
           mainProgram = "radare2";

     

       155
       155
       -
           platforms = platforms.unix;

     

       167
       167
       +
           platforms = lib.platforms.unix;

     

       156
       168
        
         };

     

       157
       169
        
       })

+2 -2

pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix

···

       9
       9
        
       buildHomeAssistantComponent rec {

     

       10
       10
        
         owner = "AlexxIT";

     

       11
       11
        
         domain = "xiaomi_gateway3";

     

       12
       12
       -
         version = "4.0.8";

     

       12
       12
       +
         version = "4.1.0";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "AlexxIT";

     

       16
       16
        
           repo = "XiaomiGateway3";

     

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

     

       18
       18
       -
           hash = "sha256-VvuvOUldhmROTs1+YbCT7++VJ71GgGKRbHjqZxQQY0w=";

     

       18
       18
       +
           hash = "sha256-fpMrp8iVO1Gmj0c80qRr3yfdZ3fl+DOiEi1vF1GZwXU=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         dependencies = [ zigpy ];

pkgs/servers/home-assistant/default.nix

···

       553
       553
        
       

     

       554
       554
        
         preCheck = ''

     

       555
       555
        
           export HOME="$TEMPDIR"

     

       556
       556
       +
           export PYTHONASYNCIODEBUG=1

     

       556
       557
        
       

     

       557
       558
        
           # the tests require the existance of a media dir

     

       558
       559
        
           mkdir "$NIX_BUILD_TOP"/media

+2 -2

pkgs/tools/security/iaito/default.nix

···

       14
       14
        
       

     

       15
       15
        
       let

     

       16
       16
        
         pname = "iaito";

     

       17
       17
       -
         version = "5.9.9";

     

       17
       17
       +
         version = "6.0.0";

     

       18
       18
        
       

     

       19
       19
        
         main_src = fetchFromGitHub rec {

     

       20
       20
        
           owner = "radareorg";

     

       21
       21
        
           repo = pname;

     

       22
       22
        
           tag = version;

     

       23
       23
       -
           hash = "sha256-y8Mfd7BmnMFJ9mpGKVL3i4VRxrzJ1gXaSsUQIFB9Wd4=";

     

       23
       23
       +
           hash = "sha256-bwGKHc2jlf1C/25CEoDUCLr6zOhAJES7+PvcGVyO8To=";

     

       24
       24
        
           name = repo;

     

       25
       25
        
         };

     

       26
       26

+52 -19

pkgs/tools/system/netdata/default.nix

···

       47
       47
        
         withDBengine ? true,

     

       48
       48
        
         withDebug ? false,

     

       49
       49
        
         withEbpf ? false,

     

       50
       50
       -
         withIpmi ? (stdenv.hostPlatform.isLinux),

     

       50
       50
       +
         withIpmi ? stdenv.hostPlatform.isLinux,

     

       51
       51
        
         withLibbacktrace ? true,

     

       52
       52
       +
         withML ? true,

     

       52
       53
        
         withNdsudo ? false,

     

       53
       53
       -
         withNetfilter ? (stdenv.hostPlatform.isLinux),

     

       54
       54
       -
         withNetworkViewer ? (stdenv.hostPlatform.isLinux),

     

       54
       54
       +
         withNetfilter ? stdenv.hostPlatform.isLinux,

     

       55
       55
       +
         withNetworkViewer ? stdenv.hostPlatform.isLinux,

     

       55
       56
        
         withSsl ? true,

     

       56
       56
       -
         withSystemdJournal ? (stdenv.hostPlatform.isLinux),

     

       57
       57
       -
         withML ? true,

     

       57
       57
       +
         withSystemdJournal ? stdenv.hostPlatform.isLinux,

     

       58
       58
       +
         withSystemdUnits ? stdenv.hostPlatform.isLinux,

     

       58
       59
        
       }:

     

       59
       60
        
       stdenv.mkDerivation (finalAttrs: {

     

       60
       60
       -
         version = "2.5.3";

     

       61
       61
       +
         version = "2.6.2";

     

       61
       62
        
         pname = "netdata";

     

       62
       63
        
       

     

       63
       64
        
         src = fetchFromGitHub {

     

       64
       65
        
           owner = "netdata";

     

       65
       66
        
           repo = "netdata";

     

       66
       67
        
           rev = "v${finalAttrs.version}";

     

       67
       67
       -
           hash = "sha256-OdH6cQ2dYvbeLh9ljaqmdr02VN2qbvNUXbPNCEkNzxc=";

     

       68
       68
       +
           hash = "sha256-XtU+oGynAnpwWTinwXVjtRYsTwIyAhkiRqY9CaOo7B0=";

     

       68
       69
        
           fetchSubmodules = true;

     

       69
       70
        
         };

     

       70
       71
        
       

     
···

       119
       120
        
           libnetfilter_acct

     

       120
       121
        
         ]

     

       121
       122
        
         ++ lib.optionals withSsl [ openssl ]

     

       122
       122
       -
         ++ lib.optionals withSystemdJournal [ systemd ];

     

       123
       123
       +
         ++ lib.optionals withSystemdJournal [ systemd ]

     

       124
       124
       +
         ++ lib.optionals withSystemdUnits [ systemd ];

     

       123
       125
        
       

     

       124
       126
        
         patches = [

     

       125
       127
        
           # Allow ndsudo to use non-hardcoded `PATH`

     
···

       166
       168
        
              $out/libexec/netdata/plugins.d/slabinfo.plugin.org

     

       167
       169
        
           mv $out/libexec/netdata/plugins.d/debugfs.plugin \

     

       168
       170
        
              $out/libexec/netdata/plugins.d/debugfs.plugin.org

     

       169
       169
       -
           ${lib.optionalString withSystemdJournal ''

     

       170
       170
       -
             mv $out/libexec/netdata/plugins.d/systemd-journal.plugin \

     

       171
       171
       -
                $out/libexec/netdata/plugins.d/systemd-journal.plugin.org

     

       172
       172
       -
           ''}

     

       173
       171
        
           ${lib.optionalString withIpmi ''

     

       174
       172
        
             mv $out/libexec/netdata/plugins.d/freeipmi.plugin \

     

       175
       173
        
                $out/libexec/netdata/plugins.d/freeipmi.plugin.org

     

       176
       174
        
           ''}

     

       177
       177
       -
           ${lib.optionalString withNetworkViewer ''

     

       178
       178
       -
             mv $out/libexec/netdata/plugins.d/network-viewer.plugin \

     

       179
       179
       -
                $out/libexec/netdata/plugins.d/network-viewer.plugin.org

     

       180
       180
       -
           ''}

     

       181
       175
        
           ${lib.optionalString withNdsudo ''

     

       182
       176
        
             mv $out/libexec/netdata/plugins.d/ndsudo \

     

       183
       177
        
               $out/libexec/netdata/plugins.d/ndsudo.org

     

       184
       178
        
       

     

       185
       179
        
             ln -s /var/lib/netdata/ndsudo/ndsudo $out/libexec/netdata/plugins.d/ndsudo

     

       186
       180
        
           ''}

     

       181
       181
       +
           ${lib.optionalString withNetworkViewer ''

     

       182
       182
       +
             mv $out/libexec/netdata/plugins.d/network-viewer.plugin \

     

       183
       183
       +
                 $out/libexec/netdata/plugins.d/network-viewer.plugin.org

     

       184
       184
       +
           ''}

     

       185
       185
       +
           ${lib.optionalString withSystemdJournal ''

     

       186
       186
       +
             mv $out/libexec/netdata/plugins.d/systemd-journal.plugin \

     

       187
       187
       +
                 $out/libexec/netdata/plugins.d/systemd-journal.plugin.org

     

       188
       188
       +
           ''}

     

       189
       189
       +
           ${lib.optionalString withSystemdUnits ''

     

       190
       190
       +
             mv $out/libexec/netdata/plugins.d/systemd-units.plugin \

     

       191
       191
       +
                 $out/libexec/netdata/plugins.d/systemd-units.plugin.org

     

       192
       192
       +
           ''}

     

       187
       193
        
         '';

     

       188
       194
        
       

     

       189
       195
        
         preConfigure = ''

     
···

       194
       200
        
           substituteInPlace packaging/cmake/Modules/NetdataGoTools.cmake \

     

       195
       201
        
             --replace-fail \

     

       196
       202
        
               'GOPROXY=https://proxy.golang.org' \

     

       197
       197
       -
               'GOPROXY=file://${finalAttrs.passthru.netdata-go-modules}'

     

       203
       203
       +
               'GOPROXY=file://${finalAttrs.passthru.netdata-go-modules},file://${finalAttrs.passthru.nd-mcp}'

     

       198
       204
        
       

     

       199
       205
        
           # Prevent the path to be caught into the Nix store path.

     

       200
       206
        
           substituteInPlace CMakeLists.txt \

     
···

       222
       228
        
           (lib.cmakeBool "ENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE" withConnPrometheus)

     

       223
       229
        
           (lib.cmakeBool "ENABLE_JEMALLOC" true)

     

       224
       230
        
           (lib.cmakeBool "ENABLE_LIBBACKTRACE" withLibbacktrace)

     

       231
       231
       +
           (lib.cmakeBool "ENABLE_ML" withML)

     

       225
       232
        
           (lib.cmakeBool "ENABLE_PLUGIN_CUPS" withCups)

     

       226
       233
        
           (lib.cmakeBool "ENABLE_PLUGIN_EBPF" withEbpf)

     

       227
       234
        
           (lib.cmakeBool "ENABLE_PLUGIN_FREEIPMI" withIpmi)

     

       228
       235
        
           (lib.cmakeBool "ENABLE_PLUGIN_NETWORK_VIEWER" withNetworkViewer)

     

       229
       236
        
           (lib.cmakeBool "ENABLE_PLUGIN_SYSTEMD_JOURNAL" withSystemdJournal)

     

       237
       237
       +
           (lib.cmakeBool "ENABLE_PLUGIN_SYSTEMD_UNITS" withSystemdUnits)

     

       230
       238
        
           (lib.cmakeBool "ENABLE_PLUGIN_XENSTAT" false)

     

       231
       231
       -
           (lib.cmakeBool "ENABLE_ML" withML)

     

       232
       239
        
           # Suggested by upstream.

     

       233
       240
        
           "-G Ninja"

     

       234
       241
        
         ]

     
···

       252
       259
        
         enableParallelBuilding = true;

     

       253
       260
        
       

     

       254
       261
        
         passthru = rec {

     

       262
       262
       +
           nd-mcp =

     

       263
       263
       +
             (buildGoModule {

     

       264
       264
       +
               pname = "nd-mcp";

     

       265
       265
       +
               version = finalAttrs.version;

     

       266
       266
       +
               inherit (finalAttrs) src;

     

       267
       267
       +
       

     

       268
       268
       +
               sourceRoot = "${finalAttrs.src.name}/src/web/mcp/bridges/stdio-golang";

     

       269
       269
       +
       

     

       270
       270
       +
               vendorHash = "sha256-6JfHrBloJQ5wHyogIPTVDZjlITWZXbsv2m2lMlQmBUY=";

     

       271
       271
       +
       

     

       272
       272
       +
               proxyVendor = true;

     

       273
       273
       +
               doCheck = false;

     

       274
       274
       +
       

     

       275
       275
       +
               subPackages = [ "." ];

     

       276
       276
       +
       

     

       277
       277
       +
               ldflags = [

     

       278
       278
       +
                 "-s"

     

       279
       279
       +
                 "-w"

     

       280
       280
       +
               ];

     

       281
       281
       +
       

     

       282
       282
       +
               meta = {

     

       283
       283
       +
                 description = "Netdata Model Context Protocol (MCP) Integration";

     

       284
       284
       +
                 license = lib.licenses.gpl3Only;

     

       285
       285
       +
               };

     

       286
       286
       +
             }).goModules;

     

       287
       287
       +
       

     

       255
       288
        
           netdata-go-modules =

     

       256
       289
        
             (buildGoModule {

     

       257
       290
        
               pname = "netdata-go-plugins";

     
···

       259
       292
        
       

     

       260
       293
        
               sourceRoot = "${finalAttrs.src.name}/src/go/plugin/go.d";

     

       261
       294
        
       

     

       262
       262
       -
               vendorHash = "sha256-N03IGTtF78PCo4kf0Sdtzv6f8z47ohg8g3YIXtINRjU=";

     

       295
       295
       +
               vendorHash = "sha256-aOFmfBcBjnTfFHfMNemSJHbnMnhBojYrGe21zDxPxME=";

     

       263
       296
        
               doCheck = false;

     

       264
       297
        
               proxyVendor = true;

     

       265
       298

+1 -5

pkgs/tools/typesetting/tex/texlive/default.nix

···

       5
       5
        
       */

     

       6
       6
        
       {

     

       7
       7
        
         lib,

     

       8
       8
       -
         #, stdenv

     

       9
       9
       -
         gcc12Stdenv,

     

       8
       8
       +
         stdenv,

     

       10
       9
        
         fetchpatch,

     

       11
       10
        
         fetchurl,

     

       12
       11
        
         runCommand,

     
···

       45
       44
        
         recurseIntoAttrs,

     

       46
       45
        
         nixfmt,

     

       47
       46
        
       }:

     

       48
       48
       -
       let

     

       49
       49
       -
         stdenv = gcc12Stdenv;

     

       50
       50
       -
       in

     

       51
       47
        
       let

     

       52
       48
        
         # various binaries (compiled)

     

       53
       49
        
         bin = callPackage ./bin.nix {

+3 -23

pkgs/top-level/all-packages.nix

···

       2740
       2740
        
       

     

       2741
       2741
        
         diffutils = callPackage ../tools/text/diffutils { };

     

       2742
       2742
        
       

     

       2743
       2743
       -
         dmd = callPackage ../by-name/dm/dmd/package.nix (

     

       2744
       2744
       -
           {

     

       2745
       2745
       -
           }

     

       2746
       2746
       -
           // lib.optionalAttrs stdenv.hostPlatform.isLinux {

     

       2747
       2747
       -
             # https://github.com/NixOS/nixpkgs/pull/206907#issuecomment-1527034123

     

       2748
       2748
       -
             stdenv = gcc11Stdenv;

     

       2749
       2749
       -
           }

     

       2750
       2750
       -
         );

     

       2751
       2751
       -
       

     

       2752
       2743
        
         dotnetfx35 = callPackage ../development/libraries/dotnetfx35 { };

     

       2753
       2744
        
       

     

       2754
       2745
        
         dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { };

     
···

       5466
       5457
        
         haxePackages = recurseIntoAttrs (callPackage ./haxe-packages.nix { });

     

       5467
       5458
        
         inherit (haxePackages) hxcpp;

     

       5468
       5459
        
       

     

       5469
       5469
       -
         falcon = callPackage ../development/interpreters/falcon {

     

       5470
       5470
       -
           stdenv = gcc10Stdenv;

     

       5471
       5471
       -
         };

     

       5460
       5460
       +
         falcon = callPackage ../development/interpreters/falcon { };

     

       5472
       5461
        
       

     

       5473
       5462
        
         dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix { });

     

       5474
       5463
        
       

     
···

       6796
       6785
        
           inherit (darwin) sigtool;

     

       6797
       6786
        
           buildJdk = jdk11_headless;

     

       6798
       6787
        
           runJdk = jdk11_headless;

     

       6799
       6799
       -
           stdenv =

     

       6800
       6800
       -
             if stdenv.cc.isClang then

     

       6801
       6801
       -
               llvmPackages_17.stdenv

     

       6802
       6802
       -
             else if stdenv.cc.isGNU then

     

       6803
       6803
       -
               gcc12Stdenv

     

       6804
       6804
       -
             else

     

       6805
       6805
       -
               stdenv;

     

       6788
       6788
       +
           stdenv = if stdenv.cc.isClang then llvmPackages_17.stdenv else stdenv;

     

       6806
       6789
        
           bazel_self = bazel_6;

     

       6807
       6790
        
         };

     

       6808
       6791
        
       

     
···

       10006
       9989
        
       

     

       10007
       9990
        
         diod = callPackage ../servers/diod { lua = lua5_1; };

     

       10008
       9991
        
       

     

       10009
       10009
       -
         directx-shader-compiler = callPackage ../tools/graphics/directx-shader-compiler {

     

       10010
       10010
       -
           # https://github.com/NixOS/nixpkgs/issues/216294

     

       10011
       10011
       -
           stdenv = if stdenv.cc.isGNU && stdenv.hostPlatform.isi686 then gcc11Stdenv else stdenv;

     

       10012
       10012
       -
         };

     

       9992
       9992
       +
         directx-shader-compiler = callPackage ../tools/graphics/directx-shader-compiler { };

     

       10013
       9993
        
       

     

       10014
       9994
        
         dodgy = with python3Packages; toPythonApplication dodgy;

     

       10015
       9995

+1 -1

pkgs/top-level/python-packages.nix

···

       7241
       7241
        
             enablePython = true;

     

       7242
       7242
        
             enableRtk = false;

     

       7243
       7243
        
             stdenv =

     

       7244
       7244
       -
               if stdenv.cc.isGNU then pkgs.stdenvAdapters.useLibsFrom stdenv pkgs.gcc12Stdenv else stdenv;

     

       7244
       7244
       +
               if stdenv.cc.isGNU then pkgs.stdenvAdapters.useLibsFrom stdenv pkgs.gcc13Stdenv else stdenv;

     

       7245
       7245
        
           }

     

       7246
       7246
        
         );

     

       7247
       7247