Merge master into staging-next

authored by

github-actions[bot] and committed by
GitHub
cf320b51 16f9e4da

+110 -14
+52
pkgs/applications/misc/index-fm/default.nix
··· 1 + { lib 2 + , mkDerivation 3 + , fetchFromGitLab 4 + , cmake 5 + , extra-cmake-modules 6 + , breeze-icons 7 + , karchive 8 + , kcoreaddons 9 + , ki18n 10 + , kio 11 + , kirigami2 12 + , mauikit 13 + , qtmultimedia 14 + , qtquickcontrols2 15 + }: 16 + 17 + mkDerivation rec { 18 + pname = "index"; 19 + version = "1.2.1"; 20 + 21 + src = fetchFromGitLab { 22 + domain = "invent.kde.org"; 23 + owner = "maui"; 24 + repo = "index-fm"; 25 + rev = "v${version}"; 26 + sha256 = "1v6z44c88cqgr3b758yq6l5d2zj1vhlnaq7v8rrhs7s5dsimzlx8"; 27 + }; 28 + 29 + nativeBuildInputs = [ 30 + cmake 31 + extra-cmake-modules 32 + ]; 33 + 34 + buildInputs = [ 35 + breeze-icons 36 + karchive 37 + kcoreaddons 38 + ki18n 39 + kio 40 + kirigami2 41 + mauikit 42 + qtmultimedia 43 + qtquickcontrols2 44 + ]; 45 + 46 + meta = with lib; { 47 + description = "Multi-platform file manager"; 48 + homepage = "https://invent.kde.org/maui/index-fm"; 49 + license = licenses.gpl3Plus; 50 + maintainers = with maintainers; [ dotlambda ]; 51 + }; 52 + }
+3 -3
pkgs/applications/networking/sync/rclone/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "rclone"; 5 - version = "1.54.0"; 5 + version = "1.54.1"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = pname; 9 9 repo = pname; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-A0c5bHP5W/NTwAh1ifGaw4AG37qYXK9P/Fjk68gkUNk="; 11 + sha256 = "sha256-DexqYAkGmgROnYpknnuWc3Q//IMOTSxgrr1w/TrueH4="; 12 12 }; 13 13 14 14 vendorSha256 = "sha256-Cpn/dUD9E2BzUlAISC+IDCW59OkEKZTpqdlvF/clV+M="; ··· 41 41 homepage = "https://rclone.org"; 42 42 changelog = "https://github.com/rclone/rclone/blob/v${version}/docs/content/changelog.md"; 43 43 license = licenses.mit; 44 - maintainers = with maintainers; [ danielfullmer marsam ]; 44 + maintainers = with maintainers; [ danielfullmer marsam SuperSandro2000 ]; 45 45 }; 46 46 }
+2
pkgs/desktops/lxqt/lxqt-policykit/default.nix
··· 8 8 , qttools 9 9 , qtx11extras 10 10 , qtsvg 11 + , polkit 11 12 , polkit-qt 12 13 , kwindowsystem 13 14 , liblxqt ··· 38 39 qttools 39 40 qtx11extras 40 41 qtsvg 42 + polkit 41 43 polkit-qt 42 44 kwindowsystem 43 45 liblxqt
+42
pkgs/development/libraries/mauikit/default.nix
··· 1 + { lib 2 + , mkDerivation 3 + , fetchFromGitLab 4 + , cmake 5 + , extra-cmake-modules 6 + , kio 7 + , qtbase 8 + , qtquickcontrols2 9 + , syntax-highlighting 10 + }: 11 + 12 + mkDerivation rec { 13 + pname = "mauikit"; 14 + version = "1.2.1"; 15 + 16 + src = fetchFromGitLab { 17 + domain = "invent.kde.org"; 18 + owner = "maui"; 19 + repo = "mauikit"; 20 + rev = "v${version}"; 21 + sha256 = "1wimbpbn9yqqdcjd59x83z0mw2fycjz09py2rwimfi8ldmvi5lgy"; 22 + }; 23 + 24 + nativeBuildInputs = [ 25 + cmake 26 + extra-cmake-modules 27 + ]; 28 + 29 + buildInputs = [ 30 + kio 31 + qtquickcontrols2 32 + syntax-highlighting 33 + ]; 34 + 35 + meta = with lib; { 36 + homepage = "https://mauikit.org/"; 37 + description = "Free and modular front-end framework for developing fast and compelling user experiences"; 38 + license = licenses.lgpl2Plus; 39 + maintainers = with maintainers; [ dotlambda ]; 40 + broken = lib.versionOlder qtbase.version "5.14.0"; 41 + }; 42 + }
+4 -3
pkgs/tools/misc/uutils-coreutils/default.nix
··· 1 1 { stdenv, fetchFromGitHub, rustPlatform, cargo, cmake, sphinx, lib, prefix ? "uutils-" 2 2 , Security 3 3 }: 4 + 4 5 rustPlatform.buildRustPackage rec { 5 6 pname = "uutils-coreutils"; 6 - version = "0.0.3"; 7 + version = "0.0.4"; 7 8 8 9 src = fetchFromGitHub { 9 10 owner = "uutils"; 10 11 repo = "coreutils"; 11 12 rev = version; 12 - sha256 = "QWiEHk8aciiwQeyNgrr0M0c1EeAgE3gSqw0ly/YTwTQ="; 13 + sha256 = "sha256-z5lDKJpFxXDCQq+0Da/63GGoUXacy5TSn+1gJiMvicc="; 13 14 }; 14 15 15 16 # too many impure/platform-dependent tests 16 17 doCheck = false; 17 18 18 - cargoSha256 = "m2a7WNkF5TxjJlytjdoQ/JZIF9gp9qBkH+UU/NVRJzA="; 19 + cargoSha256 = "sha256-x/nn2JNe8x+I0G2Vbr2PZAHCghwLBDhKAhkHPQFeL0M="; 19 20 20 21 makeFlags = 21 22 [ "CARGO=${cargo}/bin/cargo" "PREFIX=$(out)" "PROFILE=release" "INSTALLDIR_MAN=$(out)/share/man/man1" ]
+3 -8
pkgs/tools/misc/ytfzf/default.nix
··· 12 12 13 13 stdenv.mkDerivation rec { 14 14 pname = "ytfzf"; 15 - version = "1.0.0"; 15 + version = "1.0.1"; 16 16 17 17 src = fetchFromGitHub { 18 18 owner = "pystardust"; 19 19 repo = "ytfzf"; 20 20 rev = "v${version}"; 21 - sha256 = "09znixn8mpkxipv2x3nrfxr2i8g7y58v25qssqf092j9lh85sf9h"; 21 + sha256 = "1i9ya38zcaj1vkfgy1n4gp5vqb59zlrd609pdmz4jqinrb0c5fgv"; 22 22 }; 23 23 24 24 nativeBuildInputs = [ makeWrapper ]; 25 25 26 - makeFlags = [ "PREFIX=${placeholder "out"}" ]; 26 + makeFlags = [ "PREFIX=${placeholder "out"}/bin" ]; 27 27 28 28 dontBuild = true; 29 - 30 - # remove after next update 31 - preInstall = '' 32 - mkdir -p "$out/bin" 33 - ''; 34 29 35 30 postInstall = '' 36 31 wrapProgram "$out/bin/ytfzf" --prefix PATH : ${lib.makeBinPath [
+2
pkgs/top-level/all-packages.nix
··· 23265 23265 # Impressive, formerly known as "KeyJNote". 23266 23266 impressive = callPackage ../applications/office/impressive { }; 23267 23267 23268 + index-fm = libsForQt5.callPackage ../applications/misc/index-fm { }; 23269 + 23268 23270 inkcut = libsForQt5.callPackage ../applications/misc/inkcut { }; 23269 23271 23270 23272 inkscape = callPackage ../applications/graphics/inkscape {
+2
pkgs/top-level/qt5-packages.nix
··· 115 115 116 116 kpmcore = callPackage ../development/libraries/kpmcore { }; 117 117 118 + mauikit = callPackage ../development/libraries/mauikit { }; 119 + 118 120 mlt = callPackage ../development/libraries/mlt/qt-5.nix { }; 119 121 120 122 openbr = callPackage ../development/libraries/openbr { };