public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-04-13 12:06:33 +00:00 committed by GitHub
commit 9853ea8817
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
50 changed files with 699 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -224,6 +224,12 @@
githubId = 1773511;
name = "Adrien Devresse";
};
addict3d = {
email = "nickbathum@gmail.com";
github = "addict3d";
githubId = 49227;
name = "Nick Bathum";
};
adisbladis = {
email = "adisbladis@gmail.com";
github = "adisbladis";

6
nixos/doc/manual/release-notes/rl-2105.xml
View File

@ -669,6 +669,12 @@ environment.systemPackages = [
Environment variables can be set using <option>environment.variables</option>.
</para>
</listitem>
<listitem>
<para>
<option>services.minio.dataDir</option> changed type to a list of paths, required for specifiyng multiple data directories for using with erasure coding.
Currently, the service doesn't enforce nor checks the correct number of paths to correspond to minio requirements.
</para>
</listitem>
</itemizedlist>
</section>

11
nixos/modules/services/web-servers/minio.nix
View File

@ -18,9 +18,9 @@ in
};
dataDir = mkOption {
default = "/var/lib/minio/data";
type = types.path;
description = "The data directory, for storing the objects.";
default = [ "/var/lib/minio/data" ];
type = types.listOf types.path;
description = "The list of data directories for storing the objects. Use one path for regular operation and the minimum of 4 endpoints for Erasure Code mode.";
};
configDir = mkOption {
@ -74,15 +74,14 @@ in
config = mkIf cfg.enable {
systemd.tmpfiles.rules = [
"d '${cfg.configDir}' - minio minio - -"
"d '${cfg.dataDir}' - minio minio - -"
];
] ++ (map (x: "d '" + x + "' - minio minio - - ") cfg.dataDir);
systemd.services.minio = {
description = "Minio Object Storage";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
ExecStart = "${cfg.package}/bin/minio server --json --address ${cfg.listenAddress} --config-dir=${cfg.configDir} ${cfg.dataDir}";
ExecStart = "${cfg.package}/bin/minio server --json --address ${cfg.listenAddress} --config-dir=${cfg.configDir} ${toString cfg.dataDir}";
Type = "simple";
User = "minio";
Group = "minio";

19
pkgs/applications/audio/ncspot/bump-security-framework-crate.patch
View File

@ -1,19 +0,0 @@
Bump security-framework from 2.1.1 to 2.1.2
security-framework=2.1.1 doesn't build on Darwin 10.12.
https://github.com/kornelski/rust-security-framework/issues/124
--- c/Cargo.lock
+++ i/Cargo.lock
@@ -3138,9 +3138,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "security-framework"
-version = "2.1.1"
+version = "2.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dfd318104249865096c8da1dfabf09ddbb6d0330ea176812a62ec75e40c4166"
+checksum = "d493c5f39e02dfb062cd8f33301f90f9b13b650e8c1b1d0fd75c19dd64bff69d"
dependencies = [
"bitflags 1.2.1",
"core-foundation",

8
pkgs/applications/audio/ncspot/default.nix
View File

@ -14,23 +14,21 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "ncspot";
version = "0.5.0";
version = "0.6.0";
src = fetchFromGitHub {
owner = "hrkfdn";
repo = "ncspot";
rev = "v${version}";
sha256 = "1h1il2mzngxmcsl169431lwzl0skv420arg9i06856r5wil37jf7";
sha256 = "0j4ax3yh0l8v5bd5i3ijd8ys27dcrh7byigjip52mw1qlqfnh8wk";
};
cargoSha256 = "13yn7l4hhl48lbpj0zsbraqzkkz6knc373j6rcf8d1p4z76yili4";
cargoSha256 = "022q6rlac97dr6l7rd9xalgx0w257r364i1pij080qx8rk97msb9";
cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];
nativeBuildInputs = [ pkg-config ];
cargoPatches = [ ./bump-security-framework-crate.patch ];
buildInputs = [ ncurses openssl ]
++ lib.optional stdenv.isDarwin libiconv
++ lib.optional withALSA alsaLib

12
pkgs/applications/graphics/megapixels/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv
, lib
, fetchgit
, fetchFromSourcehut
, meson
, ninja
, pkg-config
@ -26,12 +26,13 @@ let
in
stdenv.mkDerivation rec {
pname = "megapixels";
version = "0.15.0";
version = "0.16.0";
src = fetchgit {
url = "https://git.sr.ht/~martijnbraam/megapixels";
src = fetchFromSourcehut {
owner = "~martijnbraam";
repo = "megapixels";
rev = version;
sha256 = "1y8irwi8lbjs948j90gpic96dx5wjmwacd41hb3d9vzhkyni2dvb";
sha256 = "0z7sx76x18yqf7carq6mg9lib0zbz0yrd1dsg9qd6hbf5niqis37";
};
nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ];
@ -49,6 +50,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "GTK3 camera application using raw v4l2 and media-requests";
homepage = "https://sr.ht/~martijnbraam/Megapixels";
changelog = "https://git.sr.ht/~martijnbraam/megapixels/refs/${version}";
license = licenses.gpl3Only;
maintainers = with maintainers; [ OPNA2608 ];
platforms = platforms.linux;

27
pkgs/applications/graphics/round/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "round";
version = "0.0.2";
src = fetchFromGitHub {
owner = "mingrammer";
repo = pname;
rev = "v${version}";
sha256 = "09brjr3h4qnhlidxlki1by5anahxy16ai078zm4k7ryl579amzdw";
};
vendorSha256 = null;
subPackages = [ "." ];
meta = with lib; {
description = "Round image corners from CLI";
homepage = "https://github.com/mingrammer/round";
license = licenses.mit;
maintainers = with maintainers; [ addict3d ];
};
}

9
pkgs/applications/misc/stretchly/default.nix
View File

@ -2,24 +2,21 @@
, lib
, fetchurl
, makeWrapper
, electron_9
, electron
, common-updater-scripts
, writeShellScript
, jq
, makeDesktopItem
}:
let
electron = electron_9;
in
stdenv.mkDerivation rec {
pname = "stretchly";
version = "1.2.0";
version = "1.5.0";
src = fetchurl {
url = "https://github.com/hovancik/stretchly/releases/download/v${version}/stretchly-${version}.tar.xz";
sha256 = "07v9yk9qgya9ladfgbfkwwnbzvczs1cv6yn3zrg9rviyv8zlqjls";
sha256 = "19czwmwqsn82zdzln9zqqyl9sb3dm95gp58dqn1459gyinkzpvda";
};
icon = fetchurl {

8
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -7,7 +7,7 @@
, xdg-utils, yasm, nasm, minizip, libwebp
, libusb1, pciutils, nss, re2
, python2Packages, perl, pkg-config
, python2Packages, python3Packages, perl, pkg-config
, nspr, systemd, libkrb5
, util-linux, alsaLib
, bison, gperf
@ -130,6 +130,8 @@ let
ninja which python2Packages.python perl pkg-config
python2Packages.ply python2Packages.jinja2 nodejs
gnutar python2Packages.setuptools
] ++ optionals (chromiumVersionAtLeast "91") [
python3Packages.python
];
buildInputs = defaultDependencies ++ [
@ -160,7 +162,9 @@ let
url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/61b0ab526d2aa3c62fa20bb756461ca9a482f6c6/trunk/chromium-fix-libva-redef.patch";
sha256 = "1qj4sn1ngz0p1l1w3346kanr1sqlr3xdzk1f1i86lqa45mhv77ny";
}) ++ optional (chromiumVersionAtLeast "90")
./fix-missing-atspi2-dependency.patch
./patches/fix-missing-atspi2-dependency.patch
++ optional (chromiumVersionAtLeast "91")
./patches/closure_compiler-Use-the-Java-binary-from-the-system.patch
;
postPatch = ''

31
pkgs/applications/networking/browsers/chromium/patches/closure_compiler-Use-the-Java-binary-from-the-system.patch Normal file
View File

@ -0,0 +1,31 @@
From e031b8be0fb2a22f953c034cdf08ca9befe130d2 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 11 Apr 2021 18:05:12 +0200
Subject: [PATCH] closure_compiler: Use the Java binary from the system
The bundled Java binary (third_party/jdk/current/bin/java) is missing in
the tarball and we want to use the one from the system anyway.
This reverts part of [0].
[0]: https://chromium-review.googlesource.com/c/chromium/src/+/2778794
---
third_party/closure_compiler/compiler.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/third_party/closure_compiler/compiler.py b/third_party/closure_compiler/compiler.py
index 75690ceb9749..7b9c76f74290 100755
--- a/third_party/closure_compiler/compiler.py
+++ b/third_party/closure_compiler/compiler.py
@@ -13,8 +13,7 @@ import subprocess
_CURRENT_DIR = os.path.join(os.path.dirname(__file__))
-_JAVA_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
-assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds"
+_JAVA_PATH = "java"
class Compiler(object):
"""Runs the Closure compiler on given source files to typecheck them
--
2.20.1

0
pkgs/applications/networking/browsers/chromium/fix-missing-atspi2-dependency.patch → pkgs/applications/networking/browsers/chromium/patches/fix-missing-atspi2-dependency.patch
View File

6
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@ -18,9 +18,9 @@
}
},
"beta": {
"version": "90.0.4430.61",
"sha256": "01vssy3q64pv9rw4cdxv5rdg7yrxmhyc03a5r75fhxc95fj66iac",
"sha256bin64": "07l8dzyv0hav1gls3xw91q9ay2l8xxmsf7yagg940cya9ncl0lhi",
"version": "90.0.4430.70",
"sha256": "0jnyqnqwdccv3i55grd12wr2w5ffxyzmj2l3c1i24xawf2zdzyym",
"sha256bin64": "1lv9gz6llphyvlvn92yw1cyhj4i6jzhy1l7hk01418prmhb4nfws",
"deps": {
"gn": {
"version": "2021-02-09",

4
pkgs/applications/networking/cluster/tektoncd-cli/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "tektoncd-cli";
version = "0.17.1";
version = "0.17.2";
src = fetchFromGitHub {
owner = "tektoncd";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-xwUTSJ0rlNzQqGQp6jL03L4SuHUvvD3aWXxa1Xp0UyM=";
sha256 = "sha256-7VG9OFt1yVt4st8EM1aiRqLCHwjSqib28GoamoJHHnM=";
};
vendorSha256 = null;

4
pkgs/applications/networking/cluster/terragrunt/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "terragrunt";
version = "0.28.19";
version = "0.28.20";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
sha256 = "sha256-REcVc4u7pDTDHvoI1Fw36Mioyg1D4U29Hq0ih8Bt95s=";
sha256 = "sha256-Hg4eeLFNm2cXUjp3T2VK6q+mgawqkHju9P3Vq9wnB9c=";
};
vendorSha256 = "sha256-kcRM76xfajtQist1aJTmaRludxRlfvHQ9ucB3LOgnBk=";

10
pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
View File

@ -25,7 +25,7 @@ let
else "");
in stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "1.40.1"; # Please backport all updates to the stable channel.
version = "5.0.0"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "0k57r1x64w38n0295qdrf3p19d3z8m530h46ps0j2x0krhah47w7";
sha256 = "17hxg61m9kk1kph6ifqy6507kzx5hi6yafr2mj8n0a6c39vc8f9g";
};
nativeBuildInputs = [
@ -96,6 +96,8 @@ in stdenv.mkDerivation rec {
dontAutoPatchelf = true;
installPhase = ''
runHook preInstall
mkdir -p $out/lib
mv usr/share $out/share
@ -109,6 +111,8 @@ in stdenv.mkDerivation rec {
# Symlink to bin
mkdir -p $out/bin
ln -s $out/lib/Signal/signal-desktop $out/bin/signal-desktop
runHook postInstall
'';
preFixup = ''
@ -136,7 +140,7 @@ in stdenv.mkDerivation rec {
'';
homepage = "https://signal.org/";
changelog = "https://github.com/signalapp/Signal-Desktop/releases/tag/v${version}";
license = lib.licenses.gpl3;
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ ixmatus primeos equirosa ];
platforms = [ "x86_64-linux" ];
};

43
pkgs/applications/terminal-emulators/wezterm/default.nix
View File

@ -2,22 +2,16 @@
, rustPlatform
, lib
, fetchFromGitHub
, pkg-config
, fontconfig
, python3
, openssl
, perl
# Apple frameworks
, CoreGraphics
, Cocoa
, Foundation
, dbus
, libX11
, xcbutil
, libxcb
, xcbutilimage
, xcbutilkeysyms
, xcbutilwm # contains xcb-ewmh among others
, libxkbcommon
@ -28,6 +22,11 @@
, libGL
, freetype
, zlib
# Apple frameworks
, CoreGraphics
, Cocoa
, Foundation
, libiconv
}:
let
runtimeDeps = [
@ -38,6 +37,7 @@ let
libX11
xcbutil
libxcb
xcbutilimage
xcbutilkeysyms
xcbutilwm
libxkbcommon
@ -47,40 +47,40 @@ let
wayland
libGLU
libGL
openssl
] ++ lib.optionals (stdenv.isDarwin) [
Foundation
CoreGraphics
Cocoa
libiconv
];
pname = "wezterm";
in
rustPlatform.buildRustPackage {
inherit pname;
version = "unstable-2020-11-22";
rustPlatform.buildRustPackage rec {
pname = "wezterm";
version = "20210407-nightly";
src = fetchFromGitHub {
owner = "wez";
repo = pname;
rev = "3bd8d8c84591f4d015ff9a47ddb478e55c231fda";
sha256 = "13xf3685kir4p159hsxrqkj9p2lwgfp0n13h9zadslrd44l8b8j8";
rev = "d2419fb99e567e3b260980694cc840a1a3b86922";
sha256 = "4tVjrdDlrDPKzcbTYK9vRlzfC9tfvkD+D0aN19A8RWE=";
fetchSubmodules = true;
};
cargoSha256 = "1ghjpyd3f5dqi6bblr6d2lihdschpyj5djfd1600hvb41x75lmhx";
cargoSha256 = "sha256-UaXeeuRuQk+CWF936mEAaWTjZuTSRPmxbQ/9E2oZIqg=";
nativeBuildInputs = [
pkg-config
python3
openssl.dev
perl
];
buildInputs = runtimeDeps;
installPhase = "" + lib.optionalString stdenv.isLinux ''
preFixup = lib.optionalString stdenv.isLinux ''
for artifact in wezterm wezterm-gui wezterm-mux-server strip-ansi-escapes; do
patchelf --set-rpath "${lib.makeLibraryPath runtimeDeps}" $releaseDir/$artifact
install -D $releaseDir/$artifact -t $out/bin
patchelf --set-rpath "${lib.makeLibraryPath runtimeDeps}" $out/bin/$artifact
done
'' + lib.optionalString stdenv.isDarwin ''
mkdir -p "$out/Applications"
@ -88,10 +88,7 @@ rustPlatform.buildRustPackage {
cp -r assets/macos/WezTerm.app "$OUT_APP"
rm $OUT_APP/*.dylib
cp -r assets/shell-integration/* "$OUT_APP"
cp $releaseDir/wezterm "$OUT_APP"
cp $releaseDir/wezterm-mux-server "$OUT_APP"
cp $releaseDir/wezterm-gui "$OUT_APP"
cp $releaseDir/strip-ansi-escapes "$OUT_APP"
ln -s $out/bin/{wezterm,wezterm-mux-server,wezterm-gui,strip-ansi-escapes} "$OUT_APP"
'';
# prevent further changes to the RPATH
@ -101,7 +98,7 @@ rustPlatform.buildRustPackage {
description = "A GPU-accelerated cross-platform terminal emulator and multiplexer written by @wez and implemented in Rust";
homepage = "https://wezfurlong.org/wezterm";
license = licenses.mit;
maintainers = with maintainers; [ steveej ];
maintainers = with maintainers; [ steveej SuperSandro2000 ];
platforms = platforms.unix;
};
}

4
pkgs/development/python-modules/aiohomekit/default.nix
View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "aiohomekit";
version = "0.2.60";
version = "0.2.61";
format = "pyproject";
disabled = pythonAtLeast "3.9";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "Jc2k";
repo = pname;
rev = version;
sha256 = "03llk5i22hq163x568kz0qar5h0sda8f8cxbmgya6z2dcxv0a83p";
sha256 = "047ql5a4i4354jgr8xr2waim8j522z58vbfi7aa62jqc9l8jzxzk";
};
nativeBuildInputs = [ poetry ];

7
pkgs/development/python-modules/datadog/default.nix
View File

@ -17,11 +17,11 @@
buildPythonPackage rec {
pname = "datadog";
version = "0.40.0";
version = "0.40.1";
src = fetchPypi {
inherit pname version;
sha256 = "4bbd66a02bbcf9cd03ba05194d605a64c9efb7aed90d5e69c6ec42655c3c01a4";
sha256 = "sha256-Q4wd3lRi5oxceSt7Sh2HoN3ZcK89sxs88VmA7tDEQxE=";
};
postPatch = ''
@ -43,12 +43,11 @@ buildPythonPackage rec {
];
disabledTestPaths = [
"tests/unit/dogstatsd/test_statsd.py" # does not work in sandbox
"tests/performance"
];
disabledTests = [
"test_default_settings_set"
"test_threadstats_thread_safety"
];
pythonImportsCheck = [ "datadog" ];

12
pkgs/development/python-modules/diagrams/build_poetry.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/pyproject.toml b/pyproject.toml
index 2c93a39..6c800e2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -24,3 +24,7 @@ isort = "^4.3"
[tool.black]
line-length = 120
+
+[build-system]
+requires = ["poetry_core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"

49
pkgs/development/python-modules/diagrams/default.nix Normal file
View File

@ -0,0 +1,49 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, black
, jinja2
, poetry-core
, round
, graphviz
, inkscape
, imagemagick
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "diagrams";
version = "0.19.1";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "mingrammer";
repo = pname;
rev = "v${version}";
sha256 = "0qvk0cp3026n5jmwp9z7m70b6pws0h6a7slxr23glg18baxr44d4";
};
preConfigure = ''
patchShebangs autogen.sh
./autogen.sh
'';
patches = [ ./build_poetry.patch ];
checkInputs = [ pytestCheckHook ];
# Despite living in 'tool.poetry.dependencies',
# these are only used at build time to process the image resource files
nativeBuildInputs = [ black inkscape imagemagick jinja2 poetry-core round ];
propagatedBuildInputs = [ graphviz ];
meta = with lib; {
description = "Diagram as Code";
homepage = "https://diagrams.mingrammer.com/";
license = licenses.mit;
maintainers = with maintainers; [ addict3d ];
};
}

2
pkgs/development/python-modules/isbnlib/default.nix
View File

@ -27,7 +27,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Extract, clean, transform, hyphenate and metadata for ISBNs";
homepage = "https://github.com/xlcnd/isbnlib";
license = licenses.lgpl3Only;
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ dotlambda ];
};
}

18
pkgs/development/python-modules/pdfx/default.nix
View File

@ -1,28 +1,24 @@
{ lib, buildPythonPackage, fetchFromGitHub, pdfminer, chardet, pytest }:
{ lib, buildPythonPackage, fetchFromGitHub, pdfminer, chardet, pytestCheckHook }:
buildPythonPackage rec {
pname = "pdfx";
version = "1.3.1";
version = "1.4.1";
src = fetchFromGitHub {
owner = "metachris";
repo = "pdfx";
rev = "v${version}";
sha256 = "1183k4h5qdf8y0imbir9ja3yzzsvdmqgbv3bi6dnkgr1wy2xfr0v";
sha256 = "sha256-POpP6XwcqwvImrtIiDjpnHoNE0MKapuPjxojo+ocBK0=";
};
# Remove after https://github.com/metachris/pdfx/pull/28
prePatch = ''
sed -i -e "s|pdfminer2|pdfminer.six|" setup.py
postPatch = ''
substituteInPlace requirements.txt \
--replace "chardet==4.0.0" "chardet"
'';
propagatedBuildInputs = [ pdfminer chardet ];
checkInputs = [ pytest ];
checkPhase = ''
py.test
'';
checkInputs = [ pytestCheckHook ];
meta = with lib; {
inherit (src.meta) homepage;

4
pkgs/development/python-modules/pyeconet/default.nix
View File

@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "pyeconet";
version = "0.1.13";
version = "0.1.14";
src = fetchPypi {
inherit pname version;
sha256 = "0pxwsmxzbmrab6p6qr867pc43ky2yjv2snra534wrdrknpj40h4s";
sha256 = "sha256-x0mkC2k65VrDhv7UavgDUuRWIQoAJMDtA7jNXNUJuVg=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/pylatexenc/default.nix
View File

@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "pylatexenc";
version = "2.8";
version = "2.10";
src = fetchFromGitHub {
owner = "phfaist";
repo = "pylatexenc";
rev = "v${version}";
sha256 = "0m9vrbh1gmbgq6dqm7xzklar3accadw0pn896rqsdi5jbgd3w0mh";
hash = "sha256-3Ho04qrmCtmmrR+BUJNbtdCZcK7lXhUGJjm4yfCTUkM=";
};
pythonImportsCheck = [ "pylatexenc" ];

8
pkgs/development/python-modules/pyupgrade/default.nix
View File

@ -8,22 +8,24 @@
buildPythonPackage rec {
pname = "pyupgrade";
version = "2.10.0";
version = "2.12.0";
disabled = isPy27;
src = fetchFromGitHub {
owner = "asottile";
repo = pname;
rev = "v${version}";
sha256 = "sha256-XYeqyyfwtS7dHLxeVvmcifW6UCOlnSMxqF1vxezBjT8=";
sha256 = "sha256-pAZszyv7jXEwtQYzEk5Zq2ULP0K2vX0y6IvR6wYsJ9c=";
};
checkInputs = [ pytestCheckHook ];
propagatedBuildInputs = [ tokenize-rt ];
pythonImportsCheck = [ "pyupgrade" ];
meta = with lib; {
description = "A tool to automatically upgrade syntax for newer versions of the language";
description = "Tool to automatically upgrade syntax for newer versions of the language";
homepage = "https://github.com/asottile/pyupgrade";
license = licenses.mit;
maintainers = with maintainers; [ lovesegfault ];

16
pkgs/development/python-modules/qiskit-aer/default.nix
View File

@ -27,7 +27,7 @@
buildPythonPackage rec {
pname = "qiskit-aer";
version = "0.7.6";
version = "0.8.0";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -36,7 +36,7 @@ buildPythonPackage rec {
owner = "Qiskit";
repo = "qiskit-aer";
rev = version;
sha256 = "0595as4rxjrd5dqx54ywz3rjsjk0z7r41bq0z9r8y1h7zgvvlrmn";
hash = "sha256-CWF3ehLs0HBXnYH11r+2CQwIcxddAfQm3ulAf1agl/o=";
};
nativeBuildInputs = [
@ -61,6 +61,7 @@ buildPythonPackage rec {
pybind11
];
# tries to install pypi cmake package, not needed
postPatch = ''
substituteInPlace setup.py --replace "'cmake!=3.17,!=3.17.0'," ""
'';
@ -83,6 +84,17 @@ buildPythonPackage rec {
disabledTests = [
"test_paulis_1_and_2_qubits"
"test_3d_oscillator"
"_057"
"_136"
"_137"
"_139"
"_138"
"_140"
"_141"
"_143"
"_144"
"test_sparse_output_probabilities"
"test_reset_2_qubit"
];
checkInputs = [
pytestCheckHook

12
pkgs/development/python-modules/qiskit-aqua/default.nix
View File

@ -34,7 +34,7 @@
buildPythonPackage rec {
pname = "qiskit-aqua";
version = "0.8.2";
version = "0.9.0";
disabled = pythonOlder "3.6";
@ -43,7 +43,7 @@ buildPythonPackage rec {
owner = "Qiskit";
repo = "qiskit-aqua";
rev = version;
sha256 = "sha256-ybf8bXqsVk6quYi0vrfo/Mplk7Nr7tQS7cevXxI9khw=";
hash = "sha256-knue9uJih72UQHsvfXZ9AA94mol4ERa9Lo/GMcp+2hA=";
};
# Optional packages: pyscf (see below NOTE) & pytorch. Can install via pip/nix if needed.
@ -74,7 +74,13 @@ buildPythonPackage rec {
# We disable appropriate tests below to allow building without pyscf installed
postPatch = ''
substituteInPlace setup.py --replace "docplex==2.15.194" "docplex"
# Because this is a legacy/final release, the maintainers restricted the maximum
# versions of all dependencies to the latest current version. That will not
# work with nixpkgs' rolling release/update system.
# Unlock all versions for compatibility
substituteInPlace setup.py --replace "<=" ">="
sed -i 's/\(\w\+-*\w*\).*/\1/' requirements.txt
substituteInPlace requirements.txt --replace "dataclasses" ""
# Add ImportWarning when running qiskit.chemistry (pyscf is a chemistry package) that pyscf is not included
echo -e "\nimport warnings\ntry: import pyscf;\nexcept ImportError:\n " \

4
pkgs/development/python-modules/qiskit-ignis/default.nix
View File

@ -23,7 +23,7 @@
buildPythonPackage rec {
pname = "qiskit-ignis";
version = "0.5.2";
version = "0.6.0";
disabled = pythonOlder "3.6";
@ -32,7 +32,7 @@ buildPythonPackage rec {
owner = "Qiskit";
repo = "qiskit-ignis";
rev = version;
sha256 = "sha256-Kl3tnoamZrCxwoDdu8betG6Lf3CC3D8R2TYiq8Zl3Aw=";
hash = "sha256-L5fwCMsN03ojiDvKIyqsGfUnwej1P7bpyHlL6mu7nh0=";
};
# hacky, fix https://github.com/Qiskit/qiskit-ignis/issues/532.

24
pkgs/development/python-modules/qiskit-terra/default.nix
View File

@ -29,8 +29,8 @@
, withCrosstalkPass ? false
, z3
# Classical function -> Quantum Circuit compiler
, withClassicalFunctionCompiler ? false
, tweedledum ? null
, withClassicalFunctionCompiler ? true
, tweedledum
# test requirements
, ddt
, hypothesis
@ -56,7 +56,7 @@ in
buildPythonPackage rec {
pname = "qiskit-terra";
version = "0.16.4";
version = "0.17.0";
disabled = pythonOlder "3.6";
@ -64,7 +64,7 @@ buildPythonPackage rec {
owner = "Qiskit";
repo = pname;
rev = version;
sha256 = "sha256-/rWlPfpAHoMedKG42jfUYt0Ezq7i+9dkyPllavkg4cc=";
hash = "sha256-LbNbaHAWAVG5YLc9juuwcOlrREBW6OjEl7VPtACfl3I=";
};
nativeBuildInputs = [ cython ];
@ -100,15 +100,17 @@ buildPythonPackage rec {
"qiskit.transpiler.passes.routing.cython.stochastic_swap.swap_trial"
];
pytestFlagsArray = [
"--ignore=test/randomized/test_transpiler_equivalence.py" # collection requires qiskit-aer, which would cause circular dependency
disabledTestPaths = [
"test/randomized/test_transpiler_equivalence.py" # collection requires qiskit-aer, which would cause circular dependency
] ++ lib.optionals (!withClassicalFunctionCompiler) [
"--ignore=test/python/classical_function_compiler/"
"test/python/classical_function_compiler/"
];
disabledTests = [
# Flaky tests
"test_cx_equivalence"
"test_pulse_limits"
] ++ lib.optionals (!withClassicalFunctionCompiler) [
"TestPhaseOracle"
]
# Disabling slow tests for build constraints
++ [
@ -130,6 +132,14 @@ buildPythonPackage rec {
"test_block_collection_reduces_1q_gate"
"test_multi_controlled_rotation_gate_matrices"
"test_block_collection_runs_for_non_cx_bases"
"test_with_two_qubit_reduction"
"test_basic_aer_qasm"
"test_hhl"
"test_H2_hamiltonian"
"test_max_evals_grouped_2"
"test_qaoa_qc_mixer_4"
"test_abelian_grouper_random_2"
"test_pauli_two_design"
];
# Moves tests to $PACKAGEDIR/test. They can't be run from /build because of finding

4
pkgs/development/python-modules/qiskit/default.nix
View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "qiskit";
# NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history
version = "0.24.1";
version = "0.25.0";
disabled = pythonOlder "3.6";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "qiskit";
repo = "qiskit";
rev = version;
sha256 = "0qfz69n8sl7sk4hzygni9qars9q1cyz0n3bv1lca00ia5qsc72d2";
hash = "sha256-pJM6d3AyFs9AexvQXG+8QQ4zwpFisJC16iBFR9gNSk0=";
};
propagatedBuildInputs = [

5
pkgs/development/python-modules/quandl/default.nix
View File

@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "quandl";
version = "3.5.0";
version = "3.6.1";
disabled = !isPy3k;
src = fetchPypi {
inherit version;
pname = "Quandl";
sha256 = "0zpw0nwqr4g56l9z4my0fahfgpcmfx74acbmv6nfx1dmq5ggraf3";
sha256 = "0jr69fqxhzdmkfh3fxz0yp2kks2hkmixrscjjf59q2l7irglwhc4";
};
checkInputs = [
@ -51,6 +51,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Quandl Python client library";
homepage = "https://github.com/quandl/quandl-python";
changelog = "https://github.com/quandl/quandl-python/blob/master/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ ilya-kolpakov ];
};

37
pkgs/development/python-modules/tweedledum/default.nix Normal file
View File

@ -0,0 +1,37 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, cmake
, ninja
, scikit-build
}:
buildPythonPackage rec {
pname = "tweedledum";
version = "1.0.0";
format = "pyproject";
src = fetchFromGitHub{
owner = "boschmitt";
repo = "tweedledum";
rev = "v${version}";
hash = "sha256-59lJzdw9HLJ9ADxp/a3KW4v5aU/dYm27NSYoz9D49i4=";
};
nativeBuildInputs = [ cmake ninja scikit-build ];
dontUseCmakeConfigure = true;
pythonImportsCheck = [ "tweedledum" ];
# TODO: use pytest, but had issues with finding the correct directories
checkPhase = ''
python -m unittest discover -s ./python/test -t .
'';
meta = with lib; {
description = "A library for synthesizing and manipulating quantum circuits";
homepage = "https://github.com/boschmitt/tweedledum";
license = licenses.mit ;
maintainers = with maintainers; [ drewrisinger ];
};
}

41
pkgs/development/python-modules/yara-python/default.nix Normal file
View File

@ -0,0 +1,41 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, yara
}:
buildPythonPackage rec {
pname = "yara-python";
version = "4.0.5";
src = fetchFromGitHub {
owner = "VirusTotal";
repo = "yara-python";
rev = "v${version}";
sha256 = "1qd0aw5p48ay77hgj0hgzpvbmq1933mknk134aqdb32036rlc5sq";
};
buildInputs = [
yara
];
checkInputs = [
pytestCheckHook
];
setupPyBuildFlags = [
"--dynamic-linking"
];
pytestFlagsArray = [ "tests.py" ];
pythonImportsCheck = [ "yara" ];
meta = with lib; {
description = "Python interface for YARA";
homepage = "https://github.com/VirusTotal/yara-python";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}

44
pkgs/development/tools/apkid/default.nix Normal file
View File

@ -0,0 +1,44 @@
{ lib
, fetchFromGitHub
, python3
}:
python3.pkgs.buildPythonApplication rec {
pname = "apkid";
version = "2.1.1";
src = fetchFromGitHub {
owner = "rednaga";
repo = "APKiD";
rev = "v${version}";
sha256 = "1p6kdjjw2jhwr875445w43k46n6zwpz0l0phkl8d3y1v4gi5l6dx";
};
propagatedBuildInputs = with python3.pkgs; [
yara-python
];
checkInputs = with python3.pkgs; [
pytestCheckHook
];
preBuild = ''
# Prepare the YARA rules
${python3.interpreter} prep-release.py
'';
postPatch = ''
# The next release will have support for later yara-python releases
substituteInPlace setup.py \
--replace "yara-python==3.11.0" "yara-python"
'';
pythonImportsCheck = [ "apkid" ];
meta = with lib; {
description = "Android Application Identifier";
homepage = "https://github.com/rednaga/APKiD";
license = with licenses; [ gpl3Only ];
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/development/tools/misc/universal-ctags/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "universal-ctags";
version = "5.9.20201206.0";
version = "5.9.20210411.0";
src = fetchFromGitHub {
owner = "universal-ctags";
repo = "ctags";
rev = "p${version}";
sha256 = "0w10zjyz46sjm6ypxmq550dkr84hvc4phm4vm9j53jp5s19x5q19";
sha256 = "0c031y0dl2b70pd0mqfbylplf8f27x11b0ch7ljka3rqav0zb1zr";
};
nativeBuildInputs = [ autoreconfHook coreutils pkg-config python3Packages.docutils ];

25
pkgs/development/tools/rust/probe-run/default.nix Normal file
View File

@ -0,0 +1,25 @@
{ lib, rustPlatform, fetchFromGitHub, pkg-config, libusb1 }:
rustPlatform.buildRustPackage rec {
pname = "probe-run";
version = "0.2.1";
src = fetchFromGitHub {
owner = "knurling-rs";
repo = pname;
rev = "v${version}";
sha256 = "QEUsigoSqVczrsSSDnOhTXm94JTXHgxeNY0tGsOaRyg=";
};
cargoSha256 = "Fr5XWIUHXyfesouHi0Uryf/ZgB/rDDJ4G1BYGHw0QeQ=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libusb1 ];
meta = with lib; {
description = "Run embedded programs just like native ones.";
homepage = "https://github.com/knurling-rs/probe-run";
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ hoverbear ];
};
}

4
pkgs/development/web/cypress/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "cypress";
version = "7.0.0";
version = "7.1.0";
src = fetchzip {
url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
sha256 = "0ad578fqbijw8yf0c92c33inpqam1cfhbwcwinzlmc22h0d4bv5h";
sha256 = "1m52v6hhblrjji9c5885bn5qq0xlaw36krbmqfac7fhgsxmkxd2h";
};
# don't remove runtime deps

68
pkgs/games/sdlpop/default.nix Normal file
View File

@ -0,0 +1,68 @@
{ lib, stdenv
, makeWrapper
, makeDesktopItem, copyDesktopItems
, fetchFromGitHub
, pkg-config
, SDL2, SDL2_image
}:
stdenv.mkDerivation rec {
pname = "sdlpop";
version = "1.21";
src = fetchFromGitHub {
owner = "NagyD";
repo = "SDLPoP";
rev = "v${version}";
sha256 = "1q4mnyg8v4420f1bp24v8lgi335vijdv61yi3fan14jgfzl38l7w";
};
nativeBuildInputs = [ pkg-config makeWrapper copyDesktopItems ];
buildInputs = [ SDL2 SDL2_image ];
makeFlags = [ "-C" "src" ];
preBuild = ''
substituteInPlace src/Makefile --replace "CC = gcc" "CC = ${stdenv.cc.targetPrefix}gcc"
'';
# The prince binary expects two things of the working directory it is called from:
# (1) There is a subdirectory "data" containing the level data.
# (2) The working directory is writable, so save and quicksave files can be created.
# Our solution is to ensure that ~/.local/share/sdlpop is the working
# directory, symlinking the data files into it. This is the task of the
# prince.sh wrapper.
installPhase = ''
runHook preInstall
install -Dm755 prince $out/bin/.prince-bin
substituteAll ${./prince.sh} $out/bin/prince
chmod +x $out/bin/prince
mkdir -p $out/share/sdlpop
cp -r data doc mods SDLPoP.ini $out/share/sdlpop
install -Dm755 data/icon.png $out/share/icons/hicolor/32x32/apps/sdlpop.png
runHook postInstall
'';
desktopItems = [ (makeDesktopItem {
name = "sdlpop";
icon = "sdlpop";
exec = "prince";
desktopName = "SDLPoP";
comment = "An open-source port of Prince of Persia";
categories = "Game;AdventureGame;";
}) ];
meta = with lib; {
description = "Open-source port of Prince of Persia";
homepage = "https://github.com/NagyD/SDLPoP";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ iblech ];
platforms = platforms.unix;
broken = stdenv.isDarwin;
};
}

16
pkgs/games/sdlpop/prince.sh Normal file
View File

@ -0,0 +1,16 @@
#! @shell@
set -euo pipefail
mkdir -p ~/.local/share/sdlpop
cd ~/.local/share/sdlpop
for i in SDLPoP.ini mods; do
[ -e $i ] || cp -r @out@/share/sdlpop/$i .
done
# Create the data symlink or update it (in case it is a symlink, else the user
# has probably tinkered with it and does not want it to be recreated).
[ ! -e data -o -L data ] && ln -sf @out@/share/sdlpop/data .
exec -a "prince" @out@/bin/.prince-bin "$@"

184
pkgs/misc/vim-plugins/generated.nix
View File

@ -65,12 +65,12 @@ let
ale = buildVimPluginFrom2Nix {
pname = "ale";
version = "2021-04-10";
version = "2021-04-12";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
rev = "686c8c5e0acbf3cbf50f1b11eafadd759b017f4a";
sha256 = "1bwv9yzvlj7ab0ybjrdjhhhqwmg1hjld9m2kb1hq8mgvdc9rsa4c";
rev = "1cd0c0c33b211b5fface9b29f9c58bc6ae09323e";
sha256 = "0cx8ap63742xr3zmk1gkqrchfzvzg0j9blggcw63s23wr9d1yriw";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@ -389,12 +389,12 @@ let
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
version = "2021-04-11";
version = "2021-04-12";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "ce6ff8e0f321b1fb3bfd4befaeeb9c97521eba9b";
sha256 = "0bl914jyw84ya9hay50jk7zdqiw7raxnr2zq8iz6kz8s1zh8r928";
rev = "45ace3afea4e722efa3697b37d8c7dd7c58cab9c";
sha256 = "113g6jqpy06z9mfc5097w99flvj7m6g8nqxv68ikkdqbp73kx51c";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@ -485,12 +485,12 @@ let
coc-explorer = buildVimPluginFrom2Nix {
pname = "coc-explorer";
version = "2021-04-08";
version = "2021-04-12";
src = fetchFromGitHub {
owner = "weirongxu";
repo = "coc-explorer";
rev = "adb0ef3bbefee3747ce7ac96551789ea882832fb";
sha256 = "0kcag0sv94fjcvqfsjx6q1bdq5qvnji5iz2rg3pry49ar1igxmj8";
rev = "252b48bdd55e494fae8dce07526c0efa33ad069d";
sha256 = "1f6pxszy7gvlz2sh9477gbxhkvjrl0ni3l8n2d6109k7lww40a3n";
};
meta.homepage = "https://github.com/weirongxu/coc-explorer/";
};
@ -630,12 +630,12 @@ let
compe-tabnine = buildVimPluginFrom2Nix {
pname = "compe-tabnine";
version = "2021-04-04";
version = "2021-04-12";
src = fetchFromGitHub {
owner = "tzachar";
repo = "compe-tabnine";
rev = "e27296ab377fed567812876bebfd74487062d518";
sha256 = "0jmn0s398896109j7k8bni2f5qgd63xjnjsmqkljlpc9zvhy1fbz";
rev = "def6e1a1c4e4a2c18f7ba3ab61152d96500ba0d3";
sha256 = "1m8qrf5984kfmmv4yjs0bnqbhg62mmpag6zsw719r95v7r2j8p6n";
};
meta.homepage = "https://github.com/tzachar/compe-tabnine/";
};
@ -954,12 +954,12 @@ let
deol-nvim = buildVimPluginFrom2Nix {
pname = "deol-nvim";
version = "2021-03-31";
version = "2021-04-12";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deol.nvim";
rev = "09598d454ce12753c562a596b6c6b798537a8e67";
sha256 = "0vmkgb6fy9vi2spvgqf242vn37yj6sjs68ddz37948l5nazalhrl";
rev = "b9dd634beacfda00a6d4c388867cc1348735f3a2";
sha256 = "055k2fph67glzlx10611a6z7s10z3jsms21ixzy25hsdvr75xpda";
};
meta.homepage = "https://github.com/Shougo/deol.nvim/";
};
@ -1607,12 +1607,12 @@ let
git-blame-nvim = buildVimPluginFrom2Nix {
pname = "git-blame-nvim";
version = "2021-04-10";
version = "2021-04-12";
src = fetchFromGitHub {
owner = "f-person";
repo = "git-blame.nvim";
rev = "bcfb85765903865fbe0a47682ed66dfc51bbcf28";
sha256 = "1zc6bsli8bpks3c23vpia38nr02mncmnldwvhip1hghphnf3crwr";
rev = "d75b433c1ea96d8133cb33dcdb2d1d47c98e59fb";
sha256 = "0b726nf63ydfsxc22v1ymz4z8qcp0i2yxgq5dh7i7b5ws809kyn5";
};
meta.homepage = "https://github.com/f-person/git-blame.nvim/";
};
@ -1643,12 +1643,12 @@ let
gitsigns-nvim = buildVimPluginFrom2Nix {
pname = "gitsigns-nvim";
version = "2021-04-10";
version = "2021-04-12";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
rev = "bfd9dcd323e7ec35f34407fc3cfd5700400c88af";
sha256 = "0w05afpbys8mkqzl13ygzh9c3rcml9q746v3snl2vamm3fjyhmzn";
rev = "2ba9f5a7610fac660c8266db244eea91b76dcf48";
sha256 = "1zcflhcpvyl1chsxwdcii8lzhig5fwjpvhr5l3wvpr63vix7iy65";
};
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
};
@ -2076,12 +2076,12 @@ let
julia-vim = buildVimPluginFrom2Nix {
pname = "julia-vim";
version = "2021-04-10";
version = "2021-04-13";
src = fetchFromGitHub {
owner = "JuliaEditorSupport";
repo = "julia-vim";
rev = "b04bdfee67a62e225fb36aa49a4806bb8c74b5aa";
sha256 = "0cq58f634qp67xbfd4hwbg8wm2pq2wk05cp2dn6ja2k5vnqymn99";
rev = "c76be0ea28926ab60276fd4788eddbd8c96b66fc";
sha256 = "1bai15a7wwr7v9z43qjzryb1cpd8xyylfrrlcjjfckw9gbqpgs3w";
};
meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/";
};
@ -2352,16 +2352,28 @@ let
lualine-nvim = buildVimPluginFrom2Nix {
pname = "lualine-nvim";
version = "2021-04-11";
version = "2021-04-12";
src = fetchFromGitHub {
owner = "hoob3rt";
repo = "lualine.nvim";
rev = "1b81b0021fa133ef6536faacb1789f170b9b4721";
sha256 = "055hw2z4h24gy74x2svkd0kgcyzdkscbpvcz867ar9f9r9cdf7ah";
rev = "8a99a0e9e76d81837ff9156599b399a70cb9fb80";
sha256 = "18ch67d3in3k1j766cy1wbbnd2dmbrch5rm9yqwys18263cjsihg";
};
meta.homepage = "https://github.com/hoob3rt/lualine.nvim/";
};
lush-nvim = buildVimPluginFrom2Nix {
pname = "lush-nvim";
version = "2021-04-11";
src = fetchFromGitHub {
owner = "rktjmp";
repo = "lush.nvim";
rev = "3db21525382fa158fba22e2a5d033d6afdbc763a";
sha256 = "1k0678h22falk08mpvlxlfsx7z89p89clrc9hlk452dzj7wjy7wi";
};
meta.homepage = "https://github.com/rktjmp/lush.nvim/";
};
lushtags = buildVimPluginFrom2Nix {
pname = "lushtags";
version = "2017-04-19";
@ -3072,12 +3084,12 @@ let
nvim-compe = buildVimPluginFrom2Nix {
pname = "nvim-compe";
version = "2021-04-09";
version = "2021-04-12";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-compe";
rev = "f167a1384c47d7eb632eb27e90cdf7dfdb7169ff";
sha256 = "1ggwfl8w85di63skxpm75gm3arbhlph9bv6iyiws9c0x79zf5c8j";
rev = "4b3ade100866bb64b472644642da670e2fc61dde";
sha256 = "0r3kwi5997rcfpc4gs25xcqslnlfwfm1cz2bgvxz389v71vay0mw";
};
meta.homepage = "https://github.com/hrsh7th/nvim-compe/";
};
@ -3096,12 +3108,12 @@ let
nvim-dap = buildVimPluginFrom2Nix {
pname = "nvim-dap";
version = "2021-04-10";
version = "2021-04-12";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-dap";
rev = "855b507a3c3608b181c761fd10beb1a4a073e0fb";
sha256 = "15qnhf1hs8xb97xi21z1g222v77gfbvrcha588rb692qvwxsrwfr";
rev = "107c6882fa13f77d8a206709e3d50fb0290d57cc";
sha256 = "0c1wq4s3cjysphvkdicxvc87dg6jr2zmxcxfnpz14ncn1s05gr9h";
};
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
};
@ -3793,12 +3805,12 @@ let
registers-nvim = buildVimPluginFrom2Nix {
pname = "registers-nvim";
version = "2021-04-10";
version = "2021-04-12";
src = fetchFromGitHub {
owner = "tversteeg";
repo = "registers.nvim";
rev = "0a437a3831b4fdaf370c664f54653dcc5aea71fc";
sha256 = "00q49377fwgy7f6fqqarqwq5m2aqx1clrq63zla72ghai66kmfhc";
rev = "29771d7b4d7b5b8b4c7398eef1becb911e2f4038";
sha256 = "07j40j3pjsp4dw1aav3j8b202p2zrqyx2zkfb5g5ng07bma5gszn";
};
meta.homepage = "https://github.com/tversteeg/registers.nvim/";
};
@ -3881,8 +3893,8 @@ let
src = fetchFromGitHub {
owner = "simrat39";
repo = "rust-tools.nvim";
rev = "7f5295d3ec13d4d2769092a9e3dc849d56e6a7e7";
sha256 = "0xzi6p895l7hmqpp0lqnn6a85fb5795i582fiahbvn4nkpsksk0s";
rev = "230b147432556f2c751e7348a4915e30fd3f8023";
sha256 = "0r2d8qqwmjd571h89i4ph44mzmfwnlyyfa7pq4jjsnhns9c6qd47";
};
meta.homepage = "https://github.com/simrat39/rust-tools.nvim/";
};
@ -4405,6 +4417,30 @@ let
meta.homepage = "https://github.com/nvim-telescope/telescope-fzy-native.nvim/";
};
telescope-symbols-nvim = buildVimPluginFrom2Nix {
pname = "telescope-symbols-nvim";
version = "2021-02-04";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope-symbols.nvim";
rev = "5139fdf31fdffdac75209362409d62d2b6033a20";
sha256 = "0va4czhncw7jhirbqr7wdap4qg3i5x7g6ic8migpmv57ym2py0m9";
};
meta.homepage = "https://github.com/nvim-telescope/telescope-symbols.nvim/";
};
telescope-z-nvim = buildVimPluginFrom2Nix {
pname = "telescope-z-nvim";
version = "2021-03-09";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope-z.nvim";
rev = "c14b6335f42bdda5100f135f18632bf6421c5f0e";
sha256 = "01y3b41ff00qi4g11pry73nd851dc5hjl039symhd2y0lf447j7h";
};
meta.homepage = "https://github.com/nvim-telescope/telescope-z.nvim/";
};
telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope-nvim";
version = "2021-04-09";
@ -4972,12 +5008,12 @@ let
vim-android = buildVimPluginFrom2Nix {
pname = "vim-android";
version = "2021-02-18";
version = "2021-04-12";
src = fetchFromGitHub {
owner = "hsanson";
repo = "vim-android";
rev = "1731cd3865669ebec84e6f32a87ccf16a00690fd";
sha256 = "0k6ch5kg8jlqa04apjdi7xr5s85ibdvg4gq4iyxh78xffw1xzafl";
rev = "a3158ec78e63e4858af2704d7a8127728639981e";
sha256 = "0rpmsf3ykg6q848f0ahp7qrr33pfp1zzxkpc32w3najyqwsfmz6a";
};
meta.homepage = "https://github.com/hsanson/vim-android/";
};
@ -5860,12 +5896,12 @@ let
vim-floaterm = buildVimPluginFrom2Nix {
pname = "vim-floaterm";
version = "2021-03-24";
version = "2021-04-12";
src = fetchFromGitHub {
owner = "voldikss";
repo = "vim-floaterm";
rev = "ae7eea5c5c6c082fe66410e72306b5b1bcb693dd";
sha256 = "1lvaww22rj9jnd8b8fjcaclvj8n6vqc390l3z5d7ivm6fc5h1k1j";
rev = "b7747704c4df716efd21f331b4d94336c490a5ad";
sha256 = "0sl40fvdciir9cbb4bcll971zhk38n6h8kmqy473viki149lg7pa";
};
meta.homepage = "https://github.com/voldikss/vim-floaterm/";
};
@ -5920,12 +5956,12 @@ let
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
version = "2021-04-11";
version = "2021-04-12";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
rev = "94bc89da0fe7083cfda9c1585f3fafb106692769";
sha256 = "17gy7yiipr5ql888z4zg1la93c8jjgyw7sc7kshvric5906bsxl3";
rev = "ae45609cfc3fae91bb7859dde95cb0aee493f34c";
sha256 = "17m46r23gbrj8qh6vglcwhkqikjipvkyskkx1k9j9x29vnwz2r54";
};
meta.homepage = "https://github.com/tpope/vim-fugitive/";
};
@ -6134,6 +6170,18 @@ let
meta.homepage = "https://github.com/takac/vim-hardtime/";
};
vim-haskell-module-name = buildVimPluginFrom2Nix {
pname = "vim-haskell-module-name";
version = "2020-01-20";
src = fetchFromGitHub {
owner = "chkno";
repo = "vim-haskell-module-name";
rev = "f9f8e9f83a30b8f805b8fbc0079163e8193b289b";
sha256 = "0jawf23gyz9dy6qrh0xhla3z7hgjl1n4g7vmi027j4ipjnlijnji";
};
meta.homepage = "https://github.com/chkno/vim-haskell-module-name/";
};
vim-haskellconceal = buildVimPluginFrom2Nix {
pname = "vim-haskellconceal";
version = "2017-06-15";
@ -6702,12 +6750,12 @@ let
vim-lsp = buildVimPluginFrom2Nix {
pname = "vim-lsp";
version = "2021-04-04";
version = "2021-04-12";
src = fetchFromGitHub {
owner = "prabirshrestha";
repo = "vim-lsp";
rev = "bba0f45c892b3c815c65ce44f93bcbe118a40377";
sha256 = "0wsbh8hx9f5jjdpvzbyb664h927jc44sm6rj2j6r9w6l2m8kr860";
rev = "9dc382c04af3389b48fd1ffb5ed4b6c294571f62";
sha256 = "19bk55ifqh76528rf3k6pnwfc5y9954cir7apkz6ymrc0abiy47d";
};
meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
};
@ -6799,12 +6847,12 @@ let
vim-matchup = buildVimPluginFrom2Nix {
pname = "vim-matchup";
version = "2021-04-03";
version = "2021-04-12";
src = fetchFromGitHub {
owner = "andymass";
repo = "vim-matchup";
rev = "e54d6250d7487f008b9f4712a521144b83d6d4bb";
sha256 = "1x0a8hirs9szx4l3lsb79rmsa8d6ial2r8lxhp1r9vf3d0b71zcl";
rev = "58a26a4c0c65a27d54159ba0d8adf8912f89f3c3";
sha256 = "19jp6ilfsgwx6p7cq1gvswxxkhhg6czwwyim9g60gd66wrh2xbqf";
};
meta.homepage = "https://github.com/andymass/vim-matchup/";
};
@ -7555,24 +7603,24 @@ let
vim-rhubarb = buildVimPluginFrom2Nix {
pname = "vim-rhubarb";
version = "2021-04-05";
version = "2021-04-12";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-rhubarb";
rev = "1c36bf8668e329b51f8baf752c4ffe42f8d524ab";
sha256 = "1ad0ypfv7bsla964q8jd1mds62vr2rfd5309bq7dybbi8z3bz6fp";
rev = "b4081f0a882ff36d92d9d3ae5c3b70a378bfd5af";
sha256 = "017mb54qc7ix5h1b1hg7rb3j31x5ihmsc1g5286sirzj4rcm90fi";
};
meta.homepage = "https://github.com/tpope/vim-rhubarb/";
};
vim-rooter = buildVimPluginFrom2Nix {
pname = "vim-rooter";
version = "2021-04-08";
version = "2021-04-12";
src = fetchFromGitHub {
owner = "airblade";
repo = "vim-rooter";
rev = "e122cb925b2d0e4f44f289fbdffd6a6ebb837a11";
sha256 = "0hc3k5338az962b2slia6lc5dkby79iqf1mvpxh57j9jp3gn9b3s";
rev = "662c00676abab9d7ce16bf9f202420bf86cc6554";
sha256 = "1birkzysn8midk627zyp3pla51wmz4sp613gs5xxlms5imq4diaq";
};
meta.homepage = "https://github.com/airblade/vim-rooter/";
};
@ -7843,12 +7891,12 @@ let
vim-snippets = buildVimPluginFrom2Nix {
pname = "vim-snippets";
version = "2021-04-06";
version = "2021-04-12";
src = fetchFromGitHub {
owner = "honza";
repo = "vim-snippets";
rev = "4600da87a064bf63b37c7135be154b34c40dec20";
sha256 = "0vm59wkzxwmpksccv8j9ry6mm0byl75hzb73yn57zdm7s7kv2398";
rev = "03f7e3395b1d2a0eaf8fc8bdb83fc95368a8b467";
sha256 = "0s7ilz0zm6p03qhadr39v9hpkbygv4i984ac6f8bbdrf5bfkrclk";
};
meta.homepage = "https://github.com/honza/vim-snippets/";
};
@ -8059,12 +8107,12 @@ let
vim-terraform-completion = buildVimPluginFrom2Nix {
pname = "vim-terraform-completion";
version = "2019-07-28";
version = "2021-04-11";
src = fetchFromGitHub {
owner = "juliosueiras";
repo = "vim-terraform-completion";
rev = "1c8792d1e85154aa6fc05eb746711bf2df2274d9";
sha256 = "0j87vhxkrv8sdrlv9w5p2zkiv9ssb3rckbffjcfhn9365d41bhgr";
rev = "125d0e892f5fd8f32b57a5a5983d03f1aa611949";
sha256 = "1ifw9s68g4ng5vzlavnvjd39c67m87ws6iafmsbnpdywywiq5q09";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/juliosueiras/vim-terraform-completion/";
@ -8648,12 +8696,12 @@ let
vimspector = buildVimPluginFrom2Nix {
pname = "vimspector";
version = "2021-04-09";
version = "2021-04-11";
src = fetchFromGitHub {
owner = "puremourning";
repo = "vimspector";
rev = "6709b45c770dca735265ef8d5e30f9f4e602cfd0";
sha256 = "0ddgyhlrvij630fyx8hx63xk8qqmskgbx1iwjhazhifrflm9gcw7";
rev = "fa92c2a8d525972bcc97cba9579d9adfca3c859a";
sha256 = "0a8wph6l1nr6ip6d02wg6x6g1zwys45pmj95i8c655fc6877rd79";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/puremourning/vimspector/";

4
pkgs/misc/vim-plugins/vim-plugin-names
View File

@ -48,6 +48,7 @@ cespare/vim-toml
Chiel92/vim-autoformat
chikatoike/concealedyank.vim
chikatoike/sourcemap.vim
chkno/vim-haskell-module-name
chr4/nginx.vim
chrisbra/CheckAttach
chrisbra/csv.vim
@ -439,6 +440,8 @@ nvim-lua/popup.nvim
nvim-telescope/telescope-frecency.nvim
nvim-telescope/telescope-fzf-writer.nvim
nvim-telescope/telescope-fzy-native.nvim
nvim-telescope/telescope-symbols.nvim
nvim-telescope/telescope-z.nvim@main
nvim-telescope/telescope.nvim
nvim-treesitter/completion-treesitter
nvim-treesitter/nvim-treesitter
@ -508,6 +511,7 @@ rhysd/vim-grammarous
rhysd/vim-operator-surround
RishabhRD/nvim-lsputils
RishabhRD/popfix
rktjmp/lush.nvim@main
rmagatti/auto-session@main
rodjek/vim-puppet
romainl/vim-cool

4
pkgs/servers/home-assistant/component-packages.nix
View File

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2021.4.3";
version = "2021.4.4";
components = {
"abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ];
@ -549,7 +549,7 @@
"netgear_lte" = ps: with ps; [ ]; # missing inputs: eternalegypt
"netio" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pynetio
"neurio_energy" = ps: with ps; [ ]; # missing inputs: neurio
"nexia" = ps: with ps; [ ]; # missing inputs: nexia
"nexia" = ps: with ps; [ nexia ];
"nextbus" = ps: with ps; [ ]; # missing inputs: py_nextbusnext
"nextcloud" = ps: with ps; [ ]; # missing inputs: nextcloudmonitor
"nfandroidtv" = ps: with ps; [ ];

5
pkgs/servers/home-assistant/default.nix
View File

@ -108,7 +108,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
hassVersion = "2021.4.3";
hassVersion = "2021.4.4";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@ -127,7 +127,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
sha256 = "00jgnk8vssvk7mdnlijwddwaj56hs1hcyw83r1jqhn5nk5qj3b7q";
sha256 = "1p36ymjhirl32ax3xxdg9ia089jw1klww5imq18r6ksajafr78ys";
};
# leave this in, so users don't have to constantly update their downstream patch handling
@ -300,6 +300,7 @@ in with py.pkgs; buildPythonApplication rec {
"mqtt_room"
"mqtt_statestream"
"mullvad"
"nexia"
"notify"
"notion"
"number"

34
pkgs/servers/pinnwand/default.nix
View File

@ -1,18 +1,11 @@
{ lib, python3, fetchFromGitHub, nixosTests }:
{ lib
, python3
, fetchFromGitHub
, fetchpatch
, nixosTests
}:
let
python = python3.override {
packageOverrides = self: super: {
tornado = super.tornado.overridePythonAttrs (oldAttrs: rec {
version = "6.0.4";
src = oldAttrs.src.override {
inherit version;
sha256 = "1p5n7sw4580pkybywg93p8ddqdj9lhhy72rzswfa801vlidx9qhg";
};
});
};
};
in with python.pkgs; buildPythonApplication rec {
with python3.pkgs; buildPythonApplication rec {
pname = "pinnwand";
version = "1.2.3";
format = "pyproject";
@ -24,6 +17,14 @@ in with python.pkgs; buildPythonApplication rec {
sha256 = "1p6agvp136q6km7gjfv8dpjn6x4ap770lqa40ifblyhw13bsrqlh";
};
patches = [
(fetchpatch {
# https://github.com/supakeen/pinnwand/issues/110
url = "https://github.com/supakeen/pinnwand/commit/b9e72abb7f25104f5e57248294ed9ae1dbc87240.patch";
sha256 = "098acif9ck165398bp7vwfr9g7sj9q3pcdc42z5y63m1nbf8naan";
})
];
nativeBuildInputs = [
poetry-core
];
@ -31,10 +32,11 @@ in with python.pkgs; buildPythonApplication rec {
propagatedBuildInputs = [
click
docutils
tornado
pygments
pygments-better-html
toml
sqlalchemy
toml
tornado
];
checkInputs = [ pytestCheckHook ];

22
pkgs/tools/misc/remind/default.nix
View File

@ -1,4 +1,9 @@
{lib, stdenv, fetchurl, tk, tcllib, makeWrapper
{ lib
, stdenv
, fetchurl
, tk
, tcllib
, makeWrapper
, tkremind ? true
}:
@ -14,13 +19,14 @@ let
tkremindPatch = optionalString tkremind ''
substituteInPlace scripts/tkremind --replace "exec wish" "exec ${tk}/bin/wish"
'';
in stdenv.mkDerivation rec {
in
stdenv.mkDerivation rec {
pname = "remind";
version = "03.03.05";
version = "03.03.06";
src = fetchurl {
url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz";
sha256 = "sha256-Ye0X2Gvek/pyaNVxGKL773OWJvC4I6F5nEsRQgzWbsE=";
sha256 = "sha256-lpoMAXDJxwODY0/aoo25GRBYWFhE4uf11pR5/ITZX1s=";
};
nativeBuildInputs = optional tkremind makeWrapper;
@ -39,11 +45,11 @@ in stdenv.mkDerivation rec {
wrapProgram $out/bin/tkremind --set TCLLIBPATH "${tclLibPaths}"
'';
meta = {
meta = with lib; {
homepage = "https://dianne.skoll.ca/projects/remind/";
description = "Sophisticated calendar and alarm program for the console";
license = lib.licenses.gpl2;
maintainers = with lib.maintainers; [raskin kovirobi];
platforms = with lib.platforms; unix;
license = licenses.gpl2Only;
maintainers = with maintainers; [ raskin kovirobi ];
platforms = platforms.unix;
};
}

14
pkgs/tools/package-management/nix-du/default.nix
View File

@ -1,17 +1,17 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, nix, boost, graphviz, darwin }:
{ lib, stdenv, fetchFromGitHub, rustPlatform, nix, boost, graphviz, Security, pkg-config }:
rustPlatform.buildRustPackage rec {
pname = "nix-du";
version = "0.3.3";
version = "0.3.4";
src = fetchFromGitHub {
owner = "symphorien";
repo = "nix-du";
rev = "v${version}";
sha256 = "0h8ya0nn65hbyi3ssmrjarfxadx2sa61sspjlrln8knk7ppxk3mq";
sha256 = "0iwlprjbphwsrxdhgsxa8ja73snsyh0rdxrpsf1ygid2ky5vc83f";
};
cargoSha256 = "0d86bn6myr29bwrzw3ihnzg1yij673s80bm1l8srk2k2szyfwwh5";
cargoSha256 = "19fwkw9iswzkhqgfq7pmcabqmq5c7vvirwaxbfjshkwcgn47rgjl";
doCheck = true;
checkInputs = [ nix graphviz ];
@ -19,12 +19,14 @@ rustPlatform.buildRustPackage rec {
buildInputs = [
boost
nix
] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
] ++ lib.optionals stdenv.isDarwin [ Security ];
nativeBuildInputs = [ pkg-config ];
meta = with lib; {
description = "A tool to determine which gc-roots take space in your nix store";
homepage = "https://github.com/symphorien/nix-du";
license = licenses.lgpl3;
license = licenses.lgpl3Only;
maintainers = [ maintainers.symphorien ];
platforms = platforms.unix;
};

11
pkgs/tools/security/yara/default.nix
View File

@ -6,8 +6,11 @@
, pkg-config
, protobufc
, withCrypto ? true, openssl
, enableMagic ? true, file
, enableCuckoo ? true, jansson
, enableDex ? true
, enableDotNet ? true
, enableMacho ? true
, enableMagic ? true, file
}:
stdenv.mkDerivation rec {
@ -46,14 +49,18 @@ stdenv.mkDerivation rec {
configureFlags = [
(lib.withFeature withCrypto "crypto")
(lib.enableFeature enableMagic "magic")
(lib.enableFeature enableCuckoo "cuckoo")
(lib.enableFeature enableDex "dex")
(lib.enableFeature enableDotNet "dotnet")
(lib.enableFeature enableMacho "macho")
(lib.enableFeature enableMagic "magic")
];
meta = with lib; {
description = "The pattern matching swiss knife for malware researchers";
homepage = "http://Virustotal.github.io/yara/";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
platforms = platforms.all;
};
}

7
pkgs/tools/typesetting/lowdown/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "lowdown";
version = "0.8.3";
version = "0.8.4";
outputs = [ "out" "lib" "dev" "man" ];
src = fetchurl {
url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz";
sha512 = "17q1jd2vih26yjjc4f9kg0qihrym8h0ydnli6z8p3h4rdwm4kfnvckrpkwminz5wl0k5z6d65dk7q4pynyfynp31d6s7q4yzkkqy6kc";
sha512 = "1rbsngfw36lyc8s6qxl8hgb1pzj0gdzlb7yqkfblb8fpgs2z0ggyhnfszrqfir8s569i7a9yk9bdx2ggwqhjj56hmi2i4inlnb3rmni";
};
nativeBuildInputs = [ which ]
@ -30,6 +30,9 @@ stdenv.mkDerivation rec {
patches = lib.optional (!stdenv.hostPlatform.isStatic) ./shared.patch;
doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
checkTarget = "regress";
meta = with lib; {
homepage = "https://kristaps.bsd.lv/lowdown/";
description = "Simple markdown translator";

12
pkgs/top-level/all-packages.nix
View File

@ -257,6 +257,8 @@ in
html5validator = python3Packages.callPackage ../applications/misc/html5validator { };
probe-run = callPackage ../development/tools/rust/probe-run {};
proto-contrib = callPackage ../development/tools/proto-contrib {};
protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {};
@ -959,6 +961,8 @@ in
lua = lua5_3;
};
apkid = callPackage ../development/tools/apkid { };
apktool = callPackage ../development/tools/apktool {
inherit (androidenv.androidPkgs_9_0) build-tools;
};
@ -17151,6 +17155,8 @@ in
rote = callPackage ../development/libraries/rote { };
round = callPackage ../applications/graphics/round { };
ronn = callPackage ../development/tools/ronn { };
rshell = python3.pkgs.callPackage ../development/tools/rshell { };
@ -28009,6 +28015,8 @@ in
inherit (gnome3) zenity;
};
sdlpop = callPackage ../games/sdlpop { };
stepmania = callPackage ../games/stepmania {
ffmpeg = ffmpeg_2;
};
@ -29900,7 +29908,9 @@ in
nix-deploy = haskell.lib.justStaticExecutables haskellPackages.nix-deploy;
nix-diff = haskell.lib.justStaticExecutables haskellPackages.nix-diff;
nix-du = callPackage ../tools/package-management/nix-du { };
nix-du = callPackage ../tools/package-management/nix-du {
inherit (darwin.apple_sdk.frameworks) Security;
};
nix-info = callPackage ../tools/nix/info { };
nix-info-tested = nix-info.override { doCheck = true; };

6
pkgs/top-level/python-packages.nix
View File

@ -1817,6 +1817,8 @@ in {
dftfit = callPackage ../development/python-modules/dftfit { };
diagrams = callPackage ../development/python-modules/diagrams { };
diceware = callPackage ../development/python-modules/diceware { };
dicom2nifti = callPackage ../development/python-modules/dicom2nifti { };
@ -8574,6 +8576,8 @@ in {
tvnamer = callPackage ../development/python-modules/tvnamer { };
tweedledum = callPackage ../development/python-modules/tweedledum { };
tweepy = callPackage ../development/python-modules/tweepy { };
twentemilieu = callPackage ../development/python-modules/twentemilieu { };
@ -9160,6 +9164,8 @@ in {
Yapsy = callPackage ../development/python-modules/yapsy { };
yara-python = callPackage ../development/python-modules/yara-python { };
yarg = callPackage ../development/python-modules/yarg { };
yarl = callPackage ../development/python-modules/yarl { };