diff options
Diffstat (limited to 'pkgs/applications')
5 files changed, 36 insertions, 13 deletions
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 28c965a72b5..f722b2315c0 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -43,6 +43,20 @@ let mv ./all/electrum/tests $out ''; }; + + py = python3.override { + packageOverrides = self: super: { + + aiorpcx = super.aiorpcx.overridePythonAttrs (oldAttrs: rec { + version = "0.18.7"; + src = oldAttrs.src.override { + inherit version; + sha256 = "1rswrspv27x33xa5bnhrkjqzhv0sknv5kd7pl1vidw9d2z4rx2l0"; + }; + }); + }; + }; + in python3.pkgs.buildPythonApplication { @@ -66,7 +80,7 @@ python3.pkgs.buildPythonApplication { nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with py.pkgs; [ aiohttp aiohttp-socks aiorpcx @@ -87,7 +101,10 @@ python3.pkgs.buildPythonApplication { ckcc-protocol keepkey trezor - ] ++ lib.optionals enableQt [ pyqt5 qdarkstyle ]; + ] ++ lib.optionals enableQt [ + pyqt5 + qdarkstyle + ]; preBuild = '' sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 6daafc204eb..377835489a2 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -75,15 +75,16 @@ let in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); # https://source.chromium.org/chromium/chromium/src/+/master:build/linux/unbundle/replace_gn_files.py - gnSystemLibraries = [ + gnSystemLibraries = lib.optionals (!chromiumVersionAtLeast "93") [ "ffmpeg" + "snappy" + ] ++ [ "flac" "libjpeg" "libpng" "libwebp" "libxslt" "opus" - "snappy" "zlib" ]; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index a6df334a97d..98197e90025 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,9 +31,9 @@ } }, "dev": { - "version": "93.0.4577.8", - "sha256": "1x6i5bmcnj8bkpcb9gcyd1m9nzpq206yyprxrnpak117k7abr2b1", - "sha256bin64": "0qjfb9jxr2gmwb1dsvl6yzz06vsjny2l3icrsdcm0pl6r6davk2w", + "version": "93.0.4577.15", + "sha256": "07gbpa1z6cnbmv8008y92ldg53w48rjx0slvgsrw4gk9cnvmnpz0", + "sha256bin64": "0sb3m2mbq6g3mnps7g6xziziwv6sng34410ww5jyx82mw0q0sxig", "deps": { "gn": { "version": "2021-07-08", diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 374062f0d80..b98f6a79822 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2021.7.0"; + version = "2021.7.3"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "sha256-FQejuKBDUCCcEq9ZmSMigdvqowTurCYEhOiXQN7exIE="; + sha256 = "sha256-p9FNH5obQfEQZRoOr35ORH+6dwbcNgSXjARF9WA7t9E="; }; vendorSha256 = null; diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index f48fe4b1ec4..a38055d9b21 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { sha256 = "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2"; }; - nativeBuildInputs = [ pkg-config ] ++ [ python wrapPython ]; + nativeBuildInputs = [ pkg-config asciidoc ] ++ [ python wrapPython ]; buildInputs = [ - openssl zlib asciidoc libxml2 libxslt docbook_xsl luajit + openssl zlib libxml2 libxslt docbook_xsl luajit ]; pythonPath = [ pygments markdown ]; @@ -48,10 +48,15 @@ stdenv.mkDerivation rec { preBuild = '' mkdir -p git tar --strip-components=1 -xf "$gitSrc" -C git - - makeFlagsArray+=(prefix="$out" CGIT_SCRIPT_PATH="$out/cgit/") ''; + makeFlags = [ + "prefix=$(out)" + "CGIT_SCRIPT_PATH=$out/cgit/" + "CC=${stdenv.cc.targetPrefix}cc" + "AR=${stdenv.cc.targetPrefix}ar" + ]; + # Install manpage. postInstall = '' # xmllint fails: |