summary refs log tree commit diff
path: root/pkgs/development/libraries/qscintilla
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2020-10-08 18:36:42 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2020-10-08 18:57:26 +0200
commitae37cb36107f573dca458c3195637d4351d1aa61 (patch)
treebc2f080c719c71398165577c2756292555a0ed21 /pkgs/development/libraries/qscintilla
parent179986f378ba6d145fe3bd4c1c011bab1537760b (diff)
downloadnixpkgs-ae37cb36107f573dca458c3195637d4351d1aa61.tar
nixpkgs-ae37cb36107f573dca458c3195637d4351d1aa61.tar.gz
nixpkgs-ae37cb36107f573dca458c3195637d4351d1aa61.tar.bz2
nixpkgs-ae37cb36107f573dca458c3195637d4351d1aa61.tar.lz
nixpkgs-ae37cb36107f573dca458c3195637d4351d1aa61.tar.xz
nixpkgs-ae37cb36107f573dca458c3195637d4351d1aa61.tar.zst
nixpkgs-ae37cb36107f573dca458c3195637d4351d1aa61.zip
qscintilla: 2.11.2 -> 2.11.5, fix license
Diffstat (limited to 'pkgs/development/libraries/qscintilla')
-rw-r--r--pkgs/development/libraries/qscintilla/default.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix
index abaeba51b45..19aebd715d6 100644
--- a/pkgs/development/libraries/qscintilla/default.nix
+++ b/pkgs/development/libraries/qscintilla/default.nix
@@ -6,17 +6,17 @@
 
 let
   pname = "qscintilla-qt${if withQt5 then "5" else "4"}";
-  version = "2.11.2";
+  version = "2.11.5";
 
 in stdenv.mkDerivation rec {
   inherit pname version;
 
   src = fetchurl {
-    url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_gpl-${version}.tar.gz";
-    sha256 = "18glb2v07mwfz6p8qmwhzcaaczyc36x3gn9wx8ndm7q6d93xr6q2";
+    url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla-${version}.tar.gz";
+    sha256 = "k2Hib9f7e1gZp+uSxcGIChjem9PtndLrAI5XOIaWcWs=";
   };
 
-  sourceRoot = "QScintilla_gpl-${version}/Qt4Qt5";
+  sourceRoot = "QScintilla-${version}/Qt4Qt5";
 
   buildInputs = [ (if withQt5 then qtbase else qt4) ];
 
@@ -63,7 +63,7 @@ in stdenv.mkDerivation rec {
       background colours and multiple fonts.
     '';
     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 ];
     platforms = platforms.unix;
   };