From be769aa2d069ee7a3cf435676ef02dfca90fe17e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Mar 2021 10:37:28 +0000 Subject: [PATCH 1/2] qcad: 3.25.2.0 -> 3.26.0.1 --- pkgs/applications/misc/qcad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index c6b9d82bcf4..bc927c48598 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -15,13 +15,13 @@ mkDerivationWith stdenv.mkDerivation rec { pname = "qcad"; - version = "3.25.2.0"; + version = "3.26.0.1"; src = fetchFromGitHub { owner = "qcad"; repo = "qcad"; rev = "v${version}"; - sha256 = "1lz6q9n2p0l7k8rwqsdj6av9p3426423g5avc4y6s7nbk36280mz"; + sha256 = "sha256-V+QlwM8BWmcarwZtqJfc+MYHOZgIH1W5R8m2EHhNJls="; }; patches = [ From dbeb068a0ebb64a80b139976481a361008e4d2b2 Mon Sep 17 00:00:00 2001 From: Yves Fischer Date: Thu, 18 Mar 2021 00:19:39 +0100 Subject: [PATCH 2/2] qcad: apply r-rmcgibbo suggestions --- pkgs/applications/misc/qcad/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index bc927c48598..6b2418ab57c 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -25,6 +25,7 @@ mkDerivationWith stdenv.mkDerivation rec { }; patches = [ + # Patch directory lookup, remove __DATE__ and executable name ./application-dir.patch ]; @@ -90,12 +91,10 @@ mkDerivationWith stdenv.mkDerivation rec { qttools ]; - enableParallelBuilding = true; - meta = with lib; { description = "2D CAD package based on Qt"; homepage = "https://qcad.org"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ yvesf ]; platforms = qtbase.meta.platforms; };