Merge master into staging-next

authored by

github-actions[bot] and committed by
GitHub
3cc71164 3bf92ca4

+197 -106
+5 -5
pkgs/applications/editors/vscode/vscode.nix
··· 13 archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; 14 15 sha256 = { 16 - x86_64-linux = "0fpa3b807hy3wrb98h5s0p6ljya279bikv2qwq30nvr0f4zn48bk"; 17 - x86_64-darwin = "0bw7pdzn0a0zr7x8fpwck7v73dq5vh71ja00z11mhjrkjnvmmd9k"; 18 - aarch64-linux = "04wrqcmyamhwiwcyay1z0q0dvf6g7k3pcs93x7hahy16l65w7s2c"; 19 - armv7l-linux = "1hkc9i4z021jwjn275w790bppfvi63g0cnwvkssqdh1c94939rhv"; 20 }.${system}; 21 in 22 callPackage ./generic.nix rec { ··· 25 26 # Please backport all compatible updates to the stable release. 27 # This is important for the extension ecosystem. 28 - version = "1.54.3"; 29 pname = "vscode"; 30 31 executableName = "code" + lib.optionalString isInsiders "-insiders";
··· 13 archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; 14 15 sha256 = { 16 + x86_64-linux = "0z1diiiykv4ilsiljffz9sl2mlvrxq0xwm8ga2ralfvjwbhzr6dn"; 17 + x86_64-darwin = "02gzw46w3kzw1ya9nx8fkhvzi0mbpz2fyp47n58jki2zkdsfiwzh"; 18 + aarch64-linux = "0bkvgdxch95dqcb41ncsjkaaswmwv6zad4hzdsr3famjm2vym1ky"; 19 + armv7l-linux = "0wdp97ihdnx9bcyn2dh6wzhb7qvdj6x730r7ng1q3i9jhd19wfi3"; 20 }.${system}; 21 in 22 callPackage ./generic.nix rec { ··· 25 26 # Please backport all compatible updates to the stable release. 27 # This is important for the extension ecosystem. 28 + version = "1.55.0"; 29 pname = "vscode"; 30 31 executableName = "code" + lib.optionalString isInsiders "-insiders";
+5 -5
pkgs/applications/editors/vscode/vscodium.nix
··· 13 archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; 14 15 sha256 = { 16 - x86_64-linux = "1577wxmm8623aj513hxqcfim4d9p1r9wbla9my0c0c1x6pik0h8h"; 17 - x86_64-darwin = "1n8q626nlqw78wlpfppzj365gmlz2swll6csg3ic7p4ik3nak95b"; 18 - aarch64-linux = "1a7rkmhz456rsqw95lrknp1wqsdp63pkzh76vhzy5bazb1h081v0"; 19 - armv7l-linux = "1qjik1r41c8n9fs7p09p0zdj8c5xgqjniwv23hcy6mp28i4whclr"; 20 }.${system}; 21 22 sourceRoot = { ··· 33 34 # Please backport all compatible updates to the stable release. 35 # This is important for the extension ecosystem. 36 - version = "1.54.3"; 37 pname = "vscodium"; 38 39 executableName = "codium";
··· 13 archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; 14 15 sha256 = { 16 + x86_64-linux = "0zzdbknmljf1hizmxnrby17i8v3kp98rklinywnr632jwgjms81j"; 17 + x86_64-darwin = "0mccq1b0l6r1ipxp5gvyam43c2hh8hxdvwqikkz6g7y93p29wz9g"; 18 + aarch64-linux = "12gpday6gzl1adcykqhgz3xrdm9568a26gsndmplkn2n6l6agnp0"; 19 + armv7l-linux = "0l886vdw7az0nvvhh14pjawz0yyib59ymychy7gbk8ay5g9vfv03"; 20 }.${system}; 21 22 sourceRoot = { ··· 33 34 # Please backport all compatible updates to the stable release. 35 # This is important for the extension ecosystem. 36 + version = "1.55.0"; 37 pname = "vscodium"; 38 39 executableName = "codium";
+2 -2
pkgs/applications/misc/mediainfo-gui/default.nix
··· 2 , desktop-file-utils, libSM, imagemagick }: 3 4 stdenv.mkDerivation rec { 5 - version = "20.09"; 6 pname = "mediainfo-gui"; 7 src = fetchurl { 8 url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; 9 - sha256 = "0rqg9z7s5bk7vlvjrs4gackzg7ib05a0dffi2ihsjf5a7kw7wcir"; 10 }; 11 12 nativeBuildInputs = [ autoreconfHook pkg-config ];
··· 2 , desktop-file-utils, libSM, imagemagick }: 3 4 stdenv.mkDerivation rec { 5 + version = "21.03"; 6 pname = "mediainfo-gui"; 7 src = fetchurl { 8 url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; 9 + sha256 = "07h2a1lbw5ak6c9bcn8qydchl0wpgk945rf9sfcqjyv05h5wll6y"; 10 }; 11 12 nativeBuildInputs = [ autoreconfHook pkg-config ];
+19 -8
pkgs/applications/radio/gnuradio/default.nix
··· 44 , pname ? "gnuradio" 45 , versionAttr ? { 46 major = "3.9"; 47 - minor = "0"; 48 patch = "0"; 49 } 50 , fetchSubmodules ? false 51 }: 52 53 let 54 - sourceSha256 = "ZjQzioAuWrd8jsYOnLNH1mK4n9EbrjgvPX3mTzVFdLk="; 55 featuresInfo = { 56 # Needed always 57 basic = { ··· 190 runtime = [ SDL ]; 191 cmakeEnableFlag = "GR_VIDEO_SDL"; 192 }; 193 - # codec2 and gsm support is broken with gr3.9: https://github.com/gnuradio/gnuradio/issues/4278 194 - # gr-vocoder = { 195 - # runtime = [ codec2 gsm ]; 196 - # cmakeEnableFlag = "GR_VOCODER"; 197 - # }; 198 gr-wavelet = { 199 cmakeEnableFlag = "GR_WAVELET"; 200 runtime = [ gsl libsodium ]; ··· 234 src 235 nativeBuildInputs 236 buildInputs 237 - cmakeFlags 238 disallowedReferences 239 stripDebugList 240 doCheck ··· 250 } // lib.optionalAttrs (hasFeature "gr-qtgui" features) { 251 inherit (libsForQt5) qwt; 252 }; 253 254 postInstall = shared.postInstall 255 # This is the only python reference worth removing, if needed.
··· 44 , pname ? "gnuradio" 45 , versionAttr ? { 46 major = "3.9"; 47 + minor = "1"; 48 patch = "0"; 49 } 50 , fetchSubmodules ? false 51 }: 52 53 let 54 + sourceSha256 = "0zydmrr3gkaqiv4jv8f42awrfzs177bqb349q34rnr6j3d32z2vp"; 55 featuresInfo = { 56 # Needed always 57 basic = { ··· 190 runtime = [ SDL ]; 191 cmakeEnableFlag = "GR_VIDEO_SDL"; 192 }; 193 + gr-vocoder = { 194 + runtime = [ codec2 gsm ]; 195 + cmakeEnableFlag = "GR_VOCODER"; 196 + }; 197 gr-wavelet = { 198 cmakeEnableFlag = "GR_WAVELET"; 199 runtime = [ gsl libsodium ]; ··· 233 src 234 nativeBuildInputs 235 buildInputs 236 disallowedReferences 237 stripDebugList 238 doCheck ··· 248 } // lib.optionalAttrs (hasFeature "gr-qtgui" features) { 249 inherit (libsForQt5) qwt; 250 }; 251 + cmakeFlags = shared.cmakeFlags 252 + # From some reason, if these are not set, libcodec2 and gsm are not 253 + # detected properly. 254 + ++ lib.optionals (hasFeature "gr-vocoder" features) [ 255 + "-DLIBCODEC2_FOUND=TRUE" 256 + "-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2.so" 257 + "-DLIBCODEC2_INCLUDE_DIRS=${codec2}/include" 258 + "-DLIBCODEC2_HAS_FREEDV_API=ON" 259 + "-DLIBGSM_FOUND=TRUE" 260 + "-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm.so" 261 + "-DLIBGSM_INCLUDE_DIRS=${gsm}/include/gsm" 262 + ] 263 + ; 264 265 postInstall = shared.postInstall 266 # This is the only python reference worth removing, if needed.
+5 -3
pkgs/data/icons/papirus-icon-theme/default.nix
··· 2 3 stdenv.mkDerivation rec { 4 pname = "papirus-icon-theme"; 5 - version = "20210302"; 6 7 src = fetchFromGitHub { 8 owner = "PapirusDevelopmentTeam"; 9 repo = pname; 10 rev = version; 11 - sha256 = "0h1cja8qqlnddm92hkyhkyj5rqfj494v0pss2mg95qqkjijpcgd0"; 12 }; 13 14 nativeBuildInputs = [ ··· 25 dontDropIconThemeCache = true; 26 27 installPhase = '' 28 mkdir -p $out/share/icons 29 mv {,e}Papirus* $out/share/icons 30 31 for theme in $out/share/icons/*; do 32 gtk-update-icon-cache $theme 33 done 34 ''; 35 36 meta = with lib; { ··· 39 license = licenses.gpl3Only; 40 # darwin gives hash mismatch in source, probably because of file names differing only in case 41 platforms = platforms.linux; 42 - maintainers = with maintainers; [ romildo ]; 43 }; 44 }
··· 2 3 stdenv.mkDerivation rec { 4 pname = "papirus-icon-theme"; 5 + version = "20210401"; 6 7 src = fetchFromGitHub { 8 owner = "PapirusDevelopmentTeam"; 9 repo = pname; 10 rev = version; 11 + sha256 = "sha256-t0zoeIpj+0QVH1wmbEIJdqzEDOGzpclePv+bcZgtnwo="; 12 }; 13 14 nativeBuildInputs = [ ··· 25 dontDropIconThemeCache = true; 26 27 installPhase = '' 28 + runHook preInstall 29 mkdir -p $out/share/icons 30 mv {,e}Papirus* $out/share/icons 31 32 for theme in $out/share/icons/*; do 33 gtk-update-icon-cache $theme 34 done 35 + runHook postInstall 36 ''; 37 38 meta = with lib; { ··· 41 license = licenses.gpl3Only; 42 # darwin gives hash mismatch in source, probably because of file names differing only in case 43 platforms = platforms.linux; 44 + maintainers = with maintainers; [ romildo fortuneteller2k ]; 45 }; 46 }
+2 -2
pkgs/development/libraries/libmediainfo/default.nix
··· 1 { lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, zlib }: 2 3 stdenv.mkDerivation rec { 4 - version = "20.09"; 5 pname = "libmediainfo"; 6 src = fetchurl { 7 url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; 8 - sha256 = "15ni9pnch6688m72swwax109a7mg4a08yx75qknrx7qa6dbyhz6h"; 9 }; 10 11 nativeBuildInputs = [ autoreconfHook pkg-config ];
··· 1 { lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, zlib }: 2 3 stdenv.mkDerivation rec { 4 + version = "21.03"; 5 pname = "libmediainfo"; 6 src = fetchurl { 7 url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; 8 + sha256 = "1jm4mk539wf3crgpcddgwdixshwdzm37mkb5441lifhcz2mykdsn"; 9 }; 10 11 nativeBuildInputs = [ autoreconfHook pkg-config ];
+45
pkgs/development/python-modules/pyturbojpeg/default.nix
···
··· 1 + { lib 2 + , stdenv 3 + , python 4 + , buildPythonPackage 5 + , fetchPypi 6 + , substituteAll 7 + , libjpeg_turbo 8 + , numpy 9 + }: 10 + 11 + buildPythonPackage rec { 12 + pname = "pyturbojpeg"; 13 + version = "1.4.1"; 14 + 15 + src = fetchPypi { 16 + pname = "PyTurboJPEG"; 17 + inherit version; 18 + sha256 = "09688a93331281e566569b4d313e1d1a058ca32ccae1a2473847a10e4ca2f2a7"; 19 + }; 20 + 21 + patches = [ 22 + (substituteAll { 23 + src = ./lib-path.patch; 24 + libturbojpeg = "${libjpeg_turbo.out}/lib/libturbojpeg${stdenv.hostPlatform.extensions.sharedLibrary}"; 25 + }) 26 + ]; 27 + 28 + propagatedBuildInputs = [ 29 + numpy 30 + ]; 31 + 32 + # upstream has no tests, but we want to test whether the library is found 33 + checkPhase = '' 34 + ${python.interpreter} -c 'from turbojpeg import TurboJPEG; TurboJPEG()' 35 + ''; 36 + 37 + pythonImportsCheck = [ "turbojpeg" ]; 38 + 39 + meta = with lib; { 40 + description = "A Python wrapper of libjpeg-turbo for decoding and encoding JPEG image"; 41 + homepage = "https://github.com/lilohuang/PyTurboJPEG"; 42 + license = licenses.mit; 43 + maintainers = with maintainers; [ dotlambda ]; 44 + }; 45 + }
+28
pkgs/development/python-modules/pyturbojpeg/lib-path.patch
···
··· 1 + diff --git a/turbojpeg.py b/turbojpeg.py 2 + index 73edb38..bfa8c67 100644 3 + --- a/turbojpeg.py 4 + +++ b/turbojpeg.py 5 + @@ -408,22 +408,7 @@ class TurboJPEG(object): 6 + 7 + def __find_turbojpeg(self): 8 + """returns default turbojpeg library path if possible""" 9 + - lib_path = find_library('turbojpeg') 10 + - if lib_path is not None: 11 + - return lib_path 12 + - for lib_path in DEFAULT_LIB_PATHS[platform.system()]: 13 + - if os.path.exists(lib_path): 14 + - return lib_path 15 + - if platform.system() == 'Linux' and 'LD_LIBRARY_PATH' in os.environ: 16 + - ld_library_path = os.environ['LD_LIBRARY_PATH'] 17 + - for path in ld_library_path.split(':'): 18 + - lib_path = os.path.join(path, 'libturbojpeg.so.0') 19 + - if os.path.exists(lib_path): 20 + - return lib_path 21 + - raise RuntimeError( 22 + - 'Unable to locate turbojpeg library automatically. ' 23 + - 'You may specify the turbojpeg library path manually.\n' 24 + - 'e.g. jpeg = TurboJPEG(lib_path)') 25 + + return '@libturbojpeg@' 26 + 27 + def __getaddr(self, nda): 28 + """returns the memory address for a given ndarray"""
+3 -3
pkgs/development/tools/cloud-nuke/default.nix
··· 2 3 buildGoModule rec { 4 pname = "cloud-nuke"; 5 - version = "0.1.25"; 6 7 src = fetchFromGitHub { 8 owner = "gruntwork-io"; 9 repo = pname; 10 rev = "v${version}"; 11 - sha256 = "sha256-tbwmHsiR/RJl3CJrzJtI6GA3v9mNAirbEHXX+wDMd2k="; 12 }; 13 14 - vendorSha256 = "sha256-vOaklBsMuKTQ3cJgXDClM1RWh+ovemO1uDWXeK1ygU4="; 15 16 buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; 17
··· 2 3 buildGoModule rec { 4 pname = "cloud-nuke"; 5 + version = "0.1.27"; 6 7 src = fetchFromGitHub { 8 owner = "gruntwork-io"; 9 repo = pname; 10 rev = "v${version}"; 11 + sha256 = "1708g8msv5cw0b4gljyjqns328wbci3p3avwysms4aknm4vky0g0"; 12 }; 13 14 + vendorSha256 = "0m7k6k790i06i8a5r8y7787mmikfibbvl7s8xqxygq1f5cpdspd6"; 15 16 buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; 17
+2 -2
pkgs/servers/home-assistant/component-packages.nix
··· 277 "foscam" = ps: with ps; [ ]; # missing inputs: libpyfoscam 278 "foursquare" = ps: with ps; [ aiohttp-cors ]; 279 "free_mobile" = ps: with ps; [ ]; # missing inputs: freesms 280 - "freebox" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: freebox-api 281 "freedns" = ps: with ps; [ ]; 282 "fritz" = ps: with ps; [ fritzconnection ]; 283 "fritzbox" = ps: with ps; [ pyfritzhome ]; ··· 353 "hlk_sw16" = ps: with ps; [ ]; # missing inputs: hlk-sw16 354 "home_connect" = ps: with ps; [ aiohttp-cors ]; # missing inputs: homeconnect 355 "homeassistant" = ps: with ps; [ ]; 356 - "homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors base36 fnvhash ha-ffmpeg zeroconf ]; # missing inputs: PyTurboJPEG 357 "homekit_controller" = ps: with ps; [ aiohomekit aiohttp-cors zeroconf ]; 358 "homematic" = ps: with ps; [ pyhomematic ]; 359 "homematicip_cloud" = ps: with ps; [ ]; # missing inputs: homematicip
··· 277 "foscam" = ps: with ps; [ ]; # missing inputs: libpyfoscam 278 "foursquare" = ps: with ps; [ aiohttp-cors ]; 279 "free_mobile" = ps: with ps; [ ]; # missing inputs: freesms 280 + "freebox" = ps: with ps; [ aiohttp-cors freebox-api netdisco zeroconf ]; 281 "freedns" = ps: with ps; [ ]; 282 "fritz" = ps: with ps; [ fritzconnection ]; 283 "fritzbox" = ps: with ps; [ pyfritzhome ]; ··· 353 "hlk_sw16" = ps: with ps; [ ]; # missing inputs: hlk-sw16 354 "home_connect" = ps: with ps; [ aiohttp-cors ]; # missing inputs: homeconnect 355 "homeassistant" = ps: with ps; [ ]; 356 + "homekit" = ps: with ps; [ HAP-python pyqrcode pyturbojpeg aiohttp-cors base36 fnvhash ha-ffmpeg zeroconf ]; 357 "homekit_controller" = ps: with ps; [ aiohomekit aiohttp-cors zeroconf ]; 358 "homematic" = ps: with ps; [ pyhomematic ]; 359 "homematicip_cloud" = ps: with ps; [ ]; # missing inputs: homematicip
+3
pkgs/servers/home-assistant/default.nix
··· 217 "flux" 218 "folder" 219 "folder_watcher" 220 "fritzbox" 221 "fritzbox_callmonitor" 222 "frontend" ··· 228 "hddtemp" 229 "history" 230 "history_stats" 231 "homekit_controller" 232 "homeassistant" 233 "homematic" ··· 393 description = "Open source home automation that puts local control and privacy first"; 394 license = licenses.asl20; 395 maintainers = with maintainers; [ dotlambda globin mic92 hexa ]; 396 }; 397 }
··· 217 "flux" 218 "folder" 219 "folder_watcher" 220 + "freebox" 221 "fritzbox" 222 "fritzbox_callmonitor" 223 "frontend" ··· 229 "hddtemp" 230 "history" 231 "history_stats" 232 + "homekit" 233 "homekit_controller" 234 "homeassistant" 235 "homematic" ··· 395 description = "Open source home automation that puts local control and privacy first"; 396 license = licenses.asl20; 397 maintainers = with maintainers; [ dotlambda globin mic92 hexa ]; 398 + platforms = platforms.linux; 399 }; 400 }
+2 -2
pkgs/tools/admin/stripe-cli/default.nix
··· 2 3 buildGoModule rec { 4 pname = "stripe-cli"; 5 - version = "1.5.11"; 6 7 src = fetchFromGitHub { 8 owner = "stripe"; 9 repo = pname; 10 rev = "v${version}"; 11 - sha256 = "sha256-aoflV4C7eH0RNdq8j7kPeAfnOEZECmfZ91/QBQy7oxY="; 12 }; 13 14 vendorSha256 = "sha256-e7EZ5o30vDpS904/R1y7/Mds7HxQNmsIftrnc1Bj2bc=";
··· 2 3 buildGoModule rec { 4 pname = "stripe-cli"; 5 + version = "1.5.12"; 6 7 src = fetchFromGitHub { 8 owner = "stripe"; 9 repo = pname; 10 rev = "v${version}"; 11 + sha256 = "sha256-eMxukwaJqsXL0+Euvk5mM+pcAsT3GsF9filuyRL4tXg="; 12 }; 13 14 vendorSha256 = "sha256-e7EZ5o30vDpS904/R1y7/Mds7HxQNmsIftrnc1Bj2bc=";
+7 -7
pkgs/tools/networking/v2ray/default.nix
··· 3 }: 4 5 let 6 - version = "4.36.2"; 7 8 src = fetchFromGitHub { 9 owner = "v2fly"; 10 repo = "v2ray-core"; 11 rev = "v${version}"; 12 - sha256 = "1gvzr4kq4klld8m0jv6mizgrx3xj6s2i69kl9vmh5n355bakb7kk"; 13 }; 14 15 - vendorSha256 = "sha256-8O0xUNIdu3W//LtwiMZlSs1wkpa6Jt+vFkTavz6TBKU="; 16 17 assets = { 18 # MIT licensed 19 "geoip.dat" = let 20 - geoipRev = "202103170314"; 21 - geoipSha256 = "147kajdhby92yxsvcpa6bpk11ilzvc4nj7rc0h84wp2f0y692kq2"; 22 in fetchurl { 23 url = "https://github.com/v2fly/geoip/releases/download/${geoipRev}/geoip.dat"; 24 sha256 = geoipSha256; ··· 26 27 # MIT licensed 28 "geosite.dat" = let 29 - geositeRev = "20210317031429"; 30 - geositeSha256 = "0nzd0ll0x7hv75cbh1i3kgmffasi002a8n3mjw22zywj71v2jwmz"; 31 in fetchurl { 32 url = "https://github.com/v2fly/domain-list-community/releases/download/${geositeRev}/dlc.dat"; 33 sha256 = geositeSha256;
··· 3 }: 4 5 let 6 + version = "4.37.0"; 7 8 src = fetchFromGitHub { 9 owner = "v2fly"; 10 repo = "v2ray-core"; 11 rev = "v${version}"; 12 + sha256 = "00bw91n7210gsnc7bw2spl6k1yl2i7d1j55w98qf4rvn80z9d59r"; 13 }; 14 15 + vendorSha256 = "sha256-sc001qWdmhhaUh0nmvaqwwVE2Ee8IFWYi4K8aAURWBE="; 16 17 assets = { 18 # MIT licensed 19 "geoip.dat" = let 20 + geoipRev = "202104010913"; 21 + geoipSha256 = "1kq6d68ii9hr2w0caxacqh5q8jran154b99aik4g7ripgx7lckpr"; 22 in fetchurl { 23 url = "https://github.com/v2fly/geoip/releases/download/${geoipRev}/geoip.dat"; 24 sha256 = geoipSha256; ··· 26 27 # MIT licensed 28 "geosite.dat" = let 29 + geositeRev = "20210403111045"; 30 + geositeSha256 = "1b64yci0dmvw9divfv3njpzczz2ag3cnvyr29c2mk8y85vp05ysc"; 31 in fetchurl { 32 url = "https://github.com/v2fly/domain-list-community/releases/download/${geositeRev}/dlc.dat"; 33 sha256 = geositeSha256;
+1 -1
pkgs/tools/security/metasploit/Gemfile
··· 1 # frozen_string_literal: true 2 source "https://rubygems.org" 3 4 - gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.37"
··· 1 # frozen_string_literal: true 2 source "https://rubygems.org" 3 4 + gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.38"
+29 -29
pkgs/tools/security/metasploit/Gemfile.lock
··· 1 GIT 2 remote: https://github.com/rapid7/metasploit-framework 3 - revision: eae71004c4a1720d9af1513ca750cfe116d99a7b 4 - ref: refs/tags/6.0.37 5 specs: 6 - metasploit-framework (6.0.37) 7 actionpack (~> 5.2.2) 8 activerecord (~> 5.2.2) 9 activesupport (~> 5.2.2) ··· 30 metasploit-concern 31 metasploit-credential 32 metasploit-model 33 - metasploit-payloads (= 2.0.39) 34 metasploit_data_models 35 - metasploit_payloads-mettle (= 1.0.7) 36 mqtt 37 msgpack 38 nessus_rest ··· 92 remote: https://rubygems.org/ 93 specs: 94 Ascii85 (1.1.0) 95 - actionpack (5.2.4.5) 96 - actionview (= 5.2.4.5) 97 - activesupport (= 5.2.4.5) 98 rack (~> 2.0, >= 2.0.8) 99 rack-test (>= 0.6.3) 100 rails-dom-testing (~> 2.0) 101 rails-html-sanitizer (~> 1.0, >= 1.0.2) 102 - actionview (5.2.4.5) 103 - activesupport (= 5.2.4.5) 104 builder (~> 3.1) 105 erubi (~> 1.4) 106 rails-dom-testing (~> 2.0) 107 rails-html-sanitizer (~> 1.0, >= 1.0.3) 108 - activemodel (5.2.4.5) 109 - activesupport (= 5.2.4.5) 110 - activerecord (5.2.4.5) 111 - activemodel (= 5.2.4.5) 112 - activesupport (= 5.2.4.5) 113 arel (>= 9.0) 114 - activesupport (5.2.4.5) 115 concurrent-ruby (~> 1.0, >= 1.0.2) 116 i18n (>= 0.7, < 2) 117 minitest (~> 5.1) ··· 123 arel-helpers (2.12.0) 124 activerecord (>= 3.1.0, < 7) 125 aws-eventstream (1.1.1) 126 - aws-partitions (1.435.0) 127 - aws-sdk-core (3.113.0) 128 aws-eventstream (~> 1, >= 1.0.2) 129 aws-partitions (~> 1, >= 1.239.0) 130 aws-sigv4 (~> 1.1) 131 jmespath (~> 1.0) 132 - aws-sdk-ec2 (1.230.0) 133 aws-sdk-core (~> 3, >= 3.112.0) 134 aws-sigv4 (~> 1.1) 135 - aws-sdk-iam (1.51.0) 136 aws-sdk-core (~> 3, >= 3.112.0) 137 aws-sigv4 (~> 1.1) 138 aws-sdk-kms (1.43.0) ··· 181 hrr_rb_ssh (0.3.0.pre2) 182 ed25519 (~> 1.2) 183 http_parser.rb (0.6.0) 184 - i18n (1.8.9) 185 concurrent-ruby (~> 1.0) 186 io-console (0.5.9) 187 - irb (1.3.4) 188 reline (>= 0.1.5) 189 jmespath (1.4.0) 190 jsobfu (0.4.2) ··· 212 activemodel (~> 5.2.2) 213 activesupport (~> 5.2.2) 214 railties (~> 5.2.2) 215 - metasploit-payloads (2.0.39) 216 metasploit_data_models (4.1.2) 217 activerecord (~> 5.2.2) 218 activesupport (~> 5.2.2) ··· 223 railties (~> 5.2.2) 224 recog (~> 2.0) 225 webrick 226 - metasploit_payloads-mettle (1.0.7) 227 method_source (1.0.0) 228 mini_portile2 (2.5.0) 229 minitest (5.14.4) ··· 236 net-ldap (0.17.0) 237 net-ssh (6.1.0) 238 network_interface (0.0.2) 239 - nexpose (7.2.1) 240 nio4r (2.5.7) 241 nokogiri (1.11.2) 242 mini_portile2 (~> 2.5.0) ··· 272 nokogiri (>= 1.6) 273 rails-html-sanitizer (1.3.0) 274 loofah (~> 2.3) 275 - railties (5.2.4.5) 276 - actionpack (= 5.2.4.5) 277 - activesupport (= 5.2.4.5) 278 method_source 279 rake (>= 0.8.7) 280 thor (>= 0.19.0, < 2.0) ··· 283 recog (2.3.19) 284 nokogiri 285 redcarpet (3.5.1) 286 - reline (0.2.4) 287 io-console (~> 0.5) 288 rex-arch (0.1.14) 289 rex-text
··· 1 GIT 2 remote: https://github.com/rapid7/metasploit-framework 3 + revision: 4c7a221f3d186b0cd65d2a765533fda54f0848f4 4 + ref: refs/tags/6.0.38 5 specs: 6 + metasploit-framework (6.0.38) 7 actionpack (~> 5.2.2) 8 activerecord (~> 5.2.2) 9 activesupport (~> 5.2.2) ··· 30 metasploit-concern 31 metasploit-credential 32 metasploit-model 33 + metasploit-payloads (= 2.0.41) 34 metasploit_data_models 35 + metasploit_payloads-mettle (= 1.0.8) 36 mqtt 37 msgpack 38 nessus_rest ··· 92 remote: https://rubygems.org/ 93 specs: 94 Ascii85 (1.1.0) 95 + actionpack (5.2.5) 96 + actionview (= 5.2.5) 97 + activesupport (= 5.2.5) 98 rack (~> 2.0, >= 2.0.8) 99 rack-test (>= 0.6.3) 100 rails-dom-testing (~> 2.0) 101 rails-html-sanitizer (~> 1.0, >= 1.0.2) 102 + actionview (5.2.5) 103 + activesupport (= 5.2.5) 104 builder (~> 3.1) 105 erubi (~> 1.4) 106 rails-dom-testing (~> 2.0) 107 rails-html-sanitizer (~> 1.0, >= 1.0.3) 108 + activemodel (5.2.5) 109 + activesupport (= 5.2.5) 110 + activerecord (5.2.5) 111 + activemodel (= 5.2.5) 112 + activesupport (= 5.2.5) 113 arel (>= 9.0) 114 + activesupport (5.2.5) 115 concurrent-ruby (~> 1.0, >= 1.0.2) 116 i18n (>= 0.7, < 2) 117 minitest (~> 5.1) ··· 123 arel-helpers (2.12.0) 124 activerecord (>= 3.1.0, < 7) 125 aws-eventstream (1.1.1) 126 + aws-partitions (1.441.0) 127 + aws-sdk-core (3.113.1) 128 aws-eventstream (~> 1, >= 1.0.2) 129 aws-partitions (~> 1, >= 1.239.0) 130 aws-sigv4 (~> 1.1) 131 jmespath (~> 1.0) 132 + aws-sdk-ec2 (1.232.0) 133 aws-sdk-core (~> 3, >= 3.112.0) 134 aws-sigv4 (~> 1.1) 135 + aws-sdk-iam (1.52.0) 136 aws-sdk-core (~> 3, >= 3.112.0) 137 aws-sigv4 (~> 1.1) 138 aws-sdk-kms (1.43.0) ··· 181 hrr_rb_ssh (0.3.0.pre2) 182 ed25519 (~> 1.2) 183 http_parser.rb (0.6.0) 184 + i18n (1.8.10) 185 concurrent-ruby (~> 1.0) 186 io-console (0.5.9) 187 + irb (1.3.5) 188 reline (>= 0.1.5) 189 jmespath (1.4.0) 190 jsobfu (0.4.2) ··· 212 activemodel (~> 5.2.2) 213 activesupport (~> 5.2.2) 214 railties (~> 5.2.2) 215 + metasploit-payloads (2.0.41) 216 metasploit_data_models (4.1.2) 217 activerecord (~> 5.2.2) 218 activesupport (~> 5.2.2) ··· 223 railties (~> 5.2.2) 224 recog (~> 2.0) 225 webrick 226 + metasploit_payloads-mettle (1.0.8) 227 method_source (1.0.0) 228 mini_portile2 (2.5.0) 229 minitest (5.14.4) ··· 236 net-ldap (0.17.0) 237 net-ssh (6.1.0) 238 network_interface (0.0.2) 239 + nexpose (7.3.0) 240 nio4r (2.5.7) 241 nokogiri (1.11.2) 242 mini_portile2 (~> 2.5.0) ··· 272 nokogiri (>= 1.6) 273 rails-html-sanitizer (1.3.0) 274 loofah (~> 2.3) 275 + railties (5.2.5) 276 + actionpack (= 5.2.5) 277 + activesupport (= 5.2.5) 278 method_source 279 rake (>= 0.8.7) 280 thor (>= 0.19.0, < 2.0) ··· 283 recog (2.3.19) 284 nokogiri 285 redcarpet (3.5.1) 286 + reline (0.2.5) 287 io-console (~> 0.5) 288 rex-arch (0.1.14) 289 rex-text
+2 -2
pkgs/tools/security/metasploit/default.nix
··· 8 }; 9 in stdenv.mkDerivation rec { 10 pname = "metasploit-framework"; 11 - version = "6.0.37"; 12 13 src = fetchFromGitHub { 14 owner = "rapid7"; 15 repo = "metasploit-framework"; 16 rev = version; 17 - sha256 = "sha256-q6/1GW02C1z5nQwAKXU7xbVVviwXwS+XS7ZfNjJryiA="; 18 }; 19 20 nativeBuildInputs = [ makeWrapper ];
··· 8 }; 9 in stdenv.mkDerivation rec { 10 pname = "metasploit-framework"; 11 + version = "6.0.38"; 12 13 src = fetchFromGitHub { 14 owner = "rapid7"; 15 repo = "metasploit-framework"; 16 rev = version; 17 + sha256 = "sha256-/e1BWhkM4A+xrvDS6Z01sND9aOZDn+cL0RIcAgT5oZs="; 18 }; 19 20 nativeBuildInputs = [ makeWrapper ];
+35 -35
pkgs/tools/security/metasploit/gemset.nix
··· 4 platforms = []; 5 source = { 6 remotes = ["https://rubygems.org"]; 7 - sha256 = "1dh83klnrhfi94s066ahfl2bxaqxqc0sqga71bvcgn8xmcl56bhq"; 8 type = "gem"; 9 }; 10 - version = "5.2.4.5"; 11 }; 12 actionview = { 13 groups = ["default"]; 14 platforms = []; 15 source = { 16 remotes = ["https://rubygems.org"]; 17 - sha256 = "0kxf9gd52hh33z6015gsfsnyavly29f15lbsljlai68r7qc2j89c"; 18 type = "gem"; 19 }; 20 - version = "5.2.4.5"; 21 }; 22 activemodel = { 23 groups = ["default"]; 24 platforms = []; 25 source = { 26 remotes = ["https://rubygems.org"]; 27 - sha256 = "0qc4bjxnkjrlqpz2k7hllqk30ydad5m2q7pbqzdr0hxzycavxz7m"; 28 type = "gem"; 29 }; 30 - version = "5.2.4.5"; 31 }; 32 activerecord = { 33 groups = ["default"]; 34 platforms = []; 35 source = { 36 remotes = ["https://rubygems.org"]; 37 - sha256 = "1smg691az7r2bsydfj2d46mr2d5sm0lq3ydwvfv6hl5c3y1y5jfg"; 38 type = "gem"; 39 }; 40 - version = "5.2.4.5"; 41 }; 42 activesupport = { 43 groups = ["default"]; 44 platforms = []; 45 source = { 46 remotes = ["https://rubygems.org"]; 47 - sha256 = "0fp4gr3g25qgl01y3pd88wfh4pjc5zj3bz4v7rkxxwaxdjg7a9cc"; 48 type = "gem"; 49 }; 50 - version = "5.2.4.5"; 51 }; 52 addressable = { 53 groups = ["default"]; ··· 114 platforms = []; 115 source = { 116 remotes = ["https://rubygems.org"]; 117 - sha256 = "13hy3xhff1cqlzv5hi3lz7vb11wh10m6221hq471d8m94chmmkjs"; 118 type = "gem"; 119 }; 120 - version = "1.435.0"; 121 }; 122 aws-sdk-core = { 123 groups = ["default"]; 124 platforms = []; 125 source = { 126 remotes = ["https://rubygems.org"]; 127 - sha256 = "1774xyfqf307qvh5npvf01948ayrviaadq576r4jxin6xvlg8j9z"; 128 type = "gem"; 129 }; 130 - version = "3.113.0"; 131 }; 132 aws-sdk-ec2 = { 133 groups = ["default"]; 134 platforms = []; 135 source = { 136 remotes = ["https://rubygems.org"]; 137 - sha256 = "1c7qqly2f94db3643xwjj9mcb34vilx11awbv40v2f8z7xisvvz3"; 138 type = "gem"; 139 }; 140 - version = "1.230.0"; 141 }; 142 aws-sdk-iam = { 143 groups = ["default"]; 144 platforms = []; 145 source = { 146 remotes = ["https://rubygems.org"]; 147 - sha256 = "0x2768blsy8lpib9pi2f2d67flabar3bq6chmbj07iqzpwvpz569"; 148 type = "gem"; 149 }; 150 - version = "1.51.0"; 151 }; 152 aws-sdk-kms = { 153 groups = ["default"]; ··· 414 platforms = []; 415 source = { 416 remotes = ["https://rubygems.org"]; 417 - sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32"; 418 type = "gem"; 419 }; 420 - version = "1.8.9"; 421 }; 422 io-console = { 423 groups = ["default"]; ··· 434 platforms = []; 435 source = { 436 remotes = ["https://rubygems.org"]; 437 - sha256 = "1zf8n7s823rs5byzxpin626hd532ql0w5hdj1i3bds3h8h5gvxwb"; 438 type = "gem"; 439 }; 440 - version = "1.3.4"; 441 }; 442 jmespath = { 443 groups = ["default"]; ··· 514 platforms = []; 515 source = { 516 fetchSubmodules = false; 517 - rev = "eae71004c4a1720d9af1513ca750cfe116d99a7b"; 518 - sha256 = "086adcr3cpxn9fbjzh8p5jz5bdf57dsjj00ckpwmq2rndlczbbxb"; 519 type = "git"; 520 url = "https://github.com/rapid7/metasploit-framework"; 521 }; 522 - version = "6.0.37"; 523 }; 524 metasploit-model = { 525 groups = ["default"]; ··· 536 platforms = []; 537 source = { 538 remotes = ["https://rubygems.org"]; 539 - sha256 = "1ibvh45sbmzdn6gsd3dgj1a67mhgy6p3hvjbh9b2qb7ijc14gv49"; 540 type = "gem"; 541 }; 542 - version = "2.0.39"; 543 }; 544 metasploit_data_models = { 545 groups = ["default"]; ··· 556 platforms = []; 557 source = { 558 remotes = ["https://rubygems.org"]; 559 - sha256 = "1ivxz2wl9k0j7ba7xas0bfm44c1iczfvlgyxhsgqbpqkqwc374vg"; 560 type = "gem"; 561 }; 562 - version = "1.0.7"; 563 }; 564 method_source = { 565 groups = ["default"]; ··· 676 platforms = []; 677 source = { 678 remotes = ["https://rubygems.org"]; 679 - sha256 = "0i108glkklwgjxhfhnlqf4b16plqf9b84qpfz0pnl2pbnal5af8m"; 680 type = "gem"; 681 }; 682 - version = "7.2.1"; 683 }; 684 nio4r = { 685 groups = ["default"]; ··· 876 platforms = []; 877 source = { 878 remotes = ["https://rubygems.org"]; 879 - sha256 = "1qwgjwfzkm4q7wby30c9r724w1sp1bywbqfmpv20lq3zdcrf1rfd"; 880 type = "gem"; 881 }; 882 - version = "5.2.4.5"; 883 }; 884 rake = { 885 groups = ["default"]; ··· 926 platforms = []; 927 source = { 928 remotes = ["https://rubygems.org"]; 929 - sha256 = "15gcafrzp9qzfv65cjapifpqg7cckyr14m9xw86fi56d2b6jms8b"; 930 type = "gem"; 931 }; 932 - version = "0.2.4"; 933 }; 934 rex-arch = { 935 groups = ["default"];
··· 4 platforms = []; 5 source = { 6 remotes = ["https://rubygems.org"]; 7 + sha256 = "1m9wdcnkls8cs31gfic5hffnrz0l1iyk0dldwx2q2z58qhh3sw0m"; 8 type = "gem"; 9 }; 10 + version = "5.2.5"; 11 }; 12 actionview = { 13 groups = ["default"]; 14 platforms = []; 15 source = { 16 remotes = ["https://rubygems.org"]; 17 + sha256 = "1xlcfcbmwlmcp6vi9ay5xw9lqnj70bl1gn19hafygv9w65sw0n2i"; 18 type = "gem"; 19 }; 20 + version = "5.2.5"; 21 }; 22 activemodel = { 23 groups = ["default"]; 24 platforms = []; 25 source = { 26 remotes = ["https://rubygems.org"]; 27 + sha256 = "1bb600bsxd0gf4vwqq2qiklg7wd37b0as6ll3k5hjy9v6izj006b"; 28 type = "gem"; 29 }; 30 + version = "5.2.5"; 31 }; 32 activerecord = { 33 groups = ["default"]; 34 platforms = []; 35 source = { 36 remotes = ["https://rubygems.org"]; 37 + sha256 = "03zijqm7xdmmylzp68hadvq5rps67lsq10hnq6kpmhq496pp7wlj"; 38 type = "gem"; 39 }; 40 + version = "5.2.5"; 41 }; 42 activesupport = { 43 groups = ["default"]; 44 platforms = []; 45 source = { 46 remotes = ["https://rubygems.org"]; 47 + sha256 = "1bizrvn05d59l1qzwkhqvwmzicamq4p66z2ziap5ks9y6hqgqmzj"; 48 type = "gem"; 49 }; 50 + version = "5.2.5"; 51 }; 52 addressable = { 53 groups = ["default"]; ··· 114 platforms = []; 115 source = { 116 remotes = ["https://rubygems.org"]; 117 + sha256 = "07i9mqbh19pd25wd3laxv1bcmzcpriw54g0x3mqzkn600h8f3lg9"; 118 type = "gem"; 119 }; 120 + version = "1.441.0"; 121 }; 122 aws-sdk-core = { 123 groups = ["default"]; 124 platforms = []; 125 source = { 126 remotes = ["https://rubygems.org"]; 127 + sha256 = "0i3x8p9gymc9977dcdkz5ca6mrmh7ym6p2mrscbh49nfd9gi5zg0"; 128 type = "gem"; 129 }; 130 + version = "3.113.1"; 131 }; 132 aws-sdk-ec2 = { 133 groups = ["default"]; 134 platforms = []; 135 source = { 136 remotes = ["https://rubygems.org"]; 137 + sha256 = "0n7hi66zpm8mgfgf32gw7c9p4rv09q9kipsr01l5l2n2d69k67q5"; 138 type = "gem"; 139 }; 140 + version = "1.232.0"; 141 }; 142 aws-sdk-iam = { 143 groups = ["default"]; 144 platforms = []; 145 source = { 146 remotes = ["https://rubygems.org"]; 147 + sha256 = "13mc05yx3f2g1543y349qysszzk811ns2dcjcidbszaasvpz3cci"; 148 type = "gem"; 149 }; 150 + version = "1.52.0"; 151 }; 152 aws-sdk-kms = { 153 groups = ["default"]; ··· 414 platforms = []; 415 source = { 416 remotes = ["https://rubygems.org"]; 417 + sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a"; 418 type = "gem"; 419 }; 420 + version = "1.8.10"; 421 }; 422 io-console = { 423 groups = ["default"]; ··· 434 platforms = []; 435 source = { 436 remotes = ["https://rubygems.org"]; 437 + sha256 = "06i0izb1jm4ijydwk9w2jqyvz72aznaa1b386769yfi8284cnwj6"; 438 type = "gem"; 439 }; 440 + version = "1.3.5"; 441 }; 442 jmespath = { 443 groups = ["default"]; ··· 514 platforms = []; 515 source = { 516 fetchSubmodules = false; 517 + rev = "4c7a221f3d186b0cd65d2a765533fda54f0848f4"; 518 + sha256 = "16x1z420470js45yg7s3wrlgvl5h6nfyklphmsqhzq0c35d43vgx"; 519 type = "git"; 520 url = "https://github.com/rapid7/metasploit-framework"; 521 }; 522 + version = "6.0.38"; 523 }; 524 metasploit-model = { 525 groups = ["default"]; ··· 536 platforms = []; 537 source = { 538 remotes = ["https://rubygems.org"]; 539 + sha256 = "1nnb6kidfm39qyhv694m7skbvmsp5sjw52633v89zq0ym4y5wld5"; 540 type = "gem"; 541 }; 542 + version = "2.0.41"; 543 }; 544 metasploit_data_models = { 545 groups = ["default"]; ··· 556 platforms = []; 557 source = { 558 remotes = ["https://rubygems.org"]; 559 + sha256 = "0nq6wxsaghj0yqwn988z71d9f0qwglcrliwkgqr9f16vbbv33p36"; 560 type = "gem"; 561 }; 562 + version = "1.0.8"; 563 }; 564 method_source = { 565 groups = ["default"]; ··· 676 platforms = []; 677 source = { 678 remotes = ["https://rubygems.org"]; 679 + sha256 = "0jz5xiwiwagd663qdlfhmc9fm76x78cqhighmfivy6w5v0n4xyq0"; 680 type = "gem"; 681 }; 682 + version = "7.3.0"; 683 }; 684 nio4r = { 685 groups = ["default"]; ··· 876 platforms = []; 877 source = { 878 remotes = ["https://rubygems.org"]; 879 + sha256 = "072spzdpc8bv35nflr43i67njlriavqkrz6cgyd42adz6bqyval9"; 880 type = "gem"; 881 }; 882 + version = "5.2.5"; 883 }; 884 rake = { 885 groups = ["default"]; ··· 926 platforms = []; 927 source = { 928 remotes = ["https://rubygems.org"]; 929 + sha256 = "1bf86g8a761mp516349gzmvxkafj36nznczznb3flkn4a84dlk3k"; 930 type = "gem"; 931 }; 932 + version = "0.2.5"; 933 }; 934 rex-arch = { 935 groups = ["default"];
+2
pkgs/top-level/python-packages.nix
··· 6927 6928 pytun = callPackage ../development/python-modules/pytun { }; 6929 6930 pytz = callPackage ../development/python-modules/pytz { }; 6931 6932 pytzdata = callPackage ../development/python-modules/pytzdata { };
··· 6927 6928 pytun = callPackage ../development/python-modules/pytun { }; 6929 6930 + pyturbojpeg = callPackage ../development/python-modules/pyturbojpeg { }; 6931 + 6932 pytz = callPackage ../development/python-modules/pytz { }; 6933 6934 pytzdata = callPackage ../development/python-modules/pytzdata { };