Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
abc8ee49e5
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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; {
|
||||
|
|
|
|||
|
|
@ -128,8 +128,13 @@ let
|
|||
|
||||
# If the target package is in a workspace, or if it's the top-level
|
||||
# crate, we should find the crate path using `cargo metadata`.
|
||||
crateCargoTOML=$(${cargo}/bin/cargo metadata --format-version 1 --no-deps --manifest-path $tree/Cargo.toml | \
|
||||
# Some packages do not have a Cargo.toml at the top-level,
|
||||
# but only in nested directories.
|
||||
# Only check the top-level Cargo.toml, if it actually exists
|
||||
if [[ -f $tree/Cargo.toml ]]; then
|
||||
crateCargoTOML=$(${cargo}/bin/cargo metadata --format-version 1 --no-deps --manifest-path $tree/Cargo.toml | \
|
||||
${jq}/bin/jq -r '.packages[] | select(.name == "${pkg.name}") | .manifest_path')
|
||||
fi
|
||||
|
||||
# If the repository is not a workspace the package might be in a subdirectory.
|
||||
if [[ -z $crateCargoTOML ]]; then
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@ builder rec {
|
|||
# Expect the text in format of '"https://ftp.gnu.org/gnu/guile/guile-3.0.8.tar.gz"'
|
||||
new_version="$(curl -s https://www.gnu.org/software/guile/download/ |
|
||||
pcregrep -o1 '"https://ftp.gnu.org/gnu/guile/guile-(3[.0-9]+).tar.gz"')"
|
||||
update-source-version ${pname} "$new_version"
|
||||
update-source-version guile_3_0 "$new_version"
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "bazel-remote";
|
||||
version = "2.3.5";
|
||||
version = "2.3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "buchgr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8tT00ppqBGLw2h+RxaiD7r3XYzyvXOHj1U8V5H/ftyQ=";
|
||||
sha256 = "sha256-geb7uHCBvhmqyaDr8wK9sQUcHT3xVgSclovFDpHhIiw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-wXgW7HigMIeUZAcZpm5TH9thfCHmpz+M42toWHgwIYo=";
|
||||
|
|
|
|||
|
|
@ -18,11 +18,11 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "gcompris";
|
||||
version = "2.1";
|
||||
version = "2.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://gcompris.net/download/qt/src/gcompris-qt-${version}.tar.xz";
|
||||
sha256 = "sha256-ljOY/uybXzfwOFmhBXB4sC4Vn/C8BP1BeUUPpdHuQwo=";
|
||||
url = "https://download.kde.org/stable/gcompris/qt/src/gcompris-qt-${version}.tar.xz";
|
||||
sha256 = "sha256-UgWLp5IVqbeFFCO/PRFJ/X1sPm7nSkagVcgEp5SdzGI=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
@ -32,15 +32,24 @@ mkDerivation rec {
|
|||
nativeBuildInputs = [ cmake gettext ninja qttools ];
|
||||
|
||||
buildInputs = [
|
||||
qmlbox2d qtbase qtdeclarative qtgraphicaleffects qtmultimedia qtquickcontrols qtsensors qtxmlpatterns
|
||||
qmlbox2d
|
||||
qtdeclarative
|
||||
qtgraphicaleffects
|
||||
qtmultimedia
|
||||
qtquickcontrols
|
||||
qtsensors
|
||||
qtxmlpatterns
|
||||
] ++ (with gst_all_1; [
|
||||
gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
gst-plugins-bad
|
||||
]);
|
||||
|
||||
postInstall = ''
|
||||
install -Dm444 ../org.kde.gcompris.desktop $out/share/applications/gcompris.desktop
|
||||
install -Dm444 ../images/256-apps-gcompris-qt.png $out/share/icons/hicolor/256x256/apps/gcompris-qt.png
|
||||
install -Dm444 ../org.kde.gcompris.desktop -t $out/share/applications
|
||||
install -Dm444 ../org.kde.gcompris.appdata.xml -t $out/share/metainfo
|
||||
install -Dm444 ../images/256-apps-gcompris-qt.png $out/share/icons/hicolor/256x256/apps/gcompris-qt.png
|
||||
|
||||
qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
|
||||
'';
|
||||
|
|
@ -49,6 +58,7 @@ mkDerivation rec {
|
|||
description = "A high quality educational software suite, including a large number of activities for children aged 2 to 10";
|
||||
homepage = "https://gcompris.net/";
|
||||
license = licenses.gpl3Plus;
|
||||
mainProgram = "gcompris-qt";
|
||||
maintainers = with maintainers; [ guibou ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3038,7 +3038,7 @@ with pkgs;
|
|||
|
||||
element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices;
|
||||
electron = electron_15;
|
||||
electron = electron_17;
|
||||
};
|
||||
element-desktop-wayland = writeScriptBin "element-desktop" ''
|
||||
#!/bin/sh
|
||||
|
|
|
|||
Loading…
Reference in a new issue