Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-02-11 06:16:39 +00:00 committed by GitHub
commit 95e9af5e42
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
32 changed files with 203 additions and 181 deletions

View file

@ -48,6 +48,12 @@
See `./scripts/check-maintainer-github-handles.sh` for an example on how to work with this data. See `./scripts/check-maintainer-github-handles.sh` for an example on how to work with this data.
*/ */
{ {
_0qq = {
email = "0qqw0qqw@gmail.com";
github = "0qq";
githubId = 64707304;
name = "Dmitry Kulikov";
};
_0x4A6F = { _0x4A6F = {
email = "mail-maintainer@0x4A6F.dev"; email = "mail-maintainer@0x4A6F.dev";
name = "Joachim Ernst"; name = "Joachim Ernst";

View file

@ -23,9 +23,12 @@ let
mkdir -p $out/${gimp.targetScriptDir}/${name}; mkdir -p $out/${gimp.targetScriptDir}/${name};
for p in "$@"; do cp "$p" -r $out/${gimp.targetScriptDir}/${name}; done for p in "$@"; do cp "$p" -r $out/${gimp.targetScriptDir}/${name}; done
} }
installPlugins(){ installPlugin() {
mkdir -p $out/${gimp.targetPluginDir}/${name}; # The base name of the first argument is the plug-in name and the main executable.
for p in "$@"; do cp "$p" -r $out/${gimp.targetPluginDir}/${name}; done # GIMP only allows a single plug-in per directory:
# https://gitlab.gnome.org/GNOME/gimp/-/commit/efae55a73e98389e38fa0e59ebebcda0abe3ee96
pluginDir=$out/${gimp.targetPluginDir}/$(basename "$1")
install -Dt "$pluginDir" "$@"
} }
''; '';
@ -83,15 +86,28 @@ in
Filters/Generic/FFT Forward Filters/Generic/FFT Forward
Filters/Generic/FFT Inverse Filters/Generic/FFT Inverse
*/ */
name = "fourier-0.4.3"; pname = "fourier";
buildInputs = with pkgs; [ fftw ]; version = "0.4.3";
src = fetchurl { src = fetchurl {
url = "https://www.lprp.fr/files/old-web/soft/gimp/${name}.tar.gz"; url = "https://www.lprp.fr/files/old-web/soft/gimp/${pname}-${version}.tar.gz";
sha256 = "0mf7f8vaqs2madx832x3kcxw3hv3w3wampvzvaps1mkf2kvrjbsn"; sha256 = "0mf7f8vaqs2madx832x3kcxw3hv3w3wampvzvaps1mkf2kvrjbsn";
}; };
installPhase = "installPlugins fourier"; buildInputs = with pkgs; [ fftw ];
postPatch = ''
# The tarball contains a prebuilt binary.
make clean
'';
installPhase = ''
runHook preInstall
installPlugin fourier
runHook postInstall
'';
meta = with lib; { meta = with lib; {
description = "GIMP plug-in to do the fourier transform"; description = "GIMP plug-in to do the fourier transform";
@ -131,7 +147,7 @@ in
rev = "de4367f71e40fe6d82387eaee68611a80a87e0e1"; rev = "de4367f71e40fe6d82387eaee68611a80a87e0e1";
sha256 = "1zzvbczly7k456c0y6s92a1i8ph4ywmbvdl8i4rcc29l4qd2z8fw"; sha256 = "1zzvbczly7k456c0y6s92a1i8ph4ywmbvdl8i4rcc29l4qd2z8fw";
}; };
installPhase = "installPlugins src/texturize"; installPhase = "installPlugin src/texturize";
meta.broken = true; # https://github.com/lmanul/gimp-texturize/issues/1 meta.broken = true; # https://github.com/lmanul/gimp-texturize/issues/1
}; };
@ -145,7 +161,7 @@ in
url = "https://github.com/pixlsus/registry.gimp.org_static/raw/master/registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz"; url = "https://github.com/pixlsus/registry.gimp.org_static/raw/master/registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz";
sha256 = "0vql1k67i21g5ivaa1jh56rg427m0icrkpryrhg75nscpirfxxqw"; sha256 = "0vql1k67i21g5ivaa1jh56rg427m0icrkpryrhg75nscpirfxxqw";
}; };
installPhase = "installPlugins src/wavelet-sharpen"; # TODO translations are not copied .. How to do this on nix? installPhase = "installPlugin src/wavelet-sharpen"; # TODO translations are not copied .. How to do this on nix?
}; };
lqrPlugin = pluginDerivation rec { lqrPlugin = pluginDerivation rec {
@ -181,7 +197,7 @@ in
buildInputs = with pkgs; [ lensfun gexiv2 ]; buildInputs = with pkgs; [ lensfun gexiv2 ];
installPhase = " installPhase = "
installPlugins gimp-lensfun installPlugin gimp-lensfun
"; ";
meta = { meta = {

View file

@ -2,20 +2,20 @@
buildGoModule rec { buildGoModule rec {
pname = "charm"; pname = "charm";
version = "0.8.5"; version = "0.8.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "charmbracelet"; owner = "charmbracelet";
repo = "charm"; repo = "charm";
rev = "v${version}"; rev = "v${version}";
sha256 = "0cgl5dpyzc4lciij9q9yghppiclrdnrl1jsbizfgh2an3s18ab8k"; sha256 = "0mjq0yy60czsw40h5n515qmi6bbvhrddll4sn5r2q1nf9pvviqr6";
}; };
vendorSha256 = "1spzawnk2fslc1m14dp8lx4vpnxwz7xgm1hxbpz4bqlqz1hfd6ax"; vendorSha256 = "1spzawnk2fslc1m14dp8lx4vpnxwz7xgm1hxbpz4bqlqz1hfd6ax";
doCheck = false; doCheck = false;
buildFlagsArray = [ "-ldflags=" "-X=main.Version=${version}" ]; buildFlagsArray = [ "-ldflags= -s -w -X=main.Version=${version}" ];
meta = with lib; { meta = with lib; {
description = "Manage your charm account on the CLI"; description = "Manage your charm account on the CLI";

View file

@ -2,7 +2,7 @@
let let
pname = "Sylk"; pname = "Sylk";
version = "3.0.0"; version = "3.0.1";
in in
appimageTools.wrapType2 rec { appimageTools.wrapType2 rec {
@ -10,7 +10,7 @@ appimageTools.wrapType2 rec {
src = fetchurl { src = fetchurl {
url = "http://download.ag-projects.com/Sylk/Sylk-${version}-x86_64.AppImage"; url = "http://download.ag-projects.com/Sylk/Sylk-${version}-x86_64.AppImage";
hash = "sha256-A+SFkGDg+I1lPJ56XPaRfBUktyjSttcsZSqgXvw9sDs="; hash = "sha256-VgepO7LHFmNKq/H0RFcIkafgtiVGt8K/LdiCO5Dw2s4=";
}; };
profile = '' profile = ''

View file

@ -7,10 +7,10 @@ in
rec { rec {
firefox = common rec { firefox = common rec {
pname = "firefox"; pname = "firefox";
ffversion = "85.0.1"; ffversion = "85.0.2";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "0i0x1jvwrjvbdz90dgmf7lw3qj56y37nf5h3qs55263d0jgvnkqfc5dgjfzrq51z5a546lmbs4p97qiaf2p3d5wiv3lx8cw43n74axd"; sha512 = "2m46li5ni1m4xv42h99rn2hhhv2mqy229wihmzxmgvws1rh2h11yf6x2a07akkjrsp2dmwxmmkhmf9dhakgj9i55z5qqi99azyx07df";
}; };
meta = { meta = {

View file

@ -4,12 +4,12 @@ with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "marvin"; pname = "marvin";
version = "21.1.0"; version = "21.2.0";
src = fetchurl { src = fetchurl {
name = "marvin-${version}.deb"; name = "marvin-${version}.deb";
url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb";
sha256 = "sha256-HlBvtpxm8voLS6E8QQ4Ur211KSUhAkL/sv4odoy8oUo="; sha256 = "sha256-CLvMspk7HqrtNM5TD45mZIz6vsS32eUuxFDJiBDs9VY=";
}; };
nativeBuildInputs = [ dpkg makeWrapper ]; nativeBuildInputs = [ dpkg makeWrapper ];

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool { lib, stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool
, pkg-config, faad2, faac, a52dec, alsaLib, fftw, lame, libavc1394 , pkg-config, faad2, faac, a52dec, alsaLib, fftw, lame, libavc1394
, libiec61883, libraw1394, libsndfile, libvorbis, libogg, libjpeg , libiec61883, libraw1394, libsndfile, libvorbis, libogg, libjpeg
, libtiff, freetype, mjpegtools, x264, gettext, openexr , libtiff, freetype, mjpegtools, x264, gettext, openexr
@ -10,12 +10,20 @@ stdenv.mkDerivation {
name = "cinelerra-cv-2018-05-16"; name = "cinelerra-cv-2018-05-16";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ratopi"; owner = "cinelerra-cv-team";
repo = "CinelerraCV"; repo = "cinelerra-cv";
rev = "d9c0dbf4393717f0a42f4b91c3e1ed5b16f955dc"; rev = "d9c0dbf4393717f0a42f4b91c3e1ed5b16f955dc";
sha256 = "0a8kfm1v96sv6jh4568crg6nkr6n3579i9xksfj8w199s6yxzsbk"; sha256 = "0a8kfm1v96sv6jh4568crg6nkr6n3579i9xksfj8w199s6yxzsbk";
}; };
patches = [
# avoid gcc10 error about narrowing
(fetchpatch {
url = "https://github.com/cinelerra-cv-team/cinelerra-cv/pull/2/commits/a1b2d9c3bd5730ec0284894f3d81892af3e77f1f.patch";
sha256 = "1cjyv1m174dblpa1bs5dggk24h4477zqvc5sbfc0m5rpkndx5ycp";
})
];
preConfigure = '' preConfigure = ''
find -type f -print0 | xargs --null sed -e "s@/usr/bin/perl@${perl}/bin/perl@" -i find -type f -print0 | xargs --null sed -e "s@/usr/bin/perl@${perl}/bin/perl@" -i
./autogen.sh ./autogen.sh
@ -28,10 +36,9 @@ stdenv.mkDerivation {
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ automake autoconf libtool pkg-config file intltool ];
buildInputs = buildInputs =
[ automake [ faad2 faac
autoconf libtool pkg-config file
faad2 faac
a52dec alsaLib fftw lame libavc1394 libiec61883 a52dec alsaLib fftw lame libavc1394 libiec61883
libraw1394 libsndfile libvorbis libogg libjpeg libtiff freetype libraw1394 libsndfile libvorbis libogg libjpeg libtiff freetype
mjpegtools x264 gettext openexr mjpegtools x264 gettext openexr
@ -39,13 +46,13 @@ stdenv.mkDerivation {
libtheora libpng libdv libuuid libtheora libpng libdv libuuid
nasm nasm
perl perl
fontconfig intltool fontconfig
]; ];
meta = { meta = with lib; {
description = "Video Editor"; description = "Video Editor";
homepage = "http://www.cinelerra.org"; homepage = "https://www.cinelerra.org/";
maintainers = [ lib.maintainers.marcweber ]; maintainers = with maintainers; [ marcweber ];
license = lib.licenses.gpl2; license = licenses.gpl2Only;
}; };
} }

View file

@ -17,14 +17,14 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "3.38.4"; version = "3.38.5";
pname = "gpaste"; pname = "gpaste";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Keruspe"; owner = "Keruspe";
repo = "GPaste"; repo = "GPaste";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-CvrwVyx5QP9CeEraJsUInV2pG5puSJebpXQiLwnrFSs="; sha256 = "sha256-hUqFijqUQ1W8OThpbioqcxkOgYvScKUBmXN84MbMPGE=";
}; };
patches = [ patches = [

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "zef"; pname = "zef";
version = "0.9.4"; version = "0.11.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ugexe"; owner = "ugexe";
repo = "zef"; repo = "zef";
rev = "v${version}"; rev = "v${version}";
sha256 = "0h3lbznzxqmsv2816vr6y244sfdchj13yhbav86zy2m79p8b5lgq"; sha256 = "sha256-wccVMEUAfTWs/8hnrT7nrxfYPHyNl+lXt+KUDkyplto=";
}; };
buildInputs = [ rakudo makeWrapper ]; buildInputs = [ rakudo makeWrapper ];

View file

@ -49,7 +49,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "liblinphone"; pname = "liblinphone";
version = "4.4.15"; version = "4.4.21";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.linphone.org"; domain = "gitlab.linphone.org";
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
group = "BC"; group = "BC";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "16a31c0n5lix4r5xk7p447xlxbrhdlmj11kb4y1krb5fx8hf65cl"; sha256 = "sha256-vs65lBRTYYhx2F90n32qnf0CvcPJUIXc16hmggTF/JI=";
}; };
# Do not build static libraries # Do not build static libraries

View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libqalculate"; pname = "libqalculate";
version = "3.16.0"; version = "3.16.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "qalculate"; owner = "qalculate";
repo = "libqalculate"; repo = "libqalculate";
rev = "v${version}"; rev = "v${version}";
sha256 = "0nrf03q3qrsvxf6kjpv69l49yfal79834a3jv75mzi6y674ach9g"; sha256 = "sha256-mTxxiyN4t84BD4bBysvsrvP7L+DNbP6sMlcNFg4eMF8=";
}; };
outputs = [ "out" "dev" "doc" ]; outputs = [ "out" "dev" "doc" ];

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libxls"; pname = "libxls";
version = "1.6.1"; version = "1.6.2";
src = fetchurl { src = fetchurl {
url = "https://github.com/libxls/libxls/releases/download/v${version}/libxls-${version}.tar.gz"; url = "https://github.com/libxls/libxls/releases/download/v${version}/libxls-${version}.tar.gz";
sha256 = "1y7wk55blk16hmvf9dz5ci84hlhv6pw6mnr1mfnibfw3gsxmzhyv"; sha256 = "sha256-XazDTZS/IRWSbIDG+2nk570u1kA9Uc/0kEGpQXL143E=";
}; };
nativeBuildInputs = [ unzip ]; nativeBuildInputs = [ unzip ];

View file

@ -10,12 +10,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "GitPython"; pname = "GitPython";
version = "3.1.12"; version = "3.1.13";
disabled = isPy27; # no longer supported disabled = isPy27; # no longer supported
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-Qtvv2NniV2xJbtAFnzED3O9xJbnOFvnV+cg0rtRKHaw="; sha256 = "sha256-hiGn53fidqXsg4tZKAulJy3RRKGBacNskD2LOLmfdQo=";
}; };
patches = [ patches = [

View file

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "btchip-python"; pname = "btchip-python";
version = "0.1.31"; version = "0.1.32";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "4167f3c6ea832dd189d447d0d7a8c2a968027671ae6f43c680192f2b72c39b2c"; sha256 = "34f5e0c161c08f65dc0d070ba2ff4c315ed21c4b7e0faa32a46862d0dc1b8f55";
}; };
propagatedBuildInputs = [ hidapi pyscard ecdsa ]; propagatedBuildInputs = [ hidapi pyscard ecdsa ];
@ -14,6 +14,8 @@ buildPythonPackage rec {
# tests requires hardware # tests requires hardware
doCheck = false; doCheck = false;
pythonImportsCheck = [ "btchip.btchip" ];
meta = with lib; { meta = with lib; {
description = "Python communication library for Ledger Hardware Wallet products"; description = "Python communication library for Ledger Hardware Wallet products";
homepage = "https://github.com/LedgerHQ/btchip-python"; homepage = "https://github.com/LedgerHQ/btchip-python";

View file

@ -5,6 +5,7 @@
, iso8601 , iso8601
, graphql-core , graphql-core
, graphql-relay , graphql-relay
, promise
, pytestCheckHook , pytestCheckHook
, pytest-asyncio , pytest-asyncio
, pytest-benchmark , pytest-benchmark
@ -31,6 +32,7 @@ buildPythonPackage rec {
]; ];
checkInputs = [ checkInputs = [
promise
pytestCheckHook pytestCheckHook
pytest-asyncio pytest-asyncio
pytest-benchmark pytest-benchmark
@ -39,6 +41,8 @@ buildPythonPackage rec {
snapshottest snapshottest
]; ];
pytestFlagsArray = [ "--benchmark-disable" ];
pythonImportsCheck = [ "graphene" ]; pythonImportsCheck = [ "graphene" ];
meta = with lib; { meta = with lib; {

View file

@ -1,10 +1,11 @@
{ buildPythonPackage { buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, lib , lib
, pythonOlder
, coveralls , coveralls
, promise , promise
, pytest , pytestCheckHook
, pytest-benchmark , pytest-benchmark
, pytest-mock , pytest-mock
, rx , rx
@ -13,36 +14,21 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "graphql-core"; pname = "graphql-core";
version = "3.1.2"; version = "3.1.3";
disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "graphql-python"; owner = "graphql-python";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0kvbj9dwpx8mjfj86kqx54dbz9k72ki147ssyj0ca2syvb8jm3wb"; sha256 = "0qy1i6vffwad74ymdsh1qjf5b6ph4z0vyxzkkc6yppwczhzmi1ps";
}; };
propagatedBuildInputs = [
promise
rx
six
];
checkInputs = [ checkInputs = [
coveralls
pytest
pytest-benchmark pytest-benchmark
pytest-mock pytestCheckHook
]; ];
checkPhase = "pytest";
configurePhase = ''
substituteInPlace setup.py \
--replace 'pytest-mock==1.2' 'pytest-mock==1.13.0' \
--replace 'pytest-benchmark==3.0.0' 'pytest-benchmark==3.2.2'
'';
meta = with lib; { meta = with lib; {
description = "Port of graphql-js to Python"; description = "Port of graphql-js to Python";
homepage = "https://github.com/graphql-python/graphql-core"; homepage = "https://github.com/graphql-python/graphql-core";

View file

@ -7,13 +7,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "hatasmota"; pname = "hatasmota";
version = "0.2.7"; version = "0.2.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "emontnemery"; owner = "emontnemery";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-QOireN6uRIa7UBKsE63r6yT+mzfs8uOGzzDcNahELws="; sha256 = "sha256-DuVpo+g5VS7bkj/DZi0vNOAPjPkzfIA5I2BD5KJ/rNQ=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -15,7 +15,6 @@
, databases , databases
, pytestCheckHook , pytestCheckHook
, pytest-asyncio , pytest-asyncio
, pytestcov
, typing-extensions , typing-extensions
, ApplicationServices , ApplicationServices
}: }:
@ -46,12 +45,14 @@ buildPythonPackage rec {
checkInputs = [ checkInputs = [
aiosqlite aiosqlite
databases databases
pytest-asyncio
pytestCheckHook pytestCheckHook
typing-extensions typing-extensions
]; ];
pytestFlagsArray = [ "--ignore=tests/test_graphql.py" ]; disabledTestFiles = [ "tests/test_graphql.py" ];
# https://github.com/encode/starlette/issues/1131
disabledTests = [ "test_debug_html" ];
pythonImportsCheck = [ "starlette" ]; pythonImportsCheck = [ "starlette" ];
meta = with lib; { meta = with lib; {

View file

@ -1,28 +0,0 @@
diff --git a/tests/test_pipes.py b/tests/test_pipes.py
index d883abf..2e74d7a 100644
--- a/tests/test_pipes.py
+++ b/tests/test_pipes.py
@@ -2,6 +2,7 @@ import asyncio
import io
import os
import socket
+import unittest
from uvloop import _testbase as tb
@@ -96,6 +97,7 @@ class _BasePipeTest:
# extra info is available
self.assertIsNotNone(proto.transport.get_extra_info('pipe'))
+ @unittest.skip("darwin sandbox")
def test_read_pty_output(self):
proto = MyReadPipeProto(loop=self.loop)
@@ -198,6 +200,7 @@ class _BasePipeTest:
self.loop.run_until_complete(proto.done)
self.assertEqual('CLOSED', proto.state)
+ @unittest.skip("darwin sandbox")
def test_write_pty(self):
master, slave = os.openpty()
os.set_blocking(master, False)

View file

@ -1,69 +1,69 @@
{ lib { lib
, stdenv , stdenv
, buildPythonPackage , buildPythonPackage
, pythonOlder
, fetchPypi , fetchPypi
, pyopenssl
, libuv , libuv
, psutil
, isPy27
, pythonAtLeast
, CoreServices , CoreServices
, ApplicationServices , ApplicationServices
# Check Inputs # Check Inputs
, aiohttp
, psutil
, pyopenssl
, pytestCheckHook , pytestCheckHook
# , pytest-asyncio
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "uvloop"; pname = "uvloop";
version = "0.14.0"; version = "0.15.0";
disabled = isPy27; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "07j678z9gf41j98w72ysrnb5sa41pl5yxd7ib17lcwfxqz0cjfhj"; sha256 = "0rfhr84km8k5gj0036b2pznwmc8macx56vkxc3aksvns95dksl0s";
}; };
patches = lib.optional stdenv.isDarwin ./darwin_sandbox.patch;
buildInputs = [ buildInputs = [
libuv libuv
] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; ] ++ lib.optionals stdenv.isDarwin [
CoreServices
pythonImportsCheck = [ ApplicationServices
"uvloop"
"uvloop.loop"
]; ];
dontUseSetuptoolsCheck = true; dontUseSetuptoolsCheck = true;
checkInputs = [ pytestCheckHook pyopenssl psutil ]; checkInputs = [
aiohttp
pytestCheckHook
pyopenssl
psutil
];
pytestFlagsArray = [ pytestFlagsArray = [
# from pytest.ini, these are NECESSARY to prevent failures # from pytest.ini, these are NECESSARY to prevent failures
"--capture=no" "--capture=no"
"--assert=plain" "--assert=plain"
"--strict"
"--tb=native" "--tb=native"
# ignore code linting tests # ignore code linting tests
"--ignore=tests/test_sourcecode.py" "--ignore=tests/test_sourcecode.py"
]; ];
disabledTests = [
"test_sock_cancel_add_reader_race" # asyncio version of test is supposed to be skipped but skip doesn't happen. uvloop version runs fine
] ++ lib.optionals (pythonAtLeast "3.8") [ "test_write_to_closed_transport" ]; # https://github.com/MagicStack/uvloop/issues/355
# force using installed/compiled uvloop vs source by moving tests to temp dir # force using installed/compiled uvloop vs source by moving tests to temp dir
preCheck = '' preCheck = ''
export TEST_DIR=$(mktemp -d) export TEST_DIR=$(mktemp -d)
cp -r tests $TEST_DIR cp -r tests $TEST_DIR
pushd $TEST_DIR pushd $TEST_DIR
'' + lib.optionalString stdenv.isDarwin ''
# Some tests fail on Darwin
rm tests/test_[stu]*.py
''; '';
postCheck = '' postCheck = ''
popd popd
''; '';
pythonImportsCheck = [
"uvloop"
"uvloop.loop"
];
# Some of the tests use localhost networking. # Some of the tests use localhost networking.
__darwinAllowLocalNetworking = true; __darwinAllowLocalNetworking = true;
@ -72,6 +72,5 @@ buildPythonPackage rec {
homepage = "https://github.com/MagicStack/uvloop"; homepage = "https://github.com/MagicStack/uvloop";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ costrouc ]; maintainers = with maintainers; [ costrouc ];
broken = pythonAtLeast "3.9"; # see: https://github.com/MagicStack/uvloop/issues/365
}; };
} }

View file

@ -11,8 +11,8 @@ let
sha256 = "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1"; sha256 = "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1";
}; };
cppo = fetchurl { cppo = fetchurl {
url = "https://github.com/mjambon/cppo/archive/v1.6.5.tar.gz"; url = "https://github.com/ocaml-community/cppo/releases/download/v1.6.6/cppo-v1.6.6.tbz";
sha256 = "1dkm3d5h6h56y937gcdk2wixlpzl59vv5pmiafglr89p20kf7gqf"; sha256 = "185q0x54id7pfc6rkbjscav8sjkrg78fz65rgfw7b4bqlyb2j9z7";
}; };
cudf = fetchurl { cudf = fetchurl {
url = "https://gforge.inria.fr/frs/download.php/36602/cudf-0.9.tar.gz"; url = "https://gforge.inria.fr/frs/download.php/36602/cudf-0.9.tar.gz";
@ -27,8 +27,8 @@ let
sha256 = "0dmf0wbfmgdy5plz1bjiisc2hjgblvxsnrqjmw2c8y45v1h23mdz"; sha256 = "0dmf0wbfmgdy5plz1bjiisc2hjgblvxsnrqjmw2c8y45v1h23mdz";
}; };
extlib = fetchurl { extlib = fetchurl {
url = "http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.5.tar.gz"; url = "https://ygrek.org/p/release/ocaml-extlib/extlib-1.7.7.tar.gz";
sha256 = "19slqf5bdj0rrph2w41giwmn6df2qm07942jn058pjkjrnk30d4s"; sha256 = "1sxmzc1mx3kg62j8kbk0dxkx8mkf1rn70h542cjzrziflznap0s1";
}; };
mccs = fetchurl { mccs = fetchurl {
url = "https://github.com/AltGr/ocaml-mccs/archive/1.1+11.tar.gz"; url = "https://github.com/AltGr/ocaml-mccs/archive/1.1+11.tar.gz";
@ -43,25 +43,25 @@ let
sha256 = "0cjw69r7iilidi7b6arr92kjnjspchvwnmwr1b1gyaxqxpr2s98m"; sha256 = "0cjw69r7iilidi7b6arr92kjnjspchvwnmwr1b1gyaxqxpr2s98m";
}; };
re = fetchurl { re = fetchurl {
url = "https://github.com/ocaml/ocaml-re/releases/download/1.8.0/re-1.8.0.tbz"; url = "https://github.com/ocaml/ocaml-re/releases/download/1.9.0/re-1.9.0.tbz";
sha256 = "0qkv42a4hpqpxvqa4kdkkcbhbg7aym9kv4mqgm3m51vxbd0pq0lv"; sha256 = "1gas4ky49zgxph3870nffzkr6y41kkpqp4nj38pz1gh49zcf12aj";
}; };
result = fetchurl { result = fetchurl {
url = "https://github.com/janestreet/result/releases/download/1.3/result-1.3.tbz"; url = "https://github.com/janestreet/result/archive/1.4.tar.gz";
sha256 = "1lrnbxdq80gbhnp85mqp1kfk0bkh6q1c93sfz2qgnq2qyz60w4sk"; sha256 = "1cjlncnzkwc6zr4v8dgy8nin490blbyxzwwp0qh0cla7s3q2jw0n";
}; };
seq = fetchurl { seq = fetchurl {
url = "https://github.com/c-cube/seq/archive/0.1.tar.gz"; url = "https://github.com/c-cube/seq/archive/0.1.tar.gz";
sha256 = "02lb2d9i12bxrz2ba5wygk2bycan316skqlyri0597q7j9210g8r"; sha256 = "02lb2d9i12bxrz2ba5wygk2bycan316skqlyri0597q7j9210g8r";
}; };
opam = fetchurl { opam = fetchurl {
url = "https://github.com/ocaml/opam/archive/2.0.7.zip"; url = "https://github.com/ocaml/opam/archive/2.0.8.zip";
sha256 = "03yxj4hw9p5dh34b1yzl3xd0l1v2l2az0n7ix453yjrkn0wn0xic"; sha256 = "1h55jh4nnx1fcn7v7ss3fgxrn6ixkgnq7pvg5njz8c9xq4njwbc1";
}; };
}; };
in stdenv.mkDerivation { in stdenv.mkDerivation {
pname = "opam"; pname = "opam";
version = "2.0.7"; version = "2.0.8";
buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap; buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap;
@ -69,7 +69,7 @@ in stdenv.mkDerivation {
postUnpack = '' postUnpack = ''
ln -sv ${srcs.cmdliner} $sourceRoot/src_ext/cmdliner.tbz ln -sv ${srcs.cmdliner} $sourceRoot/src_ext/cmdliner.tbz
ln -sv ${srcs.cppo} $sourceRoot/src_ext/cppo.tar.gz ln -sv ${srcs.cppo} $sourceRoot/src_ext/cppo.tbz
ln -sv ${srcs.cudf} $sourceRoot/src_ext/cudf.tar.gz ln -sv ${srcs.cudf} $sourceRoot/src_ext/cudf.tar.gz
ln -sv ${srcs.dose3} $sourceRoot/src_ext/dose3.tar.gz ln -sv ${srcs.dose3} $sourceRoot/src_ext/dose3.tar.gz
ln -sv ${srcs.dune-local} $sourceRoot/src_ext/dune-local.tbz ln -sv ${srcs.dune-local} $sourceRoot/src_ext/dune-local.tbz
@ -78,7 +78,7 @@ in stdenv.mkDerivation {
ln -sv ${srcs.ocamlgraph} $sourceRoot/src_ext/ocamlgraph.tar.gz ln -sv ${srcs.ocamlgraph} $sourceRoot/src_ext/ocamlgraph.tar.gz
ln -sv ${srcs.opam-file-format} $sourceRoot/src_ext/opam-file-format.tar.gz ln -sv ${srcs.opam-file-format} $sourceRoot/src_ext/opam-file-format.tar.gz
ln -sv ${srcs.re} $sourceRoot/src_ext/re.tbz ln -sv ${srcs.re} $sourceRoot/src_ext/re.tbz
ln -sv ${srcs.result} $sourceRoot/src_ext/result.tbz ln -sv ${srcs.result} $sourceRoot/src_ext/result.tar.gz
ln -sv ${srcs.seq} $sourceRoot/src_ext/seq.tar.gz ln -sv ${srcs.seq} $sourceRoot/src_ext/seq.tar.gz
''; '';
@ -117,4 +117,4 @@ in stdenv.mkDerivation {
platforms = platforms.all; platforms = platforms.all;
}; };
} }
# Generated by: ./opam.nix.pl -v 2.0.7 -p opam-shebangs.patch # Generated by: ./opam.nix.pl -v 2.0.8 -p opam-shebangs.patch

View file

@ -21,7 +21,7 @@ chomp $OPAM_RELEASE_SHA256;
my $OPAM_BASE_URL = "https://raw.githubusercontent.com/$OPAM_GITHUB_REPO/$OPAM_TAG"; my $OPAM_BASE_URL = "https://raw.githubusercontent.com/$OPAM_GITHUB_REPO/$OPAM_TAG";
my $OPAM_OPAM = `curl -L --url \Q$OPAM_BASE_URL\E/opam-devel.opam`; my $OPAM_OPAM = `curl -L --url \Q$OPAM_BASE_URL\E/opam-devel.opam`;
my($OCAML_MIN_VERSION) = $OPAM_OPAM =~ /^available: ocaml-version >= "(.*)"$/m my($OCAML_MIN_VERSION) = $OPAM_OPAM =~ /^ "ocaml" {>= "(.*)"}$/m
or die "could not parse ocaml version bound\n"; or die "could not parse ocaml version bound\n";
print <<"EOF"; print <<"EOF";

View file

@ -8,7 +8,7 @@ let
in in
buildNodejs { buildNodejs {
inherit enableNpm; inherit enableNpm;
version = "12.20.1"; version = "12.20.2";
sha256 = "0lqq6a2byw4qmig98j45gqnl0593xdhx1dr9k7x2nnvhblrfw3p0"; sha256 = "0g3dxip7b5j7fzkw4b82ln93fphxn1zpdizbj1ikjv3hy00dc6ln";
patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
} }

View file

@ -25,11 +25,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "unciv"; pname = "unciv";
version = "3.12.12"; version = "3.12.13-patch1";
src = fetchurl { src = fetchurl {
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
sha256 = "sha256-C5Mhn4v0dCAVGuYxi/3YMQKGUBkdBBXYGfsM1heJkQg="; sha256 = "sha256-OwS1rn5mfU6cA6pvpp7Q407Kw2wBGvpqWmqlajgHtCI=";
}; };
dontUnpack = true; dontUnpack = true;

View file

@ -65,11 +65,11 @@ let
ale = buildVimPluginFrom2Nix { ale = buildVimPluginFrom2Nix {
pname = "ale"; pname = "ale";
version = "2021-02-06"; version = "2021-02-10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dense-analysis"; owner = "dense-analysis";
repo = "ale"; repo = "ale";
rev = "388cf3374312b05122151bc68691bf09a69ff840"; rev = "1773a496ad39fdd3d904679955b39357f3f38442";
sha256 = "1jzfdbfw333r929l5bl1ca1dv9b6yyhsjhk3gdf7wxklbzcrww3p"; sha256 = "1jzfdbfw333r929l5bl1ca1dv9b6yyhsjhk3gdf7wxklbzcrww3p";
}; };
meta.homepage = "https://github.com/dense-analysis/ale/"; meta.homepage = "https://github.com/dense-analysis/ale/";
@ -389,12 +389,12 @@ let
chadtree = buildVimPluginFrom2Nix { chadtree = buildVimPluginFrom2Nix {
pname = "chadtree"; pname = "chadtree";
version = "2021-02-10"; version = "2021-02-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ms-jpq"; owner = "ms-jpq";
repo = "chadtree"; repo = "chadtree";
rev = "62e7bff3c4a29869423b88be2dff1314e1a34986"; rev = "eeaff0c9db2779d93c36ab7266ccfb0129525f55";
sha256 = "07dqd2z9xjc89b9p8hp2pwfbrimva3yp5493gwcpfnqsncxshm37"; sha256 = "1w3dpqs4k8hbzjl9q382wvrwjyk8j6xxq78r852cclnayyx9rw19";
}; };
meta.homepage = "https://github.com/ms-jpq/chadtree/"; meta.homepage = "https://github.com/ms-jpq/chadtree/";
}; };
@ -690,12 +690,12 @@ let
conjure = buildVimPluginFrom2Nix { conjure = buildVimPluginFrom2Nix {
pname = "conjure"; pname = "conjure";
version = "2021-02-07"; version = "2021-02-10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Olical"; owner = "Olical";
repo = "conjure"; repo = "conjure";
rev = "831334312237a305d92e54092bfab447376cc844"; rev = "88e7865b97737809d963b81b10737c41e90b4377";
sha256 = "1y0a43j1rhqzfm9qmd7dax6bn1mg9vwvh3rc355k94ix3x82n93j"; sha256 = "075rm1s1y1cklnsqf7845s3knfwyiqs1wd82d9rvbvc3gs12xlpf";
}; };
meta.homepage = "https://github.com/Olical/conjure/"; meta.homepage = "https://github.com/Olical/conjure/";
}; };
@ -2356,8 +2356,8 @@ let
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wfxr"; owner = "wfxr";
repo = "minimap.vim"; repo = "minimap.vim";
rev = "a05a32d70a043cc342d5e6e0a46432e294df7d8e"; rev = "1964f5e56467be5f894c8a9c99db58794da38b36";
sha256 = "16fqqp1di9abcvignz5d09hlc9qzafaa1d2v97lks28jjcri5616"; sha256 = "141p9hc343cgivp76bihv2l45l0yvznv2f2m9ndy3kdsh0ckwk0w";
}; };
meta.homepage = "https://github.com/wfxr/minimap.vim/"; meta.homepage = "https://github.com/wfxr/minimap.vim/";
}; };
@ -2812,8 +2812,8 @@ let
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "preservim"; owner = "preservim";
repo = "nerdtree"; repo = "nerdtree";
rev = "1d46d6df3e581984d4b31d30d362cb94bc993e1d"; rev = "d3f9fc44caaa5688b65ccc508af6fac7defa120f";
sha256 = "1zm08jrc2grd7fbcsxwspsj4jlv92s45wa54x404vijxyvgis9bz"; sha256 = "0rdz6li5qj6jl58731ddr3v8anx22ahvaqf5s19lnjakfdip3nn9";
}; };
meta.homepage = "https://github.com/preservim/nerdtree/"; meta.homepage = "https://github.com/preservim/nerdtree/";
}; };
@ -2976,12 +2976,12 @@ let
nvim-highlite = buildVimPluginFrom2Nix { nvim-highlite = buildVimPluginFrom2Nix {
pname = "nvim-highlite"; pname = "nvim-highlite";
version = "2021-02-04"; version = "2021-02-10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Iron-E"; owner = "Iron-E";
repo = "nvim-highlite"; repo = "nvim-highlite";
rev = "daa245b13b77b478b5b9f62e2e0bb79e65dcf5e8"; rev = "aa8e36bd4f34dd0157d725c74874dfa44841a5e7";
sha256 = "19qibdkwzcqxkzzdc0bi2s1nf8rbzikkygs0yf41an5ll35xl528"; sha256 = "1zrqd3ndlv3393xjmf1n3w6im24fyqmnpldqvph5ix9lfrrf5vzh";
}; };
meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
}; };
@ -3096,12 +3096,12 @@ let
nvim-treesitter = buildVimPluginFrom2Nix { nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter"; pname = "nvim-treesitter";
version = "2021-02-08"; version = "2021-02-10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-treesitter"; owner = "nvim-treesitter";
repo = "nvim-treesitter"; repo = "nvim-treesitter";
rev = "6533fb9af7f881c18b761ae94b2a502606f27989"; rev = "72ecefc859096cdea114f78ca09ad67970f8a1d8";
sha256 = "1rj9ndcvm24yirxg59y7sp6gs4dkyk0waa37j378liya5ia1cw48"; sha256 = "0jyq6qd7ykkdm4s1m6whmj0g4n1b4xvlhwiizim9vv2m86lnwfqb";
}; };
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
}; };
@ -3280,8 +3280,8 @@ let
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wbthomason"; owner = "wbthomason";
repo = "packer.nvim"; repo = "packer.nvim";
rev = "b57a0f2f02ffd3e5f1604fdea6b76d4f67502814"; rev = "8d220a40b760fea7ee637602ec781bff80df5122";
sha256 = "06414cik0iqb6jwksqikin328mylfwxl6215036bb7rl2lc8cs99"; sha256 = "1l4dwkq1rwb0dwd4xnhz6yisqqfgha9k92kgl73fldnx0pkcycbk";
}; };
meta.homepage = "https://github.com/wbthomason/packer.nvim/"; meta.homepage = "https://github.com/wbthomason/packer.nvim/";
}; };
@ -7325,6 +7325,18 @@ let
meta.homepage = "https://github.com/tpope/vim-sexp-mappings-for-regular-people/"; meta.homepage = "https://github.com/tpope/vim-sexp-mappings-for-regular-people/";
}; };
vim-shellcheck = buildVimPluginFrom2Nix {
pname = "vim-shellcheck";
version = "2019-07-25";
src = fetchFromGitHub {
owner = "itspriddle";
repo = "vim-shellcheck";
rev = "4346419ac57ef341a15aa39c827c0848f17c6faf";
sha256 = "0j28nqmfjxzhwylp2r1mp5v39fws5jvn7k9maam97mi3j66a9jz5";
};
meta.homepage = "https://github.com/itspriddle/vim-shellcheck/";
};
vim-signature = buildVimPluginFrom2Nix { vim-signature = buildVimPluginFrom2Nix {
pname = "vim-signature"; pname = "vim-signature";
version = "2018-07-06"; version = "2018-07-06";
@ -8216,12 +8228,12 @@ let
vimspector = buildVimPluginFrom2Nix { vimspector = buildVimPluginFrom2Nix {
pname = "vimspector"; pname = "vimspector";
version = "2021-02-06"; version = "2021-02-10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "puremourning"; owner = "puremourning";
repo = "vimspector"; repo = "vimspector";
rev = "7f77842ab89524d2d3b45a4fe7198fb51ac9e0a8"; rev = "e99ac0d65867f4d97e7b891ac21cd341de1ff53f";
sha256 = "0njsncynnbyqwcj0lr13ycz7kl9yg0blmb1dizlvki5gwqlj881r"; sha256 = "1jxl33svlymcwc3dsalabpy7px91rgfpalpb2bhxkqd4vgxwcjql";
fetchSubmodules = true; fetchSubmodules = true;
}; };
meta.homepage = "https://github.com/puremourning/vimspector/"; meta.homepage = "https://github.com/puremourning/vimspector/";

View file

@ -187,6 +187,7 @@ itchyny/lightline.vim
itchyny/thumbnail.vim itchyny/thumbnail.vim
itchyny/vim-cursorword itchyny/vim-cursorword
itchyny/vim-gitbranch itchyny/vim-gitbranch
itspriddle/vim-shellcheck
ivanov/vim-ipython ivanov/vim-ipython
jackguo380/vim-lsp-cxx-highlight jackguo380/vim-lsp-cxx-highlight
jacoborus/tender.vim jacoborus/tender.vim

View file

@ -1,4 +1,4 @@
{ lib, stdenv, buildPackages, fetchurl, fetchpatch, flex, cracklib, db4, gettext { lib, stdenv, buildPackages, fetchurl, flex, cracklib, db4, gettext
, nixosTests , nixosTests
}: }:
@ -11,17 +11,6 @@ stdenv.mkDerivation rec {
sha256 = "sha256-IB1AcwsRNbGzzeoJ8sKKxjTXMYHM0Bcs7d7jZJxXkvw="; sha256 = "sha256-IB1AcwsRNbGzzeoJ8sKKxjTXMYHM0Bcs7d7jZJxXkvw=";
}; };
patches = lib.optionals (stdenv.hostPlatform.libc == "musl") [
(fetchpatch {
url = "https://git.alpinelinux.org/aports/plain/main/linux-pam/fix-compat.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc";
sha256 = "1h5yp5h2mqp1fcwiwwklyfpa69a3i03ya32pivs60fd7g5bqa7sf";
})
(fetchpatch {
url = "https://git.alpinelinux.org/aports/plain/main/linux-pam/libpam-fix-build-with-eglibc-2.16.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc";
sha256 = "1ib6shhvgzinjsc603k2x1lxh9dic6qq449fnk110gc359m23j81";
})
];
outputs = [ "out" "doc" "man" /* "modules" */ ]; outputs = [ "out" "doc" "man" /* "modules" */ ];
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];

