From e68fc84783b5d7b962203758cfec1f49d9226acd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 25 Feb 2022 05:24:23 -0800 Subject: [PATCH] OSCAR: 1.3.0 -> 1.3.1 * OSCAR: 1.3.0 -> 1.3.1 (#159715) * OSCAR: use SPDX3 license identifier and define eligible platforms using the proper attributes Co-authored-by: Renaud --- pkgs/applications/misc/OSCAR/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/OSCAR/default.nix b/pkgs/applications/misc/OSCAR/default.nix index 92eeeb142cc..9b5d2e68ad9 100644 --- a/pkgs/applications/misc/OSCAR/default.nix +++ b/pkgs/applications/misc/OSCAR/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, mkDerivation, fetchFromGitLab, qmake, qtbase, qttools, qtserialport, libGLU }: mkDerivation rec { pname = "OSCAR"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitLab { owner = "pholy"; repo = "OSCAR-code"; rev = "v${version}"; - sha256 = "sha256-oKKwX5HiT8RACiqzZegOxH6IHQn/u0N4ih/ubH6YYjg="; + sha256 = "sha256-/70NoyiQ33RFdSTBAyi5c/JPZ2AV1/iRvkAZ6VjpUXw="; }; buildInputs = [ qtbase qttools qtserialport libGLU ]; @@ -19,6 +19,7 @@ mkDerivation rec { qmakeFlags = [ "OSCAR_QT.pro" ]; installPhase = '' + runHook preInstall install -d $out/bin install -d $out/share/OSCAR/Help install -d $out/share/OSCAR/Html @@ -32,15 +33,16 @@ mkDerivation rec { install oscar/Translations/* $out/share/OSCAR/Translations install -T Building/Linux/OSCAR.png $out/share/icons/OSCAR/OSCAR.png install -T Building/Linux/OSCAR.desktop $out/share/applications/OSCAR.desktop + runHook postInstall ''; meta = with lib; { homepage = "https://www.sleepfiles.com/OSCAR/"; description = "Software for reviewing and exploring data produced by CPAP and related machines used in the treatment of sleep apnea"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = [ maintainers.roconnor ]; # Someone needs to create a suitable installPhase for Darwin and Windows. # See https://gitlab.com/pholy/OSCAR-code/-/tree/master/Building. - broken = !stdenv.hostPlatform.isLinux; + platforms = platforms.linux; }; }