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

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Jan Tojnar 2021-04-07 05:32:57 +02:00
commit 714ef27ffe
6 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/office/pyspread/default.nix
View File

@ -8,11 +8,11 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "pyspread"; pname = "pyspread";
version = "1.99.5"; version = "1.99.6";
src = python3.pkgs.fetchPypi { src = python3.pkgs.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-05bC+Uvx72FAh3qxkgXm8jdb/gHRv1D/M7tjOEdE3Xg="; sha256 = "sha256-B1oyWUAXn63mmVFN9brJwbHxi7I5nYrK2JJU1DjAlb8=";
}; };
patches = [ patches = [
@ -35,10 +35,12 @@ python3.pkgs.buildPythonApplication rec {
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [
dateutil dateutil
markdown2
matplotlib matplotlib
numpy numpy
pyenchant pyenchant
pyqt5 pyqt5
setuptools
]; ];
doCheck = false; # it fails miserably with a core dump doCheck = false; # it fails miserably with a core dump

2
pkgs/development/libraries/science/astronomy/indilib/default.nix
View File

@ -51,6 +51,6 @@ stdenv.mkDerivation rec {
changelog = "https://github.com/indilib/indi/releases/tag/v${version}"; changelog = "https://github.com/indilib/indi/releases/tag/v${version}";
license = licenses.lgpl2Plus; license = licenses.lgpl2Plus;
maintainers = with maintainers; [ hjones2199 ]; maintainers = with maintainers; [ hjones2199 ];
platforms = [ "x86_64-linux" ]; platforms = platforms.linux;
}; };
} }

2
pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix
View File

@ -59,6 +59,6 @@ stdenv.mkDerivation rec {
changelog = "https://github.com/indilib/indi-3rdparty/releases/tag/v${version}"; changelog = "https://github.com/indilib/indi-3rdparty/releases/tag/v${version}";
license = licenses.lgpl2Plus; license = licenses.lgpl2Plus;
maintainers = with maintainers; [ hjones2199 ]; maintainers = with maintainers; [ hjones2199 ];
platforms = [ "x86_64-linux" ]; platforms = platforms.linux;
}; };
} }

6
pkgs/servers/x11/xorg/default.nix
View File

@ -1717,11 +1717,11 @@ lib.makeScope newScope (self: with self; {
}) {}; }) {};
xf86inputlibinput = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libinput, xorgserver }: stdenv.mkDerivation { xf86inputlibinput = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libinput, xorgserver }: stdenv.mkDerivation {
name = "xf86-input-libinput-0.30.0"; name = "xf86-input-libinput-1.0.0";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = "mirror://xorg/individual/driver/xf86-input-libinput-0.30.0.tar.bz2"; url = "mirror://xorg/individual/driver/xf86-input-libinput-1.0.0.tar.bz2";
sha256 = "1h4np66p87jf0c85ig524w8f5rbhl5gx8fww1qg0c55f87yzkizr"; sha256 = "0x4ay9y2clm2bql3myqnvhmikjbpzy95c800qiva8pg6dbvc4mgg";
}; };
hardeningDisable = [ "bindnow" "relro" ]; hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

2
pkgs/servers/x11/xorg/tarballs.list
View File

@ -81,7 +81,7 @@ mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2
mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2 mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2
mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2
mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2
mirror://xorg/individual/driver/xf86-input-libinput-0.30.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-libinput-1.0.0.tar.bz2
mirror://xorg/individual/driver/xf86-input-mouse-1.9.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-mouse-1.9.3.tar.bz2
mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2
mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2

2
pkgs/tools/networking/connman/connman.nix
View File

@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
# directories flags # directories flags
"--sysconfdir=${placeholder "out"}/etc" "--sysconfdir=/etc"
"--localstatedir=/var" "--localstatedir=/var"
"--with-dbusconfdir=${placeholder "out"}/share" "--with-dbusconfdir=${placeholder "out"}/share"
"--with-dbusdatadir=${placeholder "out"}/share" "--with-dbusdatadir=${placeholder "out"}/share"