git.iko.soy/typeable/nixpkgs
on master help sign in
Merge branch 'master' into staging-next
commitd05ca00ab5cbaa4413b93192bff054feb3695e4e authorDmitry Kalinkin <dmitry.kalinkin@gmail.com> dateTue 1 Feb 2022, 21:29 (5 years ago) parent70961d5c613c25
5 files changed+14−12
compare with master
unifiedsplit
pkgs/applications/networking/cluster/tilt/default.nix+2−2 pkgs/development/php-packages/xdebug/default.nix+2−2 pkgs/development/tools/database/beekeeper-studio/default.nix+4−4 pkgs/development/tools/stylua/default.nix+3−3 pkgs/top-level/all-packages.nix+3−1
pkgs/applications/networking/cluster/tilt/default.nix+2−2
@@ -5,13 +5,13 @@ buildGoModule rec {
55 /* Do not use "dev" as a version. If you do, Tilt will consider itself
66 running in development environment and try to serve assets from the
77 source tree, which is not there once build completes. */
8− version = "0.23.5";
8+ version = "0.23.9";
99
1010 src = fetchFromGitHub {
1111 owner = "tilt-dev";
1212 repo = pname;
1313 rev = "v${version}";
14− sha256 = "sha256-qVybS+gRuTezX89NMWYQVWtUH6wnjB11HImejrzVHAc=";
14+ sha256 = "sha256-sxOUO5dLWBgNvbi42/aoN4YQStuNuXxWuM3WJxh1ucg=";
1515 };
1616 vendorSha256 = null;
1717
pkgs/development/php-packages/xdebug/default.nix+2−2
@@ -3,8 +3,8 @@
33buildPecl {
44 pname = "xdebug";
55
6− version = "3.1.2";
7− sha256 = "sha256-CD9r4RAN95zL3wSdr8OTC6s18OuA+bGawa2E+md5zPM=";
6+ version = "3.1.3";
7+ sha256 = "sha256-N9CmcBlV9bNAbGwye3cCvXwhRi5lbztMziSgUlgBPU4=";
88
99 doCheck = true;
1010 checkTarget = "test";
pkgs/development/tools/database/beekeeper-studio/default.nix+4−4
@@ -2,13 +2,13 @@
22
33let
44 pname = "beekeeper-studio";
5− version = "2.1.4";
5+ version = "3.1.0";
66 name = "${pname}-${version}";
77
88 src = fetchurl {
99 url = "https://github.com/beekeeper-studio/beekeeper-studio/releases/download/v${version}/Beekeeper-Studio-${version}.AppImage";
1010 name="${pname}-${version}.AppImage";
11− sha512 = "1aik88wi9axv66axjmmjmlna1sp0pz92z8i2x6pq3bs0gcs4i1q3qxxbrfc14ynbpa65knimfhwzrrshchnijgdazx3qjzh8jwzfiwl";
11+ sha512 = "sha512:1zv4fclac94fzzhgqmjgc5pllxcxajjx6yjf3zblj53cc7m4sp4ydjx3wh4db57j75x8vh7xc3q1xpq6q3sj1dafnap0j0icfi6wznk";
1212 };
1313
1414 appimageContents = appimageTools.extractType2 {
@@ -32,9 +32,9 @@ in appimageTools.wrapType2 {
3232 meta = with lib; {
3333 description = "Modern and easy to use SQL client for MySQL, Postgres, SQLite, SQL Server, and more. Linux, MacOS, and Windows";
3434 homepage = "https://www.beekeeperstudio.io";
35− changelog = "https://github.com/beekeeper-studio/beekeeper-studio/releases/tag/v2.1.4";
35+ changelog = "https://github.com/beekeeper-studio/beekeeper-studio/releases/tag/v${version}";
3636 license = licenses.mit;
37− maintainers = with maintainers; [ milogert ];
37+ maintainers = with maintainers; [ milogert alexnortung ];
3838 platforms = [ "x86_64-linux" ];
3939 };
4040}
pkgs/development/tools/stylua/default.nix+3−3
@@ -8,16 +8,16 @@
88
99rustPlatform.buildRustPackage rec {
1010 pname = "stylua";
11− version = "0.11.3";
11+ version = "0.12.1";
1212
1313 src = fetchFromGitHub {
1414 owner = "johnnymorganz";
1515 repo = pname;
1616 rev = "v${version}";
17− sha256 = "sha256-9V8vuFfyEdSzOG3Azk/e55N+Oh1VtMgcM+/PEMwJ6DI=";
17+ sha256 = "sha256-LmmOaxB7UNQQUFBYN5wNZYt9xH5wDrBbtB9QOCb3suQ=";
1818 };
1919
20− cargoSha256 = "sha256-PrZojkObidzzVv6KwFtI1QUGj5UB5TiMmzdBKq45Ci4=";
20+ cargoSha256 = "sha256-Schaiu9XnkEfjY6D8ZT7dtCf8UN58zQ6256xeOWBi5M=";
2121
2222 buildFeatures = lib.optional lua52Support "lua52"
2323 ++ lib.optional luauSupport "luau";
pkgs/top-level/all-packages.nix+3−1
@@ -33969,7 +33969,9 @@ with pkgs;
3396933969
3397033970 tgswitch = callPackage ../applications/networking/cluster/tgswitch {};
3397133971
33972− tilt = callPackage ../applications/networking/cluster/tilt {};
33972+ tilt = callPackage ../applications/networking/cluster/tilt {
33973+ buildGoModule = buildGo117Module;
33974+ };
3397333975
3397433976 timeular = callPackage ../applications/office/timeular {};
3397533977