From c27941ae27379bb71c407446071d42ec178a2356 Mon Sep 17 00:00:00 2001 From: hqurve Date: Sun, 1 Jan 2023 20:19:03 -0400 Subject: [PATCH 1/5] qgis, qgis-ltr: disable qtwebkit by default qtwebkit has been marked has having known vulnerabilities. Since qtlocation was propagated by qtwebkit, it now needs to be explicitly added. See also: https://github.com/archlinux/svntogit-community/commit/783d52696588264257eed9d32c9fd212d0fdeace --- pkgs/applications/gis/qgis/unwrapped-ltr.nix | 4 +++- pkgs/applications/gis/qgis/unwrapped.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index da26f266f4c2..919b945e80cf 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -29,11 +29,12 @@ , qtkeychain , qt3d , qscintilla +, qtlocation , qtserialport , qtxmlpatterns , withGrass ? true , grass -, withWebKit ? true +, withWebKit ? false , qtwebkit , pdal , zstd @@ -111,6 +112,7 @@ in mkDerivation rec { qca-qt5 qtkeychain qscintilla + qtlocation qtserialport qtxmlpatterns qt3d diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 047173f00f30..4df5f9178ce5 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -29,11 +29,12 @@ , qtkeychain , qt3d , qscintilla +, qtlocation , qtserialport , qtxmlpatterns , withGrass ? true , grass -, withWebKit ? true +, withWebKit ? false , qtwebkit , pdal , zstd @@ -111,6 +112,7 @@ in mkDerivation rec { qca-qt5 qtkeychain qscintilla + qtlocation qtserialport qtxmlpatterns qt3d From a455e67b0d8b116badcce7bd704ae94056edf618 Mon Sep 17 00:00:00 2001 From: hqurve Date: Sun, 1 Jan 2023 20:23:58 -0400 Subject: [PATCH 2/5] qgis, qgis-ltr: fix grass --- pkgs/applications/gis/qgis/unwrapped-ltr.nix | 6 +++++- pkgs/applications/gis/qgis/unwrapped.nix | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index 919b945e80cf..2e848725cdd2 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -136,7 +136,11 @@ in mkDerivation rec { "-DWITH_3D=True" "-DWITH_PDAL=TRUE" ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" - ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/grass78"; + ++ lib.optional withGrass (let + gmajor = lib.versions.major grass.version; + gminor = lib.versions.minor grass.version; + in "-DGRASS_PREFIX${gmajor}=${grass}/grass${gmajor}${gminor}" + ); dontWrapGApps = true; # wrapper params passed below diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 4df5f9178ce5..252bf09a638d 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -136,7 +136,11 @@ in mkDerivation rec { "-DWITH_3D=True" "-DWITH_PDAL=TRUE" ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" - ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/grass78"; + ++ lib.optional withGrass (let + gmajor = lib.versions.major grass.version; + gminor = lib.versions.minor grass.version; + in "-DGRASS_PREFIX${gmajor}=${grass}/grass${gmajor}${gminor}" + ); dontWrapGApps = true; # wrapper params passed below From 25f2a8d306ec9c129488818163d4de684e4e708f Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 11 Feb 2023 17:03:26 +0200 Subject: [PATCH 3/5] tevent: copy cross fix from talloc & add libxcrypt testing pyembed configuration : Could not build a python embedded interpreter tevent-aarch64-unknown-linux-gnu> In file included from ../../pytevent.c:26: tevent-aarch64-unknown-linux-gnu> ../../lib/replace/replace.h:885:10: fatal error: crypt.h: No such file or directory tevent-aarch64-unknown-linux-gnu> 885 | #include tevent-aarch64-unknown-linux-gnu> | ^~~~~~~~~ tevent-aarch64-unknown-linux-gnu> compilation terminated. (cherry picked from commit 30826d6035ffff0ccc16b53f5f42111661214882) --- pkgs/development/libraries/tevent/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index f10235650c4a..7b798d00b01e 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -10,6 +10,7 @@ , docbook_xml_dtd_42 , which , wafHook +, libxcrypt }: stdenv.mkDerivation rec { @@ -36,6 +37,7 @@ stdenv.mkDerivation rec { cmocka readline # required to build python talloc + libxcrypt ]; # otherwise the configure script fails with @@ -52,6 +54,11 @@ stdenv.mkDerivation rec { "--builtin-libraries=replace" ]; + # python-config from build Python gives incorrect values when cross-compiling. + # If python-config is not found, the build falls back to using the sysconfig + # module, which works correctly in all cases. + PYTHON_CONFIG = "/invalid"; + meta = with lib; { description = "An event system based on the talloc memory management library"; homepage = "https://tevent.samba.org/"; From 7840aefcdb0c599936af0803732737d78e37415c Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 11 Feb 2023 17:52:13 +0200 Subject: [PATCH 4/5] ldb: fix cross & add libxcrypt ERROR: Python module pytdb of version 1.4.7 not found, and bundling disabled (cherry picked from commit 0d4a49af8670cf2adf2e23a65830ca4e0bdbe4b2) --- pkgs/development/libraries/ldb/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index 37856f5a0130..bdd630103e37 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -12,6 +12,7 @@ , docbook_xml_dtd_42 , cmocka , wafHook +, libxcrypt }: stdenv.mkDerivation rec { @@ -32,6 +33,8 @@ stdenv.mkDerivation rec { libxslt docbook-xsl-nons docbook_xml_dtd_42 + tdb + tevent ]; buildInputs = [ @@ -42,6 +45,7 @@ stdenv.mkDerivation rec { tevent popt cmocka + libxcrypt ]; # otherwise the configure script fails with From c51b7157ed54331bcc5d6f455b7d598908a7b713 Mon Sep 17 00:00:00 2001 From: Moritz 'e1mo' Fromm Date: Wed, 22 Feb 2023 21:46:23 +0100 Subject: [PATCH 5/5] molly-guard: Reduce closure size by stripping unneeded dependeicies (cherry picked from commit f165ce37c0dde1c89b09bcf09406bbb975889aad) --- pkgs/os-specific/linux/molly-guard/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/molly-guard/default.nix b/pkgs/os-specific/linux/molly-guard/default.nix index de396e4f5c76..1100751f451e 100644 --- a/pkgs/os-specific/linux/molly-guard/default.nix +++ b/pkgs/os-specific/linux/molly-guard/default.nix @@ -11,10 +11,8 @@ stdenv.mkDerivation rec { buildInputs = [ dpkg ]; - sourceRoot = "."; - unpackCmd = '' - dpkg-deb -x "$src" . + dpkg-deb -x "$src" source ''; installPhase = ''