Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-07-11 18:01:23 +00:00 committed by GitHub
commit 56ebfce4ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 79 additions and 45 deletions

View file

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "charge-lnd";
version = "0.1.3";
version = "0.2.1";
src = fetchFromGitHub {
owner = "accumulator";
repo = pname;
rev = "v${version}";
sha256 = "0npn45qbbsbzj5qy9kwx662hml1y610ysmfl89sda02l6wf1sp3y";
sha256 = "0l4h3fdvln03ycbg3xngh8vkhgrz4ad864yyn4gmdjp0ypi69qa1";
};
propagatedBuildInputs = with python3Packages; [

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform }:
{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices }:
rustPlatform.buildRustPackage rec {
pname = "cobalt";
@ -13,10 +13,13 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "27LcoGBI4elt80uQkTwvToOyEmd2+/3ma5Y32OFrJaw=";
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
meta = with lib; {
description = "Static site generator written in Rust";
homepage = "https://github.com/cobalt-org/cobalt.rs/";
license = licenses.mit;
maintainers = with maintainers; [ ethancedwards8 ];
platforms = platforms.unix;
};
}

View file

@ -1,21 +1,22 @@
{ appimageTools, lib, fetchurl }:
let
pname = "neo4j-desktop";
version = "1.4.5";
version = "1.4.7";
name = "${pname}-${version}";
src = fetchurl {
url = "https://s3-eu-west-1.amazonaws.com/dist.neo4j.org/${pname}/linux-offline/${name}-x86_64.AppImage";
sha256 = "sha256-TCkjYhvGhgqgrDEMvC4Ww/sDxRhHC70YgfDlCIFitMo";
hash = "sha256-oEcSW7UIeiGY2fCPJQ5EtDBRtd73Q04HaSk+7ObLKJc=";
};
appimageContents = appimageTools.extract { inherit src; name = pname; };
appimageContents = appimageTools.extract { inherit name src; };
in appimageTools.wrapType2 {
inherit name src;
extraPkgs = pkgs: with pkgs; [ libsecret ];
extraInstallCommands = ''
mv $out/bin/${name} $out/bin/${pname}
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'

View file

@ -2,7 +2,7 @@
python3Packages.buildPythonApplication rec {
pname = "snakemake";
version = "6.5.0";
version = "6.5.3";
propagatedBuildInputs = with python3Packages; [
appdirs
@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec {
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "b166ec74537e02553fcaf0ddcffc32dfdb9dcaa1260af297a56eded6a179b2ee";
sha256 = "a06839346425c74542e6e2e6047db3133cd747ef89e1ebd87dad1fbba041f62d";
};
doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json

View file

@ -0,0 +1,31 @@
{ lib, stdenv, fetchFromSourcehut, installShellFiles, lua }:
stdenv.mkDerivation rec {
pname = "fennel";
version = "0.9.2";
src = fetchFromSourcehut {
owner = "~technomancy";
repo = pname;
rev = version;
sha256 = "1kpm3lzxzwkhxm4ghpbx8iw0ni7gb73y68lsc3ll2rcx0fwv9303";
};
nativeBuildInputs = [ installShellFiles ];
buildInputs = [ lua ];
makeFlags = [ "PREFIX=${placeholder "out"}" ];
postInstall = ''
installManPage fennel.1
'';
meta = with lib; {
description = "A Lua Lisp language";
homepage = "https://fennel-lang.org/";
license = licenses.mit;
platforms = lua.meta.platforms;
maintainers = [ maintainers.maaslalani ];
};
}

View file

@ -3,7 +3,7 @@ set -eu -o pipefail
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
node2nix=$(nix-build ../../.. -A nodePackages.node2nix)
cd ${DIR}
cd "$DIR"
rm -f ./node-env.nix
${node2nix}/bin/node2nix -i node-packages.json -o node-packages.nix -c composition.nix
# using --no-out-link in nix-build argument would cause the

View file

@ -1,22 +1,22 @@
{ buildPythonPackage
{ lib
, buildPythonPackage
, fetchPypi
, isPy27
, pythonOlder
, aiohttp
, pytest
, pytestCheckHook
, pytest-aiohttp
, pygments
, lib
}:
buildPythonPackage rec {
pname = "aiojobs";
version = "0.2.2";
version = "0.3.0";
format = "flit";
disabled = isPy27;
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "01a0msjh4w58fd7jplmblh0hwgpzwjs5xkgqz3d0p5yv3cykwjwf";
sha256 = "sha256-9mMdQtxDCPfYg6u9cNTpdvP8w1o7oejq5dSvSUCh4MM=";
};
nativeBuildInputs = [
@ -28,13 +28,11 @@ buildPythonPackage rec {
];
checkInputs = [
pytest
pytestCheckHook
pytest-aiohttp
];
checkPhase = ''
pytest tests
'';
pythonImportsCheck = [ "aiojobs" ];
meta = with lib; {
homepage = "https://github.com/aio-libs/aiojobs";

View file

@ -11,7 +11,7 @@
}:
buildPythonPackage rec {
version = "0.8";
version = "0.9";
pname = "asgi-csrf";
disabled = isPy27;
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "simonw";
repo = pname;
rev = version;
sha256 = "sha256-0I/p9SjVVZhJQeR7s1R3tooP9XMNLPlcxl0dBSzsVaw=";
sha256 = "sha256-mmOsN2mW6eGtapq3xLqHK8hhSD0Gjzp3DsY5AGUlI8g=";
};
propagatedBuildInputs = [

View file

@ -5,20 +5,21 @@
, numba
, numpy
, pytestCheckHook
, pyyaml
, rapidjson
}:
buildPythonPackage rec {
pname = "awkward";
version = "1.3.0";
version = "1.4.0";
src = fetchPypi {
inherit pname version;
sha256 = "b6021694adec9813842bad1987b837e439dabaf5b0dff9041201d238fca71fb4";
sha256 = "25ae6114d5962c717cb87e3bc30a2f6eaa232b252cf8c51ba805b8f04664ae0d";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ rapidjson ];
buildInputs = [ pyyaml rapidjson ];
propagatedBuildInputs = [ numpy ];
dontUseCmakeConfigure = true;

View file

@ -56,6 +56,12 @@ buildPythonPackage rec {
url = "https://0xacab.org/jvoisin/mat2/-/commit/c9be50f968212b01f8d8ad85e59e19c3e67d8578.patch";
sha256 = "0895dkv6575ps3drdfnli15cggx27n9irjx0axigrm4ql4ma0648";
})
# fix white space error in the tests for exiftool, remove for next release
(fetchpatch {
name = "fix-tests-exiftool.patch";
url = "https://0xacab.org/jvoisin/mat2/-/commit/6df615281b2a649b85ff7670f6d87d3beed0b977.patch";
sha256 = "1gix63n0mzavnqjq5ll0v210z4vdz4f93aq03bfzlgifxcd9vl1x";
})
];
postPatch = ''

View file

@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, dovecot, libtool, xapian, icu64 }:
stdenv.mkDerivation rec {
pname = "fts-xapian";
version = "1.4.9";
version = "1.4.11";
src = fetchFromGitHub {
owner = "grosjo";
repo = "fts-xapian";
rev = version;
sha256 = "0p4ps9h24vr9bldrcf9cdx6l4rdz5i8zyc58qp10h7cc3jilwddy";
sha256 = "sha256-HPmS2Z1PIEM9fc6EerCEigQJg5BK/115zOW2uxFqjP0=";
};
buildInputs = [ dovecot xapian icu64 ];

View file

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "17.04";
src = fetchFromGitHub {
owner = "szcnick";
owner = "jinfeihan57";
repo = pname;
rev = "v${version}";
sha256 = "sha256-19F4hPV0nKVuFZNbOcXrcA1uW6Y3HQolaHVIYXGmh18=";
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing";
meta = {
homepage = "https://github.com/szcnick/p7zip";
homepage = "https://github.com/jinfeihan57/p7zip";
description = "A new p7zip fork with additional codecs and improvements (forked from https://sourceforge.net/projects/p7zip/)";
platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.raskin ];

View file

@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec {
doCheck = false;
propagatedBuildInputs = [ pythonPackages.pycrypto pythonPackages.distorm3 ];
propagatedBuildInputs = with pythonPackages; [ pycrypto distorm3 pillow ];
meta = with lib; {
homepage = "https://www.volatilityfoundation.org/";

View file

@ -3889,7 +3889,9 @@ in
cloud-utils = callPackage ../tools/misc/cloud-utils { };
cobalt = callPackage ../applications/misc/cobalt { };
cobalt = callPackage ../applications/misc/cobalt {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
cocoapods = callPackage ../development/mobile/cocoapods { };
@ -10754,6 +10756,8 @@ in
fasmg = callPackage ../development/compilers/fasmg { };
fennel = callPackage ../development/compilers/fennel { };
flasm = callPackage ../development/compilers/flasm { };
flyctl = callPackage ../development/web/flyctl { };

View file

@ -10793,25 +10793,15 @@ let
};
};
ImageExifTool = buildPerlPackage {
ImageExifTool = buildPerlPackage rec {
pname = "Image-ExifTool";
version = "12.16";
version = "12.29";
src = fetchurl {
url = "mirror://cpan/authors/id/E/EX/EXIFTOOL/Image-ExifTool-12.16.tar.gz";
sha256 = "0skm22b3gg1bfk0amklrprpva41m6mkrhqp0gi7z1nmcf9ypjh61";
url = "https://exiftool.org/Image-ExifTool-${version}.tar.gz";
sha256 = "09yszwhirprqr94jwrsr9kyav5syv0mjmnjngqn20fn7m135wv95";
};
patches = [
# Unfortunately, not every release is uploaded to CPAN so security fixes
# would need to be cherry-picked from releases
(fetchpatch {
name = "CVE-2021-22204.patch";
url = "https://salsa.debian.org/perl-team/modules/packages/libimage-exiftool-perl/-/raw/0347501fda93cb8366d6451aedcf258b34fb4a2b/debian/patches/CVE-2021-22204.patch";
sha256 = "1fxw32zcssillnv764wsd05lyswn8bbrc90q5cy9aknx0ncgsrxj";
})
];
nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
postInstall = lib.optionalString stdenv.isDarwin ''
shortenPerlShebang $out/bin/exiftool