diff options
Diffstat (limited to 'pkgs/applications')
12 files changed, 78 insertions, 34 deletions
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index d157c1e2ee9..a5c8dcfb50f 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -5,6 +5,7 @@ , vscode-utils , asciidoctor , nodePackages +, python3Packages , jdk , llvmPackages_8 , nixpkgs-fmt @@ -1313,6 +1314,33 @@ let }; }; + kddejong.vscode-cfn-lint = let + inherit (python3Packages) cfn-lint; + in buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-cfn-lint"; + publisher = "kddejong"; + version = "0.21.0"; + sha256 = "sha256-IueXiN+077tiecAsVCzgYksWYTs00mZv6XJVMtRJ/PQ="; + }; + + nativeBuildInputs = [ jq moreutils ]; + + buildInputs = [ cfn-lint ]; + + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."cfnLint.path".default = "${cfn-lint}/bin/cfn-lint"' package.json | sponge package.json + ''; + + meta = with lib; { + description = "CloudFormation Linter IDE integration, autocompletion, and documentation"; + homepage = "https://github.com/aws-cloudformation/cfn-lint-visual-studio-code"; + license = lib.licenses.asl20; + maintainers = with maintainers; [ wolfangaukang ]; + }; + }; + kubukoz.nickel-syntax = buildVscodeMarketplaceExtension { mktplcRef = { name = "nickel-syntax"; diff --git a/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix index 2ac16662b88..d2c2cf03683 100644 --- a/pkgs/applications/emulators/ryujinx/default.nix +++ b/pkgs/applications/emulators/ryujinx/default.nix @@ -17,13 +17,13 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.64"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.76"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "54bfaa125d9b6ae1be53ec431d40326fba51d0de"; - sha256 = "0p8wmnm8sjx7wqb5z62mp8c3cwrv241ji3fawj2qgqx3k9jlb31i"; + rev = "e2ffa5a125fcbe8a25c73d8e04c08c08ef378860"; + sha256 = "1rmiyjqwlsbzh9q7d12n72ka9adaby2rfcbn75sf47p5857yi3p9"; }; dotnet-sdk = dotnetCorePackages.sdk_6_0; diff --git a/pkgs/applications/emulators/ryujinx/deps.nix b/pkgs/applications/emulators/ryujinx/deps.nix index 804b17d8946..4dc809a74b1 100644 --- a/pkgs/applications/emulators/ryujinx/deps.nix +++ b/pkgs/applications/emulators/ryujinx/deps.nix @@ -22,6 +22,7 @@ (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.15.0"; sha256 = "0dwx7dk8jr10784nriqbi364qbxzfwq0c6xia0ac5rzrp7179r4d"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.15.0"; sha256 = "0jn9a20a2zixnkm3bmpmvmiv7mk0hqdlnpi0qgjkg1nir87czm19"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.15.0"; sha256 = "1nbgydr45f7lp980xyrkzpyaw2mkkishjwp3slgxk7f0mz6q8i1v"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.8.0"; sha256 = "1ln2mva7j2mpsj9rdhpk8vhm3pgd8wn563xqdcwd38avnhp74rm9"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.0"; sha256 = "188cbx99ahvksap9w20943p62fmzxa6fl133w4r7c6bjpsrm29a4"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.0"; sha256 = "1016ld3kg4dav2yxxh0i32cy0ixv7s0wl9czydbhkbs2d8669kfx"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.0"; sha256 = "0qaylw18flrfl3vxnbp8wsiz29znidmn6dhv7k4v4jj2za16wmji"; }) @@ -32,7 +33,6 @@ (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.8.0"; sha256 = "1ln2mva7j2mpsj9rdhpk8vhm3pgd8wn563xqdcwd38avnhp74rm9"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.8.0"; sha256 = "0ii9d88py6mjsxzj9v3zx4izh6rb9ma6s9kj85xmc0xrw7jc2g3m"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "16.8.0"; sha256 = "1rh8cga1km3jfafkwfjr0dwqrxb4306hf7fipwba9h02w7vlhb9a"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; }) diff --git a/pkgs/applications/misc/abook/default.nix b/pkgs/applications/misc/abook/default.nix index de463cfd666..e822f869619 100644 --- a/pkgs/applications/misc/abook/default.nix +++ b/pkgs/applications/misc/abook/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { description = "Text-based addressbook program designed to use with mutt mail client"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.edwtjo ]; - platforms = with lib.platforms; linux; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/applications/misc/moonlight-qt/default.nix b/pkgs/applications/misc/moonlight-qt/default.nix index 1a764dfaef3..c2981351749 100644 --- a/pkgs/applications/misc/moonlight-qt/default.nix +++ b/pkgs/applications/misc/moonlight-qt/default.nix @@ -57,5 +57,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ luc65r ]; platforms = platforms.all; + mainProgram = "moonlight"; }; } diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 4de0ecc5377..d71faf6a51e 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -45,9 +45,9 @@ } }, "ungoogled-chromium": { - "version": "99.0.4844.51", - "sha256": "1qxsn8zvvvsnn0k7nn606rhaial8ikrlfh175msqpp50xibjxicp", - "sha256bin64": "04kqfppa88g2q54vp53avyyhqzrxljz49p4wqk76kq7fz2rm94x1", + "version": "99.0.4844.74", + "sha256": "165vzxv3xi4r9ia3qnqsr4p9ai0344w1pnq03c6jdq7x613lcprd", + "sha256bin64": "1xzr7qv4rcardl3apr8w22dn81lzqkklhp26qqlbdcylacqqji04", "deps": { "gn": { "version": "2022-01-10", @@ -56,8 +56,8 @@ "sha256": "1103lf38h7412949j6nrk48m2vv2rrxacn42sjg33lg88nyv7skv" }, "ungoogled-patches": { - "rev": "99.0.4844.51-1", - "sha256": "0rs10jrng63lk4xgnqpgc8zxaj6lp70csbx6r0ihpv4z3rdn37va" + "rev": "99.0.4844.74-1", + "sha256": "1ki517fi55rz7ib2sq0q6gw1w1m2j4yakkpcgpmgvapg05s3zg7m" } } } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 8df80ab526a..50cc5718290 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -11,7 +11,6 @@ , gdk-pixbuf , glib , glibc -, gtk2 , gtk3 , libkrb5 , libX11 @@ -110,7 +109,6 @@ stdenv.mkDerivation { gdk-pixbuf glib glibc - gtk2 gtk3 libkrb5 mesa diff --git a/pkgs/applications/networking/cluster/driftctl/default.nix b/pkgs/applications/networking/cluster/driftctl/default.nix index 4c22b9adca5..03f5ccda400 100644 --- a/pkgs/applications/networking/cluster/driftctl/default.nix +++ b/pkgs/applications/networking/cluster/driftctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "driftctl"; - version = "0.23.0"; + version = "0.23.2"; src = fetchFromGitHub { owner = "snyk"; repo = "driftctl"; rev = "v${version}"; - sha256 = "sha256-TUwTvCsWB+n+shVU1hTzLYROG9Wp4ySzJwAnappK7TY="; + sha256 = "sha256-hGwQdR2LF1uuq11d2BD4hVjcXpPCbRNovOqJpj0J1Sw="; }; vendorSha256 = "sha256-I0OCRhUvuaF4k5qqPaV6R24mrd9AG5GgQCCF6yodK0E="; diff --git a/pkgs/applications/networking/cluster/kn/default.nix b/pkgs/applications/networking/cluster/kn/default.nix index d5faebdab3c..93ccd873f77 100644 --- a/pkgs/applications/networking/cluster/kn/default.nix +++ b/pkgs/applications/networking/cluster/kn/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kn"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "knative"; repo = "client"; rev = "knative-v${version}"; - sha256 = "sha256-PxiYxDHcA95MinNpEcXul2cYrV/VB6gThhYCZANqAGY="; + sha256 = "sha256-xpSnirdEZ/Cua/wicu62HzeDm0E8Xo/Jt2eMfUS7mDo="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix index e0042e43efb..88c3a31fd2d 100644 --- a/pkgs/applications/networking/cluster/velero/default.nix +++ b/pkgs/applications/networking/cluster/velero/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "velero"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "velero"; rev = "v${version}"; - sha256 = "sha256-tQGAzQFrpCUAEzdd5vr4j2oIb6TKeN9DQm96TdP0n40="; + sha256 = "sha256-oiYr9JQlJVxjZxGhZyOIUy934KedBmDhzK+71qmaD58="; }; ldflags = [ diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix index b6583efe730..ecfde0a39c2 100644 --- a/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/pkgs/applications/networking/protonvpn-gui/default.nix @@ -1,8 +1,21 @@ -{ lib, fetchFromGitHub, gobject-introspection, imagemagick, -wrapGAppsHook, python3Packages, gtk3, networkmanager, webkitgtk }: +{ lib +, buildPythonApplication +, fetchFromGitHub +, wrapGAppsHook +, gobject-introspection +, imagemagick +, networkmanager +, pango +, webkitgtk +# Python libs +, protonvpn-nm-lib +, psutil +# Optionals +, withIndicator ? true +, libappindicator-gtk3 }: -python3Packages.buildPythonApplication rec { - pname = "protonvpn-linux-gui"; +buildPythonApplication rec { + pname = "protonvpn-gui"; version = "1.7.0"; src = fetchFromGitHub { @@ -12,22 +25,26 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-uzooFQBq2mhqTBr/cgea5cVQ889P70sgSk2vjXBQEfw="; }; - strictDeps = false; - nativeBuildInputs = [ - gobject-introspection imagemagick wrapGAppsHook + gobject-introspection + imagemagick + wrapGAppsHook ]; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = [ protonvpn-nm-lib psutil ]; buildInputs = [ - gtk3 networkmanager webkitgtk - ]; + # To avoid enabling strictDeps = false (#56943) + gobject-introspection + networkmanager + pango + webkitgtk + ] ++ lib.optionals withIndicator [ libappindicator-gtk3 ]; - postFixup = '' + postInstall = '' # Setting icons for size in 16 32 48 64 72 96 128 192 512 1024; do mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps @@ -45,9 +62,9 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = with lib; { - description = "Linux GUI for ProtonVPN, written in Python"; + description = "Official ProtonVPN Linux app"; homepage = "https://github.com/ProtonVPN/linux-app"; - maintainers = with maintainers; [ offline wolfangaukang ]; + maintainers = with maintainers; [ wolfangaukang ]; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index 89da6b6b11e..ed518d8eb2e 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.21.7"; + version = "0.21.8"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2fh1/7/or++AzvkJfwXD07UiyX8U8CIEe+qXc5S82mM="; + sha256 = "sha256-l0XfitQSmSkivEg8+XcA/+bWdy/wzIpii/Npc4p8kUw="; }; - cargoSha256 = "sha256-ERBxY0PBQOvAVeWCRcB7rApTLjtHxa0KMV4qGlU/j/Q="; + cargoSha256 = "sha256-2rJ9ZZHK1acJu6r6EjuoolLJZMdBsbKgN1DNvGM7deA="; nativeBuildInputs = [ pkg-config makeWrapper ]; |