commit 2ae4878af75c7d3c70e04af2908edfa87ffc28bc · pyrox.dev/nixpkgs

+2 -2

pkgs/misc/logging/beats/7.x.nix

···

       21
       21
        
                 owner = "elastic";

     

       22
       22
        
                 repo = "beats";

     

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

     

       24
       24
       -
                 hash = "sha256-0qwWHRIDLlnaPOCRmiiFGg+/jdanWuQtggM2QSaMR1o=";

     

       24
       24
       +
                 hash = "sha256-TzcKB1hIHe1LNZ59GcvR527yvYqPKNXPIhpWH2vyMTY=";

     

       25
       25
        
               };

     

       26
       26
        
       

     

       27
       27
       -
               vendorHash = "sha256-rwCCpptppkpvwQWUtqTjBUumP8GSpPHBTCaj0nYVQv8=";

     

       27
       27
       +
               vendorHash = "sha256-JOCcceYYutC5MI+/lXBqcqiET+mcrG1e3kWySo3+NIk=";

     

       28
       28
        
       

     

       29
       29
        
               subPackages = [ package ];

     

       30
       30

+4 -4

pkgs/servers/search/elasticsearch/7.x.nix

···

       17
       17
        
         arch = lib.elemAt info 0;

     

       18
       18
        
         plat = lib.elemAt info 1;

     

       19
       19
        
         hashes = {

     

       20
       20
       -
           x86_64-linux = "sha512-OiWGRxaCdRxXuxE/W04v87ytzOeUEcHRjF5nyRkdqSbZSnLXUyKOYQ4fKmk4til0VBOaKZYId20XyPiu/XTXNw==";

     

       21
       21
       -
           x86_64-darwin = "sha512-V/vKYL96+M1lp7ZJlvuneRBePWZmucUANfUrFPMuq+fnUP4nN69RStLWcgwgt65EspFMBwKVyQbak4swV8rWxw==";

     

       22
       22
       -
           aarch64-linux = "sha512-fNgVRaIIGx01reNHOnGKhMOG1aYU7gC8HLpIESSbM3+9xO1q9IHIaL/ObI/w2RYj/lD22d7PAdX5N6Hd1pVSAA==";

     

       23
       23
       -
           aarch64-darwin = "sha512-DgexeyoxZ1YTPw9HjSUAM6eC8XtzIw7MY1WUVsIa8zl5j3RpCp25s3oI12BWefjYYCTjdtFDMsnoFSqZBabLig==";

     

       20
       20
       +
           x86_64-linux = "sha512-xlbdx/fFQxilECdDiN80U+s+huBowo9Qf5tDIYwZ1z9gUCriNL0rMNDkvzUDL73BEI3WMFMqHdbi3cn7b5l9gA==";

     

       21
       21
       +
           x86_64-darwin = "sha512-hiTSp7lO/x6tBYiUgKglce39k/oxT4hUlTAoC50pYFiqANALAN+2E0HtZdvsMmrOn4aGLxh+SKVglMHfrGxr+g==";

     

       22
       22
       +
           aarch64-linux = "sha512-MPrDfBMcwNCgWW8dpOeAtlz9Odfk/0z8i+Rn08hTp35kU849KdPQLTmexlvnf/jVwqfwzN2xWJtNF0sQO26pUA==";

     

       23
       23
       +
           aarch64-darwin = "sha512-uq5VVwvbOX4Rv32iLFw+RalFPBxQqA+1hBjFw3svzOaD1caOOrGHD4lJVHFxsFw0xl//AZuSG7S3r7Eh9AmWvQ==";

     

       24
       24
        
         };

     

       25
       25
        
       in

     

       26
       26
        
       stdenv.mkDerivation rec {

+12 -12

pkgs/servers/search/elasticsearch/plugins.nix

···

       38
       38
        
           src = fetchurl {

     

       39
       39
        
             url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";

     

       40
       40
        
             hash =

     

       41
       41
       -
               if version == "7.17.16" then "sha256-wgm6N5fofs5wTM25ZT3dJkg7iDesXsc3Up419IAY9gk="

     

       41
       41
       +
               if version == "7.17.27" then "sha256-HGHhcWj+6IWZ9kQCGJD7HmmvwqYV1zjN0tCsEpN4IAA="

     

       42
       42
        
               else throw "unsupported version ${version} for plugin ${pluginName}";

     

       43
       43
        
           };

     

       44
       44
        
           meta = {

     
···

       54
       54
        
           src = fetchurl {

     

       55
       55
        
             url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";

     

       56
       56
        
             hash =

     

       57
       57
       -
               if version == "7.17.16" then "sha256-SShdBcWfm21XoVhghSSiWIhsoXzG7wz6162iOmuf5EU="

     

       57
       57
       +
               if version == "7.17.27" then "sha256-j0WXuGmE3bRNBnDx/uWxfWrIUrdatDt52ASj8m3mrVg="

     

       58
       58
        
               else throw "unsupported version ${version} for plugin ${pluginName}";

     

       59
       59
        
           };

     

       60
       60
        
           meta = {

     
···

       87
       87
        
           src = fetchurl {

     

       88
       88
        
             url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";

     

       89
       89
        
             hash =

     

       90
       90
       -
               if version == "7.17.16" then "sha256-S/Cp9opeLitFh2/3Qw7/MFt6GcYKufxXKD6cJSi3SaQ="

     

       90
       90
       +
               if version == "7.17.27" then "sha256-X8b8z9LznJQ24aF9GugRuDz1c9buqT7QGS3jhuDbYBM="

     

       91
       91
        
               else throw "unsupported version ${version} for plugin ${pluginName}";

     

       92
       92
        
           };

     

       93
       93
        
           meta = {

     
···

       103
       103
        
           src = fetchurl {

     

       104
       104
        
             url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";

     

       105
       105
        
             hash =

     

       106
       106
       -
               if version == "7.17.16" then

     

       107
       107
       -
                 "sha256-Ym2h7Qe+L4PFhcFjsSBSfXbYoG3PgfaVKXfkaPwvuFM="

     

       106
       106
       +
               if version == "7.17.27" then

     

       107
       107
       +
                 "sha256-0hHHkywdpjKqzZ9vFqQ9B2aLCky17AYzFcSiaz/zGSw="

     

       108
       108
        
               else

     

       109
       109
        
                 throw "unsupported version ${version} for plugin ${pluginName}";

     

       110
       110
        
           };

     
···

       121
       121
        
           src = fetchurl {

     

       122
       122
        
             url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";

     

       123
       123
        
             hash =

     

       124
       124
       -
               if version == "7.17.16" then "sha256-hMErTLd5fXg420Olz+j6Zv7WByA1aNq9FlEgCtkYIxY="

     

       124
       124
       +
               if version == "7.17.27" then "sha256-44p0Pn0mYKR5hWtC8jdaUbh9mbUGiHN9PK98ZT1jQFY="

     

       125
       125
        
               else throw "unsupported version ${version} for plugin ${pluginName}";

     

       126
       126
        
           };

     

       127
       127
        
           meta = {

     
···

       137
       137
        
           src = fetchurl {

     

       138
       138
        
             url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";

     

       139
       139
        
             hash =

     

       140
       140
       -
               if version == "7.17.16" then "sha256-z0gfdx98urCzdQNlVn99CmteG6jweOmUDmGJW89twtU="

     

       140
       140
       +
               if version == "7.17.27" then "sha256-i+fGO7Ic2Wm/COfPGeRhiJ99Os+rLRYgs/pSepQr68g="

     

       141
       141
        
               else throw "unsupported version ${version} for plugin ${pluginName}";

     

       142
       142
        
           };

     

       143
       143
        
           meta = {

     
···

       153
       153
        
           src = fetchurl {

     

       154
       154
        
             url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip";

     

       155
       155
        
             hash =

     

       156
       156
       -
               if version == "7.17.16" then "sha256-TWMN8jzFjzBVTUB+zn4tJr47VMXHC8U+014BvnArK8M="

     

       156
       156
       +
               if version == "7.17.27" then "sha256-o2T0Dd2RqVh99wDPJMEvpnEpFFjz0lQrN9yAVJfiSGY="

     

       157
       157
        
               else throw "unsupported version ${version} for plugin ${pluginName}";

     

       158
       158
        
           };

     

       159
       159
        
           meta = {

     
···

       169
       169
        
           src = fetchurl {

     

       170
       170
        
             url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip";

     

       171
       171
        
             hash =

     

       172
       172
       -
               if version == "7.17.16" then "sha256-hG5wy1Xw4T1NzI7pja3CejwJg002/n6YqM1/QaVSWbg="

     

       172
       172
       +
               if version == "7.17.27" then "sha256-CWyQuzf2fP9BSIUWL/jxkxrXwdvHyujEINDNhY3FKNI="

     

       173
       173
        
               else throw "unsupported version ${version} for plugin ${pluginName}";

     

       174
       174
        
           };

     

       175
       175
        
           meta = {

     
···

       185
       185
        
           pluginName = "search-guard";

     

       186
       186
        
           version =

     

       187
       187
        
             # https://docs.search-guard.com/latest/search-guard-versions

     

       188
       188
       -
             if esVersion == "7.17.16" then "${esVersion}-53.8.0"

     

       188
       188
       +
             if esVersion == "7.17.27" then "${esVersion}-53.10.0"

     

       189
       189
        
             else throw "unsupported version ${esVersion} for plugin ${pluginName}";

     

       190
       190
        
           src =

     

       191
       191
       -
             if esVersion == "7.17.16" then

     

       191
       191
       +
             if esVersion == "7.17.27" then

     

       192
       192
        
               fetchurl {

     

       193
       193
        
                 url = "https://maven.search-guard.com/search-guard-suite-release/com/floragunn/search-guard-suite-plugin/${version}/search-guard-suite-plugin-${version}.zip";

     

       194
       194
       -
                 hash = "sha256-j8dz7rUKWqMvT6EksoFIuGJzYcgdMipKeg2d8UtzlDI=";

     

       194
       194
       +
                 hash = "sha256-M1yJ8OD+mDq2uEiK6pvsMxUQMrg6o5A4xEPX8nDt1Rs=";

     

       195
       195
        
               }

     

       196
       196
        
             else throw "unsupported version ${version} for plugin ${pluginName}";

     

       197
       197
        
           meta = {

+6 -6

pkgs/tools/misc/logstash/7.x.nix

···

       17
       17
        
         hashes =

     

       18
       18
        
           if enableUnfree then

     

       19
       19
        
             {

     

       20
       20
       -
               x86_64-linux = "sha512-ze0hJxUHCN52bOxUs5upDj64tIE58P2BTow2kaCo6HreRiF9rfTTzNkNr/hCmEgE+/oFbgSEuOQLz+6G373RDQ==";

     

       21
       21
       -
               x86_64-darwin = "sha512-FOFd8d+4UddSGorjuUWW/JbQ5fQH4LU1f1HJLmdbfnb8Q5L4GEveb2LmWNILU8/a85V4HGmD6lL8mCJqH9CULQ==";

     

       22
       22
       -
               aarch64-linux = "sha512-giYqW88/6iT3haXzJVn/+b7uxjYhHq4GERmiq3tMIvjxDyu7B6g+X7JneaTYxhpNdn6gOD/hfXgNv+hFRq6lgg==";

     

       20
       20
       +
               x86_64-linux = "sha512-9JzopnY43Osoy4/0G9gxJYlbCl1a9Qy2pL4GL1uyjJ3uSNoOskEBhhsqLp9BhtJXOaquuRDgbJnXhbBrlE0rKg==";

     

       21
       21
       +
               x86_64-darwin = "sha512-ZcdKWFrIQUmGtxoWbLc2F7g85quXfRqy62DyVPR/9zBtMTgFH0eG4Cj40ELpW7nYXZqglmAUTF/0mZZYUg2Ciw==";

     

       22
       22
       +
               aarch64-linux = "sha512-V2Nt/lup4ofgoMqpAH3OHF8Fp0PvC1M8nl6sCKmTf+ZXQYHNjAJkJwGJwHeQQ0L/348JHyCkeWL43dS7Jr6ZJQ==";

     

       23
       23
        
             }

     

       24
       24
        
           else

     

       25
       25
        
             {

     

       26
       26
       -
               x86_64-linux = "sha512-OC9gx76k+RMdjqcDkrJCNbPYSQameyddaYMxUIB0foVxCmo6UvbdcwZGXRLPPn95in8rYOCjvPoBkmupiQw9xQ==";

     

       27
       27
       -
               x86_64-darwin = "sha512-1OEfEED/jjlT3Fd095Y5VYiWKnovytI3UYCCy1Rs3tEvkZPHYwqIQHfMQYeAvGgUci37ADwEDu8xrSQULHToLw==";

     

       28
       28
       -
               aarch64-linux = "sha512-QWW0AXOMNIXThxpUiRomvINm+917MvGrSDndrEw11IYYuvi0d0dckJiRytfnBbBNoOKpVhB68uOmfjIcZBNpWQ==";

     

       26
       26
       +
               x86_64-linux = "sha512-L11ZUdXC8VDiSEVDBMous2OaMlAFgvkQ+eDbmbA9r/sDIXY8W7dx3jgPNXoorDtatTemwy8aXw1XJGaVmj4T3Q==";

     

       27
       27
       +
               x86_64-darwin = "sha512-az5ujFtwcuNNGuITDeGRu1FB2bb8/hIUmGMvm0Xcfvs0GZPnCZVY6ScsiHZYjT8X+qBYkn/httT3MYozrPOy4Q==";

     

       28
       28
       +
               aarch64-linux = "sha512-iVft0kZYhvFJ1NKCfdePhRxDljPTwV+3G7wV94iykYISgLTVoehzDTMdxUyfK/mmQhu3hmmHbVpw1jXjTrS7ng==";

     

       29
       29
        
             };

     

       30
       30
        
         this = stdenv.mkDerivation rec {

     

       31
       31
        
           version = elk7Version;

+1 -1

pkgs/top-level/all-packages.nix

···

       3181
       3181
        
       

     

       3182
       3182
        
         # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic.

     

       3183
       3183
        
         # When updating make sure to update all plugins or they will break!

     

       3184
       3184
       -
         elk7Version = "7.17.16";

     

       3184
       3184
       +
         elk7Version = "7.17.27";

     

       3185
       3185
        
       

     

       3186
       3186
        
         elasticsearch7 = callPackage ../servers/search/elasticsearch/7.x.nix {

     

       3187
       3187
        
           util-linux = util-linuxMinimal;