JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Dmitry Kalinkin 2022-02-01 21:29:29 -05:00
commit d05ca00ab5
No known key found for this signature in database
GPG Key ID: 5157B3EC8B2CA333
5 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/cluster/tilt/default.nix
View File

@ -5,13 +5,13 @@ buildGoModule rec {
/* Do not use "dev" as a version. If you do, Tilt will consider itself
running in development environment and try to serve assets from the
source tree, which is not there once build completes. */
version = "0.23.5";
version = "0.23.9";
src = fetchFromGitHub {
owner = "tilt-dev";
repo = pname;
rev = "v${version}";
sha256 = "sha256-qVybS+gRuTezX89NMWYQVWtUH6wnjB11HImejrzVHAc=";
sha256 = "sha256-sxOUO5dLWBgNvbi42/aoN4YQStuNuXxWuM3WJxh1ucg=";
};
vendorSha256 = null;

4
pkgs/development/php-packages/xdebug/default.nix
View File

@ -3,8 +3,8 @@
buildPecl {
pname = "xdebug";
version = "3.1.2";
sha256 = "sha256-CD9r4RAN95zL3wSdr8OTC6s18OuA+bGawa2E+md5zPM=";
version = "3.1.3";
sha256 = "sha256-N9CmcBlV9bNAbGwye3cCvXwhRi5lbztMziSgUlgBPU4=";
doCheck = true;
checkTarget = "test";

8
pkgs/development/tools/database/beekeeper-studio/default.nix
View File

@ -2,13 +2,13 @@
let
pname = "beekeeper-studio";
version = "2.1.4";
version = "3.1.0";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/beekeeper-studio/beekeeper-studio/releases/download/v${version}/Beekeeper-Studio-${version}.AppImage";
name="${pname}-${version}.AppImage";
sha512 = "1aik88wi9axv66axjmmjmlna1sp0pz92z8i2x6pq3bs0gcs4i1q3qxxbrfc14ynbpa65knimfhwzrrshchnijgdazx3qjzh8jwzfiwl";
sha512 = "sha512:1zv4fclac94fzzhgqmjgc5pllxcxajjx6yjf3zblj53cc7m4sp4ydjx3wh4db57j75x8vh7xc3q1xpq6q3sj1dafnap0j0icfi6wznk";
};
appimageContents = appimageTools.extractType2 {
@ -32,9 +32,9 @@ in appimageTools.wrapType2 {
meta = with lib; {
description = "Modern and easy to use SQL client for MySQL, Postgres, SQLite, SQL Server, and more. Linux, MacOS, and Windows";
homepage = "https://www.beekeeperstudio.io";
changelog = "https://github.com/beekeeper-studio/beekeeper-studio/releases/tag/v2.1.4";
changelog = "https://github.com/beekeeper-studio/beekeeper-studio/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ milogert ];
maintainers = with maintainers; [ milogert alexnortung ];
platforms = [ "x86_64-linux" ];
};
}

6
pkgs/development/tools/stylua/default.nix
View File

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "stylua";
version = "0.11.3";
version = "0.12.1";
src = fetchFromGitHub {
owner = "johnnymorganz";
repo = pname;
rev = "v${version}";
sha256 = "sha256-9V8vuFfyEdSzOG3Azk/e55N+Oh1VtMgcM+/PEMwJ6DI=";
sha256 = "sha256-LmmOaxB7UNQQUFBYN5wNZYt9xH5wDrBbtB9QOCb3suQ=";
};
cargoSha256 = "sha256-PrZojkObidzzVv6KwFtI1QUGj5UB5TiMmzdBKq45Ci4=";
cargoSha256 = "sha256-Schaiu9XnkEfjY6D8ZT7dtCf8UN58zQ6256xeOWBi5M=";
buildFeatures = lib.optional lua52Support "lua52"
++ lib.optional luauSupport "luau";

4
pkgs/top-level/all-packages.nix
View File

@ -33969,7 +33969,9 @@ with pkgs;
tgswitch = callPackage ../applications/networking/cluster/tgswitch {};
tilt = callPackage ../applications/networking/cluster/tilt {};
tilt = callPackage ../applications/networking/cluster/tilt {
buildGoModule = buildGo117Module;
};
timeular = callPackage ../applications/office/timeular {};