novelwriter: 2.6.3 -> 2.7.4 (#430843)

authored by Peder Bergebakken Sundt and committed by GitHub 678bc0c5 b5e97e44

+14 -19
+14 -19
pkgs/by-name/no/novelwriter/package.nix
··· 3 3 stdenv, 4 4 python3, 5 5 fetchFromGitHub, 6 - qt5, 6 + qt6, 7 7 nix-update-script, 8 8 }: 9 9 let 10 - version = "2.6.3"; 10 + version = "2.7.4"; 11 11 in 12 12 python3.pkgs.buildPythonApplication { 13 13 pname = "novelwriter"; ··· 17 17 src = fetchFromGitHub { 18 18 owner = "vkbo"; 19 19 repo = "novelWriter"; 20 - rev = "v${version}"; 21 - hash = "sha256-262YMVqxSZv8G82amdRnHiW/5gnxkYyFSQDiS5gOdBE="; 20 + tag = "v${version}"; 21 + hash = "sha256-um8D5wqAe8KYQBG8XPKKS6iYnHsPLxSHpW710winDkY="; 22 22 }; 23 23 24 - nativeBuildInputs = [ qt5.wrapQtAppsHook ]; 24 + nativeBuildInputs = [ qt6.wrapQtAppsHook ]; 25 + buildInputs = [ qt6.qtbase ]; 25 26 26 27 build-system = with python3.pkgs; [ setuptools ]; 27 - 28 28 dependencies = with python3.pkgs; [ 29 - pyqt5 29 + pyqt6 30 30 pyenchant 31 - qt5.qtbase 32 - qt5.qtwayland 33 31 ]; 34 32 35 - preBuild = '' 36 - export QT_QPA_PLATFORM_PLUGIN_PATH=${qt5.qtbase.bin}/lib/qt-${qt5.qtbase.version}/plugins/platforms 37 - ''; 38 - 33 + # See setup/debian/install 39 34 postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' 40 - mkdir -p $out/share/{icons,applications,pixmaps,mime/packages} 41 - 35 + mkdir -p $out/share/icons 42 36 cp -r setup/data/hicolor $out/share/icons 43 - cp setup/data/novelwriter.desktop $out/share/applications 44 - cp setup/data/novelwriter.png $out/share/pixmaps 45 - cp setup/data/x-novelwriter-project.xml $out/share/mime/packages 37 + 38 + install -Dm644 setup/data/novelwriter.png -t $out/share/pixmaps 39 + install -Dm644 setup/data/novelwriter.desktop -t $out/share/applications 40 + install -Dm644 setup/data/x-novelwriter-project.xml -t $out/share/mime/packages 46 41 ''; 47 42 48 43 dontWrapQtApps = true; ··· 63 58 description = "Open source plain text editor designed for writing novels"; 64 59 homepage = "https://novelwriter.io"; 65 60 changelog = "https://github.com/vkbo/novelWriter/blob/main/CHANGELOG.md"; 66 - license = with lib.licenses; [ gpl3 ]; 61 + license = with lib.licenses; [ gpl3Only ]; 67 62 maintainers = with lib.maintainers; [ pluiedev ]; 68 63 mainProgram = "novelwriter"; 69 64