From b25837d9f46228c3b97d041c7ff03e16251ba54b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 6 Mar 2021 11:31:22 +0100 Subject: [PATCH 1/6] libsForQt5.mauikit: init at 1.2.1 --- .../development/libraries/mauikit/default.nix | 42 +++++++++++++++++++ pkgs/top-level/qt5-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/libraries/mauikit/default.nix diff --git a/pkgs/development/libraries/mauikit/default.nix b/pkgs/development/libraries/mauikit/default.nix new file mode 100644 index 00000000000..0ec814b7164 --- /dev/null +++ b/pkgs/development/libraries/mauikit/default.nix @@ -0,0 +1,42 @@ +{ lib +, mkDerivation +, fetchFromGitLab +, cmake +, extra-cmake-modules +, kio +, qtbase +, qtquickcontrols2 +, syntax-highlighting +}: + +mkDerivation rec { + pname = "mauikit"; + version = "1.2.1"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "maui"; + repo = "mauikit"; + rev = "v${version}"; + sha256 = "1wimbpbn9yqqdcjd59x83z0mw2fycjz09py2rwimfi8ldmvi5lgy"; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + kio + qtquickcontrols2 + syntax-highlighting + ]; + + meta = with lib; { + homepage = "https://mauikit.org/"; + description = "Free and modular front-end framework for developing fast and compelling user experiences"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ dotlambda ]; + broken = lib.versionOlder qtbase.version "5.14.0"; + }; +} diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 336f58adf11..656a8a5c0f0 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -115,6 +115,8 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeApplications // qt5 // kpmcore = callPackage ../development/libraries/kpmcore { }; + mauikit = callPackage ../development/libraries/mauikit { }; + mlt = callPackage ../development/libraries/mlt/qt-5.nix { }; openbr = callPackage ../development/libraries/openbr { }; From 026dbb4652b6ec9c55519f5efeafdaa91f4724b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 6 Mar 2021 11:31:44 +0100 Subject: [PATCH 2/6] index-fm: init at 1.2.1 --- pkgs/applications/misc/index-fm/default.nix | 52 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/applications/misc/index-fm/default.nix diff --git a/pkgs/applications/misc/index-fm/default.nix b/pkgs/applications/misc/index-fm/default.nix new file mode 100644 index 00000000000..328db965001 --- /dev/null +++ b/pkgs/applications/misc/index-fm/default.nix @@ -0,0 +1,52 @@ +{ lib +, mkDerivation +, fetchFromGitLab +, cmake +, extra-cmake-modules +, breeze-icons +, karchive +, kcoreaddons +, ki18n +, kio +, kirigami2 +, mauikit +, qtmultimedia +, qtquickcontrols2 +}: + +mkDerivation rec { + pname = "index"; + version = "1.2.1"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "maui"; + repo = "index-fm"; + rev = "v${version}"; + sha256 = "1v6z44c88cqgr3b758yq6l5d2zj1vhlnaq7v8rrhs7s5dsimzlx8"; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + breeze-icons + karchive + kcoreaddons + ki18n + kio + kirigami2 + mauikit + qtmultimedia + qtquickcontrols2 + ]; + + meta = with lib; { + description = "Multi-platform file manager"; + homepage = "https://invent.kde.org/maui/index-fm"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index df8a55a3525..acf0102f336 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23224,6 +23224,8 @@ in # Impressive, formerly known as "KeyJNote". impressive = callPackage ../applications/office/impressive { }; + index-fm = libsForQt5.callPackage ../applications/misc/index-fm { }; + inkcut = libsForQt5.callPackage ../applications/misc/inkcut { }; inkscape = callPackage ../applications/graphics/inkscape { From 4e6eff318e3e47a3e0d48b0de66652ca481cba2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 9 Mar 2021 11:41:52 +0100 Subject: [PATCH 3/6] rclone: 1.54.0 -> 1.54.1, add SuperSandro2000 as maintainer --- pkgs/applications/networking/sync/rclone/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index e2199cfcfb9..58f9745454a 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rclone"; - version = "1.54.0"; + version = "1.54.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-A0c5bHP5W/NTwAh1ifGaw4AG37qYXK9P/Fjk68gkUNk="; + sha256 = "sha256-DexqYAkGmgROnYpknnuWc3Q//IMOTSxgrr1w/TrueH4="; }; vendorSha256 = "sha256-Cpn/dUD9E2BzUlAISC+IDCW59OkEKZTpqdlvF/clV+M="; @@ -41,6 +41,6 @@ buildGoModule rec { homepage = "https://rclone.org"; changelog = "https://github.com/rclone/rclone/blob/v${version}/docs/content/changelog.md"; license = licenses.mit; - maintainers = with maintainers; [ danielfullmer marsam ]; + maintainers = with maintainers; [ danielfullmer marsam SuperSandro2000 ]; }; } From d23f00c9acaad6118d473bce35d5ddcfc19e5859 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 9 Mar 2021 16:12:12 +0100 Subject: [PATCH 4/6] ytfzf: 1.0.0 -> 1.0.1 --- pkgs/tools/misc/ytfzf/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/ytfzf/default.nix b/pkgs/tools/misc/ytfzf/default.nix index bf64e858d2b..9feecb58912 100644 --- a/pkgs/tools/misc/ytfzf/default.nix +++ b/pkgs/tools/misc/ytfzf/default.nix @@ -12,26 +12,21 @@ stdenv.mkDerivation rec { pname = "ytfzf"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "pystardust"; repo = "ytfzf"; rev = "v${version}"; - sha256 = "09znixn8mpkxipv2x3nrfxr2i8g7y58v25qssqf092j9lh85sf9h"; + sha256 = "1i9ya38zcaj1vkfgy1n4gp5vqb59zlrd609pdmz4jqinrb0c5fgv"; }; nativeBuildInputs = [ makeWrapper ]; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; + makeFlags = [ "PREFIX=${placeholder "out"}/bin" ]; dontBuild = true; - # remove after next update - preInstall = '' - mkdir -p "$out/bin" - ''; - postInstall = '' wrapProgram "$out/bin/ytfzf" --prefix PATH : ${lib.makeBinPath [ curl dmenu fzf jq mpv youtube-dl From 9c251b861bb4186797300dd0c7bbad23f5708fa7 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 9 Mar 2021 22:42:22 +0700 Subject: [PATCH 5/6] uutils-coreutils: 0.0.3 -> 0.0.4 --- pkgs/tools/misc/uutils-coreutils/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix index 44871b07a8e..fd195ab1843 100644 --- a/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/pkgs/tools/misc/uutils-coreutils/default.nix @@ -1,21 +1,22 @@ { stdenv, fetchFromGitHub, rustPlatform, cargo, cmake, sphinx, lib, prefix ? "uutils-" , Security }: + rustPlatform.buildRustPackage rec { pname = "uutils-coreutils"; - version = "0.0.3"; + version = "0.0.4"; src = fetchFromGitHub { owner = "uutils"; repo = "coreutils"; rev = version; - sha256 = "QWiEHk8aciiwQeyNgrr0M0c1EeAgE3gSqw0ly/YTwTQ="; + sha256 = "sha256-z5lDKJpFxXDCQq+0Da/63GGoUXacy5TSn+1gJiMvicc="; }; # too many impure/platform-dependent tests doCheck = false; - cargoSha256 = "m2a7WNkF5TxjJlytjdoQ/JZIF9gp9qBkH+UU/NVRJzA="; + cargoSha256 = "sha256-x/nn2JNe8x+I0G2Vbr2PZAHCghwLBDhKAhkHPQFeL0M="; makeFlags = [ "CARGO=${cargo}/bin/cargo" "PREFIX=$(out)" "PROFILE=release" "INSTALLDIR_MAN=$(out)/share/man/man1" ] From 0ccc9d5c63312bb23f68f45e35f9854a63ba5512 Mon Sep 17 00:00:00 2001 From: Bogdan B Date: Tue, 9 Mar 2021 17:20:06 +0100 Subject: [PATCH 6/6] lxqt.lxqt-policykit: fix missing buildInput polkit (#115529) --- pkgs/desktops/lxqt/lxqt-policykit/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix index fc4378d861c..adda2339f36 100644 --- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix +++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix @@ -8,6 +8,7 @@ , qttools , qtx11extras , qtsvg +, polkit , polkit-qt , kwindowsystem , liblxqt @@ -38,6 +39,7 @@ mkDerivation rec { qttools qtx11extras qtsvg + polkit polkit-qt kwindowsystem liblxqt