Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-02-12 00:36:19 +00:00 committed by GitHub
commit 344456f66a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
39 changed files with 2402 additions and 1404 deletions

View file

@ -29,33 +29,18 @@ import ./make-test-python.nix ({ pkgs, ...} :
start_all() start_all()
machine.wait_for_x() machine.wait_for_x()
# Create a file that we'll open # Start VSCodium with a file that doesn't exist yet
machine.succeed("su - alice -c 'echo \" Hello World\" > foo.txt'") machine.fail("ls /home/alice/foo.txt")
# It's one line long
assert "1 foo.txt" in machine.succeed(
"su - alice -c 'wc foo.txt -l'"
), "File has wrong length"
# Start VSCodium with that file
machine.succeed("su - alice -c 'codium foo.txt' &") machine.succeed("su - alice -c 'codium foo.txt' &")
# Wait for the window to appear # Wait for the window to appear
machine.wait_for_text("VSCodium") machine.wait_for_text("VSCodium")
# Add a line
machine.send_key("ret")
# Save file # Save file
machine.send_key("ctrl-s") machine.send_key("ctrl-s")
# Wait until the file has been saved # Wait until the file has been saved
machine.sleep(1) machine.wait_for_file("/home/alice/foo.txt")
# Now the file is 2 lines long
assert "2 foo.txt" in machine.succeed(
"su - alice -c 'wc foo.txt -l'"
), "File has wrong length"
machine.screenshot("VSCodium") machine.screenshot("VSCodium")
''; '';

View file

@ -1,48 +1,36 @@
{ mkDerivation { mkDerivation
, lib, stdenv , lib
, fetchFromGitHub , fetchFromGitHub
, qmake , qmake
, qtbase , pkg-config
, qttools , qttools
, alsaSupport ? stdenv.hostPlatform.isLinux , qtbase
, alsaLib , rtaudio
, pulseSupport ? stdenv.hostPlatform.isLinux , rtmidi
, libpulseaudio
, jackSupport ? stdenv.hostPlatform.isUnix
, libjack2
}: }:
let
inherit (lib) optional optionals;
in
mkDerivation rec { mkDerivation rec {
pname = "bambootracker"; pname = "bambootracker";
version = "0.4.5"; version = "0.4.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rerrahkr"; owner = "rerrahkr";
repo = "BambooTracker"; repo = "BambooTracker";
rev = "v${version}"; rev = "v${version}";
sha256 = "0ibi0sykxf6cp5la2c4pgxf5gvy56yv259fbmdwdrdyv6vlddf42"; sha256 = "0iddqfw951dw9xpl4w7310sl4z544507ppb12i8g4fzvlxfw2ifc";
}; };
sourceRoot = "source/BambooTracker"; nativeBuildInputs = [ qmake qttools pkg-config ];
nativeBuildInputs = [ qmake qttools ]; buildInputs = [ qtbase rtaudio rtmidi ];
buildInputs = [ qtbase ] qmakeFlags = [ "CONFIG+=system_rtaudio" "CONFIG+=system_rtmidi" ];
++ optional alsaSupport alsaLib
++ optional pulseSupport libpulseaudio
++ optional jackSupport libjack2;
qmakeFlags = [ "CONFIG+=release" "CONFIG-=debug" ] postConfigure = "make qmake_all";
++ optional pulseSupport "CONFIG+=use_pulse"
++ optionals jackSupport [ "CONFIG+=use_jack" "CONFIG+=jack_has_rename" ];
meta = with lib; { meta = with lib; {
description = "A tracker for YM2608 (OPNA) which was used in NEC PC-8801/9801 series computers"; description = "A tracker for YM2608 (OPNA) which was used in NEC PC-8801/9801 series computers";
homepage = "https://github.com/rerrahkr/BambooTracker"; homepage = "https://rerrahkr.github.io/BambooTracker";
license = licenses.gpl2Only; license = licenses.gpl2Only;
platforms = platforms.all; platforms = platforms.all;
maintainers = with maintainers; [ OPNA2608 ]; maintainers = with maintainers; [ OPNA2608 ];

View file

@ -1,30 +1,56 @@
{ lib { lib
, python3 , ansiwrap
, asteval
, buildPythonApplication
, colorama
, cryptography
, fetchFromGitHub
, keyring
, parsedatetime
, poetry
, pytestCheckHook
, python-dateutil
, pytz
, pyxdg
, pyyaml
, tzlocal
}: }:
with python3.pkgs;
buildPythonApplication rec { buildPythonApplication rec {
pname = "jrnl"; pname = "jrnl";
version = "1.9.8"; version = "2.7";
format = "pyproject";
src = fetchPypi { src = fetchFromGitHub {
inherit pname version; owner = "jrnl-org";
sha256 = "d254c9c8f24dcf985b98a1d5311337c7f416e6305107eec34c567f58c95b06f4"; repo = pname;
rev = "v${version}";
sha256 = "1hyjjw9mxy73n3pkliaaif135h2sd4iy43pw9d5zynid5abnr3yz";
}; };
nativeBuildInputs = [ poetry ];
propagatedBuildInputs = [ propagatedBuildInputs = [
pytz six tzlocal keyring dateutil ansiwrap
parsedatetime pycrypto asteval
colorama
cryptography
keyring
parsedatetime
python-dateutil
pytz
pyxdg
pyyaml
tzlocal
]; ];
# No tests in archive checkInputs = [ pytestCheckHook ];
doCheck = false; pythonImportsCheck = [ "jrnl" ];
meta = with lib; { meta = with lib; {
homepage = "http://maebert.github.io/jrnl/"; homepage = "http://maebert.github.io/jrnl/";
description = "A simple command line journal application that stores your journal in a plain text file"; description = "A simple command line journal application that stores your journal in a plain text file";
license = licenses.mit; license = licenses.gpl3Only;
maintainers = with maintainers; [ zalakain ]; maintainers = with maintainers; [ zalakain ];
}; };
} }

View file

@ -0,0 +1,36 @@
{ lib
, buildPythonApplication
, fetchPypi
, requests
, twitch-python
, pytz
, python-dateutil
}:
buildPythonApplication rec {
pname = "twitch-chat-downloader";
version = "3.2.1";
src = fetchPypi {
inherit version;
pname = "tcd";
sha256 = "f9b5ea2ad3badb7deffdd9604368ccb54170cd7929efbaa2d7b534e089ae6338";
};
postPatch = ''
substituteInPlace setup.py --replace "'pipenv>=2020.5.28'," ""
'';
propagatedBuildInputs = [ requests twitch-python pytz python-dateutil ];
doCheck = false; # no tests
pythonImportsCheck = [ "tcd" ];
meta = with lib; {
description = "Twitch Chat Downloader";
homepage = "https://github.com/PetterKraabol/Twitch-Chat-Downloader";
license = licenses.mit;
maintainers = with maintainers; [ marsam ];
};
}

View file

@ -12,6 +12,10 @@ python3Packages.buildPythonApplication rec {
propagatedBuildInputs = with python3Packages; [ ansiwrap cryptography ]; propagatedBuildInputs = with python3Packages; [ ansiwrap cryptography ];
# No tests are available
doCheck = false;
pythonImportsCheck = [ "av98" ];
meta = with lib; { meta = with lib; {
homepage = "https://tildegit.org/solderpunk/AV-98"; homepage = "https://tildegit.org/solderpunk/AV-98";
description = "Experimental console client for the Gemini protocol"; description = "Experimental console client for the Gemini protocol";

View file

@ -31,11 +31,11 @@ with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "claws-mail"; pname = "claws-mail";
version = "3.17.7"; version = "3.17.8";
src = fetchurl { src = fetchurl {
url = "https://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"; url = "https://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz";
sha256 = "1j6x09621wng0lavh53nwzh9vqjzpspl8kh5azh7kbihpi4ldfb0"; sha256 = "sha256-zbeygUmV1vSpw7HwvBRn7Vw88qXg2hcwqqJaisyv3a8=";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "diff-so-fancy"; pname = "diff-so-fancy";
version = "1.3.0"; version = "1.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "so-fancy"; owner = "so-fancy";
repo = "diff-so-fancy"; repo = "diff-so-fancy";
rev = "v${version}"; rev = "v${version}";
sha256 = "0aavxahzha2mms4vdwysk79pa6wzswpfwgsq2hwaxnaf66maahfl"; sha256 = "sha256-//n7kOANVHRSjxclxDcMnpMVzUcd/U6fFsP8acRjVWA=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "git-repo"; pname = "git-repo";
version = "2.12"; version = "2.12.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "android"; owner = "android";
repo = "tools_repo"; repo = "tools_repo";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-k9G0lN7qKQhWiXibzhC9Ma9h+44LQJ966MIakWk5nJM="; sha256 = "sha256-9w8kGMgxvbeKpri+zC8mcsbC6pnwqbLbKu1XB5tfBBo=";
}; };
patches = [ ./import-ssl-module.patch ]; patches = [ ./import-ssl-module.patch ];

View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, autoreconfHook { lib, stdenv, fetchurl, autoreconfHook
, libarchive, perl, xorg, libdvdnav, libbluray , libarchive, perl, xorg, libdvdnav, libbluray
, zlib, a52dec, libmad, faad2, ffmpeg_3, alsaLib , zlib, a52dec, libmad, faad2, ffmpeg, alsaLib
, pkg-config, dbus, fribidi, freefont_ttf, libebml, libmatroska , pkg-config, dbus, fribidi, freefont_ttf, libebml, libmatroska
, libvorbis, libtheora, speex, lua5, libgcrypt, libgpgerror, libupnp , libvorbis, libtheora, speex, lua5, libgcrypt, libgpgerror, libupnp
, libcaca, libpulseaudio, flac, schroedinger, libxml2, librsvg , libcaca, libpulseaudio, flac, schroedinger, libxml2, librsvg
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
# which are not included here for no other reason that nobody has mentioned # which are not included here for no other reason that nobody has mentioned
# needing them # needing them
buildInputs = [ buildInputs = [
zlib a52dec libmad faad2 ffmpeg_3 alsaLib libdvdnav libdvdnav.libdvdread zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libgpgerror libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libgpgerror
libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec
systemd gnutls avahi libcddb SDL SDL_image libmtp unzip taglib libarchive systemd gnutls avahi libcddb SDL SDL_image libmtp unzip taglib libarchive

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "iconpack-obsidian"; pname = "iconpack-obsidian";
version = "4.14"; version = "4.15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "madmaxms"; owner = "madmaxms";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1rhs8k88gh6673flr22cb3gbbw37wyzhd6jyysx6qgjjsnjvl2h8"; sha256 = "1f32isq1xyn9b6p1nx5rssqgg9gw0jp9ld19860xk29fspmlfb8n";
}; };
nativeBuildInputs = [ gtk3 ]; nativeBuildInputs = [ gtk3 ];
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Gnome icon pack based upon Faenza"; description = "Gnome icon pack based upon Faenza";
homepage = "https://github.com/madmaxms/iconpack-obsidian"; homepage = "https://github.com/madmaxms/iconpack-obsidian";
license = licenses.lgpl3; license = licenses.gpl3Only;
# darwin cannot deal with file names differing only in case # darwin cannot deal with file names differing only in case
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

View file

@ -2,23 +2,17 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "inih"; pname = "inih";
version = "r52"; version = "r53";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "benhoyt"; owner = "benhoyt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0lsvm34zabvi1xlximybzvgc58zb90mm3b9babwxlqs05jy871m4"; sha256 = "0dqf5j2sw4hq68rqvxbrsf44ygfzx9ypiyzipk4cvp9aimbvsbc6";
}; };
nativeBuildInputs = [ meson ninja ]; nativeBuildInputs = [ meson ninja ];
mesonFlags = [
"-Ddefault_library=shared"
"-Ddistro_install=true"
"-Dwith_INIReader=true"
];
meta = with lib; { meta = with lib; {
description = "Simple .INI file parser in C, good for embedded systems"; description = "Simple .INI file parser in C, good for embedded systems";
homepage = "https://github.com/benhoyt/inih"; homepage = "https://github.com/benhoyt/inih";

View file

@ -1,7 +1,6 @@
{ lib, stdenv { lib, stdenv
, substituteAll , substituteAll
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, pkg-config , pkg-config
, meson , meson
, ninja , ninja
@ -19,7 +18,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libmodulemd"; pname = "libmodulemd";
version = "2.9.2"; version = "2.12.0";
outputs = [ "bin" "out" "dev" "devdoc" "man" "py" ]; outputs = [ "bin" "out" "dev" "devdoc" "man" "py" ];
@ -27,7 +26,7 @@ stdenv.mkDerivation rec {
owner = "fedora-modularity"; owner = "fedora-modularity";
repo = pname; repo = pname;
rev = "${pname}-${version}"; rev = "${pname}-${version}";
sha256 = "0xl5f6a32hmli29b0rfp54h7vnagxdv9qa2r871mrgrr6fzjwvbn"; sha256 = "1mq9as98q4wyka404f8xwfc44cn5j4bsk0fch5pf07v81sagc1q9";
}; };
patches = [ patches = [
@ -36,17 +35,6 @@ stdenv.mkDerivation rec {
src = ./glib-devdoc.patch; src = ./glib-devdoc.patch;
glib_devdoc = glib.devdoc; glib_devdoc = glib.devdoc;
}) })
# Install pygobject overrides to our prefix instead of python3 one.
# https://github.com/fedora-modularity/libmodulemd/pull/469
(fetchpatch {
url = "https://github.com/fedora-modularity/libmodulemd/commit/f72a4bea092f4d84cfc48a3e820eb10270e828d0.patch";
sha256 = "1rrf94q1yf98w6b9bm67mb6w6qv1zqi306iv1vzspvjhsqvzmzpg";
})
(fetchpatch {
url = "https://github.com/fedora-modularity/libmodulemd/commit/021ab08006b5cf601ce153174fdf403b910b8273.patch";
sha256 = "0z35jpnnzzb5bvmc2lglrpfnwarhky2jqmhq9avnnki22fdw89i6";
})
]; ];
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -200,6 +200,7 @@
, "stackdriver-statsd-backend" , "stackdriver-statsd-backend"
, "stf" , "stf"
, "stylelint" , "stylelint"
, "svelte-language-server"
, "svgo" , "svgo"
, "swagger" , "swagger"
, {"tedicross": "git+https://github.com/TediCross/TediCross.git#v0.8.7"} , {"tedicross": "git+https://github.com/TediCross/TediCross.git#v0.8.7"}

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,54 @@
{ lib
, aiohttp
, aresponses
, async-timeout
, buildPythonPackage
, fetchFromGitHub
, freezegun
, poetry-core
, pytest-asyncio
, pytest-cov
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "aiorecollect";
version = "1.0.2";
format = "pyproject";
src = fetchFromGitHub {
owner = "bachya";
repo = pname;
rev = version;
sha256 = "0dlz8zmqcn6g6000lfgcy5krpfafzdzrznmk6iwra65wcs7l9392";
};
nativeBuildInputs = [ poetry-core ];
propagatedBuildInputs = [ aiohttp ];
checkInputs = [
aresponses
freezegun
pytest-asyncio
pytest-cov
pytestCheckHook
];
# Ignore the examples as they are prefixed with test_
pytestFlagsArray = [ "--ignore examples/" ];
pythonImportsCheck = [ "aiorecollect" ];
meta = with lib; {
description = "Python library for the Recollect Waste API";
longDescription = ''
aiorecollect is a Python asyncio-based library for the ReCollect
Waste API. It allows users to programmatically retrieve schedules
for waste removal in their area, including trash, recycling, compost
and more.
'';
homepage = "https://github.com/bachya/aiorecollect";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -1,11 +1,10 @@
{ lib { lib
, buildPythonPackage
, fetchPypi
, tox
, pytest
, ansicolors , ansicolors
, buildPythonPackage
, coverage , coverage
, pytestcov , fetchPypi
, pytest-cov
, pytestCheckHook
, textwrap3 , textwrap3
}: }:
@ -20,20 +19,15 @@ buildPythonPackage rec {
}; };
checkInputs = [ checkInputs = [
tox
pytest
ansicolors ansicolors
coverage coverage
pytestcov pytest-cov
pytestCheckHook
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [ textwrap3 ];
textwrap3
];
checkPhase = '' pythonImportsCheck = [ "ansiwrap" ];
pytest
'';
meta = with lib; { meta = with lib; {
description = "Textwrap, but savvy to ANSI colors and styles"; description = "Textwrap, but savvy to ANSI colors and styles";

View file

@ -0,0 +1,30 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "asteval";
version = "0.9.21";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "newville";
repo = pname;
rev = version;
sha256 = "1bhdj7zybsqghgd7qx50il7nwfg79qx9wg03n0z96jgq5gydqd9w";
};
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "asteval" ];
meta = with lib; {
description = "AST evaluator of Python expression using ast module";
homepage = "https://github.com/newville/asteval";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -12,11 +12,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-iot"; pname = "google-cloud-iot";
version = "2.0.1"; version = "2.0.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "08spn5g0s386x21dgwb46na8aknbwq5d1sn8bh6kayk9fjfbxwla"; sha256 = "768ccd567b87bf0030f9458d796cc0a846c40825fa2896b77e9cc7a4af30ba2b";
}; };
propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ]; propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ];

View file

@ -5,12 +5,12 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "0.5.3"; version = "0.5.4";
pname = "imutils"; pname = "imutils";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "857af6169d90e4a0a814130b9b107f5d611150ce440107e1c1233521c6fb1e2b"; sha256 = "03827a9fca8b5c540305c0844a62591cf35a0caec199cb0f2f0a4a0fb15d8f24";
}; };
propagatedBuildInputs = [ opencv3 ]; propagatedBuildInputs = [ opencv3 ];
@ -18,6 +18,14 @@ buildPythonPackage rec {
# no tests # no tests
doCheck = false; doCheck = false;
pythonImportsCheck = [
"imutils"
"imutils.video"
"imutils.io"
"imutils.feature"
"imutils.face_utils"
];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/jrosebr1/imutils"; homepage = "https://github.com/jrosebr1/imutils";
description = "A series of convenience functions to make basic image processing functions"; description = "A series of convenience functions to make basic image processing functions";

View file

@ -4,17 +4,24 @@
, setuptools , setuptools
, pyopenssl , pyopenssl
, cryptography , cryptography
, mock
, pytestCheckHook
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "josepy"; pname = "josepy";
version = "1.5.0"; version = "1.6.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "502a36f86efe2a6d09bf7018bca9fd8f8f24d8090a966aa037dbc844459ff9c8"; sha256 = "0aab1c3ceffe045e7fd5bcfe7685e27e9d2758518d9ba7116b5de34087e70bf5";
}; };
postPatch = ''
# remove coverage flags
sed -i '/addopts/d' pytest.ini
'';
propagatedBuildInputs = [ propagatedBuildInputs = [
pyopenssl pyopenssl
cryptography cryptography
@ -22,8 +29,10 @@ buildPythonPackage rec {
setuptools setuptools
]; ];
# too many unpackaged check requirements checkInputs = [
doCheck = false; mock
pytestCheckHook
];
meta = with lib; { meta = with lib; {
description = "JOSE protocol implementation in Python"; description = "JOSE protocol implementation in Python";

View file

@ -12,13 +12,13 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "0.11.0"; version = "2021.1.0";
pname = "jupyter-repo2docker"; pname = "jupyter-repo2docker";
disabled = !(pythonAtLeast "3.4"); disabled = !(pythonAtLeast "3.4");
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "7fc2edf0cda1e46f2e7553bfb84a47e6d141b8dac393268ef01ee3504ca6ad94"; sha256 = "3e3e671407ef2a7f7695338dc6ce2ca9cc75683ffc7a543829cf119564aca802";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -1,23 +1,35 @@
{ lib, buildPythonPackage, fetchPypi, { lib
marshmallow, sqlalchemy , buildPythonPackage
, fetchPypi
, marshmallow
, sqlalchemy
, pytest-lazy-fixture
, pytestCheckHook
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "marshmallow-sqlalchemy"; pname = "marshmallow-sqlalchemy";
version = "0.24.1"; version = "0.24.2";
meta = {
homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy";
description = "SQLAlchemy integration with marshmallow ";
license = lib.licenses.mit;
};
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "d051cf013c075c43e1ee5c4b01f8fab6dd6b140dab6825be45875f674a0d289c"; sha256 = "ee3ead3b83de6608c6850ff60515691b0dc556ca226680f8a82b9f785cdb71b1";
}; };
propagatedBuildInputs = [ marshmallow sqlalchemy ]; propagatedBuildInputs = [
marshmallow
sqlalchemy
];
checkInputs = [
pytest-lazy-fixture
pytestCheckHook
];
meta = with lib; {
homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy";
description = "SQLAlchemy integration with marshmallow ";
license = licenses.mit;
};
doCheck = false;
} }

View file

@ -4,11 +4,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "nocasedict"; pname = "nocasedict";
version = "1.0.1"; version = "1.0.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "bl1b0R3jP5PSJUXZ7SOguY+EDyzawNdJ0vqkYXrcd3I="; sha256 = "86e2dae49e34de7c31b65b486c8f9aa58b66dc2e8ee9b34c390c6c58885c85a0";
}; };
checkInputs = [ checkInputs = [

View file

@ -8,13 +8,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pymyq"; pname = "pymyq";
version = "3.0.0"; version = "3.0.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "arraylabs"; owner = "arraylabs";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-uCXgJxMy5gZQBvhHnmfev/rfJXOjhLqZdOrn8SetUT0="; sha256 = "1wrfnbz87ns2ginyvljna0axl35s0xfaiqwzapxm8ira40ax5wrl";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -0,0 +1,30 @@
{ lib, buildPythonPackage, fetchPypi, requests, rx, pytestCheckHook, responses, isPy3k }:
buildPythonPackage rec {
pname = "twitch-python";
version = "0.0.19";
src = fetchPypi {
inherit pname version;
sha256 = "b0b02abdd33458e4ffabc632aa6a6779f3599e188819632551353b6c5553f5c5";
};
disabled = !isPy3k;
postPatch = ''
substituteInPlace setup.py --replace "'pipenv'," ""
'';
propagatedBuildInputs = [ requests rx ];
checkInputs = [ pytestCheckHook responses ];
pythonImportsCheck = [ "twitch" ];
meta = with lib; {
description = "Twitch module for Python";
homepage = "https://github.com/PetterKraabol/Twitch-Python";
license = licenses.mit;
maintainers = with maintainers; [ marsam ];
};
}

View file

@ -10,11 +10,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "liquibase"; pname = "liquibase";
version = "4.2.2"; version = "4.3.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "0k3vrz12dgfirz9p4ckgk2swr42w8fl50hdgg8pwc7yh2jsz8zl0"; sha256 = "sha256-Zwh8baMD8jt+yfsK0jpsTEU32rT+IAQGwavVT3rpRsU=";
}; };
buildInputs = [ jre makeWrapper ]; buildInputs = [ jre makeWrapper ];

