From 730cefd17579d0913c07c11c64514c287f680a0b Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Wed, 23 Aug 2023 14:49:34 -0500 Subject: [PATCH] Remove Mac-only overlays --- overlays/default.nix | 6 ------ overlays/mac/bitwarden.nix | 32 -------------------------------- overlays/mac/gnucash.nix | 32 -------------------------------- overlays/mac/handbrake.nix | 32 -------------------------------- overlays/mac/onlyoffice-bin.nix | 32 -------------------------------- overlays/mac/vlc.nix | 32 -------------------------------- 6 files changed, 166 deletions(-) delete mode 100644 overlays/mac/bitwarden.nix delete mode 100644 overlays/mac/gnucash.nix delete mode 100644 overlays/mac/handbrake.nix delete mode 100644 overlays/mac/onlyoffice-bin.nix delete mode 100644 overlays/mac/vlc.nix diff --git a/overlays/default.nix b/overlays/default.nix index 0906666..4dbf372 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -75,10 +75,4 @@ in rec { xontrib-vox ]; }); - - #bitwarden = macOver ./mac/bitwarden.nix "bitwarden"; - #gnucash = macOver ./mac/gnucash.nix "gnucash"; - #handbrake = macOver ./mac/handbrake.nix "handbrake"; - #onlyoffice-bin = macOver ./mac/onlyoffice-bin.nix "onlyoffice-bin"; - #vlc = macOver ./mac/vlc.nix "vlc"; } diff --git a/overlays/mac/bitwarden.nix b/overlays/mac/bitwarden.nix deleted file mode 100644 index 6c9277c..0000000 --- a/overlays/mac/bitwarden.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, - undmg, -}: - -stdenv.mkDerivation rec { - version = "2022.10.1"; - pname = "Bitwarden"; - - buildInputs = [ - undmg - ]; - sourceRoot = "."; - phases = [ - "unpackPhase" - "installPhase" - ]; - installPhase = '' - mkdir -p "$out/Applications" - cp -r Bitwarden*.app "$out/Applications" - ''; - - src = fetchurl { - name = "Bitwarden-${version}.dmg"; - url = "https://github.com/bitwarden/clients/releases/download/desktop-v${version}/Bitwarden-${version}-universal.dmg"; - sha256 = "sha256-6O8xaGBaG4d6l9QRtGM5wj9OCMFy87dH8N1MfEBBjck="; - }; - - meta = { - description = "Bitwarden, an open source password management tool"; - homepage = "https://bitwarden.com"; - }; -} diff --git a/overlays/mac/gnucash.nix b/overlays/mac/gnucash.nix deleted file mode 100644 index ea4c398..0000000 --- a/overlays/mac/gnucash.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, - undmg, -}: - -stdenv.mkDerivation rec { - version = "4.12"; - pname = "GnuCash"; - - buildInputs = [ - undmg - ]; - sourceRoot = "."; - phases = [ - "unpackPhase" - "installPhase" - ]; - installPhase = '' - mkdir -p "$out/Applications" - cp -r Gnucash*.app "$out/Applications" - ''; - - src = fetchurl { - name = "${pname}-${version}.dmg"; - url = "https://sourceforge.net/projects/gnucash/files/gnucash%20(stable)/${version}/Gnucash-Intel-${version}-1.dmg"; - sha256 = "sha256-GXsGOk+F/QdcD19ZmZmor0upCFHa7iy3Hs4CLbiby1M="; - }; - - meta = { - description = "GnuCash is free accounting software for your local machine"; - homepage = "https://www.gnucash.org"; - }; -} diff --git a/overlays/mac/handbrake.nix b/overlays/mac/handbrake.nix deleted file mode 100644 index 4ce96b1..0000000 --- a/overlays/mac/handbrake.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, - undmg, -}: - -stdenv.mkDerivation rec { - version = "1.5.1"; - pname = "HandBrake"; - - buildInputs = [ - undmg - ]; - sourceRoot = "."; - phases = [ - "unpackPhase" - "installPhase" - ]; - installPhase = '' - mkdir -p "$out/Applications" - cp -r ${pname}*.app "$out/Applications" - ''; - - src = fetchurl { - name = "${pname}-${version}.dmg"; - url = "https://github.com/HandBrake/HandBrake/releases/download/${version}/${pname}-${version}.dmg"; - sha256 = "sha256-dnyxYxTjhpxCz/eNuSvK16f6qGHHD5exMm/jaGxith8="; - }; - - meta = { - description = "HandBrake is an open source video transcoder"; - homepage = "https://handbrake.fr/"; - }; -} diff --git a/overlays/mac/onlyoffice-bin.nix b/overlays/mac/onlyoffice-bin.nix deleted file mode 100644 index c9918bf..0000000 --- a/overlays/mac/onlyoffice-bin.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, - undmg, -}: - -stdenv.mkDerivation rec { - version = "7.2.1"; - pname = "onlyoffice"; - - buildInputs = [ - undmg - ]; - sourceRoot = "."; - phases = [ - "unpackPhase" - "installPhase" - ]; - installPhase = '' - mkdir -p "$out/Applications" - cp -r *.app "$out/Applications" - ''; - - src = fetchurl { - name = "${pname}-${version}.dmg"; - url = "https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v${version}/ONLYOFFICE-x86_64.dmg"; - sha256 = "sha256-dsuTaZ+IqsDE/j78ht0Md5NoqQ090cJ4u5LClu3tSp0="; - }; - - meta = { - description = "OnlyOffice provides a suite of Office-like document editors for the desktop and web."; - homepage = "https://www.onlyoffice.com/"; - }; -} diff --git a/overlays/mac/vlc.nix b/overlays/mac/vlc.nix deleted file mode 100644 index ad9b25c..0000000 --- a/overlays/mac/vlc.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, - undmg, -}: - -stdenv.mkDerivation rec { - version = "3.0.17.3"; - pname = "vlc"; - - buildInputs = [ - undmg - ]; - sourceRoot = "."; - phases = [ - "unpackPhase" - "installPhase" - ]; - installPhase = '' - mkdir -p "$out/Applications" - cp -r *.app "$out/Applications" - ''; - - src = fetchurl { - name = "${pname}-${version}.dmg"; - url = "https://get.videolan.org/vlc/${version}/macosx/${pname}-${version}-intel64.dmg"; - sha256 = "sha256-zKJn8sUa5WjgLztNimrbqHsr3l8BGiuHxZXBAtifEdg="; - }; - - meta = { - description = "VLC is a very versatile video player."; - homepage = "https://www.videolan.org/"; - }; -}