diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-17 06:01:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-17 06:01:51 +0000 |
| commit | abc8ee49e520ae00413cead1dde85be2abed2dc1 (patch) | |
| tree | d3196842edc379d44ddc9118595f49dc763fa50a /pkgs/applications | |
| parent | 2eac3106dfbf4a60bf8c059ad0fa70224840052a (diff) | |
| parent | 29e3b931556d49589c79ff93317e3e2ad0d62cff (diff) | |
| download | nixpkgs-abc8ee49e520ae00413cead1dde85be2abed2dc1.tar nixpkgs-abc8ee49e520ae00413cead1dde85be2abed2dc1.tar.gz nixpkgs-abc8ee49e520ae00413cead1dde85be2abed2dc1.tar.bz2 nixpkgs-abc8ee49e520ae00413cead1dde85be2abed2dc1.tar.lz nixpkgs-abc8ee49e520ae00413cead1dde85be2abed2dc1.tar.xz nixpkgs-abc8ee49e520ae00413cead1dde85be2abed2dc1.tar.zst nixpkgs-abc8ee49e520ae00413cead1dde85be2abed2dc1.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications')
3 files changed, 13 insertions, 7 deletions
diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index 7a4d2ee1d25..c3037f0da8d 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -45,7 +45,7 @@ let meta = with lib; { inherit description; - homepage = "https://github.com/supermerili/SuperSlicer"; + homepage = "https://github.com/supermerill/SuperSlicer"; license = licenses.agpl3; maintainers = with maintainers; [ cab404 moredread ]; mainProgram = "superslicer"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 8ff0628a661..457b9d342cc 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -772,12 +772,12 @@ }, "oci": { "owner": "oracle", - "provider-source-address": "registry.terraform.io/hashicorp/oci", + "provider-source-address": "registry.terraform.io/oracle/oci", "repo": "terraform-provider-oci", - "rev": "v4.67.0", - "sha256": "sha256-kgnyGLF6UbWRbrjXDkh7y11jx4JO3hFo7/qdJzwX0rU=", + "rev": "v4.68.0", + "sha256": "sha256-f1Nk5NurQvJuGyGrZQnZIXIpaH1qFAX+oTBNan6rORI=", "vendorSha256": null, - "version": "4.67.0" + "version": "4.68.0" }, "okta": { "owner": "okta", diff --git a/pkgs/applications/networking/instant-messengers/neochat/default.nix b/pkgs/applications/networking/instant-messengers/neochat/default.nix index 6de6922913f..a8e73ad1098 100644 --- a/pkgs/applications/networking/instant-messengers/neochat/default.nix +++ b/pkgs/applications/networking/instant-messengers/neochat/default.nix @@ -8,6 +8,7 @@ , kconfig , kdbusaddons , ki18n +, kio , kirigami2 , kitemmodels , knotifications @@ -16,23 +17,25 @@ , libquotient , libsecret , olm +, qcoro , qqc2-desktop-style , qtgraphicaleffects , qtkeychain , qtmultimedia , qtquickcontrols2 +, sonnet }: mkDerivation rec { pname = "neochat"; - version = "1.2"; + version = "22.02"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "network"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Kpv7BY/qS0A3xFlYFhz1RRNwQVsyhOTHHGDbWRTTv1I="; + sha256 = "sha256-7EBnHuwpyJ/bGrCldZHWOwcnJWDIDaNWZXHkCYkOTjs="; }; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ]; @@ -41,6 +44,7 @@ mkDerivation rec { cmark kconfig kdbusaddons + kio ki18n kirigami2 kitemmodels @@ -50,11 +54,13 @@ mkDerivation rec { libquotient libsecret olm + qcoro qtgraphicaleffects qtkeychain qtmultimedia qtquickcontrols2 qqc2-desktop-style + sonnet ]; meta = with lib; { |