Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2d9eb216020f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 95a3c8d151b0
Choose a head ref
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on Sep 30, 2019

  1. qscintilla: Use both .so and _qt5.so suffix 

    Make sure that the both libqscintilla2_qt5.so and libqscintilla2.so are
present in `$out/lib` so all the dependant packages can find the most
appropriate library (some except the empty suffix, such as
sqlitebrowser, other expect the _qt5 suffix such as
python3Packages.qscintilla-qt5).

The mechanism would also work work for qt4 build, but it is broken at
the moment.

Also make sure python*Packages.qscintilla* are up to date
    @lsix
    lsix committed Sep 30, 2019
    Copy the full SHA
    4bf49d9 View commit details

  2. python3Packages.qscintilla-qt5: fix build

    @lsix
    lsix committed Sep 30, 2019
    Copy the full SHA
    edc638c View commit details

Commits on Oct 2, 2019

  1. qgis: 3.8.0 -> 3.8.3

    @lsix
    lsix committed Oct 2, 2019
    Copy the full SHA
    5d8ec9b View commit details

Commits on Oct 3, 2019

  1. Merge pull request #68375 from lsix/qgis-3.8.2 

    qgis: 3.8.0 -> 3.8.3
    @peterhoeg
    peterhoeg authored Oct 3, 2019
    Copy the full SHA
    95a3c8d View commit details
18 changes: 9 additions & 9 deletions pkgs/applications/gis/qgis/unwrapped.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, cmake, ninja, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl
{ mkDerivation, lib, fetchFromGitHub, cmake, ninja, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl
, qwt, fcgi, python3Packages, libspatialindex, libspatialite, postgresql
, txt2tags, openssl, libzip, hdf5, netcdf, exiv2
, qtbase, qtwebkit, qtsensors, qca-qt5, qtkeychain, qscintilla, qtserialport, qtxmlpatterns
@@ -9,16 +9,16 @@ let
pythonBuildInputs = with python3Packages;
[ qscintilla-qt5 gdal jinja2 numpy psycopg2
chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ];
in stdenv.mkDerivation rec {
version = "3.8.0";
in mkDerivation rec {
version = "3.8.3";
pname = "qgis";
name = "${pname}-unwrapped-${version}";

src = fetchFromGitHub {
owner = "qgis";
repo = "QGIS";
rev = "final-${lib.replaceStrings ["."] ["_"] version}";
sha256 = "11jqj6lavpw9piv0rm8vvbgd99zhcxl6yfjg699wlrjlyf71xac5";
sha256 = "16axjih48qn8ri3p71d8f7k0y3rd05wghmg1fcbyda871b45b2f8";
};

passthru = {
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ openssl proj geos xlibsWrapper sqlite gsl qwt exiv2
fcgi libspatialindex libspatialite postgresql txt2tags libzip hdf5 netcdf
qtbase qtwebkit qtsensors qca-qt5 qtkeychain qscintilla qtserialport qtxmlpatterns] ++
(stdenv.lib.optional withGrass grass) ++ pythonBuildInputs;
(lib.optional withGrass grass) ++ pythonBuildInputs;

nativeBuildInputs = [ cmake flex bison ninja ];

@@ -45,13 +45,13 @@ in stdenv.mkDerivation rec {
cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/share/sip/PyQt5"
"-DQSCI_SIP_DIR=${python3Packages.qscintilla-qt5}/share/sip/PyQt5" ] ++
stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}";
lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}";

meta = {
description = "A Free and Open Source Geographic Information System";
homepage = http://www.qgis.org;
license = stdenv.lib.licenses.gpl2Plus;
platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [ lsix ];
license = lib.licenses.gpl2Plus;
platforms = with lib.platforms; linux;
maintainers = with lib.maintainers; [ lsix ];
};
}
11 changes: 6 additions & 5 deletions pkgs/development/libraries/qscintilla/default.nix
View file
Original file line number Diff line number Diff line change
@@ -34,15 +34,16 @@ in stdenv.mkDerivation rec {

patches = lib.optional (stdenv.isDarwin && withQt5) [ xcodePatch ];

# Make sure that libqscintilla2.so is available in $out/lib since it is expected
# by some packages such as sqlitebrowser
postFixup = ''
ln -s $out/lib/libqscintilla2_qt?.so $out/lib/libqscintilla2.so
'';

enableParallelBuilding = true;

# By default qscintilla will name the library with a qt version suffix which
# confuses the crap out of sqlitebrowser and possibly others so we simply
# strip the suffix as we don't need it and the various FindQScintilla.cmake
# files floating around *should* look for the un-suffixed version.
postPatch = ''
substituteInPlace qscintilla.pro \
--replace '_qt$''${QT_MAJOR_VERSION}' "" \
--replace '$$[QT_INSTALL_LIBS]' $out/lib \
--replace '$$[QT_INSTALL_HEADERS]' $out/include \
--replace '$$[QT_INSTALL_TRANSLATIONS]' $out/translations \
8 changes: 8 additions & 0 deletions pkgs/development/python-modules/qscintilla-qt5/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,6 +15,13 @@ buildPythonPackage {
buildInputs = [ qscintilla ];
propagatedBuildInputs = [ pyqt5 ];

postPatch = ''
substituteInPlace Python/configure.py \
--replace \
"target_config.py_module_dir" \
"'$out/${python.sitePackages}'"
'';

preConfigure = ''
mkdir -p $out
lndir ${pyqt5} $out
@@ -26,6 +33,7 @@ buildPythonPackage {
--stubsdir=$out/${python.sitePackages}/PyQt5 \
--apidir=$out/api/${python.libPrefix} \
--qsci-incdir=${qscintilla}/include \
--qsci-featuresdir=${qscintilla}/mkspecs/features \
--qsci-libdir=${qscintilla}/lib \
--pyqt-sipdir=${pyqt5}/share/sip/PyQt5 \
--qsci-sipdir=$out/share/sip/PyQt5 \