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

Merge master into staging-next

parents a4744117 5e85de91

lib/attrsets.nix

+1333 −541

File changed.

Preview size limit exceeded, changes collapsed.

lib/trivial.nix

+727 −214

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/applications/misc/1password/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -12,12 +12,12 @@ let 
    if extension == "zip" then fetchzip args else fetchurl args;



  pname = "1password-cli";

  version = "2.25.1";

  version = "2.26.0";

  sources = rec {

    aarch64-linux = fetch "linux_arm64" "sha256-3LUfqTaLpJal/tjtRzTztm8H4wl1g4VSHWiFRukAqvE=" "zip";

    i686-linux = fetch "linux_386" "sha256-QJu4SHfM4zzHP14MKaSydAeFCvAPa4wsMh+JvWGR7J4=" "zip";

    x86_64-linux = fetch "linux_amd64" "sha256-erZCpCH5Q4VqGO045qKP5KAp07xKgMKrVrY54btT5BM=" "zip";

    aarch64-darwin = fetch "apple_universal" "sha256-kOAbr5MrDylgEQGMYUDklKCNNkZalVfJBcUwSZSMFH0=" "pkg";

    aarch64-linux = fetch "linux_arm64" "sha256-zWmWeAPtgSR8/3l40K4DPdMm0Pan+J1uNjUaEx+geO4=" "zip";

    i686-linux = fetch "linux_386" "sha256-OOjAMfRTSW+RuD0PPosvxMIPJcPQQok5Wn209sa0tuU=" "zip";

    x86_64-linux = fetch "linux_amd64" "sha256-RwdEeqBFNj5dgBsmC2fiDwUGFWhuqeEL7g60ogFEq1Y=" "zip";

    aarch64-darwin = fetch "apple_universal" "sha256-pwXHax0DBx1UpVmwYytpSikt5xdKZJXrdqvjWyWdUBM=" "pkg";

    x86_64-darwin = aarch64-darwin;

  };

  platforms = builtins.attrNames sources;

pkgs/applications/networking/rymdport/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -11,16 +11,16 @@ 


buildGoModule rec {

  pname = "rymdport";

  version = "3.5.2";

  version = "3.5.3";



  src = fetchFromGitHub {

    owner = "Jacalz";

    repo = "rymdport";

    rev = "v${version}";

    hash = "sha256-LTCr1OFh+1QQhXFNl9SoLPqEY0ERlLlWfSxRKjyyqPk=";

    hash = "sha256-lCtFm360UeypzYpivlYXxuqZ0BzGzGkkq31dmgjwv4M=";

  };



  vendorHash = "sha256-twXeLNWy/5wTaFb645mCeI5PzByEGj5aCWl6vO+qRLQ=";

  vendorHash = "sha256-PXRy12JWYQQMMzh7jrEhquileY2oYFvqt8KZvrfp2o0=";



  nativeBuildInputs = [

    pkg-config

pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -10,13 +10,13 @@ in 
buildKodiBinaryAddon rec {

  pname = "inputstream-adaptive";

  namespace = "inputstream.adaptive";

  version = "20.3.16";

  version = "20.3.18";



  src = fetchFromGitHub {

    owner = "xbmc";

    repo = "inputstream.adaptive";

    rev = "${version}-${rel}";

    sha256 = "sha256-1OY+3pvpVW8rkj7HL84IECyHpAmWsUQ9mTzuGesH+jI=";

    sha256 = "sha256-cjlUKrus4Dv48dCk6AlOgY2iZYTwT39tj2u7aq1P104=";

  };



  extraCMakeFlags = [