pyrox.dev / nixpkgs
lol
fork atom

Merge branch 'master' into staging-next

Jan Tojnar 714ef27f 5e509a83

+11 -9
unified split
+4 -2
pkgs/applications/office/pyspread/default.nix
··· 8 8 9 9 python3.pkgs.buildPythonApplication rec { 10 10 pname = "pyspread"; 11 - version = "1.99.5"; 11 + version = "1.99.6"; 12 12 13 13 src = python3.pkgs.fetchPypi { 14 14 inherit pname version; 15 - sha256 = "sha256-05bC+Uvx72FAh3qxkgXm8jdb/gHRv1D/M7tjOEdE3Xg="; 15 + sha256 = "sha256-B1oyWUAXn63mmVFN9brJwbHxi7I5nYrK2JJU1DjAlb8="; 16 16 }; 17 17 18 18 patches = [ ··· 35 35 36 36 propagatedBuildInputs = with python3.pkgs; [ 37 37 dateutil 38 + markdown2 38 39 matplotlib 39 40 numpy 40 41 pyenchant 41 42 pyqt5 43 + setuptools 42 44 ]; 43 45 44 46 doCheck = false; # it fails miserably with a core dump
+1 -1
pkgs/development/libraries/science/astronomy/indilib/default.nix
··· 51 51 changelog = "https://github.com/indilib/indi/releases/tag/v${version}"; 52 52 license = licenses.lgpl2Plus; 53 53 maintainers = with maintainers; [ hjones2199 ]; 54 - platforms = [ "x86_64-linux" ]; 54 + platforms = platforms.linux; 55 55 }; 56 56 }
+1 -1
pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix
··· 59 59 changelog = "https://github.com/indilib/indi-3rdparty/releases/tag/v${version}"; 60 60 license = licenses.lgpl2Plus; 61 61 maintainers = with maintainers; [ hjones2199 ]; 62 - platforms = [ "x86_64-linux" ]; 62 + platforms = platforms.linux; 63 63 }; 64 64 }
+3 -3
pkgs/servers/x11/xorg/default.nix
··· 1717 1717 }) {}; 1718 1718 1719 1719 xf86inputlibinput = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libinput, xorgserver }: stdenv.mkDerivation { 1720 - name = "xf86-input-libinput-0.30.0"; 1720 + name = "xf86-input-libinput-1.0.0"; 1721 1721 builder = ./builder.sh; 1722 1722 src = fetchurl { 1723 - url = "mirror://xorg/individual/driver/xf86-input-libinput-0.30.0.tar.bz2"; 1724 - sha256 = "1h4np66p87jf0c85ig524w8f5rbhl5gx8fww1qg0c55f87yzkizr"; 1723 + url = "mirror://xorg/individual/driver/xf86-input-libinput-1.0.0.tar.bz2"; 1724 + sha256 = "0x4ay9y2clm2bql3myqnvhmikjbpzy95c800qiva8pg6dbvc4mgg"; 1725 1725 }; 1726 1726 hardeningDisable = [ "bindnow" "relro" ]; 1727 1727 nativeBuildInputs = [ pkg-config ];
+1 -1
pkgs/servers/x11/xorg/tarballs.list
··· 81 81 mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2 82 82 mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2 83 83 mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2 84 - mirror://xorg/individual/driver/xf86-input-libinput-0.30.0.tar.bz2 84 + mirror://xorg/individual/driver/xf86-input-libinput-1.0.0.tar.bz2 85 85 mirror://xorg/individual/driver/xf86-input-mouse-1.9.3.tar.bz2 86 86 mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2 87 87 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2
+1 -1
pkgs/tools/networking/connman/connman.nix
··· 86 86 87 87 configureFlags = [ 88 88 # directories flags 89 - "--sysconfdir=${placeholder "out"}/etc" 89 + "--sysconfdir=/etc" 90 90 "--localstatedir=/var" 91 91 "--with-dbusconfdir=${placeholder "out"}/share" 92 92 "--with-dbusdatadir=${placeholder "out"}/share"