Commit 7b015fba authored by K900's avatar K900
Browse files

Merge remote-tracking branch 'origin/master' into staging-next

parents 6ff18cf3 bcea670c

nixos/modules/programs/gnupg.nix

+0 −16
Original line number Diff line number Diff line
@@ -8,22 +8,6 @@ let 
  agentSettingsFormat = pkgs.formats.keyValue {

    mkKeyValue = lib.generators.mkKeyValueDefault { } " ";

  };



  xserverCfg = config.services.xserver;



  defaultPinentryFlavor =

    if xserverCfg.desktopManager.lxqt.enable

    || xserverCfg.desktopManager.plasma5.enable

    || xserverCfg.desktopManager.plasma6.enable

    || xserverCfg.desktopManager.deepin.enable then

      "qt"

    else if xserverCfg.desktopManager.xfce.enable then

      "gtk2"

    else if xserverCfg.enable || config.programs.sway.enable then

      "gnome3"

    else

      "curses";



in

{

  imports = [

nixos/modules/services/audio/navidrome.nix

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ in 
            };

          };

        };

        default = { };

        example = {

          MusicFolder = "/mnt/music";

        };

pkgs/applications/blockchains/polkadot/Cargo.lock

+569 −667

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/applications/blockchains/polkadot/default.nix

+4 −3
Original line number Diff line number Diff line
@@ -17,13 +17,13 @@ let 
in

rustPlatform.buildRustPackage rec {

  pname = "polkadot";

  version = "1.11.0";

  version = "1.12.0";



  src = fetchFromGitHub {

    owner = "paritytech";

    repo = "polkadot-sdk";

    rev = "polkadot-v${version}";

    hash = "sha256-q8u2L7CUDUPZrU/i8K5jsqG4Ib0Wh5e/LIUc6Z4SFfY=";

    hash = "sha256-/m7Tg+9JHbnwKwWPY8gWIJkIHktGFlqcrbLLgNWjfwU=";



    # the build process of polkadot requires a .git folder in order to determine

    # the git commit hash that is being built and add it to the version string.
@@ -48,9 +48,10 @@ rustPlatform.buildRustPackage rec { 
    lockFile = ./Cargo.lock;

    outputHashes = {

      "ark-secret-scalar-0.0.2" = "sha256-91sODxaj0psMw0WqigMCGO5a7+NenAsRj5ZmW6C7lvc=";

      "ckb-merkle-mountain-range-0.6.0" = "sha256-oTe1l406lTpgOefPai664JYwzezLjkIDXpiZTfjbd28=";

      "common-0.1.0" = "sha256-LHz2dK1p8GwyMimlR7AxHLz1tjTYolPwdjP7pxork1o=";

      "fflonk-0.1.0" = "sha256-+BvZ03AhYNP0D8Wq9EMsP+lSgPA6BBlnWkoxTffVLwo=";

      "litep2p-0.3.0" = "sha256-IiJmmSb1+8+HbT/LP/zvhioVBeeGAncf4zo7Czuq6qY=";

      "litep2p-0.3.0" = "sha256-y0my2vi0+2CWNOtCh/vtsUbIcU1iNSFAJbLiCktEcOc=";

      "sp-ark-bls12-381-0.4.2" = "sha256-nNr0amKhSvvI9BlsoP+8v6Xppx/s7zkf0l9Lm3DW8w8=";

      "sp-crypto-ec-utils-0.4.1" = "sha256-/Sw1ZM/JcJBokFE4y2mv/P43ciTL5DEm0PDG0jZvMkI=";

    };

pkgs/applications/office/libreoffice/darwin/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -9,21 +9,21 @@ 
let

  appName = "LibreOffice.app";

  scriptName = "soffice";

  version = "7.6.4";

  version = "7.6.7";



  dist = {

    aarch64-darwin = rec {

      arch = "aarch64";

      archSuffix = arch;

      url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${arch}/LibreOffice_${version}_MacOS_${archSuffix}.dmg";

      sha256 = "44d141603010771b720fb047a760cb1c184e767528d7c4933b5456c64ebaddb2";

      sha256 = "17686aff42734ea4feef08e1189bab3011220000f7784061314c1ae9e5942531";

    };



    x86_64-darwin = rec {

      arch = "x86_64";

      archSuffix = "x86-64";

      url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${arch}/LibreOffice_${version}_MacOS_${archSuffix}.dmg";

      sha256 = "58ecd09fd4b57805d03207f0daf2d3549ceeb774e54bd4a2f339dc6c7b15dbc9";

      sha256 = "42d2eeaeee7bcb0e76e9decdcb8f5a4beebf133ad31f7d42a5e96ea770860110";

    };

  };

in