commit e2839320bbd82060bcb040d543d96c2b2d70d0c5 · pyrox.dev/nixpkgs

-1

nixos/modules/services/monitoring/parsedmarc.md

···

       17
       17
        
           host = "imap.example.com";

     

       18
       18
        
           user = "alice@example.com";

     

       19
       19
        
           password = "/path/to/imap_password_file";

     

       20
       20
       -
           watch = true;

     

       21
       20
        
         };

     

       22
       21
        
         provision.geoIp = false; # Not recommended!

     

       23
       22
        
       };

+30 -16

nixos/modules/services/monitoring/parsedmarc.nix

···

       123
       123
        
                   host = "imap.example.com";

     

       124
       124
        
                   user = "alice@example.com";

     

       125
       125
        
                   password = { _secret = "/run/keys/imap_password" };

     

       126
       126
       +
                 };

     

       127
       127
       +
                 mailbox = {

     

       126
       128
        
                   watch = true;

     

       129
       129
       +
                   batch_size = 30;

     

       127
       130
        
                 };

     

       128
       131
        
                 splunk_hec = {

     

       129
       132
        
                   url = "https://splunkhec.example.com";

     
···

       170
       173
        
                   };

     

       171
       174
        
                 };

     

       172
       175
        
       

     

       176
       176
       +
                 mailbox = {

     

       177
       177
       +
                   watch = lib.mkOption {

     

       178
       178
       +
                     type = lib.types.bool;

     

       179
       179
       +
                     default = true;

     

       180
       180
       +
                     description = lib.mdDoc ''

     

       181
       181
       +
                       Use the IMAP IDLE command to process messages as they arrive.

     

       182
       182
       +
                     '';

     

       183
       183
       +
                   };

     

       184
       184
       +
       

     

       185
       185
       +
                   delete = lib.mkOption {

     

       186
       186
       +
                     type = lib.types.bool;

     

       187
       187
       +
                     default = false;

     

       188
       188
       +
                     description = lib.mdDoc ''

     

       189
       189
       +
                       Delete messages after processing them, instead of archiving them.

     

       190
       190
       +
                     '';

     

       191
       191
       +
                   };

     

       192
       192
       +
                 };

     

       193
       193
       +
       

     

       173
       194
        
                 imap = {

     

       174
       195
        
                   host = lib.mkOption {

     

       175
       196
        
                     type = lib.types.str;

     
···

       216
       237
        
                     '';

     

       217
       238
        
                     apply = x: if isAttrs x || x == null then x else { _secret = x; };

     

       218
       239
        
                   };

     

       219
       219
       -
       

     

       220
       220
       -
                   watch = lib.mkOption {

     

       221
       221
       -
                     type = lib.types.bool;

     

       222
       222
       -
                     default = true;

     

       223
       223
       -
                     description = lib.mdDoc ''

     

       224
       224
       -
                       Use the IMAP IDLE command to process messages as they arrive.

     

       225
       225
       -
                     '';

     

       226
       226
       -
                   };

     

       227
       227
       -
       

     

       228
       228
       -
                   delete = lib.mkOption {

     

       229
       229
       -
                     type = lib.types.bool;

     

       230
       230
       -
                     default = false;

     

       231
       231
       -
                     description = lib.mdDoc ''

     

       232
       232
       -
                       Delete messages after processing them, instead of archiving them.

     

       233
       233
       -
                     '';

     

       234
       234
       -
                   };

     

       235
       240
        
                 };

     

       236
       241
        
       

     

       237
       242
        
                 smtp = {

     
···

       360
       365
        
       

     

       361
       366
        
         config = lib.mkIf cfg.enable {

     

       362
       367
        
       

     

       368
       368
       +
           warnings = let

     

       369
       369
       +
             deprecationWarning = optname: "Starting in 8.0.0, the `${optname}` option has been moved from the `services.parsedmarc.settings.imap`"

     

       370
       370
       +
               + "configuration section to the `services.parsedmarc.settings.mailbox` configuration section.";

     

       371
       371
       +
             hasImapOpt = lib.flip builtins.hasAttr cfg.settings.imap;

     

       372
       372
       +
             movedOptions = [ "reports_folder" "archive_folder" "watch" "delete" "test" "batch_size" ];

     

       373
       373
       +
           in builtins.map deprecationWarning (builtins.filter hasImapOpt movedOptions);

     

       374
       374
       +
       

     

       363
       375
        
           services.elasticsearch.enable = lib.mkDefault cfg.provision.elasticsearch;

     

       364
       376
        
       

     

       365
       377
        
           services.geoipupdate = lib.mkIf cfg.provision.geoIp {

     
···

       444
       456
        
                 ssl = false;

     

       445
       457
        
                 user = cfg.provision.localMail.recipientName;

     

       446
       458
        
                 password = "${pkgs.writeText "imap-password" "@imap-password@"}";

     

       459
       459
       +
               };

     

       460
       460
       +
               mailbox = {

     

       447
       461
        
                 watch = true;

     

       448
       462
        
               };

     

       449
       463
        
             })

