From 91298bbfe55c88d958416b86cee0be5734ae9050 Mon Sep 17 00:00:00 2001 From: "Alexander \"PapaTutuWawa" Date: Wed, 2 Feb 2022 20:35:20 +0100 Subject: [PATCH] sublime: Remove the no-test version --- hosts/miku.nix | 4 +- .../audio/sublime-music/default.nix | 91 ------------------- packages/default.nix | 3 - 3 files changed, 1 insertion(+), 97 deletions(-) delete mode 100644 packages/applications/audio/sublime-music/default.nix diff --git a/hosts/miku.nix b/hosts/miku.nix index f0f9171..75eaf5b 100644 --- a/hosts/miku.nix +++ b/hosts/miku.nix @@ -24,7 +24,6 @@ gajim-mainwindow virt-manager qemu scream replaysorcery # Custom package - #evdev-proxy # Custom package vfio-isolate # Custom Package steam-wrapped discord-wrapped # Custom package mumble @@ -32,12 +31,11 @@ trackma # Custom package anime-dl # Custom package thunderbird - #multimc-wrapped # Custom package #nwg-launchers gnome-podcasts cantata newsflash - sublime-music-no-test + sublime-music anki #psst ]; diff --git a/packages/applications/audio/sublime-music/default.nix b/packages/applications/audio/sublime-music/default.nix deleted file mode 100644 index 99c9bef..0000000 --- a/packages/applications/audio/sublime-music/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ fetchFromGitLab -, lib -, python3Packages -, gobject-introspection -, gtk3 -, pango -, wrapGAppsHook -, xvfb-run -, chromecastSupport ? false -, serverSupport ? false -, keyringSupport ? true -, notifySupport ? true, libnotify -, networkSupport ? true, networkmanager -}: - -python3Packages.buildPythonApplication rec { - pname = "sublime-music"; - version = "0.11.16"; - format = "pyproject"; - - src = fetchFromGitLab { - owner = "sublime-music"; - repo = pname; - rev = "v${version}"; - sha256 = "0n06x7l4i9nqbc74yhrjgg10zffdb75jz43mbxd03hr5057fdglz"; - }; - - nativeBuildInputs = [ - gobject-introspection - python3Packages.poetry-core - wrapGAppsHook - ]; - - buildInputs = [ - gtk3 - pango - ] - ++ lib.optional notifySupport libnotify - ++ lib.optional networkSupport networkmanager - ; - - propagatedBuildInputs = with python3Packages; [ - bleach - dataclasses-json - deepdiff - fuzzywuzzy - mpv - peewee - pygobject3 - python-Levenshtein - python-dateutil - requests - semver - ] - ++ lib.optional chromecastSupport PyChromecast - ++ lib.optional keyringSupport keyring - ++ lib.optional serverSupport bottle - ; - - # hook for gobject-introspection doesn't like strictDeps - # https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - - # Use the test suite provided by the upstream project. - doCheck = false; - checkInputs = with python3Packages; [ - pytest - pytest-cov - ]; - checkPhase = "${xvfb-run}/bin/xvfb-run pytest"; - - # Also run the python import check for sanity - #pythonImportsCheck = [ "sublime_music" ]; - - postInstall = '' - install -Dm444 sublime-music.desktop -t $out/share/applications - install -Dm444 sublime-music.metainfo.xml -t $out/share/metainfo - - for size in 16 22 32 48 64 72 96 128 192 512 1024; do - install -Dm444 logo/rendered/"$size".png \ - $out/share/icons/hicolor/"$size"x"$size"/apps/sublime-music.png - done - ''; - - meta = with lib; { - description = "GTK3 Subsonic/Airsonic client"; - homepage = "https://sublimemusic.app/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ albakham sumnerevans ]; - }; -} diff --git a/packages/default.nix b/packages/default.nix index 9001d39..895a784 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -46,9 +46,6 @@ in { swaync = prev.callPackage ./tools/desktop/swaync {}; - # TODO: Remove once NixOS has version 0.11.16 in their repos - sublime-music-no-test = prev.callPackage ./applications/audio/sublime-music {}; - sound-gambit = prev.callPackage tools/audio/sound-gambit {}; ebu-norm = prev.callPackage tools/audio/ebu-norm {};