From b0372cefc4cf6d088219fc137534fb18055aa405 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 19 Dec 2020 15:40:49 +0000 Subject: [PATCH 1/4] connman: set sysconfdir to /etc If sysconfdir is set to something in connman's prefix, it's not possible to change the configuration (at least without providing a flag to connman). --- pkgs/tools/networking/connman/connman.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/connman/connman.nix b/pkgs/tools/networking/connman/connman.nix index d8380340caea..c6792ecfd3b6 100644 --- a/pkgs/tools/networking/connman/connman.nix +++ b/pkgs/tools/networking/connman/connman.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { configureFlags = [ # directories flags - "--sysconfdir=${placeholder "out"}/etc" + "--sysconfdir=/etc" "--localstatedir=/var" "--with-dbusconfdir=${placeholder "out"}/share" "--with-dbusdatadir=${placeholder "out"}/share" From e2756c59000397ced8556b8eb9955e22361457c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 6 Apr 2021 23:55:01 +0200 Subject: [PATCH 2/4] pyspread: 1.99.5 -> 1.99.6 https://gitlab.com/pyspread/pyspread/-/tags/v1.99.6 --- pkgs/applications/office/pyspread/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/pyspread/default.nix b/pkgs/applications/office/pyspread/default.nix index 2efb09a143c4..54d3b8f5c3e2 100644 --- a/pkgs/applications/office/pyspread/default.nix +++ b/pkgs/applications/office/pyspread/default.nix @@ -8,11 +8,11 @@ python3.pkgs.buildPythonApplication rec { pname = "pyspread"; - version = "1.99.5"; + version = "1.99.6"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "sha256-05bC+Uvx72FAh3qxkgXm8jdb/gHRv1D/M7tjOEdE3Xg="; + sha256 = "sha256-B1oyWUAXn63mmVFN9brJwbHxi7I5nYrK2JJU1DjAlb8="; }; patches = [ @@ -35,10 +35,12 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ dateutil + markdown2 matplotlib numpy pyenchant pyqt5 + setuptools ]; doCheck = false; # it fails miserably with a core dump From 551f1dac036211663b8ba3e940255038a4de2227 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 6 Apr 2021 22:34:14 +0000 Subject: [PATCH 3/4] xorg.xf86inputlibinput: 0.30.0 -> 1.0.0 https://lists.x.org/archives/xorg-announce/2021-April/003079.html --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 11dcd57d9cc6..47355a5dcf9b 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1717,11 +1717,11 @@ lib.makeScope newScope (self: with self; { }) {}; 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; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-input-libinput-0.30.0.tar.bz2"; - sha256 = "1h4np66p87jf0c85ig524w8f5rbhl5gx8fww1qg0c55f87yzkizr"; + url = "mirror://xorg/individual/driver/xf86-input-libinput-1.0.0.tar.bz2"; + sha256 = "0x4ay9y2clm2bql3myqnvhmikjbpzy95c800qiva8pg6dbvc4mgg"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 1da718095027..dcf68ef097e8 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -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-joystick-1.6.3.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-synaptics-1.9.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 From 4cb48cc25622334f17ec6b9bf56e83de0d521fb7 Mon Sep 17 00:00:00 2001 From: hjones2199 Date: Tue, 6 Apr 2021 19:39:37 -0500 Subject: [PATCH 4/4] indilib: set platform to linux (#118696) Co-authored-by: Sandro --- .../development/libraries/science/astronomy/indilib/default.nix | 2 +- .../libraries/science/astronomy/indilib/indi-3rdparty.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/astronomy/indilib/default.nix b/pkgs/development/libraries/science/astronomy/indilib/default.nix index da4ba218fdfa..f7966046fa87 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/default.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/default.nix @@ -51,6 +51,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/indilib/indi/releases/tag/v${version}"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ hjones2199 ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix index e6e82bc02497..34ef40887135 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix @@ -59,6 +59,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/indilib/indi-3rdparty/releases/tag/v${version}"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ hjones2199 ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; }; }