diff --git a/outputs.nix b/outputs.nix index d07a848..79d9a9b 100644 --- a/outputs.nix +++ b/outputs.nix @@ -54,7 +54,7 @@ in packages = { inherit (pkgs) comic-code comic-sans; inherit (pkgs) mk-enc-usb mk-encrypted-drive mk-raspberry-ext-drive; - inherit (pkgs) gotosocial grocy mpd-headless owncast; + inherit (pkgs) gotosocial mpd-headless owncast; inherit (pkgs) kitty-terminfo; }; } diff --git a/overlay/default.nix b/overlay/default.nix index 27f7876..c83b4a6 100644 --- a/overlay/default.nix +++ b/overlay/default.nix @@ -13,32 +13,6 @@ final: prev: rec { cp -r ${./kitty-terminfo}/* $out/share ''; - # latest version - # to generate zip: - # nix-shell -p stdenv php phpPackages.composer nodejs yarn - # yarn install --frozen-lockfile --modules-folder public/packages --production - # composer install --no-interaction --no-dev --optimize-autoloader - # bsdtar cvaf ../Projects/nixfiles/overlay/grocy-9f94ba55a4a5ad91a442800d6734ee6968847d3b.zip . - # - # this includes a bunch of unneeded files - # but we cba to go through the bat file - # the author uses to figure out what all the 7z commands do) - grocy = prev.grocy.overrideAttrs (_old: let - version = "4.2.0"; - hash = ""; - in rec { - inherit version; - src = final.fetchurl { - url = "https://github.com/grocy/grocy/releases/download/v${version}/grocy_${version}.zip"; - hash = "sha256-3ci1hB+Q1B8c6Tz4v5r1jX7n5lG1cFWaMjBi7smnndk="; - }; - nativeBuildInputs = [final.unzip]; - unpackPhase = '' - unzip ${src} -d . - ''; - patches = [./grocy-env-variables.diff]; - }); - mpd-headless = (prev.mpdWithFeatures.override { ffmpeg = final.ffmpeg_6-headless;