This repository has been archived by the owner on Nov 27, 2024. It is now read-only.
generated from nix-community/nur-packages-template
-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #500 from imincik/weekly-update-2024.26
pkgs: weekly update (weekly-update-2024.26)
- Loading branch information
Showing
10 changed files
with
375 additions
and
43 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| { | ||
| rev = "a49c3d1"; | ||
| hash = "sha256-6glRv+Xtz5naR+rSkBE9q4K9NoOYMajWM7j5g7rjhRM="; | ||
| rev = "d6a7db5"; | ||
| hash = "sha256-ZUhYNpQSSTv0nDHRdWCjtQTxmCZsr74QUcqgtz/I/kc="; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| diff --git b/pkgs/pdal/default.nix a/pkgs/pdal/default.nix | ||
| index c035460..eb96889 100644 | ||
| --- b/pkgs/pdal/default.nix | ||
| +++ a/pkgs/pdal/default.nix | ||
| @@ -10,7 +10,7 @@ | ||
| , curl | ||
| , gdal | ||
| , hdf5-cpp | ||
| -, laszip | ||
| +, LASzip | ||
| , libe57format | ||
| , libgeotiff | ||
| , libtiff | ||
| @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { | ||
| curl | ||
| gdal | ||
| hdf5-cpp | ||
| - laszip | ||
| + LASzip | ||
| libgeotiff | ||
| libtiff | ||
| libxml2 | ||
| @@ -92,7 +92,6 @@ stdenv.mkDerivation (finalAttrs: { | ||
| # This test should be re-enabled once https://github.com/PDAL/PDAL/pull/4411 | ||
| # is merged ! | ||
| "pdal_io_ogr_writer_test" | ||
| - | ||
| # Tests failing due to TileDB library implementation, disabled also | ||
| # by upstream CI. | ||
| # See: https://github.com/PDAL/PDAL/blob/bc46bc77f595add4a6d568a1ff923d7fe20f7e74/.github/workflows/linux.yml#L81 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| { lib | ||
| , makeWrapper | ||
| , nixosTests | ||
| , symlinkJoin | ||
|
|
||
| , extraPythonPackages ? (ps: [ ]) | ||
| , qgis-unwrapped | ||
|
|
||
| , libsForQt5 | ||
| }: | ||
|
|
||
| symlinkJoin rec { | ||
|
|
||
| inherit (qgis-unwrapped) version; | ||
| name = "qgis-${version}"; | ||
|
|
||
| paths = [ qgis-unwrapped ]; | ||
|
|
||
| nativeBuildInputs = [ | ||
| makeWrapper | ||
| qgis-unwrapped.py.pkgs.wrapPython | ||
| ]; | ||
|
|
||
| # extend to add to the python environment of QGIS without rebuilding QGIS application. | ||
| pythonInputs = qgis-unwrapped.pythonBuildInputs ++ (extraPythonPackages qgis-unwrapped.py.pkgs); | ||
|
|
||
| postBuild = '' | ||
| # unpackPhase | ||
| buildPythonPath "$pythonInputs" | ||
| wrapProgram $out/bin/qgis \ | ||
| --prefix PATH : $program_PATH \ | ||
| --set PYTHONPATH $program_PYTHONPATH | ||
| ''; | ||
|
|
||
| passthru = { | ||
| unwrapped = qgis-unwrapped; | ||
| tests.qgis = nixosTests.qgis; | ||
| }; | ||
|
|
||
| meta = qgis-unwrapped.meta; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| diff --git a/cmake/FindPyQt5.cmake b/cmake/FindPyQt5.cmake | ||
| index b51fd0075e..87ee317e05 100644 | ||
| --- a/cmake/FindPyQt5.cmake | ||
| +++ b/cmake/FindPyQt5.cmake | ||
| @@ -25,7 +25,7 @@ ELSE(EXISTS PYQT5_VERSION_STR) | ||
| IF(SIP_BUILD_EXECUTABLE) | ||
| # SIP >= 5.0 path | ||
|
|
||
| - FILE(GLOB _pyqt5_metadata "${Python_SITEARCH}/PyQt5-*.dist-info/METADATA") | ||
| + FILE(GLOB _pyqt5_metadata "@pyQt5PackageDir@/PyQt5-*.dist-info/METADATA") | ||
| IF(_pyqt5_metadata) | ||
| FILE(READ ${_pyqt5_metadata} _pyqt5_metadata_contents) | ||
| STRING(REGEX REPLACE ".*\nVersion: ([^\n]+).*$" "\\1" PYQT5_VERSION_STR ${_pyqt5_metadata_contents}) | ||
|
|
||
| diff --git a/cmake/FindQsci.cmake b/cmake/FindQsci.cmake | ||
| index 69e41c1fe9..5456c3d59b 100644 | ||
| --- a/cmake/FindQsci.cmake | ||
| +++ b/cmake/FindQsci.cmake | ||
| @@ -24,7 +24,7 @@ ELSE(QSCI_MOD_VERSION_STR) | ||
| IF(SIP_BUILD_EXECUTABLE) | ||
| # SIP >= 5.0 path | ||
|
|
||
| - FILE(GLOB _qsci_metadata "${Python_SITEARCH}/QScintilla*.dist-info/METADATA") | ||
| + FILE(GLOB _qsci_metadata "@qsciPackageDir@/QScintilla*.dist-info/METADATA") | ||
| IF(_qsci_metadata) | ||
| FILE(READ ${_qsci_metadata} _qsci_metadata_contents) | ||
| STRING(REGEX REPLACE ".*\nVersion: ([^\n]+).*$" "\\1" QSCI_MOD_VERSION_STR ${_qsci_metadata_contents}) | ||
| @@ -33,7 +33,7 @@ ELSE(QSCI_MOD_VERSION_STR) | ||
| ENDIF(_qsci_metadata) | ||
|
|
||
| IF(QSCI_MOD_VERSION_STR) | ||
| - SET(QSCI_SIP_DIR "${PYQT_SIP_DIR}") | ||
| + SET(QSCI_SIP_DIR "@qsciPackageDir@/PyQt5/bindings") | ||
| SET(QSCI_FOUND TRUE) | ||
| ENDIF(QSCI_MOD_VERSION_STR) | ||
|
|
||
| diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt | ||
| index 4cd19c3af4..668cc6a5e6 100644 | ||
| --- a/python/CMakeLists.txt | ||
| +++ b/python/CMakeLists.txt | ||
| @@ -212,7 +212,7 @@ if (WITH_GUI) | ||
| install(FILES ${QGIS_PYTHON_OUTPUT_DIRECTORY}/_gui.pyi DESTINATION ${QGIS_PYTHON_DIR}) | ||
| endif() | ||
| if(QSCI_SIP_DIR) | ||
| - set(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -I ${QSCI_SIP_DIR}) | ||
| + set(SIP_BUILD_EXTRA_OPTIONS ${SIP_BUILD_EXTRA_OPTIONS} --include-dir=${QSCI_SIP_DIR}) | ||
| else() | ||
| message(STATUS "Qsci sip file not found - disabling bindings for derived classes") | ||
| set(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} HAVE_QSCI_SIP) |
Oops, something went wrong.