git.iko.soy/typeable/nixpkgs
on master help sign in
Merge staging-next into staging
commitabc8ee49e520ae00413cead1dde85be2abed2dc1 authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> dateThu 17 Mar 2022, 06:01 (5 years ago) parent2eac31029e3b93
8 files changed+40−19
compare with master
unifiedsplit
pkgs/applications/misc/prusa-slicer/super-slicer.nix+1−1 pkgs/applications/networking/cluster/terraform-providers/providers.json+4−4 pkgs/applications/networking/instant-messengers/neochat/default.nix+8−2 pkgs/build-support/rust/import-cargo-lock.nix+6−1 pkgs/development/interpreters/guile/3.0.nix+1−1 pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix+2−2 pkgs/games/gcompris/default.nix+17−7 pkgs/top-level/all-packages.nix+1−1
pkgs/applications/misc/prusa-slicer/super-slicer.nix+1−1
@@ -45,7 +45,7 @@ let
4545
4646 meta = with lib; {
4747 inherit description;
48− homepage = "https://github.com/supermerili/SuperSlicer";
48+ homepage = "https://github.com/supermerill/SuperSlicer";
4949 license = licenses.agpl3;
5050 maintainers = with maintainers; [ cab404 moredread ];
5151 mainProgram = "superslicer";
pkgs/applications/networking/cluster/terraform-providers/providers.json+4−4
@@ -772,12 +772,12 @@
772772 },
773773 "oci": {
774774 "owner": "oracle",
775− "provider-source-address": "registry.terraform.io/hashicorp/oci",
775+ "provider-source-address": "registry.terraform.io/oracle/oci",
776776 "repo": "terraform-provider-oci",
777− "rev": "v4.67.0",
778− "sha256": "sha256-kgnyGLF6UbWRbrjXDkh7y11jx4JO3hFo7/qdJzwX0rU=",
777+ "rev": "v4.68.0",
778+ "sha256": "sha256-f1Nk5NurQvJuGyGrZQnZIXIpaH1qFAX+oTBNan6rORI=",
779779 "vendorSha256": null,
780− "version": "4.67.0"
780+ "version": "4.68.0"
781781 },
782782 "okta": {
783783 "owner": "okta",
pkgs/applications/networking/instant-messengers/neochat/default.nix+8−2
@@ -8,6 +8,7 @@
88, kconfig
99, kdbusaddons
1010, ki18n
11+, kio
1112, kirigami2
1213, kitemmodels
1314, knotifications
@@ -16,23 +17,25 @@
1617, libquotient
1718, libsecret
1819, olm
20+, qcoro
1921, qqc2-desktop-style
2022, qtgraphicaleffects
2123, qtkeychain
2224, qtmultimedia
2325, qtquickcontrols2
26+, sonnet
2427}:
2528
2629mkDerivation rec {
2730 pname = "neochat";
28− version = "1.2";
31+ version = "22.02";
2932
3033 src = fetchFromGitLab {
3134 domain = "invent.kde.org";
3235 owner = "network";
3336 repo = pname;
3437 rev = "v${version}";
35− sha256 = "sha256-Kpv7BY/qS0A3xFlYFhz1RRNwQVsyhOTHHGDbWRTTv1I=";
38+ sha256 = "sha256-7EBnHuwpyJ/bGrCldZHWOwcnJWDIDaNWZXHkCYkOTjs=";
3639 };
3740
3841 nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ];
@@ -41,6 +44,7 @@ mkDerivation rec {
4144 cmark
4245 kconfig
4346 kdbusaddons
47+ kio
4448 ki18n
4549 kirigami2
4650 kitemmodels
@@ -50,11 +54,13 @@ mkDerivation rec {
5054 libquotient
5155 libsecret
5256 olm
57+ qcoro
5358 qtgraphicaleffects
5459 qtkeychain
5560 qtmultimedia
5661 qtquickcontrols2
5762 qqc2-desktop-style
63+ sonnet
5864 ];
5965
6066 meta = with lib; {
pkgs/build-support/rust/import-cargo-lock.nix+6−1
@@ -128,8 +128,13 @@ let
128128
129129 # If the target package is in a workspace, or if it's the top-level
130130 # crate, we should find the crate path using `cargo metadata`.
131− crateCargoTOML=$(${cargo}/bin/cargo metadata --format-version 1 --no-deps --manifest-path $tree/Cargo.toml | \
131+ # Some packages do not have a Cargo.toml at the top-level,
132+ # but only in nested directories.
133+ # Only check the top-level Cargo.toml, if it actually exists
134+ if [[ -f $tree/Cargo.toml ]]; then
135+ crateCargoTOML=$(${cargo}/bin/cargo metadata --format-version 1 --no-deps --manifest-path $tree/Cargo.toml | \
132136 ${jq}/bin/jq -r '.packages[] | select(.name == "${pkg.name}") | .manifest_path')
137+ fi
133138
134139 # If the repository is not a workspace the package might be in a subdirectory.
135140 if [[ -z $crateCargoTOML ]]; then
pkgs/development/interpreters/guile/3.0.nix+1−1
@@ -140,7 +140,7 @@ builder rec {
140140 # Expect the text in format of '"https://ftp.gnu.org/gnu/guile/guile-3.0.8.tar.gz"'
141141 new_version="$(curl -s https://www.gnu.org/software/guile/download/ |
142142 pcregrep -o1 '"https://ftp.gnu.org/gnu/guile/guile-(3[.0-9]+).tar.gz"')"
143− update-source-version ${pname} "$new_version"
143+ update-source-version guile_3_0 "$new_version"
144144 '';
145145 };
146146
pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix+2−2
@@ -5,13 +5,13 @@
55
66buildGoModule rec {
77 pname = "bazel-remote";
8− version = "2.3.5";
8+ version = "2.3.6";
99
1010 src = fetchFromGitHub {
1111 owner = "buchgr";
1212 repo = pname;
1313 rev = "v${version}";
14− sha256 = "sha256-8tT00ppqBGLw2h+RxaiD7r3XYzyvXOHj1U8V5H/ftyQ=";
14+ sha256 = "sha256-geb7uHCBvhmqyaDr8wK9sQUcHT3xVgSclovFDpHhIiw=";
1515 };
1616
1717 vendorSha256 = "sha256-wXgW7HigMIeUZAcZpm5TH9thfCHmpz+M42toWHgwIYo=";
pkgs/games/gcompris/default.nix+17−7
@@ -18,11 +18,11 @@
1818
1919mkDerivation rec {
2020 pname = "gcompris";
21− version = "2.1";
21+ version = "2.3";
2222
2323 src = fetchurl {
24− url = "http://gcompris.net/download/qt/src/gcompris-qt-${version}.tar.xz";
25− sha256 = "sha256-ljOY/uybXzfwOFmhBXB4sC4Vn/C8BP1BeUUPpdHuQwo=";
24+ url = "https://download.kde.org/stable/gcompris/qt/src/gcompris-qt-${version}.tar.xz";
25+ sha256 = "sha256-UgWLp5IVqbeFFCO/PRFJ/X1sPm7nSkagVcgEp5SdzGI=";
2626 };
2727
2828 cmakeFlags = [
@@ -32,15 +32,24 @@ mkDerivation rec {
3232 nativeBuildInputs = [ cmake gettext ninja qttools ];
3333
3434 buildInputs = [
35− qmlbox2d qtbase qtdeclarative qtgraphicaleffects qtmultimedia qtquickcontrols qtsensors qtxmlpatterns
35+ qmlbox2d
36+ qtdeclarative
37+ qtgraphicaleffects
38+ qtmultimedia
39+ qtquickcontrols
40+ qtsensors
41+ qtxmlpatterns
3642 ] ++ (with gst_all_1; [
37− gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad
43+ gstreamer
44+ gst-plugins-base
45+ gst-plugins-good
46+ gst-plugins-bad
3847 ]);
3948
4049 postInstall = ''
41− install -Dm444 ../org.kde.gcompris.desktop $out/share/applications/gcompris.desktop
42− install -Dm444 ../images/256-apps-gcompris-qt.png $out/share/icons/hicolor/256x256/apps/gcompris-qt.png
50+ install -Dm444 ../org.kde.gcompris.desktop -t $out/share/applications
4351 install -Dm444 ../org.kde.gcompris.appdata.xml -t $out/share/metainfo
52+ install -Dm444 ../images/256-apps-gcompris-qt.png $out/share/icons/hicolor/256x256/apps/gcompris-qt.png
4453
4554 qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
4655 '';
@@ -49,6 +58,7 @@ mkDerivation rec {
4958 description = "A high quality educational software suite, including a large number of activities for children aged 2 to 10";
5059 homepage = "https://gcompris.net/";
5160 license = licenses.gpl3Plus;
61+ mainProgram = "gcompris-qt";
5262 maintainers = with maintainers; [ guibou ];
5363 platforms = platforms.linux;
5464 };
pkgs/top-level/all-packages.nix+1−1
@@ -3038,7 +3038,7 @@ with pkgs;
30383038
30393039 element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix {
30403040 inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices;
3041− electron = electron_15;
3041+ electron = electron_17;
30423042 };
30433043 element-desktop-wayland = writeScriptBin "element-desktop" ''
30443044 #!/bin/sh