Merge master into staging-next
commit72b55bcbef7f62f171abf4f3babf13586c68d184
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
dateSun 13 Mar 2022, 12:01 (5 years ago)
parent1630ab9e7eaee7
pkgs/applications/editors/vscode/vscode.nix+6−6
@@ -14,17 +14,17 @@ let
1414 archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
1515
1616 sha256 = {
17− x86_64-linux = "09hqcym8dj4d8r5ibdzypdmjxdw4ix24zq688vnb4kfas2jbb3hi";
18− x86_64-darwin = "1wij82gl1wqrprrfn9cfih19wr4h3bn2xapr1l2l0mkansrzsvg5";
19− aarch64-linux = "09x93i190lmxb3ygzjcmb7ag3dz7ixf07yk7zqc7ljrnn5f0b6ag";
20− aarch64-darwin = "1k7glnqy0vjx55chjpwbgwipcvzb0vx0wmvqis865pvzmr0d06a0";
21− armv7l-linux = "0vkivg1f61k8vkr0j9dm7fw2klh45xxnp07pill1gmrwxafm5bra";
17+ x86_64-linux = "0x8vc6gj83mn767wi285k0hxhlh5gh1lcvq63na89vglja4ipna4";
18+ x86_64-darwin = "1x47xfq0fgd10wq6aa8gq55aqrl1ir1f6v1mm6324yny16pf20k2";
19+ aarch64-linux = "1ibg2qvpnwfwwzgby2xva9xz138b13x9q8vf1xf6plazv0arla1l";
20+ aarch64-darwin = "100834mqix7b46frlqf0jz4qs673lavxm8sizfjm7c9y0xxy4ld3";
21+ armv7l-linux = "100yfkzvnjccp1g3p353jr2vicvkjc0skiwmmzgad6i8j1m9js62";
2222 }.${system};
2323in
2424 callPackage ./generic.nix rec {
2525 # Please backport all compatible updates to the stable release.
2626 # This is important for the extension ecosystem.
27− version = "1.65.1";
27+ version = "1.65.2";
2828 pname = "vscode";
2929
3030 executableName = "code" + lib.optionalString isInsiders "-insiders";
pkgs/applications/emulators/fceux/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "fceux";
5− version = "2.6.2";
5+ version = "2.6.3";
66
77 src = fetchFromGitHub {
88 owner = "TASEmulators";
99 repo = pname;
1010 rev = "${pname}-${version}";
11− sha256 = "sha256-yQX58m/sMW/8Jr5cm2SrVXTiF7qyZOgOZg1v0qEyiLw=";
11+ sha256 = "sha256-jNR9AB8s2S9ehYsompkV2GOLsaXIQzldeQ1WRCxdDG0=";
1212 };
1313
1414 nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
pkgs/applications/graphics/lightburn/default.nix+2−2
@@ -6,7 +6,7 @@
66
77stdenv.mkDerivation rec {
88 pname = "lightburn";
9− version = "1.1.01";
9+ version = "1.1.03";
1010
1111 nativeBuildInputs = [
1212 p7zip
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616
1717 src = fetchurl {
1818 url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z";
19− sha256 = "sha256-HgyqpZTf9GTsbDi1+e20YNoFIPYtTHQd8KC626G0038=";
19+ sha256 = "sha256-X7hAkzVqIABpyFokiYaMGZqSda69cKhKghFDWDEVOow=";
2020 };
2121
2222 buildInputs = [
pkgs/applications/misc/charm/default.nix+3−3
@@ -2,16 +2,16 @@
22
33buildGoModule rec {
44 pname = "charm";
5− version = "0.10.2";
5+ version = "0.10.3";
66
77 src = fetchFromGitHub {
88 owner = "charmbracelet";
99 repo = "charm";
1010 rev = "v${version}";
11− sha256 = "sha256-kyfyRq/5QWMoiMooEpLv7UkehGxFlrfGEq9jA3OHiIs=";
11+ sha256 = "sha256-7WdSIpmpN8Zz2k5PveYZoCueQo5sLxLLZvZdzxRlkaE=";
1212 };
1313
14− vendorSha256 = "sha256-LB5fwySDOH+kOYYdGdtLAvETmI6fFP2QT6l2eAS3Ijg=";
14+ vendorSha256 = "sha256-5cqZxh2uvmJV7DtAGzQwt//heF3kF9mjyB0KAs8nWZY=";
1515
1616 doCheck = false;
1717
pkgs/applications/misc/otpclient/default.nix+2−2
@@ -15,13 +15,13 @@
1515
1616stdenv.mkDerivation rec {
1717 pname = "otpclient";
18− version = "2.4.8";
18+ version = "2.4.9.1";
1919
2020 src = fetchFromGitHub {
2121 owner = "paolostivanin";
2222 repo = pname;
2323 rev = "v${version}";
24− sha256 = "sha256-2exqMYcxg0UxlH+ZANQv2MFii9dZ6nizB4vxGR9cAwk=";
24+ sha256 = "sha256-QcdPyuwbGK12Kul+gGTfRGmXfghr0qugpBEcrgATOT4=";
2525 };
2626
2727 buildInputs = [ gtk3 jansson libgcrypt libzip libpng libcotp zbar ];
pkgs/applications/networking/browsers/surf/default.nix+1−1
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121
2222 inherit patches;
2323
24− installFlags = [ "PREFIX=$(out)" ];
24+ makeFlags = [ "PREFIX=$(out)" ];
2525
2626 # Add run-time dependencies to PATH. Append them to PATH so the user can
2727 # override the dependencies with their own PATH.
pkgs/applications/networking/cluster/vcluster/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildGoModule rec {
44 pname = "vcluster";
5− version = "0.5.3";
5+ version = "0.6.0";
66
77 src = fetchFromGitHub {
88 owner = "loft-sh";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "sha256-+rLDRVfB6wZ1wYoLE2wwRxzS6GmI6KYtOKdXZd+LnnU=";
11+ sha256 = "sha256-kY12bsZyDb36KE2dWx6RVYlKTbJh+XFQcBpFXoCLgEM=";
1212 };
1313
1414 vendorSha256 = null;
pkgs/applications/networking/instant-messengers/cinny/default.nix+2−2
@@ -4,11 +4,11 @@ let
44 configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf);
55in stdenv.mkDerivation rec {
66 pname = "cinny";
7− version = "1.7.0";
7+ version = "1.8.0";
88
99 src = fetchurl {
1010 url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz";
11− sha256 = "0133dbzxy0n0i6bn2p3lx33kpabnf9kzs9mv4xws30hbns25q99k";
11+ sha256 = "0pbapzl3pfx87ns4vp7088kkhl34c0ihbq90r3d0iz6sa16mcs79";
1212 };
1313
1414 installPhase = ''
pkgs/applications/networking/juju/default.nix+3−3
@@ -2,16 +2,16 @@
22
33buildGoModule rec {
44 pname = "juju";
5− version = "2.9.11";
5+ version = "2.9.25";
66
77 src = fetchFromGitHub {
88 owner = "juju";
99 repo = "juju";
1010 rev = "juju-${version}";
11− sha256 = "sha256-KcvlnEfDzwhFzwaWLYuRGa8nh6MkjqZ+u+qJSJZl13U=";
11+ sha256 = "sha256-h4w12dmGEviV2N0BWXQKt1eUVxdbgwRKLQghnd6bLFI=";
1212 };
1313
14− vendorSha256 = "sha256-0KGeMJDv1BdqM1/uMk+mKpK+Nejz9PiCAfRy96pu3OQ=";
14+ vendorSha256 = "sha256-AATK4tDg2eW8Bt8gU88tIk6I+qp5ZeUtXzD74/59c7w=";
1515
1616 # Disable tests because it attempts to use a mongodb instance
1717 doCheck = false;
pkgs/applications/networking/nextdns/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildGoModule rec {
44 pname = "nextdns";
5− version = "1.37.7";
5+ version = "1.37.10";
66
77 src = fetchFromGitHub {
88 owner = "nextdns";
99 repo = "nextdns";
1010 rev = "v${version}";
11− sha256 = "sha256-L5PeT4Y2oWM1WUJaBK9xgrpfkpvKM1+sA29A3AiDE38=";
11+ sha256 = "sha256-iwxgDBIuTClikvXF+3mCjFKKV0upN+K+aL85ewYkMXo=";
1212 };
1313
1414 vendorSha256 = "sha256-6hWD05lXteqL7egj9tiRVHlevKM33i+a+zBUZs7PF7I=";
pkgs/applications/version-management/git-repo/default.nix+2−2
@@ -4,13 +4,13 @@
44
55stdenv.mkDerivation rec {
66 pname = "git-repo";
7− version = "2.21";
7+ version = "2.22";
88
99 src = fetchFromGitHub {
1010 owner = "android";
1111 repo = "tools_repo";
1212 rev = "v${version}";
13− sha256 = "sha256-nl/NFbyL0MWgvpwaqkCOkKuSquFTQRKZ7Ski5qYRL9w=";
13+ sha256 = "sha256-oVwvoZdjD6V3CHECZOYBSYVtCX1XwW5fynyCn7Oj+Bc=";
1414 };
1515
1616 # Fix 'NameError: name 'ssl' is not defined'
pkgs/applications/virtualization/x11docker/default.nix+2−2
@@ -1,12 +1,12 @@
11{ lib, stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute2 }:
22stdenv.mkDerivation rec {
33 pname = "x11docker";
4− version = "7.1.1";
4+ version = "7.1.3";
55 src = fetchFromGitHub {
66 owner = "mviereck";
77 repo = "x11docker";
88 rev = "v${version}";
9− sha256 = "sha256-SUHWqcDL/oDljCpngkhUvzOvMIlZSc1p0j0wjupPBqw=";
9+ sha256 = "sha256-eSarw5RG2ckup9pNlZtAyZAN8IPZy94RRfej9ppiLfo=";
1010 };
1111 nativeBuildInputs = [ makeWrapper ];
1212
pkgs/data/fonts/sudo/default.nix+2−2
@@ -1,11 +1,11 @@
11{ lib, fetchzip }:
22
33let
4− version = "0.62";
4+ version = "0.63.1";
55in fetchzip {
66 name = "sudo-font-${version}";
77 url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip";
8− sha256 = "sha256-I0E2zYbfEFBEIBNC7nnJb+hOaBgGZkAIg08YpA8awso=";
8+ sha256 = "sha256-z/1Y2eJMrQ+43UIt4HWcLwjYs+hfCY/g4iRxJ+yBAqw=";
99
1010 postFetch = ''
1111 mkdir -p $out/share/fonts/
pkgs/development/compilers/fasm/bin.nix+2−2
@@ -3,11 +3,11 @@
33stdenvNoCC.mkDerivation rec {
44 pname = "fasm-bin";
55
6− version = "1.73.29";
6+ version = "1.73.30";
77
88 src = fetchurl {
99 url = "https://flatassembler.net/fasm-${version}.tgz";
10− sha256 = "sha256-Yyj02DRo9wTkJ01ukOwElHr1ZyZFPOMTibwyAkqYISs=";
10+ sha256 = "sha256-dRlQUaWIHbu+DwQBFh6Tf4o2u0LTRw/Ehp2hT9LC8QE=";
1111 };
1212
1313 installPhase = ''
pkgs/development/python-modules/parts/default.nix+2−2
@@ -5,12 +5,12 @@
55
66buildPythonPackage rec {
77 pname = "parts";
8− version = "1.2.2";
8+ version = "1.3.0";
99 format = "setuptools";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "6463d5c49142d14029196a6a781b57bc98ba5b3d93244f4ed637f534d08129c1";
13+ sha256 = "sha256-NrhNpWyzqwn1bNnuqmcyKcUED0A4v7VJE4ZlTHFafJY=";
1414 };
1515
1616 # Project has no tests
pkgs/development/python-modules/pyathena/default.nix+2−2
@@ -10,7 +10,7 @@
1010
1111buildPythonPackage rec {
1212 pname = "pyathena";
13− version = "2.5.0";
13+ version = "2.5.1";
1414 format = "setuptools";
1515
1616 disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
1818 src = fetchPypi {
1919 pname = "PyAthena";
2020 inherit version;
21− sha256 = "sha256-2Z0KjJm6cWhMTKXa2zBs3Ef2i/e1tqQYZx5sSKIT9a4=";
21+ sha256 = "sha256-GTcDiDtZGgTpdl6YBgPuztv7heEPZ/ymhup/4JwfELA=";
2222 };
2323
2424 propagatedBuildInputs = [
pkgs/development/tools/mold/default.nix+2−2
@@ -12,13 +12,13 @@
1212
1313stdenv.mkDerivation rec {
1414 pname = "mold";
15− version = "1.1";
15+ version = "1.1.1";
1616
1717 src = fetchFromGitHub {
1818 owner = "rui314";
1919 repo = pname;
2020 rev = "v${version}";
21− sha256 = "sha256-+uIP/U7H9P7oy78TL1edX9+JNYUzpwro105PYj3D6Yk=";
21+ sha256 = "sha256-+uPVt3w3A25JFyENxqhAcjZMRzSowi2uHwGjkeQP8Og=";
2222 };
2323
2424 buildInputs = [ zlib openssl ];
pkgs/development/web/deno/default.nix+3−3
@@ -17,15 +17,15 @@
1717
1818rustPlatform.buildRustPackage rec {
1919 pname = "deno";
20− version = "1.19.3";
20+ version = "1.19.1";
2121
2222 src = fetchFromGitHub {
2323 owner = "denoland";
2424 repo = pname;
2525 rev = "v${version}";
26− sha256 = "sha256-mm4hCRjQitFvSA3ow/p/N+UgG3P7FC440Obfqz3KVbQ=";
26+ sha256 = "sha256-BqwiconG5hn5RPV+hlKu6e6+GjZA4Im/dD+no3IduYw=";
2727 };
28− cargoSha256 = "sha256-tSIYs52pZk/h2hVJLHUbwlsl2gdu2Mszs9OBR52EQKQ=";
28+ cargoSha256 = "sha256-q/5AezLQgN7WdGsbHoxX5riJMlxw3cTFhVs5OvCeI5U=";
2929
3030 # Install completions post-install
3131 nativeBuildInputs = [ installShellFiles ];
pkgs/development/web/deno/librusty_v8.nix+5−5
@@ -11,11 +11,11 @@ let
1111 };
1212in
1313fetch_librusty_v8 {
14− version = "0.40.2";
14+ version = "0.40.0";
1515 shas = {
16− x86_64-linux = "sha256-RtEKNDQdL0orI0B4953RaT18KeWPZJIdhPnYbJGj2eM=";
17− aarch64-linux = "sha256-TL5boy1X/OgOt17H6PYEA5D3MJbChCULrB38ykC5Ghk=";
18− x86_64-darwin = "sha256-ABnHMABtggrHoTjeFB8YVH6PV2HvVlPZTQWaeRnRZaE=";
19− aarch64-darwin = "sha256-PGrRmNJxS49K9jviQTxRJlTq1SAn+8epXXNJaexTAWU=";
16+ x86_64-linux = "sha256-VHkopvK6f5lxdFLBywHe0Z+su2g5hgBsLcTxrwFgq0Y=";
17+ aarch64-linux = "sha256-awWjziqqUDAl9fcLADUjytLFds1y93y5gZoOtvReL9w=";
18+ x86_64-darwin = "sha256-WlRnGiJK3iFgTjNzr25rvmmiPAICPRLaD5hbys7MoJA=";
19+ aarch64-darwin = "sha256-zblcAQVwnLQWh85wajg8CalqxycSR+4WGoSC2dnX7jA=";
2020 };
2121}
pkgs/servers/tailscale/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildGoModule rec {
44 pname = "tailscale";
5− version = "1.22.0";
5+ version = "1.22.1";
66
77 src = fetchFromGitHub {
88 owner = "tailscale";
99 repo = "tailscale";
1010 rev = "v${version}";
11− sha256 = "sha256-kBxZFzny61xsLynD0sWz4dd8BzbdZkah0ATnHo3txRM=";
11+ sha256 = "sha256-VUML5GwHrRYPd9lnOZuMA3T1SfdC0rVLP5m1yf+SA0A=";
1212 };
1313
1414 nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];
pkgs/tools/admin/aliyun-cli/default.nix+3−3
@@ -2,17 +2,17 @@
22
33buildGoModule rec {
44 pname = "aliyun-cli";
5− version = "3.0.110";
5+ version = "3.0.112";
66
77 src = fetchFromGitHub {
88 rev = "v${version}";
99 owner = "aliyun";
1010 repo = pname;
1111 fetchSubmodules = true;
12− sha256 = "sha256-Omi82feAq0tBuMSuA25JtDatfSJwWcxK3KkWkSI9ax4=";
12+ sha256 = "sha256-gzZFxZMLq0TS8bxnQTTEno6OdAu/5tqr0Tl1cF8Rm3c=";
1313 };
1414
15− vendorSha256 = "sha256-c7LsCNcxdHwDBEknXJt9AyrmFcem8YtUYy06vNDBdDY=";
15+ vendorSha256 = "sha256-FQvBq8+80h7m271gjraV445ayWcpkemOtVswfmHzUM0=";
1616
1717 subPackages = [ "main" ];
1818
pkgs/tools/misc/zellij/default.nix+3−3
@@ -15,16 +15,16 @@
1515
1616rustPlatform.buildRustPackage rec {
1717 pname = "zellij";
18− version = "0.25.0";
18+ version = "0.26.0";
1919
2020 src = fetchFromGitHub {
2121 owner = "zellij-org";
2222 repo = "zellij";
2323 rev = "v${version}";
24− sha256 = "sha256-MTSM8fYAcNcmjg6bkOEN+U5+WilaEy52EJOfyoIy3Zg=";
24+ sha256 = "sha256-8PgEsRh2nBOIvKeX9SJ853NN8Szb4geKwv2qvTtkMxk=";
2525 };
2626
27− cargoSha256 = "sha256-2QEDrxTz7I9hF+WfVKkGLXHWZjQ5by/zuO16NGOJSKk=";
27+ cargoSha256 = "sha256-YaqaXn1Ol5RfwAzWi7767vt1je+wqWFtfgxMOSIy9UI=";
2828
2929 nativeBuildInputs = [
3030 mandown
pkgs/tools/package-management/cargo-release/default.nix+3−3
@@ -2,16 +2,16 @@
22
33rustPlatform.buildRustPackage rec {
44 pname = "cargo-release";
5− version = "0.20.2";
5+ version = "0.20.3";
66
77 src = fetchFromGitHub {
88 owner = "crate-ci";
99 repo = "cargo-release";
1010 rev = "v${version}";
11− sha256 = "sha256-KWLZdFpRwtdP17x71IU2MGFwd1SNnTRcgTUoW1p5Px4=";
11+ sha256 = "sha256-oYnqrNqbn/OsJd0Lh6rQ2pt7FrLOp5p3MoavC56dWQc=";
1212 };
1313
14− cargoSha256 = "sha256-CTaEWANx3s7YCm8pqGWuvGqR362YtVjmbnc9V3kC8pI=";
14+ cargoSha256 = "sha256-LtDIzqHzzur+GxxvUHciNQCRmxqdmaXSG4ncMV3Rx3c=";
1515
1616 nativeBuildInputs = [ pkg-config ];
1717