+3 -4

nixos/modules/services/monitoring/parsedmarc.xml

···

       15
       15
        
             email address and saves them to a local Elasticsearch instance

     

       16
       16
        
             looks like this:

     

       17
       17
        
           </para>

     

       18
       18
       -
           <programlisting language="bash">

     

       18
       18
       +
           <programlisting>

     

       19
       19
        
       services.parsedmarc = {

     

       20
       20
        
         enable = true;

     

       21
       21
        
         settings.imap = {

     

       22
       22
        
           host = &quot;imap.example.com&quot;;

     

       23
       23
        
           user = &quot;alice@example.com&quot;;

     

       24
       24
        
           password = &quot;/path/to/imap_password_file&quot;;

     

       25
       25
       -
           watch = true;

     

       26
       25
        
         };

     

       27
       26
        
         provision.geoIp = false; # Not recommended!

     

       28
       27
        
       };

     
···

       45
       44
        
             email address that should be configured in the domain’s dmarc

     

       46
       45
        
             policy is <literal>dmarc@monitoring.example.com</literal>.

     

       47
       46
        
           </para>

     

       48
       48
       -
           <programlisting language="bash">

     

       47
       47
       +
           <programlisting>

     

       49
       48
        
       services.parsedmarc = {

     

       50
       49
        
         enable = true;

     

       51
       50
        
         provision = {

     
···

       68
       67
        
             Elasticsearch instance is automatically added as a Grafana

     

       69
       68
        
             datasource, and the dashboard is added to Grafana as well.

     

       70
       69
        
           </para>

     

       71
       71
       -
           <programlisting language="bash">

     

       70
       70
       +
           <programlisting>

     

       72
       71
        
       services.parsedmarc = {

     

       73
       72
        
         enable = true;

     

       74
       73
        
         provision = {

-1

nixos/tests/parsedmarc/default.nix

···

       155
       155
        
                         ssl = true;

     

       156
       156
        
                         user = "alice";

     

       157
       157
        
                         password = "${pkgs.writeText "imap-password" "foobar"}";

     

       158
       158
       -
                         watch = true;

     

       159
       158
        
                       };

     

       160
       159
        
                     };

     

       161
       160

+2 -2

pkgs/applications/audio/ocenaudio/default.nix

···

       11
       11
        
       

     

       12
       12
        
       stdenv.mkDerivation rec {

     

       13
       13
        
         pname = "ocenaudio";

     

       14
       14
       -
         version = "3.11.20";

     

       14
       14
       +
         version = "3.11.21";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchurl {

     

       17
       17
        
           url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}";

     

       18
       18
       -
           sha256 = "sha256-ifzth9qd2YX9WeF6QeXSWkMqRyTGBxPyTm5tkanPiFQ=";

     

       18
       18
       +
           sha256 = "sha256-nItqx3g4W3s1phHe6F8EtOL4nwJQ0XnKB8Ujg71/Q3Q=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [

+2 -2

pkgs/applications/audio/rosegarden/default.nix

···

       23
       23
        
       

     

       24
       24
        
       stdenv.mkDerivation rec {

     

       25
       25
        
         pname = "rosegarden";

     

       26
       26
       -
         version = "20.12";

     

       26
       26
       +
         version = "22.12.1";

     

       27
       27
        
       

     

       28
       28
        
         src = fetchurl {

     

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

     

       30
       30
       -
           sha256 = "sha256-iGaEr8WFipV4I00fhFGI2xMBFPf784IIxNXs2hUTHFs=";

     

       30
       30
       +
           sha256 = "sha256-fqeif37lxJeBcI+cYVpRkZuJImSlmeZO3yzSNzPZkgY=";

     

       31
       31
        
         };

     

       32
       32
        
       

     

       33
       33
        
         postPhase = ''

+5 -8

pkgs/applications/audio/spek/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkg-config, ffmpeg, wxGTK30, gtk3, wrapGAppsHook }:

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkg-config, ffmpeg, wxGTK32, gtk3, wrapGAppsHook }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "spek";

     

       5
       5
       -
         version = "unstable-2018-12-29";

     

       5
       5
       +
         version = "0.8.4";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "alexkay";

     

       9
       9
        
           repo = "spek";

     

       10
       10
       -
           rev = "f071c2956176ad53c7c8059e5c00e694ded31ded";

     

       11
       11
       -
           sha256 = "1l9gj9c1n92zlcjnyjyk211h83dk0idk644xnm5rs7q40p2zliy5";

     

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

     

       11
       11
       +
           sha256 = "sha256-JLQx5LlnVe1TT1KVO3/QSVRqYL+pAMCxoDWrnkUNmRU=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         # needed for autoreconfHook

     

       15
       15
       -
         AUTOPOINT="intltoolize --automake --copy";

     

       16
       16
       -
       

     

       17
       14
        
         nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ];

     

       18
       15
        
       

     

       19
       19
       -
         buildInputs = [ ffmpeg wxGTK30 gtk3 ];

     

       16
       16
       +
         buildInputs = [ ffmpeg wxGTK32 gtk3 ];

     

       20
       17
        
       

     

       21
       18
        
         meta = with lib; {

     

       22
       19
        
           description = "Analyse your audio files by showing their spectrogram";

+2 -2

pkgs/applications/misc/grip/default.nix

···

       11
       11
        
       

     

       12
       12
        
       stdenv.mkDerivation rec {

     

       13
       13
        
         pname = "grip";

     

       14
       14
       -
         version = "4.2.3";

     

       14
       14
       +
         version = "4.2.4";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchurl {

     

       17
       17
        
           url = "mirror://sourceforge/grip/grip-${version}.tar.gz";

     

       18
       18
       -
           sha256 = "sha256-5Qgsf4+xs0ckhYJk2csKulXC3nWaLRAsQ15qaTkKkjw=";

     

       18
       18
       +
           sha256 = "sha256-lXu0mLLfcX8K1EmoFH0vp2cHluyRwhTL0/bW5Ax36mI=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [ pkg-config libtool ];

+2 -2

pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "signalbackup-tools";

     

       5
       5
       -
         version = "20221208";

     

       5
       5
       +
         version = "20221227-1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "bepaald";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-GSZy2zW9Ek9nP9zoBfvq3wLghEsaGqmC1f4cs+OVaFE=";

     

       11
       11
       +
           sha256 = "sha256-yOOKgB7MO9LW6qkr/JZOYtteQTW/Yms4CMAg4EIJGc8=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         postPatch = ''

+2 -2

pkgs/applications/networking/libcoap/default.nix

···

       4
       4
        
       }:

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         pname = "libcoap";

     

       7
       7
       -
         version = "4.3.0";

     

       7
       7
       +
         version = "4.3.1";

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           repo = "libcoap";

     

       10
       10
        
           owner = "obgm";

     

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

     

       12
       12
        
           fetchSubmodules = true;

     

       13
       13
       -
           sha256 = "1l031ys833gch600g9g3lvbsr4nysx6glbbj4lwvx3ywl0jr6l9k";

     

       13
       13
       +
           sha256 = "sha256-4XcAo5StyYIfe9wD0cPHKFZalMcBAuiVV2qFZ126KT8=";

     

       14
       14
        
         };

     

       15
       15
        
         nativeBuildInputs = [

     

       16
       16
        
           automake

+3 -3

pkgs/applications/networking/protonmail-bridge/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "protonmail-bridge";

     

       5
       5
       -
         version = "2.1.3";

     

       5
       5
       +
         version = "2.3.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "ProtonMail";

     

       9
       9
        
           repo = "proton-bridge";

     

       10
       10
        
           rev = "br-${version}";

     

       11
       11
       -
           sha256 = "sha256-+XeNhjwtH1T5p8iydMQk22nXztyamSn6yY56/qqvkmk=";

     

       11
       11
       +
           sha256 = "sha256-7p+Q6/BphE/dxNQe+gfcIty6TAWHUcPpvSJWfmf4OQg=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "sha256-YTGjiteYfuRkDC4M9c/JKqURq4WiC5n9pFRqRVYhyxU=";

     

       14
       14
       +
         vendorSha256 = "sha256-dhrn6xQ0IJzBYeO6ko2PUCO+idopC2An0ylqCnx5jKg=";

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ pkg-config ];

     

       17
       17

+2 -2

pkgs/applications/science/biology/igv/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "igv";

     

       5
       5
       -
         version = "2.15.1";

     

       5
       5
       +
         version = "2.15.4";

     

       6
       6
        
         src = fetchzip {

     

       7
       7
        
           url = "https://data.broadinstitute.org/igv/projects/downloads/${lib.versions.majorMinor version}/IGV_${version}.zip";

     

       8
       8
       -
           sha256 = "sha256-hwZ6Pl6BxoVbJI5e3b0s7jhQ/AADhVJVqM9Q8ppERuk=";

     

       8
       8
       +
           sha256 = "sha256-nDD0QTtLDe//VFMsIPKIykZ6dY85p3aomrCaF1p9HQM=";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         installPhase = ''

+3 -3

pkgs/applications/virtualization/nixpacks/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "nixpacks";

     

       5
       5
       -
         version = "0.16.0";

     

       5
       5
       +
         version = "1.0.3";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "railwayapp";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-p9kKTNtZoWl2rZyL1cD7fK9+IwDtBCfdRzWjKQmje5M=";

     

       11
       11
       +
           sha256 = "sha256-0Q0G2vUIkKRTSbQQrXoInzaPfFNWwT/NQ1/NKQeVpHU=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         cargoSha256 = "sha256-UWefCe5DLaxUFNbQV0XNyqNI1dx9HPHfwj+aJaEasFc=";

     

       14
       14
       +
         cargoSha256 = "sha256-vLUR8Rs33GukkRihoB9jD3G4ailJc8oakm7NSjoZdok=";

     

       15
       15
        
       

     

       16
       16
        
         # skip test due FHS dependency

     

       17
       17
        
         doCheck = false;

+15 -2

pkgs/development/compilers/llvm/8/lldb/default.nix

···

       23
       23
        
       

     

       24
       24
        
         patches = [

     

       25
       25
        
           ./gnu-install-dirs.patch

     

       26
       26
       +
       

     

       27
       27
       +
           # Fix darwin build

     

       28
       28
       +
           ./lldb-gdb-remote-no-libcompress.patch

     

       26
       29
        
         ];

     

       27
       30
        
       

     

       28
       31
        
         postPatch = ''

     
···

       33
       36
        
             cmake/modules/LLDBStandalone.cmake

     

       34
       37
        
           sed -i 's,"$.LLVM_LIBRARY_DIR.",${libllvm.lib}/lib ${libclang.lib}/lib,' \

     

       35
       38
        
             cmake/modules/LLDBStandalone.cmake

     

       39
       39
       +
       

     

       40
       40
       +
           substituteInPlace tools/CMakeLists.txt \

     

       41
       41
       +
             --replace "add_subdirectory(debugserver)" ""

     

       36
       42
        
         '';

     

       37
       43
        
       

     

       38
       44
        
         outputs = [ "out" "lib" "dev" ];

     
···

       46
       52
        
         ] ++ lib.optionals stdenv.isDarwin [

     

       47
       53
        
           darwin.libobjc

     

       48
       54
        
           darwin.apple_sdk.libs.xpc

     

       49
       49
       -
           darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa

     

       55
       55
       +
           darwin.apple_sdk.frameworks.Foundation

     

       56
       56
       +
           darwin.bootstrap_cmds

     

       57
       57
       +
           darwin.apple_sdk.frameworks.Carbon

     

       58
       58
       +
           darwin.apple_sdk.frameworks.Cocoa

     

       59
       59
       +
           darwin.apple_sdk.frameworks.DebugSymbols

     

       50
       60
        
         ];

     

       51
       61
        
       

     

       52
       62
        
         CXXFLAGS = "-fno-rtti";

     
···

       55
       65
        
         cmakeFlags = [

     

       56
       66
        
           "-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}"

     

       57
       67
        
           "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic

     

       68
       68
       +
         ] ++ lib.optionals stdenv.isDarwin [

     

       69
       69
       +
           # Building debugserver requires the proprietary libcompression

     

       70
       70
       +
           "-DLLDB_NO_DEBUGSERVER=ON"

     

       58
       71
        
         ] ++ lib.optionals doCheck [

     

       59
       72
        
           "-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"

     

       60
       73
        
           "-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"

     
···

       80
       93
        
         '';

     

       81
       94
        
       

     

       82
       95
        
         meta = llvm_meta // {

     

       83
       83
       -
           broken = stdenv.isDarwin;

     

       96
       96
       +
           broken = stdenv.isDarwin && stdenv.isAarch64;

     

       84
       97
        
           homepage = "https://lldb.llvm.org/";

     

       85
       98
        
           description = "A next-generation high-performance debugger";

     

       86
       99
        
           longDescription = ''

+30

pkgs/development/compilers/llvm/8/lldb/lldb-gdb-remote-no-libcompress.patch

···

       1
       1
       +
       diff -ru a/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp b/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp

     

       2
       2
       +
       --- a/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp	2019-01-09 19:46:09.000000000 -0500

     

       3
       3
       +
       +++ b/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp	2021-11-27 00:23:08.000000000 -0500

     

       4
       4
       +
       @@ -42,11 +42,6 @@

     

       5
       5
       +
        #define DEBUGSERVER_BASENAME "lldb-server"

     

       6
       6
       +
        #endif

     

       7
       7
       +
        

     

       8
       8
       +
       -#if defined(__APPLE__)

     

       9
       9
       +
       -#define HAVE_LIBCOMPRESSION

     

       10
       10
       +
       -#include <compression.h>

     

       11
       11
       +
       -#endif

     

       12
       12
       +
       -

     

       13
       13
       +
        #if defined(HAVE_LIBZ)

     

       14
       14
       +
        #include <zlib.h>

     

       15
       15
       +
        #endif

     

       16
       16
       +
       diff -ru a/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp b/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp

     

       17
       17
       +
       --- a/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp	2018-12-18 18:02:50.000000000 -0500

     

       18
       18
       +
       +++ b/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp	2021-11-27 00:09:07.000000000 -0500

     

       19
       19
       +
       @@ -37,11 +37,6 @@

     

       20
       20
       +
        

     

       21
       21
       +
        #include "llvm/ADT/StringSwitch.h"

     

       22
       22
       +
        

     

       23
       23
       +
       -#if defined(__APPLE__)

     

       24
       24
       +
       -#define HAVE_LIBCOMPRESSION

     

       25
       25
       +
       -#include <compression.h>

     

       26
       26
       +
       -#endif

     

       27
       27
       +
       -

     

       28
       28
       +
        using namespace lldb;

     

       29
       29
       +
        using namespace lldb_private;

     

       30
       30
       +
        using namespace lldb_private::process_gdb_remote;

+22 -1

pkgs/development/compilers/llvm/9/lldb/default.nix

···

       1
       1
        
       { lib, stdenv, llvm_meta

     

       2
       2
        
       , fetch

     

       3
       3
       +
       , fetchpatch

     

       3
       4
        
       , cmake

     

       4
       5
        
       , zlib

     

       5
       6
        
       , ncurses

     
···

       13
       14
        
       , version

     

       14
       15
        
       , darwin

     

       15
       16
        
       , makeWrapper

     

       17
       17
       +
       , perl

     

       16
       18
        
       , lit

     

       17
       19
        
       }:

     

       18
       20
        
       

     
···

       25
       27
        
         patches = [

     

       26
       28
        
           ./procfs.patch

     

       27
       29
        
           ./gnu-install-dirs.patch

     

       30
       30
       +
       

     

       31
       31
       +
           # Fix darwin build

     

       32
       32
       +
           (fetchpatch {

     

       33
       33
       +
             name = "lldb-use-system-debugserver-fix.patch";

     

       34
       34
       +
             url = "https://github.com/llvm-mirror/lldb/commit/be770754cc43da22eacdb70c6203f4582eeb011f.diff";

     

       35
       35
       +
             sha256 = "sha256-tKkk6sn//0Hu0nlzoKWs5fXMWc+O2JAWOEJ1ZnaLuVU=";

     

       36
       36
       +
             excludes = [ "packages/*" ];

     

       37
       37
       +
             postFetch = ''

     

       38
       38
       +
               substituteInPlace "$out" --replace add_lldb_tool_subdirectory add_subdirectory

     

       39
       39
       +
             '';

     

       40
       40
       +
           })

     

       41
       41
       +
           ./lldb-gdb-remote-no-libcompress.patch

     

       28
       42
        
         ];

     

       29
       43
        
       

     

       30
       44
        
         outputs = [ "out" "lib" "dev" ];

     

       31
       45
        
       

     

       32
       46
        
         nativeBuildInputs = [

     

       33
       47
        
           cmake python3 which swig lit makeWrapper

     

       48
       48
       +
         ] ++ lib.optionals stdenv.isDarwin [

     

       49
       49
       +
           # for scripts/generate-vers.pl

     

       50
       50
       +
           perl

     

       34
       51
        
         ];

     

       35
       52
        
       

     

       36
       53
        
         buildInputs = [

     
···

       42
       59
        
           darwin.bootstrap_cmds

     

       43
       60
        
           darwin.apple_sdk.frameworks.Carbon

     

       44
       61
        
           darwin.apple_sdk.frameworks.Cocoa

     

       62
       62
       +
           darwin.apple_sdk.frameworks.DebugSymbols

     

       45
       63
        
         ];

     

       46
       64
        
       

     

       47
       65
        
         CXXFLAGS = "-fno-rtti";

     
···

       52
       70
        
           "-DClang_DIR=${libclang.dev}/lib/cmake"

     

       53
       71
        
           "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit"

     

       54
       72
        
           "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic

     

       73
       73
       +
         ] ++ lib.optionals stdenv.isDarwin [

     

       74
       74
       +
           # Building debugserver requires the proprietary libcompression

     

       75
       75
       +
           "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON"

     

       55
       76
        
         ] ++ lib.optionals doCheck [

     

       56
       77
        
           "-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"

     

       57
       78
        
           "-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"

     
···

       80
       101
        
         '';

     

       81
       102
        
       

     

       82
       103
        
         meta = llvm_meta // {

     

       83
       83
       -
           broken = stdenv.isDarwin;

     

       104
       104
       +
           broken = stdenv.isDarwin && stdenv.isAarch64;

     

       84
       105
        
           homepage = "https://lldb.llvm.org/";

     

       85
       106
        
           description = "A next-generation high-performance debugger";

     

       86
       107
        
           longDescription = ''

+17

pkgs/development/compilers/llvm/9/lldb/lldb-gdb-remote-no-libcompress.patch

···

       1
       1
       +
       diff -ru a/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp b/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp

     

       2
       2
       +
       --- a/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp	2019-12-11 14:15:30.000000000 -0500

     

       3
       3
       +
       +++ b/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp	2021-11-26 23:44:28.000000000 -0500

     

       4
       4
       +
       @@ -36,13 +36,6 @@

     

       5
       5
       +
        

     

       6
       6
       +
        #include "llvm/ADT/StringSwitch.h"

     

       7
       7
       +
        

     

       8
       8
       +
       -#if defined(__APPLE__)

     

       9
       9
       +
       -#ifndef HAVE_LIBCOMPRESSION

     

       10
       10
       +
       -#define HAVE_LIBCOMPRESSION

     

       11
       11
       +
       -#endif

     

       12
       12
       +
       -#include <compression.h>

     

       13
       13
       +
       -#endif

     

       14
       14
       +
       -

     

       15
       15
       +
        using namespace lldb;

     

       16
       16
       +
        using namespace lldb_private;

     

       17
       17
       +
        using namespace lldb_private::process_gdb_remote;

+2 -2

pkgs/development/libraries/nv-codec-headers/11_x.nix

···

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
        
         pname = "nv-codec-headers";

     

       8
       8
       -
         version = "11.1.5.1";

     

       8
       8
       +
         version = "11.1.5.2";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchgit {

     

       11
       11
        
           url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git";

     

       12
       12
        
           rev = "n${version}";

     

       13
       13
       -
           sha256 = "sha256-yTOKLjyYLxT/nI1FBOMwHpkDhfuua3+6Z5Mpb7ZrRhU=";

     

       13
       13
       +
           sha256 = "sha256-KzaqwpzISHB7tSTruynEOJmSlJnAFK2h7/cRI/zkNPk=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         makeFlags = [

+4 -4

pkgs/development/ocaml-modules/base64/default.nix

···

       1
       1
       -
       { lib, fetchurl, buildDunePackage, ocaml, alcotest, bos, rresult }:

     

       1
       1
       +
       { lib, fetchurl, buildDunePackage, ocaml, findlib, alcotest, bos, rresult }:

     

       2
       2
        
       

     

       3
       3
        
       buildDunePackage rec {

     

       4
       4
        
         pname = "base64";

     

       5
       5
        
         version = "3.5.0";

     

       6
       6
        
       

     

       7
       7
       -
         minimumOCamlVersion = "4.03";

     

       8
       8
       -
       

     

       9
       9
       -
         useDune2 = true;

     

       7
       7
       +
         minimalOCamlVersion = "4.03";

     

       10
       8
        
       

     

       11
       9
        
         src = fetchurl {

     

       12
       10
        
           url = "https://github.com/mirage/ocaml-base64/releases/download/v${version}/base64-v${version}.tbz";

     

       13
       11
        
           sha256 = "sha256-WJ3pwAV46/54QZismBjTWGxHSyMWts0+HEbMsfYq46Q=";

     

       14
       12
        
         };

     

       13
       13
       +
       

     

       14
       14
       +
         propagatedBuildInputs = [ findlib ];

     

       15
       15
        
       

     

       16
       16
        
         # otherwise fmt breaks evaluation

     

       17
       17
        
         doCheck = lib.versionAtLeast ocaml.version "4.08";

+6 -3

pkgs/development/ocaml-modules/mrmime/default.nix

···

       6
       6
        
       , bigarray-overlap

     

       7
       7
        
       , bigstringaf

     

       8
       8
        
       , buildDunePackage

     

       9
       9
       +
       , cmdliner

     

       9
       10
        
       , emile

     

       10
       11
        
       , fetchzip

     

       11
       12
        
       , fmt

     
···

       16
       17
        
       , ke

     

       17
       18
        
       , lib

     

       18
       19
        
       , mirage-crypto-rng

     

       20
       20
       +
       , ocaml

     

       19
       21
        
       , pecu

     

       20
       22
        
       , prettym

     

       21
       23
        
       , ptime

     
···

       34
       36
        
           sha256 = "14k67v0b39b8jq3ny2ymi8g8sqx2gd81mlzsjphdzdqnlx6fk716";

     

       35
       37
        
         };

     

       36
       38
        
       

     

       37
       37
       -
         useDune2 = true;

     

       39
       39
       +
         duneVersion = "3";

     

       40
       40
       +
       

     

       41
       41
       +
         buildInputs = [ cmdliner hxd ];

     

       38
       42
        
       

     

       39
       43
        
         propagatedBuildInputs = [

     

       40
       44
        
           angstrom

     
···

       60
       64
        
       

     

       61
       65
        
         checkInputs = [

     

       62
       66
        
           alcotest

     

       63
       63
       -
           hxd

     

       64
       67
        
           jsonm

     

       65
       68
        
         ];

     

       66
       66
       -
         doCheck = true;

     

       69
       69
       +
         doCheck = lib.versionOlder ocaml.version "5.0";

     

       67
       70
        
       

     

       68
       71
        
         meta = {

     

       69
       72
        
           description = "Parser and generator of mail in OCaml";

+4

pkgs/development/ocaml-modules/piaf/default.nix

···

       1
       1
        
       { alcotest-lwt

     

       2
       2
        
       , buildDunePackage

     

       3
       3
       +
       , ocaml

     

       3
       4
        
       , dune-site

     

       4
       5
        
       , fetchzip

     

       5
       6
        
       , gluten-lwt-unix

     
···

       13
       14
        
       , ssl

     

       14
       15
        
       , uri

     

       15
       16
        
       }:

     

       17
       17
       +
       

     

       18
       18
       +
       lib.throwIf (lib.versionAtLeast ocaml.version "5.0")

     

       19
       19
       +
         "piaf is not available for OCaml ${ocaml.version}"

     

       16
       20
        
       

     

       17
       21
        
       buildDunePackage rec {

     

       18
       22
        
         pname = "piaf";

+2 -1

pkgs/development/ocaml-modules/ppx_deriving/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , fetchurl

     

       3
       3
        
       , buildDunePackage

     

       4
       4
       +
       , ocaml

     

       4
       5
        
       , cppo

     

       5
       6
        
       , ppxlib

     

       6
       7
        
       , ppx_derivers

     
···

       51
       52
        
           result

     

       52
       53
        
         ];

     

       53
       54
        
       

     

       54
       54
       -
         doCheck = true;

     

       55
       55
       +
         doCheck = lib.versionOlder ocaml.version "5.0";

     

       55
       56
        
         checkInputs = [

     

       56
       57
        
           (if lib.versionAtLeast version "5.2" then ounit2 else ounit)

     

       57
       58
        
         ];

+2 -2

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

···

       7
       7
        
       

     

       8
       8
        
       buildPythonPackage rec {

     

       9
       9
        
         pname = "whois";

     

       10
       10
       -
         version = "0.9.19";

     

       10
       10
       +
         version = "0.9.20";

     

       11
       11
        
         format = "setuptools";

     

       12
       12
        
       

     

       13
       13
        
         disabled = pythonOlder "3.7";

     
···

       16
       16
        
           owner = "DannyCork";

     

       17
       17
        
           repo = "python-whois";

     

       18
       18
        
           rev = "refs/tags/${version}";

     

       19
       19
       -
           hash = "sha256-b8OZppynDT0MCwH4ic+wMJzWqyUzsigzxD0yYGfgJmI=";

     

       19
       19
       +
           hash = "sha256-J2v2TKTrzhi1XLW2e/N3jAGCy3W8cQEFV5cJAf8gT4g=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         propagatedBuildInputs = [

+3 -3

pkgs/development/tools/database/timescaledb-tune/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "timescaledb-tune";

     

       5
       5
       -
         version = "0.14.2";

     

       5
       5
       +
         version = "0.14.3";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "timescale";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-vbFfqGWYpw0ppon/0oQMRixQStk+YSi/QFMi0AQoUpQ=";

     

       11
       11
       +
           sha256 = "sha256-MQi8A7eWOShP/VhxuX4Uhz1ueLtKvOi1x4E7aFXEsQo=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "sha256-n2jrg9FiR/gSrbds/QVV8Duf7BTEs36yYi4F3Ve+d0E=";

     

       14
       14
       +
         vendorSha256 = "sha256-yXWeINubvfZ2S+3gVFsrzeVO3XXIiZ14qfK+9Bj3SV4=";

     

       15
       15
        
       

     

       16
       16
        
         ldflags = [ "-s" "-w" ];

     

       17
       17

+3

pkgs/os-specific/darwin/apple-sdk-11.0/private-frameworks.nix

···

       18
       18
        
       

     

       19
       19
        
         # Also expose CoreSymbolication; used by `root` package.

     

       20
       20
        
         CoreSymbolication = {};

     

       21
       21
       +
       

     

       22
       22
       +
         # Also expose DebugSymbols; used by `llvmPackages_8.lldb` package.

     

       23
       23
       +
         DebugSymbols = {};

     

       21
       24
        
       }

+1 -1

pkgs/os-specific/darwin/apple-sdk/default.nix

···

       326
       326
        
               "Versions/A/Frameworks/WebKitLegacy.framework/Versions/A/WebKitLegacy.tbd"

     

       327
       327
        
             ];

     

       328
       328
        
           });

     

       329
       329
       -
         } // lib.genAttrs [ "ContactsPersistence" "CoreSymbolication" "GameCenter" "SkyLight" "UIFoundation" ] (x: tbdOnlyFramework x {});

     

       329
       329
       +
         } // lib.genAttrs [ "ContactsPersistence" "CoreSymbolication" "DebugSymbols" "GameCenter" "SkyLight" "UIFoundation" ] (x: tbdOnlyFramework x {});

     

       330
       330
        
       

     

       331
       331
        
         bareFrameworks = lib.mapAttrs framework (import ./frameworks.nix {

     

       332
       332
        
           inherit frameworks libs;

-2

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

···

       2
       2
        
       , stdenv

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
        
       , autoreconfHook

     

       5
       5
       -
       , glib

     

       6
       5
        
       , gperf

     

       7
       6
        
       , kmod

     

       8
       7
        
       , pkg-config

     
···

       27
       26
        
         ];

     

       28
       27
        
       

     

       29
       28
        
         buildInputs = [

     

       30
       30
       -
           glib

     

       31
       29
        
           kmod

     

       32
       30
        
           util-linux

     

       33
       31
        
         ];

+2 -2

pkgs/servers/monitoring/vmagent/default.nix

···

       1
       1
        
       { lib, fetchFromGitHub, buildGoModule }:

     

       2
       2
        
       buildGoModule rec {

     

       3
       3
        
         pname = "vmagent";

     

       4
       4
       -
         version = "1.85.0";

     

       4
       4
       +
         version = "1.85.3";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchFromGitHub {

     

       7
       7
        
           owner = "VictoriaMetrics";

     

       8
       8
        
           repo = "VictoriaMetrics";

     

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

     

       10
       10
       -
           sha256 = "sha256-ez/gq+QBDy2xGqUBoUWQFDDUpd4i0zpj9mUDZUWKbIw=";

     

       10
       10
       +
           sha256 = "sha256-/p5oHxp1fVyUMjZ3vim9YKNhFqIACGa3KTYIv/k4MXg=";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ];