From 48b415786b0d33df61c99275268d8fab8afcae80 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Mar 2021 18:50:40 +0000 Subject: [PATCH 01/19] stripe-cli: 1.5.11 -> 1.5.12 --- pkgs/tools/admin/stripe-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix index dd754742150..13620d164e6 100644 --- a/pkgs/tools/admin/stripe-cli/default.nix +++ b/pkgs/tools/admin/stripe-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.5.11"; + version = "1.5.12"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aoflV4C7eH0RNdq8j7kPeAfnOEZECmfZ91/QBQy7oxY="; + sha256 = "sha256-eMxukwaJqsXL0+Euvk5mM+pcAsT3GsF9filuyRL4tXg="; }; vendorSha256 = "sha256-e7EZ5o30vDpS904/R1y7/Mds7HxQNmsIftrnc1Bj2bc="; From da2417923b39510392b672f43ceca495aa4c3f0b Mon Sep 17 00:00:00 2001 From: upkeep-bot Date: Thu, 1 Apr 2021 00:12:01 +0000 Subject: [PATCH 02/19] vscode: 1.54.3 -> 1.55.0 --- pkgs/applications/editors/vscode/vscode.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 988bcf412ef..09a58e7dfd1 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0fpa3b807hy3wrb98h5s0p6ljya279bikv2qwq30nvr0f4zn48bk"; - x86_64-darwin = "0bw7pdzn0a0zr7x8fpwck7v73dq5vh71ja00z11mhjrkjnvmmd9k"; - aarch64-linux = "04wrqcmyamhwiwcyay1z0q0dvf6g7k3pcs93x7hahy16l65w7s2c"; - armv7l-linux = "1hkc9i4z021jwjn275w790bppfvi63g0cnwvkssqdh1c94939rhv"; + x86_64-linux = "0z1diiiykv4ilsiljffz9sl2mlvrxq0xwm8ga2ralfvjwbhzr6dn"; + x86_64-darwin = "02gzw46w3kzw1ya9nx8fkhvzi0mbpz2fyp47n58jki2zkdsfiwzh"; + aarch64-linux = "0bkvgdxch95dqcb41ncsjkaaswmwv6zad4hzdsr3famjm2vym1ky"; + armv7l-linux = "0wdp97ihdnx9bcyn2dh6wzhb7qvdj6x730r7ng1q3i9jhd19wfi3"; }.${system}; in callPackage ./generic.nix rec { @@ -25,7 +25,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.54.3"; + version = "1.55.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; From 4c0515aefe6900903c36b59a23e4a5556b0279b5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 1 Apr 2021 06:31:58 +0000 Subject: [PATCH 03/19] cloud-nuke: 0.1.25 -> 0.1.26 --- pkgs/development/tools/cloud-nuke/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index e729b8c448a..0e487b6fe3d 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.1.25"; + version = "0.1.26"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tbwmHsiR/RJl3CJrzJtI6GA3v9mNAirbEHXX+wDMd2k="; + sha256 = "sha256-gzigpb5ML7H6F+ojGtH7Y108cCscGD2gG7LfPuGRjnI="; }; - vendorSha256 = "sha256-vOaklBsMuKTQ3cJgXDClM1RWh+ovemO1uDWXeK1ygU4="; + vendorSha256 = "sha256-pl3dLisu4Oc77kgfuteKbsZaDzrHo1wUigZEkM4081Q="; buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; From 694696dfa6d3eb6a79f24efa0f179f7f8b1fadf4 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 1 Apr 2021 04:20:00 +0000 Subject: [PATCH 04/19] cloud-nuke: 0.1.26 -> 0.1.27 https://github.com/gruntwork-io/cloud-nuke/releases/tag/v0.1.27 --- pkgs/development/tools/cloud-nuke/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index 0e487b6fe3d..0be4faf0ed8 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.1.26"; + version = "0.1.27"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gzigpb5ML7H6F+ojGtH7Y108cCscGD2gG7LfPuGRjnI="; + sha256 = "1708g8msv5cw0b4gljyjqns328wbci3p3avwysms4aknm4vky0g0"; }; - vendorSha256 = "sha256-pl3dLisu4Oc77kgfuteKbsZaDzrHo1wUigZEkM4081Q="; + vendorSha256 = "0m7k6k790i06i8a5r8y7787mmikfibbvl7s8xqxygq1f5cpdspd6"; buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; From e689f682812443e49add6297d1280442e3b107e7 Mon Sep 17 00:00:00 2001 From: upkeep-bot Date: Fri, 2 Apr 2021 00:18:48 +0000 Subject: [PATCH 05/19] vscodium: 1.54.3 -> 1.55.0 --- pkgs/applications/editors/vscode/vscodium.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 06613485e7f..b11a8a8f103 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1577wxmm8623aj513hxqcfim4d9p1r9wbla9my0c0c1x6pik0h8h"; - x86_64-darwin = "1n8q626nlqw78wlpfppzj365gmlz2swll6csg3ic7p4ik3nak95b"; - aarch64-linux = "1a7rkmhz456rsqw95lrknp1wqsdp63pkzh76vhzy5bazb1h081v0"; - armv7l-linux = "1qjik1r41c8n9fs7p09p0zdj8c5xgqjniwv23hcy6mp28i4whclr"; + x86_64-linux = "0zzdbknmljf1hizmxnrby17i8v3kp98rklinywnr632jwgjms81j"; + x86_64-darwin = "0mccq1b0l6r1ipxp5gvyam43c2hh8hxdvwqikkz6g7y93p29wz9g"; + aarch64-linux = "12gpday6gzl1adcykqhgz3xrdm9568a26gsndmplkn2n6l6agnp0"; + armv7l-linux = "0l886vdw7az0nvvhh14pjawz0yyib59ymychy7gbk8ay5g9vfv03"; }.${system}; sourceRoot = { @@ -33,7 +33,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.54.3"; + version = "1.55.0"; pname = "vscodium"; executableName = "codium"; From 24abc4bfc475e100bc4c1cc5120474ff7050e124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Fri, 2 Apr 2021 19:48:46 +0200 Subject: [PATCH 06/19] gnuradio: 3.9.0.0 -> 3.9.1.0 --- pkgs/applications/radio/gnuradio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index bcb2560144a..13b498e9c46 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -44,14 +44,14 @@ , pname ? "gnuradio" , versionAttr ? { major = "3.9"; - minor = "0"; + minor = "1"; patch = "0"; } , fetchSubmodules ? false }: let - sourceSha256 = "ZjQzioAuWrd8jsYOnLNH1mK4n9EbrjgvPX3mTzVFdLk="; + sourceSha256 = "0zydmrr3gkaqiv4jv8f42awrfzs177bqb349q34rnr6j3d32z2vp"; featuresInfo = { # Needed always basic = { From 6242f38c3058f5a9136b357d0fa0598c18bd5cae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Sat, 3 Apr 2021 14:47:43 +0200 Subject: [PATCH 07/19] gnuradio: enable gr-vocoder --- pkgs/applications/radio/gnuradio/default.nix | 26 +++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index 13b498e9c46..cb464bde16e 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -190,11 +190,10 @@ let runtime = [ SDL ]; cmakeEnableFlag = "GR_VIDEO_SDL"; }; - # codec2 and gsm support is broken with gr3.9: https://github.com/gnuradio/gnuradio/issues/4278 - # gr-vocoder = { - # runtime = [ codec2 gsm ]; - # cmakeEnableFlag = "GR_VOCODER"; - # }; + gr-vocoder = { + runtime = [ codec2 gsm ]; + cmakeEnableFlag = "GR_VOCODER"; + }; gr-wavelet = { cmakeEnableFlag = "GR_WAVELET"; runtime = [ gsl libsodium ]; @@ -234,7 +233,6 @@ stdenv.mkDerivation rec { src nativeBuildInputs buildInputs - cmakeFlags disallowedReferences stripDebugList doCheck @@ -250,6 +248,22 @@ stdenv.mkDerivation rec { } // lib.optionalAttrs (hasFeature "gr-qtgui" features) { inherit (libsForQt5) qwt; }; + cmakeFlags = shared.cmakeFlags + # From some reason, if these are not set, libcodec2 and gsm are not + # detected properly. + ++ lib.optionals (hasFeature "gr-vocoder" features) [ + "-DLIBCODEC2_FOUND=TRUE" + "-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2.so" + "-DLIBCODEC2_INCLUDE_DIRS=${codec2}/include" + "-DLIBCODEC2_HAS_FREEDV_API=ON" + "-DLIBGSM_FOUND=TRUE" + "-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm.so" + "-DLIBGSM_INCLUDE_DIRS=${gsm}/include/gsm" + ] + ++ lib.optionals (hasFeature "volk" features && volk != null) [ + "-DENABLE_INTERNAL_VOLK=OFF" + ] + ; postInstall = shared.postInstall # This is the only python reference worth removing, if needed. From 5e8ff7b3b9ab850131654bb80873fd7b4e134615 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 3 Apr 2021 15:54:52 +0200 Subject: [PATCH 08/19] pythonPackages.pyturbojpeg: init at 1.4.1 --- .../python-modules/pyturbojpeg/default.nix | 45 +++++++++++++++++++ .../python-modules/pyturbojpeg/lib-path.patch | 28 ++++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 75 insertions(+) create mode 100644 pkgs/development/python-modules/pyturbojpeg/default.nix create mode 100644 pkgs/development/python-modules/pyturbojpeg/lib-path.patch diff --git a/pkgs/development/python-modules/pyturbojpeg/default.nix b/pkgs/development/python-modules/pyturbojpeg/default.nix new file mode 100644 index 00000000000..1eebc05d89e --- /dev/null +++ b/pkgs/development/python-modules/pyturbojpeg/default.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, python +, buildPythonPackage +, fetchPypi +, substituteAll +, libjpeg_turbo +, numpy +}: + +buildPythonPackage rec { + pname = "pyturbojpeg"; + version = "1.4.1"; + + src = fetchPypi { + pname = "PyTurboJPEG"; + inherit version; + sha256 = "09688a93331281e566569b4d313e1d1a058ca32ccae1a2473847a10e4ca2f2a7"; + }; + + patches = [ + (substituteAll { + src = ./lib-path.patch; + libturbojpeg = "${libjpeg_turbo.out}/lib/libturbojpeg${stdenv.hostPlatform.extensions.sharedLibrary}"; + }) + ]; + + propagatedBuildInputs = [ + numpy + ]; + + # upstream has no tests, but we want to test whether the library is found + checkPhase = '' + ${python.interpreter} -c 'from turbojpeg import TurboJPEG; TurboJPEG()' + ''; + + pythonImportsCheck = [ "turbojpeg" ]; + + meta = with lib; { + description = "A Python wrapper of libjpeg-turbo for decoding and encoding JPEG image"; + homepage = "https://github.com/lilohuang/PyTurboJPEG"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pyturbojpeg/lib-path.patch b/pkgs/development/python-modules/pyturbojpeg/lib-path.patch new file mode 100644 index 00000000000..30e6ed58bac --- /dev/null +++ b/pkgs/development/python-modules/pyturbojpeg/lib-path.patch @@ -0,0 +1,28 @@ +diff --git a/turbojpeg.py b/turbojpeg.py +index 73edb38..bfa8c67 100644 +--- a/turbojpeg.py ++++ b/turbojpeg.py +@@ -408,22 +408,7 @@ class TurboJPEG(object): + + def __find_turbojpeg(self): + """returns default turbojpeg library path if possible""" +- lib_path = find_library('turbojpeg') +- if lib_path is not None: +- return lib_path +- for lib_path in DEFAULT_LIB_PATHS[platform.system()]: +- if os.path.exists(lib_path): +- return lib_path +- if platform.system() == 'Linux' and 'LD_LIBRARY_PATH' in os.environ: +- ld_library_path = os.environ['LD_LIBRARY_PATH'] +- for path in ld_library_path.split(':'): +- lib_path = os.path.join(path, 'libturbojpeg.so.0') +- if os.path.exists(lib_path): +- return lib_path +- raise RuntimeError( +- 'Unable to locate turbojpeg library automatically. ' +- 'You may specify the turbojpeg library path manually.\n' +- 'e.g. jpeg = TurboJPEG(lib_path)') ++ return '@libturbojpeg@' + + def __getaddr(self, nda): + """returns the memory address for a given ndarray""" diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 19442dff09d..f460f07a0fc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6915,6 +6915,8 @@ in { pytun = callPackage ../development/python-modules/pytun { }; + pyturbojpeg = callPackage ../development/python-modules/pyturbojpeg { }; + pytz = callPackage ../development/python-modules/pytz { }; pytzdata = callPackage ../development/python-modules/pytzdata { }; From 990f2778f573a452a6abe07378fb8b75c91d65fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 3 Apr 2021 15:57:12 +0200 Subject: [PATCH 09/19] home-assistant: update component-packages.nix --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index f41c5556d71..b8ee73fc8b6 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -353,7 +353,7 @@ "hlk_sw16" = ps: with ps; [ ]; # missing inputs: hlk-sw16 "home_connect" = ps: with ps; [ aiohttp-cors ]; # missing inputs: homeconnect "homeassistant" = ps: with ps; [ ]; - "homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors base36 fnvhash ha-ffmpeg zeroconf ]; # missing inputs: PyTurboJPEG + "homekit" = ps: with ps; [ HAP-python pyqrcode pyturbojpeg aiohttp-cors base36 fnvhash ha-ffmpeg zeroconf ]; "homekit_controller" = ps: with ps; [ aiohomekit aiohttp-cors zeroconf ]; "homematic" = ps: with ps; [ pyhomematic ]; "homematicip_cloud" = ps: with ps; [ ]; # missing inputs: homematicip From a8c0dbdab9f446b6264aba18a645c47f84b839cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 3 Apr 2021 15:57:40 +0200 Subject: [PATCH 10/19] home-assistant: test homekit component --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 88dde650e5a..984501318d7 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -227,6 +227,7 @@ in with py.pkgs; buildPythonApplication rec { "hddtemp" "history" "history_stats" + "homekit" "homekit_controller" "homeassistant" "homematic" From 55abe2a96371563c21c6fbaa1d5c453b513d7763 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 3 Apr 2021 18:22:48 +0200 Subject: [PATCH 11/19] home-assistant: update component-packages.nix --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index f41c5556d71..622208b5c4c 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -277,7 +277,7 @@ "foscam" = ps: with ps; [ ]; # missing inputs: libpyfoscam "foursquare" = ps: with ps; [ aiohttp-cors ]; "free_mobile" = ps: with ps; [ ]; # missing inputs: freesms - "freebox" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: freebox-api + "freebox" = ps: with ps; [ aiohttp-cors freebox-api netdisco zeroconf ]; "freedns" = ps: with ps; [ ]; "fritz" = ps: with ps; [ fritzconnection ]; "fritzbox" = ps: with ps; [ pyfritzhome ]; From b94f2dfd168bb4607f2ca8661f9ab609e0b91a86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 3 Apr 2021 18:23:36 +0200 Subject: [PATCH 12/19] home-assistant: test freebox component --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 88dde650e5a..b02bb77fc52 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -216,6 +216,7 @@ in with py.pkgs; buildPythonApplication rec { "flux" "folder" "folder_watcher" + "freebox" "fritzbox" "fritzbox_callmonitor" "frontend" From 9531c4adefd7fca359acee9e90f58bfe182dae4b Mon Sep 17 00:00:00 2001 From: Serval Date: Sun, 4 Apr 2021 02:51:57 +0800 Subject: [PATCH 13/19] v2ray: 4.36.2 -> 4.37.0 --- pkgs/tools/networking/v2ray/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix index 7515105948f..5181216e1c0 100644 --- a/pkgs/tools/networking/v2ray/default.nix +++ b/pkgs/tools/networking/v2ray/default.nix @@ -3,22 +3,22 @@ }: let - version = "4.36.2"; + version = "4.37.0"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - sha256 = "1gvzr4kq4klld8m0jv6mizgrx3xj6s2i69kl9vmh5n355bakb7kk"; + sha256 = "00bw91n7210gsnc7bw2spl6k1yl2i7d1j55w98qf4rvn80z9d59r"; }; - vendorSha256 = "sha256-8O0xUNIdu3W//LtwiMZlSs1wkpa6Jt+vFkTavz6TBKU="; + vendorSha256 = "sha256-sc001qWdmhhaUh0nmvaqwwVE2Ee8IFWYi4K8aAURWBE="; assets = { # MIT licensed "geoip.dat" = let - geoipRev = "202103170314"; - geoipSha256 = "147kajdhby92yxsvcpa6bpk11ilzvc4nj7rc0h84wp2f0y692kq2"; + geoipRev = "202104010913"; + geoipSha256 = "1kq6d68ii9hr2w0caxacqh5q8jran154b99aik4g7ripgx7lckpr"; in fetchurl { url = "https://github.com/v2fly/geoip/releases/download/${geoipRev}/geoip.dat"; sha256 = geoipSha256; @@ -26,8 +26,8 @@ let # MIT licensed "geosite.dat" = let - geositeRev = "20210317031429"; - geositeSha256 = "0nzd0ll0x7hv75cbh1i3kgmffasi002a8n3mjw22zywj71v2jwmz"; + geositeRev = "20210403111045"; + geositeSha256 = "1b64yci0dmvw9divfv3njpzczz2ag3cnvyr29c2mk8y85vp05ysc"; in fetchurl { url = "https://github.com/v2fly/domain-list-community/releases/download/${geositeRev}/dlc.dat"; sha256 = geositeSha256; From 0d12b459918a2b686cb8d6c80bcc9fcef458ab83 Mon Sep 17 00:00:00 2001 From: devhell Date: Sat, 3 Apr 2021 19:53:44 +0100 Subject: [PATCH 14/19] mediainfo-gui: 20.09 -> 21.03 --- pkgs/applications/misc/mediainfo-gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index 3e8aacb9895..89d7c2df741 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -2,11 +2,11 @@ , desktop-file-utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "20.09"; + version = "21.03"; pname = "mediainfo-gui"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "0rqg9z7s5bk7vlvjrs4gackzg7ib05a0dffi2ihsjf5a7kw7wcir"; + sha256 = "07h2a1lbw5ak6c9bcn8qydchl0wpgk945rf9sfcqjyv05h5wll6y"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From bfeba88bb3a4e626cd91d200169ef20235badfeb Mon Sep 17 00:00:00 2001 From: devhell Date: Sat, 3 Apr 2021 19:54:17 +0100 Subject: [PATCH 15/19] libmediainfo: 20.09 -> 21.03 --- pkgs/development/libraries/libmediainfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index d78ccbc50ab..3541d3d466f 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, zlib }: stdenv.mkDerivation rec { - version = "20.09"; + version = "21.03"; pname = "libmediainfo"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "15ni9pnch6688m72swwax109a7mg4a08yx75qknrx7qa6dbyhz6h"; + sha256 = "1jm4mk539wf3crgpcddgwdixshwdzm37mkb5441lifhcz2mykdsn"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 8b0b632f881d43bfbba69dd5cdeb46cc6bd55437 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Apr 2021 22:00:43 +0200 Subject: [PATCH 16/19] metasploit: 6.0.37 -> 6.0.38 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 58 ++++++++--------- pkgs/tools/security/metasploit/default.nix | 4 +- pkgs/tools/security/metasploit/gemset.nix | 70 ++++++++++----------- 4 files changed, 67 insertions(+), 67 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 7c2f230266e..150f00e92b4 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.37" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.38" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 85d41fba9f9..c64e2b31aff 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: eae71004c4a1720d9af1513ca750cfe116d99a7b - ref: refs/tags/6.0.37 + revision: 4c7a221f3d186b0cd65d2a765533fda54f0848f4 + ref: refs/tags/6.0.38 specs: - metasploit-framework (6.0.37) + metasploit-framework (6.0.38) actionpack (~> 5.2.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -30,9 +30,9 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.39) + metasploit-payloads (= 2.0.41) metasploit_data_models - metasploit_payloads-mettle (= 1.0.7) + metasploit_payloads-mettle (= 1.0.8) mqtt msgpack nessus_rest @@ -92,26 +92,26 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.1.0) - actionpack (5.2.4.5) - actionview (= 5.2.4.5) - activesupport (= 5.2.4.5) + actionpack (5.2.5) + actionview (= 5.2.5) + activesupport (= 5.2.5) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.4.5) - activesupport (= 5.2.4.5) + actionview (5.2.5) + activesupport (= 5.2.5) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activemodel (5.2.4.5) - activesupport (= 5.2.4.5) - activerecord (5.2.4.5) - activemodel (= 5.2.4.5) - activesupport (= 5.2.4.5) + activemodel (5.2.5) + activesupport (= 5.2.5) + activerecord (5.2.5) + activemodel (= 5.2.5) + activesupport (= 5.2.5) arel (>= 9.0) - activesupport (5.2.4.5) + activesupport (5.2.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -123,16 +123,16 @@ GEM arel-helpers (2.12.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.1.1) - aws-partitions (1.435.0) - aws-sdk-core (3.113.0) + aws-partitions (1.441.0) + aws-sdk-core (3.113.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.230.0) + aws-sdk-ec2 (1.232.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.51.0) + aws-sdk-iam (1.52.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-kms (1.43.0) @@ -181,10 +181,10 @@ GEM hrr_rb_ssh (0.3.0.pre2) ed25519 (~> 1.2) http_parser.rb (0.6.0) - i18n (1.8.9) + i18n (1.8.10) concurrent-ruby (~> 1.0) io-console (0.5.9) - irb (1.3.4) + irb (1.3.5) reline (>= 0.1.5) jmespath (1.4.0) jsobfu (0.4.2) @@ -212,7 +212,7 @@ GEM activemodel (~> 5.2.2) activesupport (~> 5.2.2) railties (~> 5.2.2) - metasploit-payloads (2.0.39) + metasploit-payloads (2.0.41) metasploit_data_models (4.1.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -223,7 +223,7 @@ GEM railties (~> 5.2.2) recog (~> 2.0) webrick - metasploit_payloads-mettle (1.0.7) + metasploit_payloads-mettle (1.0.8) method_source (1.0.0) mini_portile2 (2.5.0) minitest (5.14.4) @@ -236,7 +236,7 @@ GEM net-ldap (0.17.0) net-ssh (6.1.0) network_interface (0.0.2) - nexpose (7.2.1) + nexpose (7.3.0) nio4r (2.5.7) nokogiri (1.11.2) mini_portile2 (~> 2.5.0) @@ -272,9 +272,9 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (5.2.4.5) - actionpack (= 5.2.4.5) - activesupport (= 5.2.4.5) + railties (5.2.5) + actionpack (= 5.2.5) + activesupport (= 5.2.5) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) @@ -283,7 +283,7 @@ GEM recog (2.3.19) nokogiri redcarpet (3.5.1) - reline (0.2.4) + reline (0.2.5) io-console (~> 0.5) rex-arch (0.1.14) rex-text diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 4a3da7d7f3f..5dce17ff190 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -8,13 +8,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.0.37"; + version = "6.0.38"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-q6/1GW02C1z5nQwAKXU7xbVVviwXwS+XS7ZfNjJryiA="; + sha256 = "sha256-/e1BWhkM4A+xrvDS6Z01sND9aOZDn+cL0RIcAgT5oZs="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 0be20b68769..49fedb7a84a 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -4,50 +4,50 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dh83klnrhfi94s066ahfl2bxaqxqc0sqga71bvcgn8xmcl56bhq"; + sha256 = "1m9wdcnkls8cs31gfic5hffnrz0l1iyk0dldwx2q2z58qhh3sw0m"; type = "gem"; }; - version = "5.2.4.5"; + version = "5.2.5"; }; actionview = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kxf9gd52hh33z6015gsfsnyavly29f15lbsljlai68r7qc2j89c"; + sha256 = "1xlcfcbmwlmcp6vi9ay5xw9lqnj70bl1gn19hafygv9w65sw0n2i"; type = "gem"; }; - version = "5.2.4.5"; + version = "5.2.5"; }; activemodel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qc4bjxnkjrlqpz2k7hllqk30ydad5m2q7pbqzdr0hxzycavxz7m"; + sha256 = "1bb600bsxd0gf4vwqq2qiklg7wd37b0as6ll3k5hjy9v6izj006b"; type = "gem"; }; - version = "5.2.4.5"; + version = "5.2.5"; }; activerecord = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1smg691az7r2bsydfj2d46mr2d5sm0lq3ydwvfv6hl5c3y1y5jfg"; + sha256 = "03zijqm7xdmmylzp68hadvq5rps67lsq10hnq6kpmhq496pp7wlj"; type = "gem"; }; - version = "5.2.4.5"; + version = "5.2.5"; }; activesupport = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fp4gr3g25qgl01y3pd88wfh4pjc5zj3bz4v7rkxxwaxdjg7a9cc"; + sha256 = "1bizrvn05d59l1qzwkhqvwmzicamq4p66z2ziap5ks9y6hqgqmzj"; type = "gem"; }; - version = "5.2.4.5"; + version = "5.2.5"; }; addressable = { groups = ["default"]; @@ -114,40 +114,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13hy3xhff1cqlzv5hi3lz7vb11wh10m6221hq471d8m94chmmkjs"; + sha256 = "07i9mqbh19pd25wd3laxv1bcmzcpriw54g0x3mqzkn600h8f3lg9"; type = "gem"; }; - version = "1.435.0"; + version = "1.441.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1774xyfqf307qvh5npvf01948ayrviaadq576r4jxin6xvlg8j9z"; + sha256 = "0i3x8p9gymc9977dcdkz5ca6mrmh7ym6p2mrscbh49nfd9gi5zg0"; type = "gem"; }; - version = "3.113.0"; + version = "3.113.1"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c7qqly2f94db3643xwjj9mcb34vilx11awbv40v2f8z7xisvvz3"; + sha256 = "0n7hi66zpm8mgfgf32gw7c9p4rv09q9kipsr01l5l2n2d69k67q5"; type = "gem"; }; - version = "1.230.0"; + version = "1.232.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x2768blsy8lpib9pi2f2d67flabar3bq6chmbj07iqzpwvpz569"; + sha256 = "13mc05yx3f2g1543y349qysszzk811ns2dcjcidbszaasvpz3cci"; type = "gem"; }; - version = "1.51.0"; + version = "1.52.0"; }; aws-sdk-kms = { groups = ["default"]; @@ -414,10 +414,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32"; + sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a"; type = "gem"; }; - version = "1.8.9"; + version = "1.8.10"; }; io-console = { groups = ["default"]; @@ -434,10 +434,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zf8n7s823rs5byzxpin626hd532ql0w5hdj1i3bds3h8h5gvxwb"; + sha256 = "06i0izb1jm4ijydwk9w2jqyvz72aznaa1b386769yfi8284cnwj6"; type = "gem"; }; - version = "1.3.4"; + version = "1.3.5"; }; jmespath = { groups = ["default"]; @@ -514,12 +514,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "eae71004c4a1720d9af1513ca750cfe116d99a7b"; - sha256 = "086adcr3cpxn9fbjzh8p5jz5bdf57dsjj00ckpwmq2rndlczbbxb"; + rev = "4c7a221f3d186b0cd65d2a765533fda54f0848f4"; + sha256 = "16x1z420470js45yg7s3wrlgvl5h6nfyklphmsqhzq0c35d43vgx"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.0.37"; + version = "6.0.38"; }; metasploit-model = { groups = ["default"]; @@ -536,10 +536,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ibvh45sbmzdn6gsd3dgj1a67mhgy6p3hvjbh9b2qb7ijc14gv49"; + sha256 = "1nnb6kidfm39qyhv694m7skbvmsp5sjw52633v89zq0ym4y5wld5"; type = "gem"; }; - version = "2.0.39"; + version = "2.0.41"; }; metasploit_data_models = { groups = ["default"]; @@ -556,10 +556,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ivxz2wl9k0j7ba7xas0bfm44c1iczfvlgyxhsgqbpqkqwc374vg"; + sha256 = "0nq6wxsaghj0yqwn988z71d9f0qwglcrliwkgqr9f16vbbv33p36"; type = "gem"; }; - version = "1.0.7"; + version = "1.0.8"; }; method_source = { groups = ["default"]; @@ -676,10 +676,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i108glkklwgjxhfhnlqf4b16plqf9b84qpfz0pnl2pbnal5af8m"; + sha256 = "0jz5xiwiwagd663qdlfhmc9fm76x78cqhighmfivy6w5v0n4xyq0"; type = "gem"; }; - version = "7.2.1"; + version = "7.3.0"; }; nio4r = { groups = ["default"]; @@ -876,10 +876,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qwgjwfzkm4q7wby30c9r724w1sp1bywbqfmpv20lq3zdcrf1rfd"; + sha256 = "072spzdpc8bv35nflr43i67njlriavqkrz6cgyd42adz6bqyval9"; type = "gem"; }; - version = "5.2.4.5"; + version = "5.2.5"; }; rake = { groups = ["default"]; @@ -926,10 +926,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15gcafrzp9qzfv65cjapifpqg7cckyr14m9xw86fi56d2b6jms8b"; + sha256 = "1bf86g8a761mp516349gzmvxkafj36nznczznb3flkn4a84dlk3k"; type = "gem"; }; - version = "0.2.4"; + version = "0.2.5"; }; rex-arch = { groups = ["default"]; From d8645cfe6f5b21523b18e2ff72bf568fc40c93c8 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Sun, 4 Apr 2021 02:02:39 +0800 Subject: [PATCH 17/19] papirus-icon-theme: 20210302 -> 20210401 --- pkgs/data/icons/papirus-icon-theme/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index 1d4c3866b4e..ff18baf75f4 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20210302"; + version = "20210401"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "0h1cja8qqlnddm92hkyhkyj5rqfj494v0pss2mg95qqkjijpcgd0"; + sha256 = "sha256-t0zoeIpj+0QVH1wmbEIJdqzEDOGzpclePv+bcZgtnwo="; }; nativeBuildInputs = [ @@ -25,12 +25,14 @@ stdenv.mkDerivation rec { dontDropIconThemeCache = true; installPhase = '' + runHook preInstall mkdir -p $out/share/icons mv {,e}Papirus* $out/share/icons for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done + runHook postInstall ''; meta = with lib; { @@ -39,6 +41,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; # darwin gives hash mismatch in source, probably because of file names differing only in case platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; + maintainers = with maintainers; [ romildo fortuneteller2k ]; }; } From 07700e51dc3c9671b878eadb835a242c8ad65953 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Sat, 3 Apr 2021 22:35:39 +0200 Subject: [PATCH 18/19] gnuradio: remove volk cmake flags mistakenly added see https://github.com/NixOS/nixpkgs/pull/118345#discussion_r606706207 --- pkgs/applications/radio/gnuradio/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index cb464bde16e..d622fef424d 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -260,9 +260,6 @@ stdenv.mkDerivation rec { "-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm.so" "-DLIBGSM_INCLUDE_DIRS=${gsm}/include/gsm" ] - ++ lib.optionals (hasFeature "volk" features && volk != null) [ - "-DENABLE_INTERNAL_VOLK=OFF" - ] ; postInstall = shared.postInstall From 1845f7a077ee8aef9c33b031a4ed7fcf7e2958bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 3 Apr 2021 23:39:33 +0200 Subject: [PATCH 19/19] home-assistant: set platforms to linux Upstream does not support running it on macOS: https://www.home-assistant.io/installation/macos/ --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index b02bb77fc52..2ec83d1e0cf 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -393,5 +393,6 @@ in with py.pkgs; buildPythonApplication rec { description = "Open source home automation that puts local control and privacy first"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda globin mic92 hexa ]; + platforms = platforms.linux; }; }