Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-05-05 18:24:02 +00:00 committed by GitHub
commit 202eb5ddf5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 452 additions and 449 deletions

View file

@ -58,10 +58,11 @@ let
# add to nvim's 'embedded rc' this:
# let g:<key>_host_prog=$out/bin/nvim-<key>
# Or this:
# let g:loaded_${prog}_provider=1
# let g:loaded_${prog}_provider=0
# While the latter tells nvim that this provider is not available
hostprog_check_table = {
node = withNodeJs;
python = false;
python3 = withPython3;
ruby = withRuby;
};
@ -107,7 +108,7 @@ let
if withProg then
"let g:${prog}_host_prog='${placeholder "out"}/bin/nvim-${prog}'"
else
"let g:loaded_${prog}_provider=1"
"let g:loaded_${prog}_provider=0"
;
# to keep backwards compatibility

View file

@ -7,10 +7,10 @@ in
rec {
firefox = common rec {
pname = "firefox";
ffversion = "88.0";
ffversion = "88.0.1";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "f58f44f2f0d0f54eae5ab4fa439205feb8b9209b1bf2ea2ae0c9691e9e583bae2cbd4033edb5bdf4e37eda5b95fca688499bed000fe26ced8ff4bbc49347ce31";
sha512 = "e2d7fc950ba49f225c83ee1d799d6318fcf16c33a3b7f40b85c49d5b7865f7e632c703e5fd227a303b56e2565d0796283ebb12d7fd1a02781dcaa45e84cea934";
};
meta = {
@ -32,10 +32,10 @@ rec {
firefox-esr-78 = common rec {
pname = "firefox-esr";
ffversion = "78.10.0esr";
ffversion = "78.10.1esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "5e2cf137dc781855542c29df6152fa74ba749801640ade3cf01487ce993786b87a4f603d25c0af9323e67c7e15c75655523428c1c1426527b8623c7ded9f5946";
sha512 = "a22773d9b3f0dca253805257f358a906769d23f15115e3a8851024f701e27dee45f056f7d34ebf1fcde0a3f91ec299639c2a12556e938a232cdea9e59835fde1";
};
meta = {

View file

@ -1,15 +1,12 @@
{ config, lib, substituteAll, stdenv, fetchurl, pkg-config, gettext, glib, atk, pango, cairo, perl, xorg
, gdk-pixbuf, xlibsWrapper, gobject-introspection
, xineramaSupport ? stdenv.isLinux
, cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups ? null
, cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups
, gdktarget ? if stdenv.isDarwin then "quartz" else "x11"
, AppKit, Cocoa
, fetchpatch
}:
assert xineramaSupport -> xorg.libXinerama != null;
assert cupsSupport -> cups != null;
with lib;
let

View file

@ -42,14 +42,12 @@
, xineramaSupport ? stdenv.isLinux
, cupsSupport ? stdenv.isLinux
, withGtkDoc ? stdenv.isLinux
, cups ? null
, cups
, AppKit
, Cocoa
, broadwaySupport ? true
}:
assert cupsSupport -> cups != null;
let
gtkCleanImmodulesCache = substituteAll {

View file

@ -46,14 +46,12 @@
, xineramaSupport ? stdenv.isLinux
, cupsSupport ? stdenv.isLinux
, withGtkDoc ? stdenv.isLinux
, cups ? null
, cups
, AppKit
, Cocoa
, broadwaySupport ? true
}:
assert cupsSupport -> cups != null;
let
gtkCleanImmodulesCache = substituteAll {

View file

@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "igraph";
version = "0.9.2";
version = "0.9.3";
src = fetchFromGitHub {
owner = "igraph";
repo = pname;
rev = version;
sha256 = "sha256-Ylw02Mz9H4wIWfq59za/X7xfhgW9o0DNU55nLFqeUeo=";
sha256 = "sha256-StRXtP2PelPcS+l5O1AOVFkza3hiKFwCdp8XLal4grE=";
};
# Normally, igraph wants us to call bootstrap.sh, which will call

View file

@ -2,14 +2,15 @@
stdenv.mkDerivation rec {
pname = "pythia";
version = "8.304";
version = "8.305";
src = fetchurl {
url = "http://home.thep.lu.se/~torbjorn/pythia8/pythia${builtins.replaceStrings ["."] [""] version}.tgz";
sha256 = "18frx7xyvxnz57fxjncjyjzsk169h0jz6hxzjfpmwm3dzcc712fk";
sha256 = "03rpy2bmx67217fh1spfn36x9xrk0igcj56byki77lgj0y5mz21a";
};
buildInputs = [ boost fastjet hepmc zlib rsync lhapdf ];
nativeBuildInputs = [ rsync ];
buildInputs = [ boost fastjet hepmc zlib lhapdf ];
preConfigure = ''
patchShebangs ./configure
@ -26,11 +27,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = {
meta = with lib; {
description = "A program for the generation of high-energy physics events";
license = lib.licenses.gpl2;
homepage = "http://home.thep.lu.se/~torbjorn/Pythia.html";
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ veprbl ];
license = licenses.gpl2Only;
homepage = "http://home.thep.lu.se/~torbjorn/Pythia.html";
platforms = platforms.unix;
maintainers = with maintainers; [ veprbl ];
};
}

View file

@ -1,29 +1,21 @@
{ buildPythonPackage, lib, fetchPypi, fetchpatch
{ buildPythonPackage, lib, fetchPypi
, pytestCheckHook, filelock, mock, pep8
, cython
, six, pyshp, shapely, geos, numpy
, gdal, pillow, matplotlib, pyepsg, pykdtree, scipy, owslib, fiona
, proj
, proj, flufl_lock
}:
buildPythonPackage rec {
pname = "cartopy";
version = "0.18.0";
version = "0.19.0.post1";
src = fetchPypi {
inherit version;
pname = "Cartopy";
sha256 = "0d24fk0cbp29gmkysrwq05vry13swmwi3vx3cpcy04c0ixz33ykz";
sha256 = "0xnm8z3as3hriivdfd26s6vn5b63gb46x6vxw6gh1mwfm5rlg2sb";
};
patches = [
# Fix numpy-1.20 compatibility. Will be part of 0.19.
(fetchpatch {
url = "https://github.com/SciTools/cartopy/commit/e663bbbef07989a5f8484a8f36ea9c07e61d14ce.patch";
sha256 = "061kbjgzkc3apaz6sxy00pkgy3n9dxcgps5wzj4rglb5iy86n2kq";
})
];
buildInputs = [
geos proj
];
@ -36,7 +28,7 @@ buildPythonPackage rec {
gdal pillow matplotlib pyepsg pykdtree scipy fiona owslib
];
checkInputs = [ pytestCheckHook filelock mock pep8 ];
checkInputs = [ pytestCheckHook filelock mock pep8 flufl_lock ];
pytestFlagsArray = [
"--pyargs" "cartopy"
@ -46,6 +38,7 @@ buildPythonPackage rec {
disabledTests = [
"test_nightshade_image"
"background_img"
"test_gridliner_labels_bbox_style"
];
nativeBuildInputs = [
@ -56,7 +49,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Process geospatial data to create maps and perform analyses";
license = licenses.lgpl3;
license = licenses.lgpl3Plus;
homepage = "https://scitools.org.uk/cartopy/docs/latest/";
maintainers = with maintainers; [ mredaelli ];
};

View file

@ -3,32 +3,34 @@
, asynctest
, buildPythonPackage
, coloredlogs
, coveralls
, fetchFromGitHub
, jsonschema
, pyserial
, pyserial-asyncio
, pytest-asyncio
, pytest-mock
, pytest-timeout
, pytestcov
, pytestCheckHook
, pythonOlder
, voluptuous
, zigpy }:
, zigpy
}:
buildPythonPackage rec {
pname = "zigpy-znp";
version = "0.4.0";
version = "0.5.1";
src = fetchFromGitHub {
owner = "zha-ng";
repo = "zigpy-znp";
owner = "zigpy";
repo = pname;
rev = "v${version}";
sha256 = "1g5jssdnibhb4i4k1js9iy9w40cipf1gdnyp847x0bv6wblzx8rl";
sha256 = "152d803jfrvkj4namni41fnbbnq85wd7zsqjhmkwrrmn2gvqjiln";
};
propagatedBuildInputs = [
async-timeout
coloredlogs
jsonschema
pyserial
pyserial-asyncio
voluptuous
@ -36,18 +38,19 @@ buildPythonPackage rec {
];
checkInputs = [
asynctest
coveralls
pytest-asyncio
pytest-mock
pytest-timeout
pytestcov
pytestCheckHook
] ++ lib.optionals (pythonOlder "3.8") [
asynctest
];
pythonImportsCheck = [ "zigpy_znp" ];
meta = with lib; {
description = "A library for zigpy which communicates with TI ZNP radios";
homepage = "https://github.com/zha-ng/zigpy-znp";
description = "Python library for zigpy which communicates with TI ZNP radios";
homepage = "https://github.com/zigpy/zigpy-znp";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ mvnetbiz ];
platforms = platforms.linux;

View file

@ -28,6 +28,14 @@ let newPython = python3.override {
sha256 = "18hpzh1am1dqx81fypn57r2wk565fi4g14292qrc5jm1h9dalzld";
};
});
# https://github.com/conan-io/conan/issues/8876
pyjwt = super.pyjwt.overridePythonAttrs (oldAttrs: rec {
version = "1.7.1";
src = oldAttrs.src.override {
inherit version;
sha256 = "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96";
};
});
};
};

View file

@ -1,16 +1,18 @@
{ lib, stdenv, fetchFromGitHub, kernel, kmod }:
{ lib, stdenv, fetchFromGitHub, kernel, linuxHeaders}:
stdenv.mkDerivation rec {
pname = "tuxedo-keyboard-${kernel.version}";
version = "2019-08-26";
version = "3.0.5";
src = fetchFromGitHub {
owner = "tuxedocomputers";
repo = "tuxedo-keyboard";
rev = "d65e76e84cfd8169591fc2a0a7c9219fa19da1b5";
sha256 = "1s48qpwybwh5pwqas2d1v2a7x4r97sm4hr9i4902r1d7h384bv17";
rev = "v${version}";
sha256 = "123ady2bi2dwbajy3pgv10l3g2pyhi5k31c1ii0zcrvl2qqhndck";
};
buildInputs = [ linuxHeaders ];
makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ];
installPhase = ''
@ -21,7 +23,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Full color keyboard driver for tuxedo computers laptops";
homepage = "https://github.com/tuxedocomputers/tuxedo-keyboard/";
license = licenses.gpl2;
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = [ maintainers.blanky0230 ];
};

View file

@ -18,7 +18,9 @@ python3.pkgs.buildPythonApplication rec {
prePatch = ''
substituteInPlace setup.cfg \
--replace "singledispatch>=3.4.0.0,<3.5.0.0" "" \
--replace "requests>=2.11.1,<2.25.0" "requests>=2.11.1,<2.26.0" \
--replace "unidecode>=0.04.19,<1.2.0" "unidecode>=0.04.19" \
--replace "cps = calibreweb:main" "calibre-web = calibreweb:main"
'';

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "oil";
version = "0.8.8";
version = "0.8.10";
src = fetchurl {
url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
sha256 = "sha256-J9aNuw72qufoVY6VnbdpCtpcI6GAI7ON10XGEJuqieI=";
sha256 = "sha256-ETB8BirlEqro8CUdRM+AsZ/ugFa/fj52wCV9pInvMB0=";
};
postPatch = ''

View file

@ -20272,7 +20272,7 @@ in
facetimehd = callPackage ../os-specific/linux/facetimehd { };
tuxedo-keyboard = callPackage ../os-specific/linux/tuxedo-keyboard { };
tuxedo-keyboard = if lib.versionAtLeast kernel.version "4.14" then callPackage ../os-specific/linux/tuxedo-keyboard { } else null;
jool = callPackage ../os-specific/linux/jool { };