View file

@ -2,7 +2,7 @@
buildGoPackage rec { buildGoPackage rec {
pname = "gron"; pname = "gron";
version = "0.6.0"; version = "0.6.1";
owner = "tomnomnom"; owner = "tomnomnom";
repo = "gron"; repo = "gron";
@ -11,7 +11,7 @@ buildGoPackage rec {
src = fetchFromGitHub { src = fetchFromGitHub {
inherit owner repo; inherit owner repo;
rev = "v${version}"; rev = "v${version}";
sha256 = "05f3w4zr15wd7xk75l12y5kip4gnv719a2x9w2hy23q3pnss9wk0"; sha256 = "0qmzawkhg0qn9kxxrssbdjni2khvamhrcklv3yxc0ljmh77mh61m";
}; };
goDeps = ./deps.nix; goDeps = ./deps.nix;

View file

@ -18,7 +18,7 @@
let let
pname = "hover"; pname = "hover";
version = "0.46.1"; version = "0.46.2";
libs = with xorg; [ libs = with xorg; [
libX11.dev libX11.dev
@ -46,13 +46,13 @@ let
subPackages = [ "." ]; subPackages = [ "." ];
vendorSha256 = "1ixfmhp5g57hn23zyf85hy9jnyadayhdbalj4d0bx4q4p5c9qchi"; vendorSha256 = "0hdh4vwzvwlarjzg6pv9dp665r9px9yplfjpgyyfjyy5b9sxl795";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "v${version}"; rev = "v${version}";
owner = "go-flutter-desktop"; owner = "go-flutter-desktop";
repo = pname; repo = pname;
sha256 = "04f3dx2dcllfrw3ay1sbb72pj18ln7bxi9rrcaahqhsd7bn2ff9k"; sha256 = "1gmsv7hmj7zzfwbz50az3kvgzqvj0jn8i2pv7sjyl9dx1bavi5g3";
}; };
nativeBuildInputs = [ addOpenGLRunpath makeWrapper ]; nativeBuildInputs = [ addOpenGLRunpath makeWrapper ];

View file

@ -0,0 +1,36 @@
{ stdenv
, lib
, fetchFromGitHub
, cmake
, pkg-config
, libftdi1
, libusb1
, udev
}:
stdenv.mkDerivation rec {
pname = "openfpgaloader";
version = "0.2.1";
src = fetchFromGitHub {
owner = "trabucayre";
repo = "openFPGALoader";
rev = "v${version}";
sha256 = "0j87mlghbanh6c7lrxv0x3p6zgd0wrkcs9b8jf6ifh7b3ivcfg82";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [
libftdi1
libusb1
udev
];
meta = with lib; {
description = "Universal utility for programming FPGAs";
homepage = "https://github.com/trabucayre/openFPGALoader";
license = licenses.agpl3Only;
maintainers = with maintainers; [ danderson ];
};
}

View file

@ -2,16 +2,18 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "goku"; pname = "goku";
version = "0.1.11"; version = "0.3.6";
src = fetchurl { src = fetchurl {
url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku.tar.gz"; url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku.tar.gz";
sha256 = "49562342be114c2656726c5c697131acd286965ab3903a1a1e157cc689e20b15"; sha256 = "1pss1k2slbqzpfynik50pdk4jsaiag4abhmr6kadmaaj18mfz7ai";
}; };
sourceRoot = "."; sourceRoot = ".";
installPhase = '' installPhase = ''
chmod +x goku
chmod +x gokuw
mkdir -p $out/bin mkdir -p $out/bin
cp goku $out/bin cp goku $out/bin
cp gokuw $out/bin cp gokuw $out/bin

View file

@ -2,7 +2,7 @@
# Do not edit! # Do not edit!
{ {
version = "2021.2.2"; version = "2021.2.3";
components = { components = {
"abode" = ps: with ps; [ abodepy ]; "abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ]; "accuweather" = ps: with ps; [ accuweather ];
@ -666,7 +666,7 @@
"random" = ps: with ps; [ ]; "random" = ps: with ps; [ ];
"raspihats" = ps: with ps; [ smbus-cffi ]; # missing inputs: raspihats "raspihats" = ps: with ps; [ smbus-cffi ]; # missing inputs: raspihats
"raspyrfm" = ps: with ps; [ ]; # missing inputs: raspyrfm-client "raspyrfm" = ps: with ps; [ ]; # missing inputs: raspyrfm-client
"recollect_waste" = ps: with ps; [ ]; # missing inputs: aiorecollect "recollect_waste" = ps: with ps; [ aiorecollect ];
"recorder" = ps: with ps; [ sqlalchemy ]; "recorder" = ps: with ps; [ sqlalchemy ];
"recswitch" = ps: with ps; [ ]; # missing inputs: pyrecswitch "recswitch" = ps: with ps; [ ]; # missing inputs: pyrecswitch
"reddit" = ps: with ps; [ praw ]; "reddit" = ps: with ps; [ praw ];

View file

@ -1,4 +1,4 @@
{ stdenv, nixosTests, lib, fetchurl, fetchFromGitHub, fetchpatch, python3, protobuf3_6 { stdenv, nixosTests, lib, fetchFromGitHub, python3
# Look up dependencies of specified components in component-packages.nix # Look up dependencies of specified components in component-packages.nix
, extraComponents ? [ ] , extraComponents ? [ ]
@ -56,7 +56,7 @@ let
extraBuildInputs = extraPackages py.pkgs; extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating # Don't forget to run parse-requirements.py after updating
hassVersion = "2021.2.2"; hassVersion = "2021.2.3";
in with py.pkgs; buildPythonApplication rec { in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant"; pname = "homeassistant";
@ -75,7 +75,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant"; owner = "home-assistant";
repo = "core"; repo = "core";
rev = version; rev = version;
sha256 = "0y7yj3kwk2454yghslvv5s2783rch9pznhxrw4mh3plr6qzi70rp"; sha256 = "0s1jcd94wwvmvzq86w8s9dwfvnmjs9l661z9pc6kwgagggjjgd8c";
}; };
# leave this in, so users don't have to constantly update their downstream patch handling # leave this in, so users don't have to constantly update their downstream patch handling
@ -180,7 +180,8 @@ in with py.pkgs; buildPythonApplication rec {
]; ];
pytestFlagsArray = [ pytestFlagsArray = [
"-n auto" # limit amout of runners to reduce race conditions
"-n 2"
# assign tests grouped by file to workers # assign tests grouped by file to workers
"--dist loadfile" "--dist loadfile"
# don't bulk test all components # don't bulk test all components
@ -198,10 +199,6 @@ in with py.pkgs; buildPythonApplication rec {
# keyring.errors.NoKeyringError: No recommended backend was available. # keyring.errors.NoKeyringError: No recommended backend was available.
"test_secrets_from_unrelated_fails" "test_secrets_from_unrelated_fails"
"test_secrets_credstash" "test_secrets_credstash"
# system_log/test_init.py: assert 0 == 1 where 0 = len([])
"test_error_posted_as_event"
# ssdp/test_init.py: RuntimeError: Event loop is closed
"test_scan_match_st"
]; ];
preCheck = '' preCheck = ''

View file

@ -2,7 +2,7 @@
buildGoModule rec { buildGoModule rec {
pname = "grafana"; pname = "grafana";
version = "7.4.0"; version = "7.4.1";
excludedPackages = [ "release_publisher" ]; excludedPackages = [ "release_publisher" ];
@ -10,15 +10,15 @@ buildGoModule rec {
rev = "v${version}"; rev = "v${version}";
owner = "grafana"; owner = "grafana";
repo = "grafana"; repo = "grafana";
sha256 = "0mdk3f237gvyjw8fxppfwzs8smhrnrj5aqc2wsykclrl52h5mv2z"; sha256 = "11gvw8kdz7238jcaiyqk6i0ciy6plixljpzdajlabywgr9jam32g";
}; };
srcStatic = fetchurl { srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
sha256 = "1dc03d5hg7f2s9lrqycxm08ry8plkx8lkrfm4q3gjk1cvf5zjwzd"; sha256 = "1266vj8saf4nh5h6cz8axkk58g1mwgvc9c6caphj71dhvr3snw6i";
}; };
vendorSha256 = "0m39dw4raqzm7zxcbncdxf7br5j173czl62xsp94q4g2h719mc9a"; vendorSha256 = "0ig0f9pa3l0nj2fs8yz8h42y1j07xi9imk7kzmla6vav6s889grc";
postPatch = '' postPatch = ''
substituteInPlace pkg/cmd/grafana-server/main.go \ substituteInPlace pkg/cmd/grafana-server/main.go \

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, runCommand, makeWrapper, python3Packages, docutils, help2man { lib, stdenv, fetchurl, runCommand, makeWrapper, python3Packages, docutils, help2man, installShellFiles
, abootimg, acl, apktool, binutils-unwrapped, build-tools, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc , abootimg, acl, apktool, binutils-unwrapped, build-tools, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc
, e2fsprogs, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar , e2fsprogs, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar
, gzip, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, openssh, openssl, pdftk, pgpdump, poppler_utils, qemu, R , gzip, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, openssh, openssl, pdftk, pgpdump, poppler_utils, qemu, R
@ -16,18 +16,17 @@ let
in in
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "diffoscope"; pname = "diffoscope";
version = "163"; version = "166";
src = fetchurl { src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
sha256 = "sha256-pCAOMRZ3sn1jhdT5RuIZoMR1e6GEYJYyd4mZt7+0lWE="; sha256 = "sha256-6VhHG3MxmIczolOYqU4D1m00h8w2n0ku4dy/dFEYqk0=";
}; };
outputs = [ "out" "man" ]; outputs = [ "out" "man" ];
patches = [ patches = [
./ignore_links.patch ./ignore_links.patch
./skip-failing-test.patch
]; ];
postPatch = '' postPatch = ''
@ -38,7 +37,7 @@ python3Packages.buildPythonApplication rec {
substituteInPlace doc/Makefile --replace "../bin" "$out/bin" substituteInPlace doc/Makefile --replace "../bin" "$out/bin"
''; '';
nativeBuildInputs = [ docutils help2man ]; nativeBuildInputs = [ docutils help2man installShellFiles ];
# Most of the non-Python dependencies here are optional command-line tools for various file-format parsers. # Most of the non-Python dependencies here are optional command-line tools for various file-format parsers.
# To help figuring out what's missing from the list, run: ./pkgs/tools/misc/diffoscope/list-missing-tools.sh # To help figuring out what's missing from the list, run: ./pkgs/tools/misc/diffoscope/list-missing-tools.sh
@ -60,14 +59,19 @@ python3Packages.buildPythonApplication rec {
hdf5 imagemagick llvm jdk mono odt2txt openssh pdftk poppler_utils qemu R tcpdump wabt hdf5 imagemagick llvm jdk mono odt2txt openssh pdftk poppler_utils qemu R tcpdump wabt
] ++ (with python3Packages; [ binwalk guestfs h5py ])); ] ++ (with python3Packages; [ binwalk guestfs h5py ]));
checkInputs = with python3Packages; [ pytest ] ++ pythonPath; checkInputs = with python3Packages; [ pytestCheckHook ] ++ pythonPath;
postInstall = '' postInstall = ''
make -C doc make -C doc
mkdir -p $out/share/man/man1 installManPage doc/diffoscope.1
cp doc/diffoscope.1 $out/share/man/man1/diffoscope.1
''; '';
# Disable flaky test and a failing one
disabledTests = [
"test_android_manifest"
"test_sbin_added_to_path"
];
meta = with lib; { meta = with lib; {
description = "Perform in-depth comparison of files, archives, and directories"; description = "Perform in-depth comparison of files, archives, and directories";
longDescription = '' longDescription = ''
@ -80,9 +84,9 @@ python3Packages.buildPythonApplication rec {
diffoscope is developed as part of the "reproducible builds" Debian diffoscope is developed as part of the "reproducible builds" Debian
project and was formerly known as "debbindiff". project and was formerly known as "debbindiff".
''; '';
homepage = "https://diffoscope.org/"; homepage = "https://diffoscope.org/";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ dezgeg ma27 danielfullmer ]; maintainers = with maintainers; [ dezgeg ma27 danielfullmer ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

View file

@ -1,12 +0,0 @@
diff --git a/tests/test_tools.py b/tests/test_tools.py
index f0010678..1c3c7ce1 100644
--- a/tests/test_tools.py
+++ b/tests/test_tools.py
@@ -21,6 +21,7 @@ import os
import pytest
+@pytest.mark.skip()
def test_sbin_added_to_path():
from diffoscope.tools import tool_required

View file

@ -64,8 +64,6 @@ stdenv.mkDerivation rec {
(fetchurl { url = "${p}/weed.at"; sha256 = "1101xakhc99f5gb9cs3mmydn43ayli7b270pzbvh7f9rbvh0d0nh"; }) (fetchurl { url = "${p}/weed.at"; sha256 = "1101xakhc99f5gb9cs3mmydn43ayli7b270pzbvh7f9rbvh0d0nh"; })
]; ];
NIX_CFLAGS_COMPILE = "-L${libmysqlclient}/lib/mysql -I${libmysqlclient}/include/mysql";
checkInputs = [ dejagnu ]; checkInputs = [ dejagnu ];
doCheck = false; # fails 1 out of a bunch of tests, looks like a bug doCheck = false; # fails 1 out of a bunch of tests, looks like a bug
doInstallCheck = false; # fails doInstallCheck = false; # fails

View file

@ -8,15 +8,15 @@
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "bash-supergenpass"; pname = "bash-supergenpass";
version = "unstable-2018-04-18"; version = "unstable-2020-02-03";
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lanzz"; owner = "lanzz";
repo = "bash-supergenpass"; repo = "bash-supergenpass";
rev = "ece772b9ec095946ac4ea985cda5561b211e56f0"; rev = "e5d96599b65d65a37148996f00f9d057e522e4d8";
sha256 = "1gkbrycyyl7y3klbfx7xjvvfw5df1h4fj6x1f73gglfy6nk8ffnd"; sha256 = "1d8csp94l2p5y5ln53aza5qf246rwmd10043x0x1yrswqrrya40f";
}; };
installPhase = '' installPhase = ''
@ -24,7 +24,9 @@ stdenv.mkDerivation {
wrapProgram "$out/bin/supergenpass" --prefix PATH : "${lib.makeBinPath [ openssl coreutils gnugrep ]}" wrapProgram "$out/bin/supergenpass" --prefix PATH : "${lib.makeBinPath [ openssl coreutils gnugrep ]}"
''; '';
passthru.updateScript = unstableGitUpdater { }; passthru.updateScript = unstableGitUpdater {
url = "https://github.com/lanzz/bash-supergenpass.git";
};
meta = with lib; { meta = with lib; {
description = "Bash shell-script implementation of SuperGenPass password generation"; description = "Bash shell-script implementation of SuperGenPass password generation";

View file

@ -5428,7 +5428,7 @@ in
jo = callPackage ../development/tools/jo { }; jo = callPackage ../development/tools/jo { };
jrnl = callPackage ../applications/misc/jrnl { }; jrnl = python3Packages.callPackage ../applications/misc/jrnl { };
jsawk = callPackage ../tools/text/jsawk { }; jsawk = callPackage ../tools/text/jsawk { };
@ -6675,6 +6675,8 @@ in
opencorsairlink = callPackage ../tools/misc/opencorsairlink { }; opencorsairlink = callPackage ../tools/misc/opencorsairlink { };
openfpgaloader = callPackage ../development/tools/misc/openfpgaloader { };
openfortivpn = callPackage ../tools/networking/openfortivpn { }; openfortivpn = callPackage ../tools/networking/openfortivpn { };
obexfs = callPackage ../tools/bluetooth/obexfs { }; obexfs = callPackage ../tools/bluetooth/obexfs { };
@ -8510,6 +8512,8 @@ in
libX11 = xorg.libX11; libX11 = xorg.libX11;
}; };
twitch-chat-downloader = python3Packages.callPackage ../applications/misc/twitch-chat-downloader { };
twitterBootstrap = callPackage ../development/web/twitter-bootstrap {}; twitterBootstrap = callPackage ../development/web/twitter-bootstrap {};
twtxt = callPackage ../applications/networking/twtxt { }; twtxt = callPackage ../applications/networking/twtxt { };

View file

@ -278,6 +278,8 @@ in {
aiopulse = callPackage ../development/python-modules/aiopulse { }; aiopulse = callPackage ../development/python-modules/aiopulse { };
aiorecollect = callPackage ../development/python-modules/aiorecollect { };
aioredis = callPackage ../development/python-modules/aioredis { }; aioredis = callPackage ../development/python-modules/aioredis { };
aioresponses = callPackage ../development/python-modules/aioresponses { }; aioresponses = callPackage ../development/python-modules/aioresponses { };
@ -461,6 +463,8 @@ in {
aspy-yaml = callPackage ../development/python-modules/aspy.yaml { }; aspy-yaml = callPackage ../development/python-modules/aspy.yaml { };
asteval = callPackage ../development/python-modules/asteval { };
astor = callPackage ../development/python-modules/astor { }; astor = callPackage ../development/python-modules/astor { };
astral = callPackage ../development/python-modules/astral { }; astral = callPackage ../development/python-modules/astral { };
@ -7932,6 +7936,8 @@ in {
twisted = callPackage ../development/python-modules/twisted { }; twisted = callPackage ../development/python-modules/twisted { };
twitch-python = callPackage ../development/python-modules/twitch-python { };
twitter = callPackage ../development/python-modules/twitter { }; twitter = callPackage ../development/python-modules/twitter { };
twitter-common-collections = callPackage ../development/python-modules/twitter-common-collections { }; twitter-common-collections = callPackage ../development/python-modules/twitter-common-collections { };