diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-07-20 00:02:29 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-20 00:02:29 +0000 |
commit | e048c645c9f22b9de3650f89c97ddf3f44b46e5b (patch) | |
tree | 21dfe756b5a68013fbaafa59557e8ccd3a3f212c /pkgs/applications | |
parent | 2c5b83e75c8758ecb2950d0d38203ca3e959a8b6 (diff) | |
parent | c6244cdd0cba75e1aa98e33089baac39bd85cee4 (diff) | |
download | nixlib-e048c645c9f22b9de3650f89c97ddf3f44b46e5b.tar nixlib-e048c645c9f22b9de3650f89c97ddf3f44b46e5b.tar.gz nixlib-e048c645c9f22b9de3650f89c97ddf3f44b46e5b.tar.bz2 nixlib-e048c645c9f22b9de3650f89c97ddf3f44b46e5b.tar.lz nixlib-e048c645c9f22b9de3650f89c97ddf3f44b46e5b.tar.xz nixlib-e048c645c9f22b9de3650f89c97ddf3f44b46e5b.tar.zst nixlib-e048c645c9f22b9de3650f89c97ddf3f44b46e5b.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications')
4 files changed, 69 insertions, 13 deletions
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 804f3bb6e13e..8698167bb479 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -326,8 +326,8 @@ let mktplcRef = { name = "astro-vscode"; publisher = "astro-build"; - version = "1.0.6"; - sha256 = "sha256-/gpZtOO8MA/MJ1o9eG4qmPqhWRZ5E+elA9Rr/kpOprI="; + version = "2.1.1"; + sha256 = "sha256-UVZOpkOHbLiwA4VfTgXxuIU8EtJLnqRa5zUVha6xQJY="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/astro-build.astro-vscode/changelog"; diff --git a/pkgs/applications/misc/cartridges/default.nix b/pkgs/applications/misc/cartridges/default.nix new file mode 100644 index 000000000000..1c7afb548319 --- /dev/null +++ b/pkgs/applications/misc/cartridges/default.nix @@ -0,0 +1,56 @@ +{ blueprint-compiler +, desktop-file-utils +, fetchFromGitHub +, gobject-introspection +, lib +, libadwaita +, meson +, ninja +, python3 +, stdenv +, wrapGAppsHook4 +}: +stdenv.mkDerivation (finalAttrs: { + pname = "cartridges"; + version = "2.0.4"; + + src = fetchFromGitHub { + owner = "kra-mo"; + repo = "cartridges"; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-DaeAdxgp6/a3H2ppgVxRjYUbHGZcyIeREVPX6FxE7bc="; + }; + + buildInputs = [ + libadwaita + (python3.withPackages (p: with p; [ + pillow + pygobject3 + pyyaml + requests + ])) + ]; + + nativeBuildInputs = [ + blueprint-compiler + desktop-file-utils + gobject-introspection + meson + ninja + wrapGAppsHook4 + ]; + + meta = with lib; { + description = "A GTK4 + Libadwaita game launcher"; + longDescription = '' + A simple game launcher for all of your games. + It has support for importing games from Steam, Lutris, Heroic + and more with no login necessary. + You can sort and hide games or download cover art from SteamGridDB. + ''; + homepage = "https://apps.gnome.org/app/hu.kramo.Cartridges/"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.getchoo ]; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/applications/networking/cluster/k3s/1_26/versions.nix b/pkgs/applications/networking/cluster/k3s/1_26/versions.nix index 330afe6b092f..799fd3f9b1db 100644 --- a/pkgs/applications/networking/cluster/k3s/1_26/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_26/versions.nix @@ -1,8 +1,8 @@ { - k3sVersion = "1.26.5+k3s1"; - k3sCommit = "7cefebeaac7dbdd0bfec131ea7a43a45cb125354"; - k3sRepoSha256 = "0iz8w24lhb3mgwnks79ky4nypdqbjn91zm4nrj1ar3abkb5i8bg3"; - k3sVendorSha256 = "sha256-yPzpt9OZfW7qY9gFgrRVgmk2l9OSMMF85OY79MDCKTs="; + k3sVersion = "1.26.6+k3s1"; + k3sCommit = "3b1919b0d55811707bd1168f0abf11cccc656c26"; + k3sRepoSha256 = "1g82bkq4w0jpfn1fanj1d24bj46rw908wk50p3cm47rqiqlys72y"; + k3sVendorSha256 = "sha256-+a9/q5a28zA9SmAdp2IItHR1MdJvlbMW5796bHTfKBw="; chartVersions = import ./chart-versions.nix; k3sRootVersion = "0.12.2"; k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 2e62537e21ae..ce5bc9793805 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -272,15 +272,15 @@ rec { # Get revisions from # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* docker_20_10 = callPackage dockerGen rec { - version = "20.10.23"; + version = "20.10.25"; cliRev = "v${version}"; - cliHash = "sha256-fNaRpstyG90Jzq3+U2A42Jj+ixb+m7tXLioIcsegPbQ="; + cliHash = "sha256-Wi/NHn8erqvKEVEJqkc99cO/sfPHptwMT44Savcuw2M="; mobyRev = "v${version}"; - mobyHash = "sha256-nBPw/M4VC9XeZ9S33HWdWSjY2J2mYpI/TPOzvLjSmJM="; - runcRev = "v1.1.4"; - runcHash = "sha256-ougJHW1Z+qZ324P8WpZqawY1QofKnn8WezP7orzRTdA="; - containerdRev = "v1.6.15"; - containerdHash = "sha256-Vlftq//mLYZPoT2R/lHJA6wLnqiuC+Cpy4lGQC8jCPA="; + mobyHash = "sha256-trJjQMYF/Uog7nvUlELyUYbsTPGz8Rn21v1/V5xhu+A="; + runcRev = "v1.1.5"; + runcHash = "sha256-r5as3hb0zt+XPfxAPeH+YIc/n6IRlscPOZMGfhVE5C4="; + containerdRev = "v1.6.20"; + containerdHash = "sha256-Nd3S6hmvA8LBFUN4XaQJMApbmwGIp6GTnFQimnYagZg="; tiniRev = "v0.19.0"; tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; |