Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-07-28 00:01:24 +00:00 committed by GitHub
commit ef4ddefb6e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 159 additions and 54 deletions

View file

@ -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

View file

@ -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"
];

View file

@ -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",

View file

@ -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;

View file

@ -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:

View file

@ -34,13 +34,13 @@
stdenv.mkDerivation rec {
pname = "yosys";
version = "0.9+4052";
version = "0.9+4221";
src = fetchFromGitHub {
owner = "YosysHQ";
repo = "yosys";
rev = "687f381b6985d9dda7e11535628e2fafff267af5";
sha256 = "15lcj798ckh9zwvdqb5gnvicilsxjyxv01gcviijg310hq62n7vf";
rev = "9600f20be887b707f6d5d3f74dec58b336e2464e";
sha256 = "0xbvbnhc6qvcq1c8zxfyf4ws959c824z660nrghfxyzkrjl8wi1h";
};
enableParallelBuilding = true;

View file

@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "aiorpcx";
version = "0.18.7";
version = "0.22.1";
src = fetchPypi {
inherit version;
pname = "aiorpcX";
sha256 = "808a9ec9172df11677a0f7b459b69d1a6cf8b19c19da55541fa31fb1afce5ce7";
sha256 = "0lx54bcinp44fmr8q4bbffsqbkg8kdcwykf9i5jj0bj3sfzgf9k0";
};
propagatedBuildInputs = [ attrs ];

View file

@ -1,25 +1,40 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytestCheckHook
, requests
, pytest, pytest-runner, responses
, responses
, urllib3
}:
buildPythonPackage rec {
pname = "matrix_client";
version = "0.3.2";
version = "0.4.0";
src = fetchPypi {
inherit pname version;
sha256 = "1mgjd0ymf9mvqjkvgx3xjhxap7rzdmpa21wfy0cxbw2xcswcrqyw";
sha256 = "0mii7ib3bah5ppqs7i8sjv5l0zbl57011908m4l0jbyby90ayy06";
};
checkInputs = [ pytest pytest-runner responses ];
propagatedBuildInputs = [
requests
urllib3
];
propagatedBuildInputs = [ requests ];
checkInputs = [
pytestCheckHook
responses
];
postPatch = ''
substituteInPlace setup.py --replace \
"pytest-runner~=5.1" ""
'';
pythonImportsCheck = [ "matrix_client" ];
meta = with lib; {
description = "Matrix Client-Server SDK";
description = "Python Matrix Client-Server SDK";
homepage = "https://github.com/matrix-org/matrix-python-sdk";
license = licenses.asl20;
maintainers = with maintainers; [ olejorgenb ];

View file

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "nexia";
version = "0.9.10";
version = "0.9.11";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "bdraco";
repo = pname;
rev = version;
sha256 = "0k97i243ap1sap5smvfmpsjqzkx5adjvi14awv82pcp52ckzkbi9";
sha256 = "0ql08nfvh6rjhjdh78gzih7az95m0fc9wxc22yqmlc9grifnp9i5";
};
propagatedBuildInputs = [

View file

@ -0,0 +1,52 @@
{stdenv, lib, fetchurl, makeDesktopItem, copyDesktopItems, cmake, pkg-config, zlib, bzip2, libjpeg, SDL, SDL_mixer, gtk2}:
let
desktopItem = makeDesktopItem {
name = "ecwolf";
exec = "ecwolf";
comment = "Enhanced Wolfenstein 3D port";
desktopName = "Wolfenstein 3D";
categories = "Game;";
};
in
stdenv.mkDerivation rec {
pname = "ecwolf";
version = "1.3.3";
src = fetchurl {
url = "https://maniacsvault.net/ecwolf/files/ecwolf/1.x/${pname}-${version}-src.tar.xz";
sha256 = "1sbdv672dz47la5a5qwmdi1v258k9kc5dkx7cdj2b6gk8nbm2srl";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ zlib bzip2 libjpeg SDL SDL_mixer gtk2 copyDesktopItems ];
desktopItems = [ desktopItem ];
# Change the location where the ecwolf executable looks for the ecwolf.pk3
# file.
#
# By default, it expects the PK3 file to reside in the same directory as the
# executable, which is not desirable.
# We will adjust the code so that it can be retrieved from the share/
# directory.
preConfigure = ''
sed -i -e "s|ecwolf.pk3|$out/share/ecwolf/ecwolf.pk3|" src/version.h
'';
# Install the required PK3 file in the required data directory
postInstall = ''
mkdir -p $out/share/ecwolf
cp ecwolf.pk3 $out/share/ecwolf
'';
meta = with lib; {
description = "Enhanched SDL-based port of Wolfenstein 3D for various platforms";
homepage = "https://maniacsvault.net/ecwolf/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ sander ];
# Darwin is untested (supported by upstream)
platforms = platforms.all;
};
}

View file

@ -425,12 +425,12 @@ final: prev:
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
version = "2021-07-24";
version = "2021-07-25";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "139ca9bb8685a2d9b807d869a49a85fcd42811f7";
sha256 = "1739vvb9rzlkyrq63lgadhf2azaszy2xhy52hw91rczg8xw7zfc5";
rev = "393fbc24cab3fdfaffca85e286e01c84bcf748c9";
sha256 = "08pcp6dh6kibppndf97nzj90iw1qv51s4zk3vq59z16w32zwkzda";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@ -1667,12 +1667,12 @@ final: prev:
friendly-snippets = buildVimPluginFrom2Nix {
pname = "friendly-snippets";
version = "2021-07-08";
version = "2021-07-24";
src = fetchFromGitHub {
owner = "rafamadriz";
repo = "friendly-snippets";
rev = "f3ca66b6a2a42eb01ffc255ac03039177b888951";
sha256 = "08wzq5i86wxdyhl2yrl9ggfhng92pfx5d7rhmxfcm4abnnl9sj07";
rev = "d5bf63e50c1c7923f1de2d10d8d822f6eb8c872e";
sha256 = "14h8kd01674i82npc2b58ivhj2d80nb1x8v0j7ag5c5n24p1nphf";
};
meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
};
@ -1941,6 +1941,18 @@ final: prev:
meta.homepage = "https://github.com/buoto/gotests-vim/";
};
goto-preview = buildVimPluginFrom2Nix {
pname = "goto-preview";
version = "2021-06-20";
src = fetchFromGitHub {
owner = "rmagatti";
repo = "goto-preview";
rev = "39aa1e0334b577c59c4f7177ef36624bdd83f100";
sha256 = "0rr22r1yp7s3hqfdqf48wlv2bqw9j5izwgm3np7x1ygp85xizcbg";
};
meta.homepage = "https://github.com/rmagatti/goto-preview/";
};
goyo-vim = buildVimPluginFrom2Nix {
pname = "goyo-vim";
version = "2020-08-29";
@ -2748,12 +2760,12 @@ final: prev:
luasnip = buildVimPluginFrom2Nix {
pname = "luasnip";
version = "2021-07-23";
version = "2021-07-24";
src = fetchFromGitHub {
owner = "l3mon4d3";
repo = "luasnip";
rev = "726aac6f8f05c94418cd3e9d6c05705e8b1ae743";
sha256 = "0v5lpcbmlghyfifwys51acihbhawg87bmapjay52g591cjzcd9ak";
rev = "e9f4d03aaacc8af6ebd17833dfb5804a6abbd021";
sha256 = "0k86j2rq5ykav8i6gna91v893j4panyr7l2cyp6vrrkj441bx5ww";
};
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
};
@ -3432,12 +3444,12 @@ final: prev:
nord-nvim = buildVimPluginFrom2Nix {
pname = "nord-nvim";
version = "2021-07-23";
version = "2021-07-24";
src = fetchFromGitHub {
owner = "shaunsingh";
repo = "nord.nvim";
rev = "b7209e7657dcc786b844a920894a517571da1317";
sha256 = "1iaslrhq18myxwla41n3kllvwcn3hb5zcgfl3h6zw4ar8n9pvwdr";
rev = "f58f77dee66babac1a859c2b552797d8128e1f86";
sha256 = "12jway928hhm8s9sbwaqzjjzdgrpvz1gr09q4q5wxicfqaln4cd1";
};
meta.homepage = "https://github.com/shaunsingh/nord.nvim/";
};
@ -3828,12 +3840,12 @@ final: prev:
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2021-07-23";
version = "2021-07-24";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "65a059b34d5bc77db01372c589f582b17524a2f9";
sha256 = "1f0iig48frgd75ccan8yqlxh5j84ywb6im1qsmq17gyfjs4vbqbx";
rev = "296fe9b8611061a1054c05922dbaa134f2b712b2";
sha256 = "0qxdd3z4696xf3nnaxmww3gs0ijfi2bw5aq9ywnqxpb3n734iapd";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@ -4044,12 +4056,12 @@ final: prev:
packer-nvim = buildVimPluginFrom2Nix {
pname = "packer-nvim";
version = "2021-07-22";
version = "2021-07-25";
src = fetchFromGitHub {
owner = "wbthomason";
repo = "packer.nvim";
rev = "fdf005f5697742da121391d31ad42a47842264f9";
sha256 = "15amdgzdiaf0srzzwy2pgk7d44bwls5pzj2088xf1206754znsas";
rev = "92dcbe5b1052c2cec1b5455a624710dd1e899777";
sha256 = "0mh3ghbz38inwlcv4sqrpmyzwxr62j10d4873p9d5zb6j68ajxn9";
};
meta.homepage = "https://github.com/wbthomason/packer.nvim/";
};
@ -4489,12 +4501,12 @@ final: prev:
rust-tools-nvim = buildVimPluginFrom2Nix {
pname = "rust-tools-nvim";
version = "2021-07-23";
version = "2021-07-24";
src = fetchFromGitHub {
owner = "simrat39";
repo = "rust-tools.nvim";
rev = "160aeb66e46e863802c2e4c5a772c3858bc02fd0";
sha256 = "108nxkbybl1fvyawgq0mzbi2c5fadycxj0pnnnsw8alycyjln13f";
rev = "27e1555146331f42ebb07fb7ba0a196b75e03dde";
sha256 = "13dr30nifxrkjj7rf8dyv9p942dinjcpiy24sbfwni2ibmyf2p52";
};
meta.homepage = "https://github.com/simrat39/rust-tools.nvim/";
};
@ -9755,12 +9767,12 @@ final: prev:
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
version = "2021-07-18";
version = "2021-07-24";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
rev = "830659752b8914f6b4567a00448901246e4d1841";
sha256 = "1zdi1kblk03gwifpg1nanq4ppn9xw6af92l3li86ziw89bv3bad9";
rev = "d1439f47a481b8665fbfa8511c6ae4e7514bdfc7";
sha256 = "0brs97yhnfbkyyz6fzhs7s7kjwgwrw6kkinyycq51idxqdqvk4s8";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};

View file

@ -575,6 +575,7 @@ RishabhRD/popfix
rktjmp/fwatch.nvim@main
rktjmp/lush.nvim@main
rmagatti/auto-session@main
rmagatti/goto-preview@main
rodjek/vim-puppet
romainl/vim-cool
romainl/vim-qf

View file

@ -24,11 +24,11 @@ let
in stdenv.mkDerivation rec {
pname = "postfix";
version = "3.6.1";
version = "3.6.2";
src = fetchurl {
url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${pname}-${version}.tar.gz";
sha256 = "sha256-IKgFYlYB57lZiSIIMsj6FM43TwcR2gVBiPjOxqkv1xw=";
url = "http://cdn.postfix.johnriley.me/mirrors/postfix-release/official/${pname}-${version}.tar.gz";
sha256 = "sha256-UHMj0g17P3BfSc+MB9Q3xtgJC+0H4Vo8DsQF7a1Up9Q=";
};
nativeBuildInputs = [ makeWrapper m4 ];
@ -101,6 +101,6 @@ in stdenv.mkDerivation rec {
description = "A fast, easy to administer, and secure mail server";
license = with licenses; [ ipl10 epl20 ];
platforms = platforms.linux;
maintainers = with maintainers; [ globin dotlambda ];
maintainers = with maintainers; [ globin dotlambda lewo ];
};
}

View file

@ -28923,6 +28923,8 @@ in
eboard = callPackage ../games/eboard { };
ecwolf = callPackage ../games/ecwolf { };
eduke32 = callPackage ../games/eduke32 { };
egoboo = callPackage ../games/egoboo { };