Merge master into staging-next
This commit is contained in:
commit
cf320b516a
52
pkgs/applications/misc/index-fm/default.nix
Normal file
52
pkgs/applications/misc/index-fm/default.nix
Normal file
|
@ -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 ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "rclone";
|
pname = "rclone";
|
||||||
version = "1.54.0";
|
version = "1.54.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = pname;
|
owner = pname;
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-A0c5bHP5W/NTwAh1ifGaw4AG37qYXK9P/Fjk68gkUNk=";
|
sha256 = "sha256-DexqYAkGmgROnYpknnuWc3Q//IMOTSxgrr1w/TrueH4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-Cpn/dUD9E2BzUlAISC+IDCW59OkEKZTpqdlvF/clV+M=";
|
vendorSha256 = "sha256-Cpn/dUD9E2BzUlAISC+IDCW59OkEKZTpqdlvF/clV+M=";
|
||||||
|
@ -41,6 +41,6 @@ buildGoModule rec {
|
||||||
homepage = "https://rclone.org";
|
homepage = "https://rclone.org";
|
||||||
changelog = "https://github.com/rclone/rclone/blob/v${version}/docs/content/changelog.md";
|
changelog = "https://github.com/rclone/rclone/blob/v${version}/docs/content/changelog.md";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ danielfullmer marsam ];
|
maintainers = with maintainers; [ danielfullmer marsam SuperSandro2000 ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
, qttools
|
, qttools
|
||||||
, qtx11extras
|
, qtx11extras
|
||||||
, qtsvg
|
, qtsvg
|
||||||
|
, polkit
|
||||||
, polkit-qt
|
, polkit-qt
|
||||||
, kwindowsystem
|
, kwindowsystem
|
||||||
, liblxqt
|
, liblxqt
|
||||||
|
@ -38,6 +39,7 @@ mkDerivation rec {
|
||||||
qttools
|
qttools
|
||||||
qtx11extras
|
qtx11extras
|
||||||
qtsvg
|
qtsvg
|
||||||
|
polkit
|
||||||
polkit-qt
|
polkit-qt
|
||||||
kwindowsystem
|
kwindowsystem
|
||||||
liblxqt
|
liblxqt
|
||||||
|
|
42
pkgs/development/libraries/mauikit/default.nix
Normal file
42
pkgs/development/libraries/mauikit/default.nix
Normal file
|
@ -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";
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,21 +1,22 @@
|
||||||
{ stdenv, fetchFromGitHub, rustPlatform, cargo, cmake, sphinx, lib, prefix ? "uutils-"
|
{ stdenv, fetchFromGitHub, rustPlatform, cargo, cmake, sphinx, lib, prefix ? "uutils-"
|
||||||
, Security
|
, Security
|
||||||
}:
|
}:
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "uutils-coreutils";
|
pname = "uutils-coreutils";
|
||||||
version = "0.0.3";
|
version = "0.0.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "uutils";
|
owner = "uutils";
|
||||||
repo = "coreutils";
|
repo = "coreutils";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "QWiEHk8aciiwQeyNgrr0M0c1EeAgE3gSqw0ly/YTwTQ=";
|
sha256 = "sha256-z5lDKJpFxXDCQq+0Da/63GGoUXacy5TSn+1gJiMvicc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# too many impure/platform-dependent tests
|
# too many impure/platform-dependent tests
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
cargoSha256 = "m2a7WNkF5TxjJlytjdoQ/JZIF9gp9qBkH+UU/NVRJzA=";
|
cargoSha256 = "sha256-x/nn2JNe8x+I0G2Vbr2PZAHCghwLBDhKAhkHPQFeL0M=";
|
||||||
|
|
||||||
makeFlags =
|
makeFlags =
|
||||||
[ "CARGO=${cargo}/bin/cargo" "PREFIX=$(out)" "PROFILE=release" "INSTALLDIR_MAN=$(out)/share/man/man1" ]
|
[ "CARGO=${cargo}/bin/cargo" "PREFIX=$(out)" "PROFILE=release" "INSTALLDIR_MAN=$(out)/share/man/man1" ]
|
||||||
|
|
|
@ -12,26 +12,21 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "ytfzf";
|
pname = "ytfzf";
|
||||||
version = "1.0.0";
|
version = "1.0.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "pystardust";
|
owner = "pystardust";
|
||||||
repo = "ytfzf";
|
repo = "ytfzf";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "09znixn8mpkxipv2x3nrfxr2i8g7y58v25qssqf092j9lh85sf9h";
|
sha256 = "1i9ya38zcaj1vkfgy1n4gp5vqb59zlrd609pdmz4jqinrb0c5fgv";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
||||||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
makeFlags = [ "PREFIX=${placeholder "out"}/bin" ];
|
||||||
|
|
||||||
dontBuild = true;
|
dontBuild = true;
|
||||||
|
|
||||||
# remove after next update
|
|
||||||
preInstall = ''
|
|
||||||
mkdir -p "$out/bin"
|
|
||||||
'';
|
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
wrapProgram "$out/bin/ytfzf" --prefix PATH : ${lib.makeBinPath [
|
wrapProgram "$out/bin/ytfzf" --prefix PATH : ${lib.makeBinPath [
|
||||||
curl dmenu fzf jq mpv youtube-dl
|
curl dmenu fzf jq mpv youtube-dl
|
||||||
|
|
|
@ -23265,6 +23265,8 @@ in
|
||||||
# Impressive, formerly known as "KeyJNote".
|
# Impressive, formerly known as "KeyJNote".
|
||||||
impressive = callPackage ../applications/office/impressive { };
|
impressive = callPackage ../applications/office/impressive { };
|
||||||
|
|
||||||
|
index-fm = libsForQt5.callPackage ../applications/misc/index-fm { };
|
||||||
|
|
||||||
inkcut = libsForQt5.callPackage ../applications/misc/inkcut { };
|
inkcut = libsForQt5.callPackage ../applications/misc/inkcut { };
|
||||||
|
|
||||||
inkscape = callPackage ../applications/graphics/inkscape {
|
inkscape = callPackage ../applications/graphics/inkscape {
|
||||||
|
|
|
@ -115,6 +115,8 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeApplications // qt5 //
|
||||||
|
|
||||||
kpmcore = callPackage ../development/libraries/kpmcore { };
|
kpmcore = callPackage ../development/libraries/kpmcore { };
|
||||||
|
|
||||||
|
mauikit = callPackage ../development/libraries/mauikit { };
|
||||||
|
|
||||||
mlt = callPackage ../development/libraries/mlt/qt-5.nix { };
|
mlt = callPackage ../development/libraries/mlt/qt-5.nix { };
|
||||||
|
|
||||||
openbr = callPackage ../development/libraries/openbr { };
|
openbr = callPackage ../development/libraries/openbr { };
|
||||||
|
|
Loading…
Reference in a new issue