Unverified Commit 66bb8338 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents dd1ff149 70d8e51d

maintainers/maintainer-list.nix

+9 −0
Original line number Diff line number Diff line
@@ -14124,6 +14124,15 @@ 
    githubId = 5991987;

    name = "Alexander Sosedkin";

  };

  t4ccer = {

    email = "t4ccer@gmail.com";

    github = "t4ccer";

    githubId = 64430288;

    name = "Tomasz Maciosowski";

    keys = [{

      fingerprint = "6866 981C 4992 4D64 D154  E1AC 19E5 A2D8 B1E4 3F19";

    }];

  };

  tadeokondrak = {

    email = "me@tadeo.ca";

    github = "tadeokondrak";

nixos/doc/manual/configuration/config-file.section.md

+1 −1
Original line number Diff line number Diff line
@@ -170,6 +170,6 @@ Packages 
    ```



    The latter option definition changes the default PostgreSQL package

    used by NixOS's PostgreSQL service to 10.x. For more information on

    used by NixOS's PostgreSQL service to 14.x. For more information on

    packages, including how to add new ones, see

    [](#sec-custom-packages).

nixos/doc/manual/from_md/configuration/config-file.section.xml

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ services.postgresql.package = pkgs.postgresql_14; 
</programlisting>

        <para>

          The latter option definition changes the default PostgreSQL

          package used by NixOS’s PostgreSQL service to 10.x. For more

          package used by NixOS’s PostgreSQL service to 14.x. For more

          information on packages, including how to add new ones, see

          <xref linkend="sec-custom-packages" />.

        </para>

pkgs/applications/audio/go-musicfox/default.nix

0 → 100644
+50 −0
Original line number Diff line number Diff line 
{ lib

, fetchFromGitHub

, buildGoModule

, clangStdenv

, pkg-config

, alsa-lib

, flac

}:



# gcc only supports objc on darwin

buildGoModule.override { stdenv = clangStdenv; } rec {

  pname = "go-musicfox";

  version = "3.6.1";



  src = fetchFromGitHub {

    owner = "anhoder";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-iinEo+HrcNM3gx1iUqe1duRd45PrYgVybRt9NKphwuY=";

  };



  deleteVendor = true;



  vendorHash = "sha256-DbdAEvcspTYMYMvc5IBEUtQAJMW8JZpNi0UA/DvzGFo=";



  subPackages = [ "cmd/musicfox.go" ];



  ldflags = [

    "-s"

    "-w"

    "-X go-musicfox/pkg/constants.AppVersion=${version}"

  ];



  nativeBuildInputs = [

    pkg-config

  ];



  buildInputs = [

    alsa-lib

    flac

  ];



  meta = with lib; {

    description = "Terminal netease cloud music client written in Go";

    homepage = "https://github.com/anhoder/go-musicfox";

    license = licenses.mit;

    mainProgram = "musicfox";

    maintainers = with maintainers; [ zendo ];

  };

}

pkgs/applications/editors/standardnotes/src.json

+5 −5
Original line number Diff line number Diff line 
{

  "version": "3.139.0",

  "version": "3.142.1",

  "appimage": {

    "x86_64-linux": {

      "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.139.0/standard-notes-3.139.0-linux-x86_64.AppImage",

      "hash": "sha512-0s/tQmP5PINoQB7FOhR5wYuBvynKHpM9uMNmkJs77z84rY+WXOdZRjki6ZeG60niNXr8rUSLOBffy4jyLka6tg=="

      "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.142.1/standard-notes-3.142.1-linux-x86_64.AppImage",

      "hash": "sha512-tf6vk108RMnxk7ZCFIAbWnlTvQqCkU6NtG+JCmMK/oR+/N3T5TDaHyufNJ9yVIh9pZrmaKMHjDUdCUgGc7lIRA=="

    },

    "aarch64-linux": {

      "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.139.0/standard-notes-3.139.0-linux-arm64.AppImage",

      "hash": "sha512-LralbOiIVQCtQTqmhTtKttdtMz4M14drPFZ00LPFcwzQviLdU2C/od3NUxf5H5piGgqt5TJlgMCOcLIiyoNKFA=="

      "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.142.1/standard-notes-3.142.1-linux-arm64.AppImage",

      "hash": "sha512-wQYeWUDLbthgcWPWcz5TbqR1rk3OkdISr/SsdbbrLIyroAaXppg+7FA/FbPW7wlrksiMKowJ/hAPQz1NIxSRZg=="

    }

  }

}