Commit 6968567d authored by K900's avatar K900
Browse files

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

parents 66be95c3 05e3b3d3

nixos/modules/services/web-apps/peertube.nix

+1 −2
Original line number Diff line number Diff line
@@ -432,7 +432,6 @@ in { 
      path = with pkgs; [ nodejs_18 yarn ffmpeg-headless openssl ];



      script = ''

        #!/bin/sh

        umask 077

        cat > /var/lib/peertube/config/local.yaml <<EOF

        ${lib.optionalString (cfg.secrets.secretsFile != null) ''
@@ -457,7 +456,7 @@ in { 
        ln -sf ${cfg.package}/config/default.yaml /var/lib/peertube/config/default.yaml

        ln -sf ${cfg.package}/client/dist -T /var/lib/peertube/www/client

        ln -sf ${cfg.settings.storage.client_overrides} -T /var/lib/peertube/www/client-overrides

        node dist/server

        exec node dist/server

      '';

      serviceConfig = {

        Type = "simple";

pkgs/applications/graphics/synfigstudio/default.nix

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

, stdenv

, fetchFromGitHub

, fetchpatch

, pkg-config

, autoreconfHook

, wrapGAppsHook3
@@ -29,12 +28,12 @@ 
}:



let

  version = "1.5.1";

  version = "1.5.3";

  src = fetchFromGitHub {

    owner = "synfig";

    repo = "synfig";

    rev = "v${version}";

    hash = "sha256-9vBYESaSgW/1FWH2uFBvPiYvxLlX0LLNnd4S7ACJcwI=";

    hash = "sha256-D+FUEyzJ74l0USq3V9HIRAfgyJfRP372aEKDqF8+hsQ=";

  };



  ETL = stdenv.mkDerivation {
@@ -56,17 +55,6 @@ let 
    pname = "synfig";

    inherit version src;



    patches = [

      # Pull upstream fix for autoconf-2.72 support:

      #   https://github.com/synfig/synfig/pull/2930

      (fetchpatch {

        name = "autoconf-2.72.patch";

        url = "https://github.com/synfig/synfig/commit/80a3386c701049f597cf3642bb924d2ff832ae05.patch";

        stripLen = 1;

        hash = "sha256-7gX8tJCR81gw8ZDyNYa8UaeZFNOx4o1Lnq0cAcaKb2I=";

      })

    ];



    sourceRoot = "${src.name}/synfig-core";



    configureFlags = [
@@ -78,6 +66,8 @@ let 
      "CXXFLAGS=-std=c++14"

    ];



    enableParallelBuilding = true;



    nativeBuildInputs = [

      pkg-config

      autoreconfHook
@@ -159,7 +149,7 @@ stdenv.mkDerivation { 
  meta = with lib; {

    description = "2D animation program";

    homepage = "http://www.synfig.org";

    license = licenses.gpl2Plus;

    license = licenses.gpl3Plus;

    maintainers = [ ];

    platforms = platforms.linux ++ platforms.darwin;

  };

pkgs/applications/networking/cluster/aiac/default.nix

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


buildGoModule rec {

  pname = "aiac";

  version = "5.2.1";

  version = "5.3.0";

  excludedPackages = [".ci"];



  src = fetchFromGitHub {

    owner = "gofireflyio";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-8LMuhUeH/KNOf3IPYMSwZDxeY8M7oDYF4Q7X7ImQSMw=";

    hash = "sha256-Lk3Bmzg1owkIWzz7jgq1YpdPyRzyZ7aNoWPIU5aWzu0=";

  };



  vendorHash = "sha256-uXYin6JITpy3bc7FI/3aJqvCD9cGwGL1qjB8hBUWLQE=";

pkgs/applications/networking/cluster/k0sctl/default.nix

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


buildGoModule rec {

  pname = "k0sctl";

  version = "0.19.1";

  version = "0.19.2";



  src = fetchFromGitHub {

    owner = "k0sproject";

    repo = "k0sctl";

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

    hash = "sha256-6mvSVbSTPFiAIDxNQUmgFmS+3v3RUh10Y552u9bHOn0=";

    hash = "sha256-TdnZZ27j++o9I4Zup4PmM2VAHwn8BPBG/CwxTUy0BWU=";

  };



  vendorHash = "sha256-Hl/eSFbwFiuSaaPh5blWFfz6m4VNrS5mYL8ehQlb90I=";

pkgs/applications/office/zotero/darwin.nix

0 → 100644
+33 −0
Original line number Diff line number Diff line 
{

  pname,

  version,

  meta,

  stdenv,

  fetchurl,

  undmg,

}:



stdenv.mkDerivation rec {

  inherit pname version meta;



  src = fetchurl {

    url = "https://download.zotero.org/client/release/${version}/Zotero-${version}.dmg";

    hash = "sha256-z1HAkHz4JGRfQJna2cINZTmYPzyj9ofp7mJHN/mNyOo=";

  };

  sourceRoot = ".";



  nativeBuildInputs = [ undmg ];



  dontConfigure = true;

  dontBuild = true;

  dontFixup = true; # breaks notarization



  installPhase = ''

    runHook preInstall



    mkdir -p $out/Applications

    cp -r Zotero.app $out/Applications



    runHook postInstall

  '';

}