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

Merge staging-next into staging

parents a0eb5736 94468986

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -14262,6 +14262,12 @@ 
    githubId = 251028;

    name = "Shell Turner";

  };

  shhht = {

    name = "shhht";

    email = "stp.tjeerd@gmail.com";

    github = "shhht";

    githubId = 118352823;

  };

  shikanime = {

    name = "William Phetsinorath";

    email = "deva.shikanime@protonmail.com";

pkgs/applications/misc/mainsail/default.nix

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

, stdenvNoCC

, fetchzip

}:



stdenvNoCC.mkDerivation rec {

  pname = "mainsail";

  version = "2.4.1";



  src = fetchzip {

    url = "https://github.com/mainsail-crew/mainsail/releases/download/v${version}/mainsail.zip";

    sha256 = "sha256-WgTzRVycrZcJ5JVXJQHLvQGg8FLm4y020/eULAqDpmA=";

    stripRoot = false;

  };



  dontConfigure = true;

  dontBuild = true;



  installPhase = ''

    runHook preInstall



    mkdir -p $out/share/mainsail

    cp -r ./* $out/share/mainsail



    runHook postInstall

  '';



  meta = with lib; {

    description = "Web interface for managing and controlling 3D printers with Klipper";

    homepage = "https://docs.mainsail.xyz";

    changelog = "https://github.com/mainsail-crew/mainsail/releases/tag/v${version}";

    license = licenses.gpl3Plus;

    platforms = platforms.linux;

    maintainers = with maintainers; [ shhht ];

  };

}

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

+2 −2
Original line number Diff line number Diff line 
{ stdenv, lib, buildGoModule, fetchFromGitHub }:

let

  version = "1.5.2";

  version = "1.5.3";

in

buildGoModule {

  pname = "ktunnel";
@@ -10,7 +10,7 @@ buildGoModule { 
    owner  = "omrikiei";

    repo   = "ktunnel";

    rev    = "v${version}";

    sha256 = "sha256-QZL3TSvxSPuBjjATAqoAOZNBSB6NCGfHHG2dq8C4Wwk=";

    sha256 = "sha256-7SWj9Emm78xpzdvJFKqpI5HVQi0ohbixkgXKGTy5C/A=";

  };



  ldflags = [

pkgs/applications/networking/cluster/terraform-providers/providers.json

+2 −2
Original line number Diff line number Diff line
@@ -1044,11 +1044,11 @@ 
    "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8="

  },

  "spotinst": {

    "hash": "sha256-KC7A7BgGF2erEZKW/hTiveZB0GaCAkzpmkbsF21Ihsg=",

    "hash": "sha256-RrnDjmzQIOR/dZjiNMqL4fw4nayLZrsaD5mtg+3OWMU=",

    "homepage": "https://registry.terraform.io/providers/spotinst/spotinst",

    "owner": "spotinst",

    "repo": "terraform-provider-spotinst",

    "rev": "v1.115.0",

    "rev": "v1.116.0",

    "spdx": "MPL-2.0",

    "vendorHash": "sha256-6ZxurzzOa/1TXOApQNLFUrY+Ryxc7n+JwZG76JuePGc="

  },

pkgs/applications/networking/instant-messengers/discord/default.nix

+2 −2
Original line number Diff line number Diff line 
{ branch ? "stable", callPackage, fetchurl, lib, stdenv }:

let

  versions = if stdenv.isLinux then {

    stable = "0.0.26";

    stable = "0.0.27";

    ptb = "0.0.42";

    canary = "0.0.151";

    development = "0.0.216";
@@ -16,7 +16,7 @@ let 
    x86_64-linux = {

      stable = fetchurl {

        url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";

        sha256 = "sha256-MPdNxZJBmIN4NGEoYWvL2cmNm37/YT275m2bVWHXbwY=";

        sha256 = "sha256-6fHaiPBcv7TQVh+TatIEYXZ/LwPmnCmU/QWXKFgUR7U=";

      };

      ptb = fetchurl {

        url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";