View file

@ -0,0 +1,25 @@
{ stdenv, lib, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "zsh-autopair";
version = "1.0";
src = fetchFromGitHub {
owner = "hlissner";
repo = "zsh-autopair";
rev = "v${version}";
sha256 = "1h0vm2dgrmb8i2pvsgis3lshc5b0ad846836m62y8h3rdb3zmpy1";
};
installPhase = ''
install -D autopair.zsh $out/share/zsh/${pname}/autopair.zsh
'';
meta = with lib; {
homepage = "https://github.com/hlissner/zsh-autopair";
description = "A plugin that auto-closes, deletes and skips over matching delimiters in zsh intelligently";
license = licenses.mit;
maintainers = with maintainers; [ _0qq ];
platforms = platforms.all;
};
}

View file

@ -13,13 +13,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "xwallpaper"; pname = "xwallpaper";
version = "0.6.5"; version = "0.6.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stoeckmann"; owner = "stoeckmann";
repo = "xwallpaper"; repo = "xwallpaper";
rev = "v${version}"; rev = "v${version}";
sha256 = "121ai4dc0v65qk12gn9w62ixly8hc8a5qrygkbb82vy8ck4jqxj7"; sha256 = "sha256-WYtbwMFzvJ0Xr84gGoKSofSSnmb7Qn6ioGMOnQOqdII=";
}; };
preConfigure = "./autogen.sh"; preConfigure = "./autogen.sh";

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "cassowary"; pname = "cassowary";
version = "0.12.0"; version = "0.12.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rogerwelin"; owner = "rogerwelin";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-HRshuMnRPMzatOYYI//yEtjC46kORGXaAWJJjLHW2+k="; sha256 = "sha256-1so9EMry7U6GfpxgqLpcqC+ZaWAn4qAsnyDZvo0FAZY=";
}; };
vendorSha256 = "sha256-d8JPsHBGkZ/MeoHTCLxi6JeNomER/0veWjqmqGal8eE="; vendorSha256 = "sha256-d8JPsHBGkZ/MeoHTCLxi6JeNomER/0veWjqmqGal8eE=";

View file

@ -15,14 +15,14 @@ with lib;
let let
go-d-plugin = callPackage ./go.d.plugin.nix {}; go-d-plugin = callPackage ./go.d.plugin.nix {};
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
version = "1.29.0"; version = "1.29.1";
pname = "netdata"; pname = "netdata";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "netdata"; owner = "netdata";
repo = "netdata"; repo = "netdata";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-Bkap0Ld5zz+HxEjkZrmPZieUpyim4/gpE8oL0q9LGqk="; sha256 = "sha256-Wmfqxjy0kCy8vsegoe+Jn5Az/XEZxeHZDRMLmOrp+Iw=";
}; };
nativeBuildInputs = [ autoreconfHook pkg-config ]; nativeBuildInputs = [ autoreconfHook pkg-config ];

View file

@ -9244,6 +9244,8 @@ in
zsh-autoenv = callPackage ../tools/misc/zsh-autoenv { }; zsh-autoenv = callPackage ../tools/misc/zsh-autoenv { };
zsh-autopair = callPackage ../shells/zsh/zsh-autopair { };
zsh-bd = callPackage ../shells/zsh/zsh-bd { }; zsh-bd = callPackage ../shells/zsh/zsh-bd { };
zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { }; zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { };