Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: da0692246671
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: eaf06c30ace7
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 29, 2020

  1. OSCAR: init at 1.2.0

    @roconnor
    roconnor committed Oct 29, 2020
    Copy the full SHA
    069e485 View commit details

Commits on Nov 1, 2020

  1. Merge pull request #101945 from roconnor/OSCAR 

    OSCAR: init at 1.2.0
    @roconnor
    roconnor authored Nov 1, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    eaf06c3 View commit details
Showing with 48 additions and 0 deletions.
  1. +46 −0 pkgs/applications/misc/OSCAR/default.nix
  2. +2 −0 pkgs/top-level/all-packages.nix
46 changes: 46 additions & 0 deletions pkgs/applications/misc/OSCAR/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{ stdenv, mkDerivation, fetchFromGitLab, qmake, qtbase, qttools, qtserialport, libGLU }:
mkDerivation rec {
pname = "OSCAR";
version = "1.2.0";

src = fetchFromGitLab {
owner = "pholy";
repo = "OSCAR-code";
rev = "v${version}";
sha256 = "10r37d8c2avr167n2s9lhld1c9hmckm444fq163z1jsy9jpid6mg";
};

buildInputs = [ qtbase qttools qtserialport libGLU ];
nativeBuildInputs = [ qmake ];
postPatch = ''
substituteInPlace oscar/oscar.pro --replace "/bin/bash" "${stdenv.shell}"
'';

qmakeFlags = [ "OSCAR_QT.pro" ];

installPhase = ''
install -d $out/bin
install -d $out/share/OSCAR/Help
install -d $out/share/OSCAR/Html
install -d $out/share/OSCAR/Translations
install -d $out/share/icons/OSCAR
install -d $out/share/applications
install -T oscar/OSCAR $out/bin/OSCAR
# help browser was removed 'temporarily' in https://gitlab.com/pholy/OSCAR-code/-/commit/57c3e4c33ccdd2d0eddedbc24c0e4f2969da3841
# install oscar/Help/* $out/share/OSCAR/Help
install oscar/Html/* $out/share/OSCAR/Html
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
'';

meta = with stdenv.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;
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;
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -27544,6 +27544,8 @@ in

opkg-utils = callPackage ../tools/package-management/opkg-utils { };

OSCAR = qt5.callPackage ../applications/misc/OSCAR { };

pgmanage = callPackage ../applications/misc/pgmanage { };

pgadmin = callPackage ../applications/misc/pgadmin {