public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qscintilla: 2.11.2 -> 2.11.5, fix license

Browse Source
This commit is contained in:
Frederik Rietdijk 2020-10-08 18:36:42 +02:00
parent 179986f378
commit ae37cb3610
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/qscintilla/default.nix
View File

@ -6,17 +6,17 @@
let let
pname = "qscintilla-qt${if withQt5 then "5" else "4"}"; pname = "qscintilla-qt${if withQt5 then "5" else "4"}";
version = "2.11.2"; version = "2.11.5";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
inherit pname version; inherit pname version;
src = fetchurl { src = fetchurl {
url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_gpl-${version}.tar.gz"; url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla-${version}.tar.gz";
sha256 = "18glb2v07mwfz6p8qmwhzcaaczyc36x3gn9wx8ndm7q6d93xr6q2"; sha256 = "k2Hib9f7e1gZp+uSxcGIChjem9PtndLrAI5XOIaWcWs=";
}; };
sourceRoot = "QScintilla_gpl-${version}/Qt4Qt5"; sourceRoot = "QScintilla-${version}/Qt4Qt5";
buildInputs = [ (if withQt5 then qtbase else qt4) ]; buildInputs = [ (if withQt5 then qtbase else qt4) ];
@ -63,7 +63,7 @@ in stdenv.mkDerivation rec {
background colours and multiple fonts. background colours and multiple fonts.
''; '';
homepage = "https://www.riverbankcomputing.com/software/qscintilla/intro"; homepage = "https://www.riverbankcomputing.com/software/qscintilla/intro";
license = with licenses; [ gpl2 gpl3 ]; # and commercial license = with licenses; [ gpl3 ]; # and commercial
maintainers = with maintainers; [ peterhoeg ]; maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.unix; platforms = platforms.unix;
}; };