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

Merge master into staging-next

parents 74098fff c0b7a892

maintainers/maintainer-list.nix

+10 −0
Original line number Diff line number Diff line
@@ -12836,6 +12836,16 @@ 
    githubId = 10601196;

    name = "Jérémie Ferry";

  };

  motiejus = {

    email = "motiejus@jakstys.lt";

    github = "motiejus";

    githubId = 107720;

    keys = [{

      fingerprint = "5F6B 7A8A 92A2 60A4 3704  9BEB 6F13 3A0C 1C28 48D7";

    }];

    matrix = "@motiejus:jakstys.lt";

    name = "Motiejus Jakštys";

  };

  mounium = {

    email = "muoniurn@gmail.com";

    github = "Mounium";

pkgs/applications/audio/ir.lv2/default.nix

+7 −13
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, fftw, gtk2, lv2, libsamplerate, libsndfile, pkg-config, zita-convolver }:

{ lib, stdenv, fetchgit, fftw, gtk2, lv2, libsamplerate, libsndfile, pkg-config, zita-convolver }:



stdenv.mkDerivation rec {

  pname = "ir.lv2";

  version = "1.2.4";

  version = "0-unstable-2018-06-21";



  src = fetchFromGitHub {

    owner = "tomszilagyi";

    repo = "ir.lv2";

    rev = version;

    sha256 = "1p6makmgr898fakdxzl4agh48qqwgv1k1kwm8cgq187n0mhiknp6";

  src = fetchgit {

    url = "https://git.hq.sig7.se/ir.lv2.git";

    rev = "38bf3ec7d370d8234dd55be99c14cf9533b43c60";

    sha256 = "sha256-5toZYQX2oIAfQ5XPMMN+HGNE4FOE/t6mciih/OpU1dw=";

  };



  buildInputs = [ fftw gtk2 lv2 libsamplerate libsndfile zita-convolver ];



  nativeBuildInputs = [  pkg-config ];



  postPatch = ''

     # Fix build with lv2 1.18: https://github.com/tomszilagyi/ir.lv2/pull/20

     find . -type f -exec fgrep -q LV2UI_Descriptor {} \; \

       -exec sed -i {} -e 's/const struct _\?LV2UI_Descriptor/const LV2UI_Descriptor/' \;

   '';



  env.NIX_CFLAGS_COMPILE = "-fpermissive";



  postBuild = "make convert4chan";

pkgs/applications/networking/cloudflared/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -7,13 +7,13 @@ 


buildGoModule rec {

  pname = "cloudflared";

  version = "2023.10.0";

  version = "2024.1.5";



  src = fetchFromGitHub {

    owner = "cloudflare";

    repo = "cloudflared";

    rev = "refs/tags/${version}";

    hash = "sha256-T+hxNvsckL8PAVb4GjXhnkVi3rXMErTjRgGxCUypwVA=";

    hash = "sha256-g7FUwEs/wEcX1vRgfoQZw+uMzx6ng3j4vFwhlHs6WKg=";

  };



  vendorHash = null;

pkgs/applications/networking/cluster/tektoncd-cli/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 


buildGoModule rec {

  pname = "tektoncd-cli";

  version = "0.34.0";

  version = "0.35.0";



  src = fetchFromGitHub {

    owner = "tektoncd";

    repo = "cli";

    rev = "v${version}";

    sha256 = "sha256-bX1PmLQDpNMh1JMYvnAQhLFYiEoa5UnQSc/i+Y6DigI=";

    sha256 = "sha256-4n+20EZvj1cCJTZFSYTpOeArVKvpz4+U1qYxaqWXBSc=";

  };



  vendorHash = null;

pkgs/applications/networking/instant-messengers/psi-plus/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -43,13 +43,13 @@ assert enablePsiMedia -> enablePlugins; 


mkDerivation rec {

  pname = "psi-plus";

  version = "1.5.1650";

  version = "1.5.1653";



  src = fetchFromGitHub {

    owner = "psi-plus";

    repo = "psi-plus-snapshots";

    rev = version;

    sha256 = "sha256-qoqusg2CbivoPFbYnBSzE5P5+p1vCKmMbSBrPdC6SqI=";

    sha256 = "sha256-9WT2S6ZgIsrHoEAvlWUB078gzCdrPylvSjkkogU5tsU=";

  };



  cmakeFlags = [