From 467c3faac6f7cb301a394bf1e3c01e2aa1d7ddef Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Aug 2019 23:14:16 -0700 Subject: [PATCH 1/2] focuswriter: 1.7.2 -> 1.7.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/focuswriter/versions --- pkgs/applications/editors/focuswriter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index ce553fa8b28..d5b42e87f23 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "focuswriter-${version}"; - version = "1.7.2"; + version = "1.7.3"; src = fetchurl { url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2"; - sha256 = "1qsfcrscm3s0h7wcl6qn8zi0irr70zdacjxsdk73kpk1dhl2j85k"; + sha256 = "155wf7z1g2yx6fb41w29kcb0m2rhnk9ci5yw882yy86s4x20b1jq"; }; nativeBuildInputs = [ pkgconfig qmake qttools ]; From dd49b443d581a13bef941b0220746c2567f1527e Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Mon, 19 Aug 2019 09:45:00 +0200 Subject: [PATCH 2/2] focuswriter: using Qt5's mkDerivation --- pkgs/applications/editors/focuswriter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index d5b42e87f23..b08e3b5fa23 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, qmake, qttools, hunspell, qtbase, qtmultimedia }: +{ stdenv, fetchurl, pkgconfig, qmake, qttools, hunspell, qtbase, qtmultimedia, mkDerivation }: -stdenv.mkDerivation rec { - name = "focuswriter-${version}"; +mkDerivation rec { + pname = "focuswriter"; version = "1.7.3"; src = fetchurl {