Unverified Commit 3f1bb546 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

Merge pull request #299762 from autrimpo/gonic-0.16.3 

gonic: 0.15.2 -> 0.16.4
parents b34f3771 ef95bc2e

nixos/doc/manual/release-notes/rl-2405.section.md

+2 −0
Original line number Diff line number Diff line
@@ -287,6 +287,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m 
  release notes of [v19](https://github.com/systemd/mkosi/releases/tag/v19) and

  [v20](https://github.com/systemd/mkosi/releases/tag/v20) for a list of changes.



- `gonic` has been updated to v0.16.4. Config now requires `playlists-path` to be set. See the rest of the [v0.16.0 release notes](https://github.com/sentriz/gonic/releases/tag/v0.16.0) for more details.



- The `services.vikunja` systemd service now uses `vikunja` as dynamic user instead of `vikunja-api`. Database users might need to be changed.



- The `services.vikunja.setupNginx` setting has been removed. Users now need to setup the webserver configuration on their own with a proxy pass to the vikunja service.

nixos/modules/services/audio/gonic.nix

+3 −0
Original line number Diff line number Diff line
@@ -55,6 +55,9 @@ in 
        RuntimeDirectory = "gonic";

        RootDirectory = "/run/gonic";

        ReadWritePaths = "";

        BindPaths = [

          cfg.settings.playlists-path

        ];

        BindReadOnlyPaths = [

          # gonic can access scrobbling services

          "-/etc/resolv.conf"

nixos/tests/gonic.nix

+10 −2
Original line number Diff line number Diff line
@@ -2,11 +2,19 @@ import ./make-test-python.nix ({ pkgs, ... }: { 
  name = "gonic";



  nodes.machine = { ... }: {

    systemd.tmpfiles.settings = {

      "10-gonic" = {

        "/tmp/music"."d" = {};

        "/tmp/podcast"."d" = {};

        "/tmp/playlists"."d" = {};

      };

    };

    services.gonic = {

      enable = true;

      settings = {

        music-path = [ "/tmp" ];

        podcast-path = "/tmp";

        music-path = [ "/tmp/music" ];

        podcast-path = "/tmp/podcast";

        playlists-path = "/tmp/playlists";

      };

    };

  };

pkgs/servers/gonic/default.nix

+9 −4
Original line number Diff line number Diff line
@@ -13,17 +13,17 @@ 


buildGoModule rec {

  pname = "gonic";

  version = "0.15.2";

  version = "0.16.4";

  src = fetchFromGitHub {

    owner = "sentriz";

    repo = pname;

    rev = "v${version}";

    sha256 = "sha256-lyKKD6Rxr4psFUxqGTtqQ3M/vQXoNPbcg0cTam9MkXk=";

    sha256 = "sha256-+8rKODoADU2k1quKvbijjs/6S/hpkegHhG7Si0LSE0k=";

  };



  nativeBuildInputs = [ pkg-config ];

  buildInputs = [ taglib zlib ];

  vendorHash = "sha256-+PUKPqW+ER7mmZXrDIc0cE4opoTxA3po3WXSeZO+Xwo=";

  vendorHash = "sha256-6JkaiaAgtXYAZqVSRZJFObZvhEsHsbPaO9pwmKqIhYI=";



  # TODO(Profpatsch): write a test for transcoding support,

  # since it is prone to break
@@ -39,6 +39,11 @@ buildGoModule rec { 
      --replace \

        '"mpv"' \

        '"${lib.getBin mpv}/bin/mpv"'

  '' + ''

    substituteInPlace server/ctrlsubsonic/testdata/test* \

      --replace \

        '"audio/flac"' \

        '"audio/x-flac"'

  '';



  passthru = {
@@ -49,7 +54,7 @@ buildGoModule rec { 
    homepage = "https://github.com/sentriz/gonic";

    description = "Music streaming server / subsonic server API implementation";

    license = lib.licenses.gpl3Plus;

    maintainers = with lib.maintainers; [ ];

    maintainers = with lib.maintainers; [ autrimpo ];

    platforms = lib.platforms.linux;

    mainProgram = "gonic";

  };