BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #123279 from NixOS/staging-next

Browse source 
Staging next
This commit is contained in:
Jonathan Ringer 2021-05-22 18:46:35 -07:00 committed by GitHub
commit d9de79194a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
711 changed files with 8099 additions and 3803 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
flake.nix
View file

@ -18,6 +18,7 @@
"aarch64-linux"
"armv6l-linux"
"armv7l-linux"
"aarch64-darwin"
];
forAllSystems = f: lib.genAttrs systems (system: f system);

15
lib/systems/default.nix
View file

@ -41,6 +41,19 @@ rec {
else if final.isNetBSD then "nblibc"
# TODO(@Ericson2314) think more about other operating systems
else "native/impure";
# Choose what linker we wish to use by default. Someday we might also
# choose the C compiler, runtime library, C++ standard library, etc. in
# this way, nice and orthogonally, and deprecate `useLLVM`. But due to
# the monolithic GCC build we cannot actually make those choices
# independently, so we are just doing `linker` and keeping `useLLVM` for
# now.
linker =
/**/ if final.useLLVM or false then "lld"
else if final.isDarwin then "cctools"
# "bfd" and "gold" both come from GNU binutils. The existance of Gold
# is why we use the more obscure "bfd" and not "binutils" for this
# choice.
else "bfd";
extensions = {
sharedLibrary =
/**/ if final.isDarwin then ".dylib"
@ -118,7 +131,7 @@ rec {
else null;
# The canonical name for this attribute is darwinSdkVersion, but some
# platforms define the old name "sdkVer".
darwinSdkVersion = final.sdkVer or "10.12";
darwinSdkVersion = final.sdkVer or (if final.isAarch64 then "11.0" else "10.12");
darwinMinVersion = final.darwinSdkVersion;
darwinMinVersionVariable =
if final.isMacOS then "MACOSX_DEPLOYMENT_TARGET"

2
lib/systems/doubles.nix
View file

@ -96,5 +96,5 @@ in {
embedded = filterDoubles predicates.isNone;
mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "armv7a-linux" "aarch64-linux" "powerpc64-linux" "powerpc64le-linux"];
mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "armv7a-linux" "aarch64-linux" "powerpc64-linux" "powerpc64le-linux" "aarch64-darwin"];
}

15
lib/systems/examples.nix
View file

@ -70,6 +70,15 @@ rec {
useAndroidPrebuilt = true;
};
aarch64-android = {
config = "aarch64-unknown-linux-android";
sdkVer = "30";
ndkVer = "21";
libc = "bionic";
useAndroidPrebuilt = false;
useLLVM = true;
};
scaleway-c1 = armv7l-hf-multiplatform // platforms.scaleway-c1;
pogoplug4 = {
@ -231,6 +240,12 @@ rec {
useiOSPrebuilt = true;
};
aarch64-darwin = {
config = "aarch64-apple-darwin";
xcodePlatform = "MacOSX";
platform = {};
};
#
# Windows
#

12
lib/systems/platforms.nix
View file

@ -375,6 +375,13 @@ rec {
};
};
apple-m1 = {
gcc = {
arch = "armv8.3-a+crypto+sha2+aes+crc+fp16+lse+simd+ras+rdm+rcpc";
cpu = "apple-a13";
};
};
##
## MIPS
##
@ -495,7 +502,10 @@ rec {
else if lib.versionOlder version "6" then sheevaplug
else if lib.versionOlder version "7" then raspberrypi
else armv7l-hf-multiplatform
else if platform.isAarch64 then aarch64-multiplatform
else if platform.isAarch64 then
if platform.isDarwin then apple-m1
else aarch64-multiplatform
else if platform.isRiscV then riscv-multiplatform

12
nixos/doc/manual/release-notes/rl-2105.xml
View file

@ -100,6 +100,18 @@
Now nginx uses the zlib-ng library by default.
</para>
</listitem>
<listitem>
<para>
KDE Gear (formerly KDE Applications) is upgraded to 21.04, see its
<link xlink:href="https://kde.org/announcements/gear/21.04/">release
notes</link> for details.
</para>
<para>
The <code>kdeApplications</code> package set is now <code>kdeGear</code>,
in keeping with the new name. The old name remains for compatibility, but
it is deprecated.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://libreswan.org/">Libreswan</link> has been updated

4
nixos/modules/services/x11/desktop-managers/plasma5.nix
View file

@ -8,7 +8,7 @@ let
cfg = xcfg.desktopManager.plasma5;
libsForQt5 = pkgs.plasma5Packages;
inherit (libsForQt5) kdeApplications kdeFrameworks plasma5;
inherit (libsForQt5) kdeGear kdeFrameworks plasma5;
inherit (pkgs) writeText;
pulseaudio = config.hardware.pulseaudio;
@ -213,7 +213,7 @@ in
environment.systemPackages =
with libsForQt5;
with plasma5; with kdeApplications; with kdeFrameworks;
with plasma5; with kdeGear; with kdeFrameworks;
[
frameworkintegration
kactivities

15
pkgs/applications/audio/flac/default.nix
View file

@ -1,13 +1,22 @@
{ lib, stdenv, fetchurl, libogg }:
{ lib, stdenv, fetchurl, fetchpatch, libogg }:
stdenv.mkDerivation rec {
name = "flac-1.3.3";
pname = "flac";
version = "1.3.3";
src = fetchurl {
url = "http://downloads.xiph.org/releases/flac/${name}.tar.xz";
url = "http://downloads.xiph.org/releases/flac/${pname}-${version}.tar.xz";
sha256 = "0j0p9sf56a2fm2hkjnf7x3py5ir49jyavg4q5zdyd7bcf6yq4gi1";
};
patches = [
(fetchpatch {
name = "CVE-2020-0499.patch";
url = "https://github.com/xiph/flac/commit/2e7931c27eb15e387da440a37f12437e35b22dd4.patch";
sha256 = "160qzq9ms5addz7sx06pnyjjkqrffr54r4wd8735vy4x008z71ah";
})
];
buildInputs = [ libogg ];
#doCheck = true; # takes lots of time

1
pkgs/applications/audio/gradio/default.nix
View file

@ -55,7 +55,6 @@ in stdenv.mkDerivation {
gsettings-desktop-schemas
] ++ gst_plugins;
enableParallelBuilding = true;
postInstall = ''
glib-compile-schemas "$out"/share/glib-2.0/schemas
'';

2
pkgs/applications/audio/mmtc/default.nix
View file

@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "0ag87hgdg6fvk80fgznba0xjlcajks5w5s6y8lvwhz9irn2kq2rz";
};
cargoSha256 = "06xqh0mqbik00qyg8mn1ddbn15v3pdwvh1agghg22xgx53kmnxb3";
cargoSha256 = "0lkx0zj9xc0rlrq91l4wydzp430hxlrqyq7ii8wq2fcan8ln22lv";
nativeBuildInputs = [ installShellFiles ];

2
pkgs/applications/audio/muso/default.nix
View file

@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
cp share/* $out/share/muso/
'';
cargoSha256 = "06jgk54r3f8gq6iylv5rgsawss3hc5kmvk02y4gl8iwfnw4xrvmg";
cargoSha256 = "1hgdzyz005244f2mh97js9ga0a6s2hcd6iydz07f1hmhsh1j2bwy";
meta = with lib; {
description = "An automatic music sorter (based on ID3 tags)";

2
pkgs/applications/audio/netease-music-tui/default.nix
View file

@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ alsaLib openssl ];
cargoSha256 = "0f06wc7h2zjipifvxsskxvihjf6mykrjrm7yk0zf98ra079bc9g9";
cargoSha256 = "1pca0sz4rz8qls6k2vhf70ixhnvgk81c4hbx81q3pv106g5k205f";
meta = with lib; {
homepage = "https://github.com/betta-cyber/netease-music-tui";

1
pkgs/applications/audio/parlatype/default.nix
View file

@ -48,7 +48,6 @@ stdenv.mkDerivation rec {
'';
doCheck = false;
enableParallelBuilding = true;
buildPhase = ''
export GST_PLUGIN_SYSTEM_PATH_1_0="$out/lib/gstreamer-1.0/:$GST_PLUGIN_SYSTEM_PATH_1_0"

2
pkgs/applications/audio/spotify-tui/default.nix
View file

@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "082y5m2vglzx9kdc2088zynz0njcnljnb0y170igmlsxq9wkrgg2";
};
cargoSha256 = "100c7x603qyhav3p24clwfal4ngh0258x9lqsi84kcj4wq2f3i8f";
cargoSha256 = "1khn6fx13qlfpqwnw7ysgan5h4nrg2qnzn2p74vn7jic3mqc3sax";
nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config python3 ];
buildInputs = [ ]

2
pkgs/applications/audio/spotifyd/default.nix
View file

@ -18,7 +18,7 @@ rustPackages.rustPlatform.buildRustPackage rec {
sha256 = "1a578h13iv8gqmskzlncfr42jlg5gp0zfcizv4wbd48y9hl8fh2l";
};
cargoSha256 = "1sm5yfgjx5xfnqqh1v8ycwzxw4kl6dq5gcvsdnc4h1cj3pdhbpcc";
cargoSha256 = "07dxfc0csrnfl01p9vdrqvca9f574svlf37dk3dz8p6q08ki0n1z";
cargoBuildFlags = [
"--no-default-features"

2
pkgs/applications/editors/amp/default.nix
View file

@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "0l1vpcfq6jrq2dkrmsa4ghwdpp7c54f46gz3n7nk0i41b12hnigw";
};
cargoSha256 = "09v991rl2w4c4jh7ga7q1lk6wyl2vr71j5cpniij8mcvszrz78qf";
cargoSha256 = "19r3xvysragmf02zk2l5s2hjg92gxdygsh52y7za81x443lvjyvq";
nativeBuildInputs = [ cmake pkg-config python3 ];
buildInputs = [ openssl xorg.libxcb libgit2 ] ++ lib.optionals stdenv.isDarwin

2
pkgs/applications/editors/hexdino/default.nix
View file

@ -11,7 +11,7 @@ rustPlatform.buildRustPackage {
sha256 = "11mz07735gxqfamjcjjmxya6swlvr1p77sgd377zjcmd6z54gwyf";
};
cargoSha256 = "06ghcd4j751mdkzwb88nqwk8la4zdb137y0iqrkpykkfx0as43x3";
cargoSha256 = "1hpndmpk1zlfvb4r95m13yvnsbjkwgw4pb9ala2d5yzfp38225nm";
buildInputs = [ ncurses ];

2
pkgs/applications/editors/kibi/default.nix
View file

@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec {
pname = "kibi";
version = "0.2.2";
cargoSha256 = "sha256-8iEUOLFwHBLS0HQL/oLnv6lcV3V9Hm4jMqXkqPvIF9E=";
cargoSha256 = "sha256-ebUCkcUACganeq5U0XU4VIGClKDZGhUw6K3WBgTUUUw=";
src = fetchFromGitHub {
owner = "ilai-deutel";

2
pkgs/applications/editors/neovim/gnvim/default.nix
View file

@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "1cc3yk04v9icdjr5cn58mqc3ba1wqmlzhf9ly7biy9m8yk30w9y0";
};
cargoSha256 = "1fyn8nsabzrfl9ykf2gk2p8if0yjp6k0ybrmp0pw67pbwaxpb9ym";
cargoSha256 = "0z6hhahxdc6d7nzqvc8jlxn1frsc39va8z5pmwfmmq5z61ahk90z";
buildInputs = [ gtk webkitgtk ];

2
pkgs/applications/editors/ox/default.nix
View file

@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "18iffnmvax6mbnhypf7yma98y5q2zlsyp9q18f92fdwz426r33p0";
};
cargoSha256 = "0v0a1dl9rq5qyy9xwnb59w62qr9db3y3zlmnp60wafvj70zi9zxs";
cargoSha256 = "0m5vglm58myf50vbb7m6gd3srk3n93afg70lz63i2kciqkkwsnjl";
meta = with lib; {
description = "An independent Rust text editor that runs in your terminal";

2
pkgs/applications/gis/whitebox-tools/default.nix
View file

@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = lib.optional stdenv.isDarwin Security;
cargoSha256 = "09rz8f1xyc64qjbj6pgw8jxr2a7chghmdc6sfkbv7hdvx6vg4wvk";
cargoSha256 = "0rdg9k44si37iyqlcl1rw7ilajcvqy93gbfpd7n4cr1hg9ypm0m3";
meta = with lib; {
description = "An advanced geospatial data analysis platform";

2
pkgs/applications/graphics/ImageMagick/6.x.nix
View file

@ -9,7 +9,7 @@ let
if stdenv.hostPlatform.system == "i686-linux" then "i686"
else if stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "x86_64-darwin" then "x86-64"
else if stdenv.hostPlatform.system == "armv7l-linux" then "armv7l"
else if stdenv.hostPlatform.system == "aarch64-linux" then "aarch64"
else if stdenv.hostPlatform.system == "aarch64-linux" || stdenv.hostPlatform.system == "aarch64-darwin" then "aarch64"
else if stdenv.hostPlatform.system == "powerpc64le-linux" then "ppc64le"
else throw "ImageMagick is not supported on this platform.";
in

2
pkgs/applications/graphics/ImageMagick/7.0.nix
View file

@ -11,7 +11,7 @@ let
if stdenv.hostPlatform.system == "i686-linux" then "i686"
else if stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "x86_64-darwin" then "x86-64"
else if stdenv.hostPlatform.system == "armv7l-linux" then "armv7l"
else if stdenv.hostPlatform.system == "aarch64-linux" then "aarch64"
else if stdenv.hostPlatform.system == "aarch64-linux" || stdenv.hostPlatform.system == "aarch64-darwin" then "aarch64"
else if stdenv.hostPlatform.system == "powerpc64le-linux" then "ppc64le"
else throw "ImageMagick is not supported on this platform.";
in

2
pkgs/applications/graphics/rx/default.nix
View file

@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "1pln65pqy39ijrld11d06klwzfhhzmrgdaxijpx9q7w9z66zmqb8";
};
cargoSha256 = "143a5x61s7ywk0ljqd10jkfvs6lrhlibkm2a9lw41wq13mgzb78j";
cargoSha256 = "1mb9wx5h729pc9y1b0d0yiapyk0mlbvdmvwq993fcpkziwjvnl44";
nativeBuildInputs = [ cmake pkg-config makeWrapper ];

4
pkgs/applications/kde/akonadi-import-wizard.nix
View file

@ -2,7 +2,8 @@
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, karchive, kcontacts, kcrash, kidentitymanagement, kio,
kmailtransport, kwallet, mailcommon, mailimporter, messagelib
kmailtransport, kwallet, mailcommon, mailimporter, messagelib,
qtkeychain, libsecret
}:
mkDerivation {
@ -15,6 +16,7 @@ mkDerivation {
buildInputs = [
akonadi karchive kcontacts kcrash kidentitymanagement kio
kmailtransport kwallet mailcommon mailimporter messagelib
qtkeychain libsecret
];
outputs = [ "out" "dev" ];
}

90
pkgs/applications/kde/akonadi/0001-akonadi-paths.patch
View file

@ -1,6 +1,6 @@
From f4d718502ecd8242500078a7783e27caba72871e Mon Sep 17 00:00:00 2001
From ca8ff6e6d527ee968300cce5e8cd148f6a4d256b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 31 Jan 2021 11:00:03 -0600
Date: Sun, 25 Apr 2021 08:00:10 -0500
Subject: [PATCH 1/3] akonadi paths
---
@ -11,32 +11,32 @@ Subject: [PATCH 1/3] akonadi paths
4 files changed, 11 insertions(+), 40 deletions(-)
diff --git a/src/akonadicontrol/agentmanager.cpp b/src/akonadicontrol/agentmanager.cpp
index 31e0cf2..6436e87 100644
index 44ceec5..eb5fa50 100644
--- a/src/akonadicontrol/agentmanager.cpp
+++ b/src/akonadicontrol/agentmanager.cpp
@@ -48,7 +48,7 @@ public:
[]() {
QCoreApplication::instance()->exit(255);
});
@@ -47,7 +47,7 @@ public:
connect(this, &Akonadi::ProcessControl::unableToStart, this, []() {
QCoreApplication::instance()->exit(255);
});
- start(QStringLiteral("akonadiserver"), args, RestartOnCrash);
+ start(QLatin1String(NIX_OUT "/bin/akonadiserver"), args, RestartOnCrash);
+ start(QStringLiteral(NIX_OUT "/bin/akonadiserver"), args, RestartOnCrash);
}
~StorageProcessControl() override
@@ -70,7 +70,7 @@ public:
[]() {
qCCritical(AKONADICONTROL_LOG) << "Failed to start AgentServer!";
});
@@ -69,7 +69,7 @@ public:
connect(this, &Akonadi::ProcessControl::unableToStart, this, []() {
qCCritical(AKONADICONTROL_LOG) << "Failed to start AgentServer!";
});
- start(QStringLiteral("akonadi_agent_server"), args, RestartOnCrash);
+ start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), args, RestartOnCrash);
+ start(QStringLiteral(NIX_OUT "/bin/akonadi_agent_server"), args, RestartOnCrash);
}
~AgentServerProcessControl() override
diff --git a/src/akonadicontrol/agentprocessinstance.cpp b/src/akonadicontrol/agentprocessinstance.cpp
index c98946c..aa307ca 100644
index 8e92e08..f98dfd8 100644
--- a/src/akonadicontrol/agentprocessinstance.cpp
+++ b/src/akonadicontrol/agentprocessinstance.cpp
@@ -49,7 +49,7 @@ bool AgentProcessInstance::start(const AgentType &agentInfo)
@@ -47,7 +47,7 @@ bool AgentProcessInstance::start(const AgentType &agentInfo)
} else {
Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher);
const QStringList arguments = QStringList() << executable << identifier();
@ -46,20 +46,20 @@ index c98946c..aa307ca 100644
}
return true;
diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
index d595a3a..99324f6 100644
index 1a437ac..3550f9d 100644
--- a/src/server/storage/dbconfigmysql.cpp
+++ b/src/server/storage/dbconfigmysql.cpp
@@ -69,7 +69,6 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
@@ -72,7 +72,6 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
// determine default settings depending on the driver
QString defaultHostName;
QString defaultOptions;
- QString defaultServerPath;
QString defaultCleanShutdownCommand;
#ifndef Q_OS_WIN
@@ -78,16 +77,7 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
@@ -80,16 +79,7 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
#endif
const bool defaultInternalServer = true;
-#ifdef MYSQLD_EXECUTABLE
- if (QFile::exists(QStringLiteral(MYSQLD_EXECUTABLE))) {
@ -75,20 +75,20 @@ index d595a3a..99324f6 100644
if (!mysqladminPath.isEmpty()) {
#ifndef Q_OS_WIN
defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/%4 shutdown")
@@ -97,10 +87,10 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
@@ -99,10 +89,10 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
#endif
}
- mMysqlInstallDbPath = findExecutable(QStringLiteral("mysql_install_db"));
+ mMysqlInstallDbPath = QLatin1String(NIXPKGS_MYSQL_MYSQL_INSTALL_DB);
qCDebug(AKONADISERVER_LOG) << "Found mysql_install_db: " << mMysqlInstallDbPath;
- mMysqlCheckPath = findExecutable(QStringLiteral("mysqlcheck"));
+ mMysqlCheckPath = QLatin1String(NIXPKGS_MYSQL_MYSQLCHECK);
qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath;
mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool();
@@ -117,7 +107,7 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
@@ -119,7 +109,7 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
mUserName = settings.value(QStringLiteral("User")).toString();
mPassword = settings.value(QStringLiteral("Password")).toString();
mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
@ -96,18 +96,18 @@ index d595a3a..99324f6 100644
+ mMysqldPath = QLatin1String(NIXPKGS_MYSQL_MYSQLD);
mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString();
settings.endGroup();
@@ -127,9 +117,6 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
@@ -129,9 +119,6 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
// intentionally not namespaced as we are the only one in this db instance when using internal mode
mDatabaseName = QStringLiteral("akonadi");
}
- if (mInternalServer && (mMysqldPath.isEmpty() || !QFile::exists(mMysqldPath))) {
- mMysqldPath = defaultServerPath;
- }
qCDebug(AKONADISERVER_LOG) << "Using mysqld:" << mMysqldPath;
@@ -139,9 +126,6 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
@@ -141,9 +128,6 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
settings.setValue(QStringLiteral("Name"), mDatabaseName);
settings.setValue(QStringLiteral("Host"), mHostName);
settings.setValue(QStringLiteral("Options"), mConnectionOptions);
@ -117,20 +117,20 @@ index d595a3a..99324f6 100644
settings.setValue(QStringLiteral("StartServer"), mInternalServer);
settings.endGroup();
settings.sync();
@@ -214,7 +198,7 @@ bool DbConfigMysql::startInternalServer()
@@ -215,7 +199,7 @@ bool DbConfigMysql::startInternalServer()
#endif
// generate config file
- const QString globalConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-global.conf"));
+ const QString globalConfig = QLatin1String(NIX_OUT "/etc/xdg/akonadi/mysql-global.conf");
const QString localConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-local.conf"));
const QString localConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-local.conf"));
const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf");
if (globalConfig.isEmpty()) {
diff --git a/src/server/storage/dbconfigpostgresql.cpp b/src/server/storage/dbconfigpostgresql.cpp
index dd273fc..05288d9 100644
index 4df61da..e3469c4 100644
--- a/src/server/storage/dbconfigpostgresql.cpp
+++ b/src/server/storage/dbconfigpostgresql.cpp
@@ -127,9 +127,7 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings)
@@ -125,9 +125,7 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings)
// determine default settings depending on the driver
QString defaultHostName;
QString defaultOptions;
@ -138,10 +138,10 @@ index dd273fc..05288d9 100644
QString defaultInitDbPath;
- QString defaultPgUpgradePath;
QString defaultPgData;
#ifndef Q_WS_WIN // We assume that PostgreSQL is running as service on Windows
@@ -140,12 +138,8 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings)
@@ -138,12 +136,8 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings)
mInternalServer = settings.value(QStringLiteral("QPSQL/StartServer"), defaultInternalServer).toBool();
if (mInternalServer) {
- const auto paths = postgresSearchPaths(QStringLiteral("/usr/lib/postgresql"));
@ -153,8 +153,8 @@ index dd273fc..05288d9 100644
- defaultPgUpgradePath = QStandardPaths::findExecutable(QStringLiteral("pg_upgrade"), paths);
defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data"));
}
@@ -164,20 +158,14 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings)
@@ -162,20 +156,14 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings)
mUserName = settings.value(QStringLiteral("User")).toString();
mPassword = settings.value(QStringLiteral("Password")).toString();
mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
@ -177,7 +177,7 @@ index dd273fc..05288d9 100644
qCDebug(AKONADISERVER_LOG) << "Found pg_upgrade:" << mPgUpgradePath;
mPgData = settings.value(QStringLiteral("PgData"), defaultPgData).toString();
if (mPgData.isEmpty()) {
@@ -194,7 +182,6 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings)
@@ -192,7 +180,6 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings)
settings.setValue(QStringLiteral("Port"), mHostPort);
}
settings.setValue(QStringLiteral("Options"), mConnectionOptions);
@ -185,6 +185,6 @@ index dd273fc..05288d9 100644
settings.setValue(QStringLiteral("InitDbPath"), mInitDbPath);
settings.setValue(QStringLiteral("StartServer"), mInternalServer);
settings.endGroup();
--
2.29.2
--
2.31.1

14
pkgs/applications/kde/akonadi/0002-akonadi-timestamps.patch
View file

@ -1,6 +1,6 @@
From badd4be311afd37a99126c60490f1ae5daced6c4 Mon Sep 17 00:00:00 2001
From f6c446cf6fab2edbd2606b4c6100903e9437362a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 31 Jan 2021 11:00:15 -0600
Date: Sun, 25 Apr 2021 08:01:02 -0500
Subject: [PATCH 2/3] akonadi timestamps
---
@ -8,19 +8,19 @@ Subject: [PATCH 2/3] akonadi timestamps
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
index 99324f6..3c170a8 100644
index 3550f9d..e9e8887 100644
--- a/src/server/storage/dbconfigmysql.cpp
+++ b/src/server/storage/dbconfigmysql.cpp
@@ -240,8 +240,7 @@ bool DbConfigMysql::startInternalServer()
@@ -241,8 +241,7 @@ bool DbConfigMysql::startInternalServer()
bool confUpdate = false;
QFile actualFile(actualConfig);
// update conf only if either global (or local) is newer than actual
- if ((QFileInfo(globalConfig).lastModified() > QFileInfo(actualFile).lastModified()) ||
- (QFileInfo(localConfig).lastModified() > QFileInfo(actualFile).lastModified())) {
- if ((QFileInfo(globalConfig).lastModified() > QFileInfo(actualFile).lastModified())
- || (QFileInfo(localConfig).lastModified() > QFileInfo(actualFile).lastModified())) {
+ if (true) {
QFile globalFile(globalConfig);
QFile localFile(localConfig);
if (globalFile.open(QFile::ReadOnly) && actualFile.open(QFile::WriteOnly)) {
--
2.29.2
2.31.1

10
pkgs/applications/kde/akonadi/0003-akonadi-revert-make-relocatable.patch
View file

@ -1,6 +1,6 @@
From 82bfa975af60757374ffad787e56a981d6df0f98 Mon Sep 17 00:00:00 2001
From 4b90a0bd4411a66bbe6ecf85ce89a60a58bee969 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 31 Jan 2021 11:01:24 -0600
Date: Sun, 25 Apr 2021 08:01:21 -0500
Subject: [PATCH 3/3] akonadi revert make relocatable
---
@ -9,10 +9,10 @@ Subject: [PATCH 3/3] akonadi revert make relocatable
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4bb5fec..35720b4 100644
index 4e8cc81..63161b7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -343,9 +343,6 @@ configure_package_config_file(
@@ -368,9 +368,6 @@ configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake"
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
@ -41,5 +41,5 @@ index bcf7320..1574319 100644
# set the directories
if(NOT AKONADI_INSTALL_DIR)
--
2.29.2
2.31.1

7
pkgs/applications/kde/akonadi/default.nix
View file

@ -1,5 +1,5 @@
{
mkDerivation, lib, kdepimTeam,
mkDerivation, lib, kdepimTeam, substituteAll,
extra-cmake-modules, shared-mime-info, qtbase, accounts-qt,
boost, kaccounts-integration, kcompletion, kconfigwidgets, kcrash, kdbusaddons,
kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mariadb, qttools,
@ -33,8 +33,7 @@ mkDerivation {
''-DNIXPKGS_POSTGRES_PG_CTL=\"\"''
''-DNIXPKGS_POSTGRES_PG_UPGRADE=\"\"''
''-DNIXPKGS_POSTGRES_INITDB=\"\"''
''-DNIX_OUT=\"${placeholder "out"}\"''
''-I${lib.getDev kio}/include/KF5'' # Fixes: kio_version.h: No such file or directory
];
preConfigure = ''
NIX_CFLAGS_COMPILE+=" -DNIX_OUT=\"$out\""
'';
}

4
pkgs/applications/kde/baloo-widgets.nix
View file

@ -1,7 +1,7 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
baloo, kconfig, kdelibs4support, kfilemetadata, ki18n, kio, kservice
baloo, kconfig, kfilemetadata, ki18n, kio, kservice
}:
mkDerivation {
@ -12,7 +12,7 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
baloo kconfig kdelibs4support kfilemetadata ki18n kio kservice
baloo kconfig kfilemetadata ki18n kio kservice
];
outputs = [ "out" "dev" ];
}

14
pkgs/applications/kde/default.nix
View file

@ -30,6 +30,9 @@ still shows most of the available features is in `./gwenview.nix`.
}:
let
minQtVersion = "5.15";
broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion;
mirror = "mirror://kde";
srcs = import ./srcs.nix { inherit fetchurl mirror; };
@ -45,10 +48,13 @@ let
outputs = args.outputs or [ "out" ];
meta = {
platforms = lib.platforms.linux;
homepage = "http://www.kde.org";
} // (args.meta or {});
meta =
let meta = args.meta or {}; in
meta // {
homepage = meta.homepage or "http://www.kde.org";
platforms = meta.platforms or lib.platforms.linux;
broken = meta.broken or broken;
};
});
packages = self: with self;

4
pkgs/applications/kde/dolphin-plugins.nix
View file

@ -1,7 +1,7 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
dolphin, kdelibs4support, ki18n, kio, kxmlgui
dolphin, ki18n, kio, kxmlgui
}:
mkDerivation {
@ -12,7 +12,7 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
dolphin kdelibs4support ki18n kio kxmlgui
dolphin ki18n kio kxmlgui
];
outputs = [ "out" "dev" ];
}

4
pkgs/applications/kde/dolphin.nix
View file

@ -2,7 +2,7 @@
mkDerivation, lib,
extra-cmake-modules, kdoctools,
baloo, baloo-widgets, kactivities, kbookmarks, kcmutils,
kcompletion, kconfig, kcoreaddons, kdelibs4support, kdbusaddons,
kcompletion, kconfig, kcoreaddons, kdbusaddons,
kfilemetadata, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications,
kparts, ktexteditor, kwindowsystem, phonon, solid,
wayland, qtbase, qtwayland
@ -19,7 +19,7 @@ mkDerivation {
propagatedUserEnvPkgs = [ baloo ];
propagatedBuildInputs = [
baloo baloo-widgets kactivities kbookmarks kcmutils kcompletion kconfig
kcoreaddons kdelibs4support kdbusaddons kfilemetadata ki18n kiconthemes
kcoreaddons kdbusaddons kfilemetadata ki18n kiconthemes
kinit kio knewstuff knotifications kparts ktexteditor kwindowsystem
phonon solid
wayland qtwayland

4
pkgs/applications/kde/dragon.nix
View file

@ -2,7 +2,7 @@
mkDerivation, lib,
extra-cmake-modules, kdoctools,
baloo, baloo-widgets, kactivities, kbookmarks, kcmutils,
kcompletion, kconfig, kcoreaddons, kdelibs4support, kdbusaddons,
kcompletion, kconfig, kcoreaddons, kdbusaddons,
kfilemetadata, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications,
kparts, ktexteditor, kwindowsystem, phonon, solid, phonon-backend-gstreamer
}:
@ -17,7 +17,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
baloo baloo-widgets kactivities kbookmarks kcmutils kcompletion kconfig
kcoreaddons kdelibs4support kdbusaddons kfilemetadata ki18n kiconthemes
kcoreaddons kdbusaddons kfilemetadata ki18n kiconthemes
kinit kio knewstuff knotifications kparts ktexteditor kwindowsystem
phonon solid phonon-backend-gstreamer
];

2
pkgs/applications/kde/fetch.sh
View file

@ -1 +1 @@
WGET_ARGS=( http://download.kde.org/stable/release-service/20.12.3/src -A '*.tar.xz' )
WGET_ARGS=( http://download.kde.org/stable/release-service/21.04.0/src -A '*.tar.xz' )

5
pkgs/applications/kde/gwenview.nix
View file

@ -2,7 +2,7 @@
mkDerivation, lib,
extra-cmake-modules, kdoctools,
exiv2, lcms2,
baloo, kactivities, kdelibs4support, kio, kipi-plugins, libkdcraw, libkipi,
baloo, kactivities, kio, kipi-plugins, kitemmodels, kparts, libkdcraw, libkipi,
phonon, qtimageformats, qtsvg, qtx11extras, kinit
}:
@ -14,7 +14,8 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
baloo exiv2 kactivities kdelibs4support kio libkdcraw lcms2 libkipi phonon
baloo kactivities kio kitemmodels kparts libkdcraw libkipi phonon
exiv2 lcms2
qtimageformats qtsvg qtx11extras
];
propagatedUserEnvPkgs = [ kipi-plugins libkipi (lib.getBin kinit) ];

4
pkgs/applications/kde/kalarm.nix
View file

@ -4,7 +4,7 @@
kauth, kcodecs, kcompletion, kconfig, kconfigwidgets, kdbusaddons, kdoctools,
kguiaddons, ki18n, kiconthemes, kidletime, kjobwidgets, kcmutils,
kdelibs4support, kio, knotifications, knotifyconfig, kservice, kwidgetsaddons,
kio, knotifications, knotifyconfig, kservice, kwidgetsaddons,
kwindowsystem, kxmlgui, phonon,
kimap, akonadi, akonadi-contacts, akonadi-mime, kalarmcal, kcalendarcore, kcalutils,
@ -25,7 +25,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kauth kcodecs kcompletion kconfig kconfigwidgets kdbusaddons kdoctools
kguiaddons ki18n kiconthemes kidletime kjobwidgets kcmutils kdelibs4support
kguiaddons ki18n kiconthemes kidletime kjobwidgets kcmutils
kio knotifications knotifyconfig kservice kwidgetsaddons kwindowsystem
kxmlgui phonon

4
pkgs/applications/kde/kalarmcal.nix
View file

@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, kcalendarcore, kdelibs4support, kholidays, kidentitymanagement,
akonadi, kcalendarcore, kholidays, kidentitymanagement,
kpimtextedit, kcalutils
}:
@ -13,7 +13,7 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
akonadi kcalendarcore kdelibs4support kholidays kidentitymanagement kpimtextedit kcalutils
akonadi kcalendarcore kholidays kidentitymanagement kpimtextedit kcalutils
];
outputs = [ "out" "dev" ];
}

4
pkgs/applications/kde/kcachegrind.nix
View file

@ -1,8 +1,8 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
karchive, ki18n, kio, perl, python3, php, qttools
, kdbusaddons
karchive, ki18n, kio, perl, python3, php, qttools,
kdbusaddons
}:
mkDerivation {

4
pkgs/applications/kde/kcalutils.nix
View file

@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
grantlee, kcalendarcore, kconfig, kontactinterface, kcoreaddons, kdelibs4support,
grantlee, kcalendarcore, kconfig, kontactinterface, kcoreaddons,
kidentitymanagement, kpimtextedit,
}:
@ -13,7 +13,7 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
grantlee kcalendarcore kconfig kontactinterface kcoreaddons kdelibs4support
grantlee kcalendarcore kconfig kontactinterface kcoreaddons
kidentitymanagement kpimtextedit
];
outputs = [ "out" "dev" ];

2
pkgs/applications/kde/kdeconnect-kde.nix
View file

@ -21,6 +21,7 @@
, qca-qt5
, qtgraphicaleffects
, qtmultimedia
, qtquickcontrols2
, qtx11extras
, breeze-icons
, sshfs
@ -47,6 +48,7 @@ mkDerivation {
qca-qt5
qtgraphicaleffects
qtmultimedia
qtquickcontrols2
qtx11extras
# otherwise buttons are blank on non-kde
breeze-icons

2
pkgs/applications/kde/kdenlive/default.nix
View file

@ -26,6 +26,7 @@
, phonon-backend-gstreamer
, qtdeclarative
, qtmultimedia
, qtnetworkauth
, qtquickcontrols2
, qtscript
, rttr
@ -61,6 +62,7 @@ mkDerivation {
phonon-backend-gstreamer
qtdeclarative
qtmultimedia
qtnetworkauth
qtquickcontrols2
qtscript
shared-mime-info

10
pkgs/applications/kde/kdepim-runtime/default.nix
View file

@ -3,9 +3,10 @@
extra-cmake-modules, kdoctools,
shared-mime-info,
akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes,
kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement,
kalarmcal, kcalutils, kcontacts, kdav, kidentitymanagement,
kimap, kldap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig,
pimcommon, qtwebengine, libkgapi, qca-qt5, qtnetworkauth, qtspeech, qtxmlpatterns,
pimcommon, libkgapi, libsecret,
qca-qt5, qtkeychain, qtnetworkauth, qtspeech, qtwebengine, qtxmlpatterns,
}:
mkDerivation {
@ -17,8 +18,9 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ];
buildInputs = [
akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes
kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap
kalarmcal kcalutils kcontacts kdav kidentitymanagement kimap
kldap kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine
pimcommon libkgapi qca-qt5 qtnetworkauth qtspeech qtxmlpatterns
pimcommon libkgapi libsecret
qca-qt5 qtkeychain qtnetworkauth qtspeech qtxmlpatterns
];
}

4
pkgs/applications/kde/khelpcenter.nix
View file

@ -1,7 +1,7 @@
{
mkDerivation,
extra-cmake-modules, kdoctools,
grantlee, kcmutils, kconfig, kcoreaddons, kdbusaddons, kdelibs4support, ki18n,
grantlee, kcmutils, kconfig, kcoreaddons, kdbusaddons, ki18n,
kinit, khtml, kservice, xapian
}:
@ -9,7 +9,7 @@ mkDerivation {
pname = "khelpcenter";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
grantlee kcmutils kconfig kcoreaddons kdbusaddons kdelibs4support khtml
grantlee kcmutils kconfig kcoreaddons kdbusaddons khtml
ki18n kinit kservice xapian
];
}

4
pkgs/applications/kde/kio-extras.nix
View file

@ -2,7 +2,7 @@
mkDerivation, lib, extra-cmake-modules, kdoctools, shared-mime-info,
exiv2, kactivities, karchive, kbookmarks, kconfig, kconfigwidgets,
kcoreaddons, kdbusaddons, kdsoap, kguiaddons, kdnssd, kiconthemes, ki18n, kio,
khtml, kdelibs4support, kpty, syntax-highlighting, libmtp, libssh, openexr,
khtml, kpty, syntax-highlighting, libmtp, libssh, openexr,
ilmbase, openslp, phonon, qtsvg, samba, solid, gperf
}:
@ -16,7 +16,7 @@ mkDerivation {
buildInputs = [
exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons
kdbusaddons kdsoap kguiaddons kdnssd kiconthemes ki18n kio khtml
kdelibs4support kpty syntax-highlighting libmtp libssh openexr openslp
kpty syntax-highlighting libmtp libssh openexr openslp
phonon qtsvg samba solid gperf
];
CXXFLAGS = [ "-I${ilmbase.dev}/include/OpenEXR" ];

4
pkgs/applications/kde/kldap.nix
View file

@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
cyrus_sasl, ki18n, kio, kmbox, openldap
cyrus_sasl, ki18n, kio, kmbox, libsecret, openldap, qtkeychain
}:
mkDerivation {
@ -11,7 +11,7 @@ mkDerivation {
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ ki18n kio kmbox ];
buildInputs = [ ki18n kio kmbox libsecret qtkeychain ];
propagatedBuildInputs = [ cyrus_sasl openldap ];
outputs = [ "out" "dev" ];
}

9
pkgs/applications/kde/kmail.nix
View file

@ -2,12 +2,13 @@
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi-search, kbookmarks, kcalutils, kcmutils, kcompletion, kconfig,
kconfigwidgets, kcoreaddons, kdelibs4support, libkdepim,
kconfigwidgets, kcoreaddons, libkdepim,
kdepim-runtime, kguiaddons, ki18n, kiconthemes, kinit, kio, kldap,
kmail-account-wizard, kmailtransport, knotifications, knotifyconfig,
kontactinterface, kparts, kpty, kservice, ktextwidgets, ktnef, kwallet,
kwidgetsaddons, kwindowsystem, kxmlgui, libgravatar, libksieve, mailcommon,
messagelib, pim-sieve-editor, qtscript, qtwebengine, akonadi, kdepim-addons
messagelib, pim-sieve-editor, qtscript, qtwebengine, akonadi, kdepim-addons,
qtkeychain, libsecret
}:
mkDerivation {
@ -19,12 +20,12 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi-search kbookmarks kcalutils kcmutils kcompletion kconfig
kconfigwidgets kcoreaddons kdelibs4support kguiaddons ki18n
kconfigwidgets kcoreaddons kguiaddons ki18n
kiconthemes kinit kio kldap kmail-account-wizard kmailtransport libkdepim
knotifications knotifyconfig kontactinterface kparts kpty kservice
ktextwidgets ktnef kwidgetsaddons kwindowsystem kxmlgui libgravatar
libksieve mailcommon messagelib pim-sieve-editor qtscript qtwebengine
kdepim-addons
kdepim-addons qtkeychain libsecret
];
propagatedUserEnvPkgs = [ kdepim-runtime kwallet akonadi ];
}

7
pkgs/applications/kde/kmailtransport.nix
View file

@ -3,7 +3,7 @@
extra-cmake-modules, kdoctools,
akonadi, akonadi-mime, cyrus_sasl, kcmutils,
ki18n, kio, kmime, kwallet, ksmtp, libkgapi,
kcalendarcore, kcontacts
kcalendarcore, kcontacts, qtkeychain, libsecret
}:
mkDerivation {
@ -13,7 +13,10 @@ mkDerivation {
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ akonadi kcmutils ki18n kio ksmtp libkgapi kcalendarcore kcontacts ];
buildInputs = [
akonadi kcmutils ki18n kio ksmtp libkgapi kcalendarcore kcontacts
qtkeychain libsecret
];
propagatedBuildInputs = [ akonadi-mime cyrus_sasl kmime kwallet ];
outputs = [ "out" "dev" ];
}

4
pkgs/applications/kde/kmix.nix
View file

@ -1,7 +1,7 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
kglobalaccel, kxmlgui, kcoreaddons, kdelibs4support,
kglobalaccel, kxmlgui, kcoreaddons,
plasma-framework, libpulseaudio, alsaLib, libcanberra_kde
}:
@ -13,7 +13,7 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
alsaLib kglobalaccel kxmlgui kcoreaddons kdelibs4support
alsaLib kglobalaccel kxmlgui kcoreaddons
libcanberra_kde libpulseaudio plasma-framework
];
cmakeFlags = [ "-DKMIX_KF5_BUILD=1" ];

3
pkgs/applications/kde/knotes.nix
View file

@ -5,7 +5,6 @@
kdbusaddons, kdnssd, kglobalaccel, kiconthemes, kitemmodels,
kitemviews, kcmutils, knewstuff, knotifications, knotifyconfig,
kparts, ktextwidgets, kwidgetsaddons, kwindowsystem,
kdelibs4support,
grantlee, grantleetheme, qtx11extras,
akonadi, akonadi-notes, akonadi-search, kcalutils,
kontactinterface, libkdepim, kmime, pimcommon, kpimtextedit,
@ -19,7 +18,7 @@ mkDerivation {
kcompletion kconfig kconfigwidgets kcoreaddons kcrash
kdbusaddons kdnssd kglobalaccel kiconthemes kitemmodels kitemviews
kcmutils knewstuff knotifications knotifyconfig kparts ktextwidgets
kwidgetsaddons kwindowsystem kdelibs4support
kwidgetsaddons kwindowsystem
grantlee grantleetheme qtx11extras
akonadi akonadi-notes kcalutils kontactinterface
libkdepim kmime pimcommon kpimtextedit

10
pkgs/applications/kde/kolourpaint.nix
View file

@ -2,14 +2,20 @@
, mkDerivation
, extra-cmake-modules
, kdoctools
, kdelibs4support
, kguiaddons
, kio
, ktextwidgets
, kwidgetsaddons
, kxmlgui
, libkexiv2
}:
mkDerivation {
pname = "kolourpaint";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kdelibs4support libkexiv2 ];
buildInputs = [
kguiaddons kio ktextwidgets kwidgetsaddons kxmlgui libkexiv2
];
meta = {
maintainers = [ lib.maintainers.fridh ];
license = with lib.licenses; [ gpl2 ];

8
pkgs/applications/kde/konqueror.nix
View file

@ -1,16 +1,16 @@
{ lib
, mkDerivation
, extra-cmake-modules, kdoctools
, kdelibs4support, kcmutils, khtml, kdesu
, qtbase, qtwebkit, qtwebengine, qtx11extras, qtscript, qtwayland
, kinit, kcmutils, khtml, kdesu
, qtbase, qtwebengine, qtx11extras, qtscript, qtwayland
}:
mkDerivation {
pname = "konqueror";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kdelibs4support kcmutils khtml kdesu
qtwebkit qtwebengine qtx11extras qtscript qtwayland
kcmutils khtml kinit kdesu
qtwebengine qtx11extras qtscript qtwayland
];
# InitialPreference values are too high and any text/html ends up

14
pkgs/applications/kde/konquest.nix
View file

@ -2,7 +2,13 @@
, mkDerivation
, extra-cmake-modules
, kdoctools
, kdelibs4support
, kconfig
, kcoreaddons
, kcrash
, kdbusaddons
, kguiaddons
, kxmlgui
, kwidgetsaddons
, libkdegames
, qtquickcontrols
}:
@ -10,7 +16,11 @@
mkDerivation {
pname = "konquest";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kdelibs4support libkdegames qtquickcontrols ];
buildInputs = [
kconfig kcoreaddons kcrash kdbusaddons kguiaddons kxmlgui kwidgetsaddons
libkdegames
qtquickcontrols
];
meta = {
license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ lheckemann ];

4
pkgs/applications/kde/konsole.nix
View file

@ -2,7 +2,7 @@
mkDerivation, lib,
extra-cmake-modules, kdoctools,
kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons,
ki18n, kiconthemes, kinit, kdelibs4support, kio, knotifications,
ki18n, kiconthemes, kinit, kio, knotifications,
knotifyconfig, kparts, kpty, kservice, ktextwidgets, kwidgetsaddons,
kwindowsystem, kxmlgui, qtscript, knewstuff
}:
@ -15,7 +15,7 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons kdelibs4support
kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons
kguiaddons ki18n kiconthemes kinit kio knotifications knotifyconfig kparts kpty
kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript knewstuff
];

3
pkgs/applications/kde/kontactinterface.nix
View file

@ -12,6 +12,7 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kiconthemes kparts kwindowsystem kxmlgui
kiconthemes kwindowsystem kxmlgui
];
propagatedBuildInputs = [ kparts ];
}

4
pkgs/applications/kde/korganizer.nix
View file

@ -7,7 +7,7 @@
akonadi-calendar, akonadi-contacts, akonadi-notes, akonadi-search,
calendarsupport, eventviews, incidenceeditor, kcalutils,
kholidays, kidentitymanagement, kldap, kmailtransport, kontactinterface,
kpimtextedit, pimcommon,
kparts, kpimtextedit, pimcommon,
}:
mkDerivation {
@ -24,6 +24,6 @@ mkDerivation {
akonadi-calendar akonadi-contacts akonadi-notes akonadi-search
calendarsupport eventviews incidenceeditor kcalutils
kholidays kidentitymanagement kldap kmailtransport kontactinterface
kpimtextedit pimcommon
kparts kpimtextedit pimcommon
];
}

14
pkgs/applications/kde/krfb.nix
View file

@ -1,7 +1,10 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
kdelibs4support, kdnssd, libvncserver, libXtst, libXdamage, qtx11extras
kconfig, kcoreaddons, kcrash, kdbusaddons, kdnssd, knotifications, kwallet,
kwidgetsaddons, kwindowsystem, kxmlgui,
libvncserver, libXtst, libXdamage,
qtx11extras
}:
mkDerivation {
@ -11,6 +14,11 @@ mkDerivation {
maintainers = with lib.maintainers; [ jerith666 ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ libvncserver libXtst libXdamage qtx11extras ];
propagatedBuildInputs = [ kdelibs4support kdnssd ];
buildInputs = [
libvncserver libXtst libXdamage
kconfig kcoreaddons kcrash kdbusaddons knotifications kwallet kwidgetsaddons
kwindowsystem kxmlgui
qtx11extras
];
propagatedBuildInputs = [ kdnssd ];
}

4
pkgs/applications/kde/ktnef.nix
View file

@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
kcalendarcore, kcalutils, kcontacts, kdelibs4support
kcalendarcore, kcalutils, kcontacts
}:
mkDerivation {
@ -12,7 +12,7 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
kcalendarcore kcalutils kcontacts kdelibs4support
kcalendarcore kcalutils kcontacts
];
outputs = [ "out" "dev" ];
}

3
pkgs/applications/kde/kwalletmanager.nix
View file

@ -7,7 +7,6 @@
, kconfigwidgets
, kcoreaddons
, kdbusaddons
, kdelibs4support
, kwallet
, kxmlgui
}:
@ -20,7 +19,7 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kauth kcmutils kconfigwidgets kcoreaddons kdbusaddons kdelibs4support
kauth kcmutils kconfigwidgets kcoreaddons kdbusaddons
kwallet kxmlgui
];
}

3
pkgs/applications/kde/libkdegames.nix
View file

@ -2,7 +2,6 @@
, mkDerivation
, extra-cmake-modules
, kdoctools
, kdelibs4support
, qtdeclarative
, kdeclarative
, kdnssd
@ -16,7 +15,7 @@ mkDerivation {
pname = "libkdegames";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kdelibs4support qtdeclarative kdeclarative kdnssd knewstuff openal libsndfile
qtdeclarative kdeclarative kdnssd knewstuff openal libsndfile
qtquickcontrols
];
meta = {

4
pkgs/applications/kde/pim-sieve-editor.nix
View file

@ -2,7 +2,7 @@
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
kdbusaddons, kcrash, kbookmarks, kiconthemes, kio, kpimtextedit,
kmailtransport, pimcommon, libksieve
kmailtransport, libksieve, pimcommon, qtkeychain, libsecret
}:
mkDerivation {
@ -14,6 +14,6 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kdbusaddons kcrash kbookmarks kiconthemes kio kpimtextedit kmailtransport
pimcommon libksieve
libksieve pimcommon qtkeychain libsecret
];
}

1800
pkgs/applications/kde/srcs.nix
View file

File diff suppressed because it is too large Load diff

2
pkgs/applications/misc/break-time/default.nix
View file

@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "18p9gfp0inbnjsc7af38fghyklr7qnl2kkr25isfy9d5m8cpxqc6";
};
cargoSha256 = "0brmgrxhspcpcarm4lvnl95dw2n96r20w736giv18xcg7d5jmgca";
cargoSha256 = "01y1p40vz30h2jkh37zipqvmfybgpq6wdcdglkab85jivmd1lslx";
nativeBuildInputs = [
pkg-config

2
pkgs/applications/misc/clipcat/default.nix
View file

@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "0rxl3ksjinw07q3p2vjqg80k3c6wx2q7pzpf2344zyfb4gkqzx1c";
};
cargoSha256 = "1ffgvhkdj8wkhlgi0cj0njdm9ycxq2qda4b5qn8bmaygzr2zkwpd";
cargoSha256 = "1n4il3l59m2a6ca54vfaivzg25abf8s4w5kpd5q51p13624iz0kb";
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";

2
pkgs/applications/misc/effitask/default.nix
View file

@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
# workaround for missing Cargo.lock file https://github.com/sanpii/effitask/issues/48
cargoPatches = [ ./cargo-lock.patch ];
cargoSha256 = "0dvmp23kny6rlv6c0mfyy3cmz1bi5wcm1mxps4z67lym5kxfd362";
cargoSha256 = "1a80kf95kr94l6jzxdj4i09x1342x358fqjy6119qjg3q3bj0y3p";
buildInputs = [ openssl gtk3 ];

2
pkgs/applications/misc/elfx86exts/default.nix
View file

@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "1j9ca2lyxjsrf0rsfv83xi53vj6jz5nb76xibh367brcsc26mvd6";
};
cargoSha256 = "1dfhx40jr5llqa554wifd920mqdbm8s5fns98m6vcqdjxzan4nr2";
cargoSha256 = "0n3b9vdk5n32jmd7ks50d55z4dfahjincd2s1d8m9z17ip2qw2c4";
meta = with lib; {
description = "Decode x86 binaries and print out which instruction set extensions they use.";

2
pkgs/applications/misc/fitnesstrax/default.nix
View file

@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
gtk3
];
cargoSha256 = "1xgyyxd2kz21xan0pk7rbxiym90s7m2qrzg2ddilcszva60bxdd9";
cargoSha256 = "0dlnlb3hqyh98y916wvdb4rd20az73brs8hqna2lgr7kv1pd77j7";
postInstall = ''
mkdir -p $out/share/glib-2.0/schemas

2
pkgs/applications/misc/flavours/default.nix
View file

@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ ]
++ lib.optionals stdenv.isDarwin [ libiconv ];
cargoSha256 = "sha256-cAXiAPhHdxdd8pFQ0Gq7eHO2p/Dam53gDbE583UYY/k=";
cargoSha256 = "sha256-I8ZH35L2CVLy6ypmdOPd8VEG/sQeGaHyT1HWNdwyZVo=";
meta = with lib; {
description = "An easy to use base16 scheme manager/builder that integrates with any workflow";

2
pkgs/applications/misc/imag/default.nix
View file

@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
cargoSha256 = "0n8cw70qh8g4hfwfaxwwxbrrx5hm2z037z8kdhvdpqkxljl9189x";
cargoSha256 = "1vnrc72g2271i2p847z30kplxmdpi60n3dzpw0s7dahg33g14ai6";
checkPhase = ''
export HOME=$TMPDIR

2
pkgs/applications/misc/kondo/default.nix
View file

@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "0kl2zn6ir3w75ny25ksgxl93vlyb13gzx2795zyimqqnsrdpbbrf";
};
cargoSha256 = "1ax81a2828z3yla1psg5xi8ild65m6zcsvx48ncz902mpzqlj92b";
cargoSha256 = "0sddsm0jys1bsj2bsr39lcyx8k2hzw17nlsv6aql0v82x8qbsiv4";
meta = with lib; {
description = "Save disk space by cleaning unneeded files from software projects";

2
pkgs/applications/misc/lscolors/default.nix
View file

@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
./cargo.lock.patch
];
cargoSha256 = "02k23idwy0sb4lnjrwnyah3qp22zj161ilbc13p75k0hdijfaxl5";
cargoSha256 = "0kfm1pq22dhiw138bf7jvf7amlkal90n1hc9fq44wr4chr9b2fmx";
meta = with lib; {
description = "Rust library and tool to colorize paths using LS_COLORS";

2
pkgs/applications/misc/pastel/default.nix
View file

@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "00xxrssa3gbr5w2jsqlf632jlzc0lc2rpybnbv618ndy5lxidnw0";
};
cargoSha256 = "1ji64h0f8f2sq12cx33kymypzar9swhaj903gclf3jdwgna77326";
cargoSha256 = "0kkhj58q1lgsyj7hpy3sxg1jva9q51m0i7j60zfzhnjnirwcd0h8";
buildInputs = lib.optional stdenv.isDarwin Security;

2
pkgs/applications/misc/pipr/default.nix
View file

@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "1pbj198nqi27kavz9bm31a3h7h70by6l00046x09yf9n8qjpp01w";
};
cargoSha256 = "1dcrafpf252dpjvimaibb93082nymb26wwbvr34zd6j7z285vach";
cargoSha256 = "05ryaxi479fxzdcl51r1xlqbiasfzxcxgvl4wnxync8qi8q2yqk0";
nativeBuildInputs = [ makeWrapper ];
postFixup = ''

2
pkgs/applications/misc/pueue/default.nix
View file

@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-wcOF34GzlB6YKISkjDgYgsaN1NmWBMIntfT23A6byx8=";
};
cargoSha256 = "sha256-7SJjtHNSabE/VqdiSwKZ/yNzk6GSMNsQLaSx/MjN5NA=";
cargoSha256 = "sha256-aW1VliL7QQm9gMeM6N+SroHlgqI3F7MX0EzcuEzcJnQ=";
nativeBuildInputs = [ installShellFiles ];

2
pkgs/applications/misc/reddsaver/default.nix
View file

@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "0ffci3as50f55n1v36hji4n0b3lkch5ylc75awjz65jz2gd2y2j4";
};
cargoSha256 = "1cx3sqr7zb1vlfdvbcxp0yva9xh654qczpy8s09c8cviy8hac5sr";
cargoSha256 = "1xf26ldgfinzpakcp65w52fdl3arsm053vfnq7gk2fwnq55cjwl0";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]

2
pkgs/applications/misc/rsclock/default.nix
View file

@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "1i93qkz6d8sbk78i4rvx099hnn4lklp4cjvanpm9ssv8na4rqvh2";
};
cargoSha256 = "01dhkis6zswq1y40n7sdq9xv1sp61f2v7nfqbkicyjngmdrmcgrl";
cargoSha256 = "1vgizkdzi9mnan4rcswyv450y6a4b9l74d0siv1ix0nnlznnqyg1";
meta = with lib; {
description = "A simple terminal clock written in Rust";

2
pkgs/applications/misc/surface-control/default.nix
View file

@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-SLJ4mwBafLGL5pneMTHLc4S4Tgds2xLqByWFH95TK1k=";
};
cargoSha256 = "sha256-a+4oOkO90TObfYnq9NZsWy5RmYFYN1BKvUKxpvjiJc8=";
cargoSha256 = "sha256-NH33AMuwf4bOF9zZJlONVMYgrrYSBq5VQClYW/rbzsM=";
nativeBuildInputs = [ installShellFiles ];

2
pkgs/applications/misc/taizen/default.nix
View file

@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin Security;
nativeBuildInputs = [ pkg-config ];
cargoSha256 = "0chrgwm97y1a3gj218x25yqk1y1h74a6gzyxjdm023msvs58nkni";
cargoSha256 = "1yqy5v02a4qshgb7k8rnn408k3n6qx3jc8zziwvv7im61n9sjynf";
meta = with lib; {
homepage = "https://crates.io/crates/taizen";

2
pkgs/applications/misc/taskwarrior-tui/default.nix
View file

@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
# Because there's a test that requires terminal access
doCheck = false;
cargoSha256 = "0xblxsp7jgqbb3kr5k7yy6ziz18a8wlkrhls0vz9ak2n0ngddg3r";
cargoSha256 = "1c9vw1n6h7irwim1zf3mr0g520jnlvfqdy7y9v9g9xpkvbjr7ich";
meta = with lib; {
description = "A terminal user interface for taskwarrior ";

2
pkgs/applications/misc/terminal-typeracer/default.nix
View file

@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "RjGHY6KN6thxbg9W5FRwaAmUeD+5/WCeMCvzFHqZ+J4=";
};
cargoSha256 = "VSwku0rtQECirCHx2CXe72gCA+p3DdPC4YYwEYu8WfM=";
cargoSha256 = "sha256-A7O/e8PAcW36i8pT71SkWoWDIiMuEhSS9SmASNzNCjk=";
buildInputs = [ openssl sqlite ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ];
nativeBuildInputs = [ pkg-config ];

2
pkgs/applications/misc/tickrs/default.nix
View file

@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-OOsBo+NCfn++2XyfQVoeEPcbSv645Ng7g9s4W7X2xg4=";
};
cargoSha256 = "sha256-PW8f4PZGctHd8YBBRvmueR8UgtyDQZpqf2lTU1t68iM=";
cargoSha256 = "sha256-HAkJKqoz4vrY4mGFSz6sylV6DdrjWvPfwb4BiLWEyKY=";
nativeBuildInputs = [ perl ];

2
pkgs/applications/misc/todiff/default.nix
View file

@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "1y0v8nkaqb8kn61xwarpbyrq019gxx1f5f5p1hzw73nqxadc1rcm";
};
cargoSha256 = "1vyc230a2b0dry2057mkdkrjb7s9d0p43fnz4q67aqrpyr4jxwx2";
cargoSha256 = "0vrn1vc3rwabv6l2r1qb7mkcxbp75q79bfl3rxhyi51ra3ij507r";
checkPhase = "cargo test --features=integration_tests";

2
pkgs/applications/misc/zktree/default.nix
View file

@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "11w86k1w5zryiq6bqr98pjhffd3l76377yz53qx0n76vc5374fk9";
};
cargoSha256 = "1d35jrxvhf7m04s1kh0yrfhy9j9i6qzwbw2mwapgsrcsr5vhxasn";
cargoSha256 = "18v7agm39acnblc703278cn8py5971hm8p5kxmznpw119fjp36s5";
meta = with lib; {
description = "A small tool to display Znodes in Zookeeper in tree structure.";

2
pkgs/applications/networking/browsers/asuka/default.nix
View file

@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "1y8v4qc5dng3v9k0bky1xlf3qi9pk2vdsi29lff4ha5310467f0k";
};
cargoSha256 = "0p0x4ch04kydg76bfal5zqzr9hvn5268wf3k2v9h7g8r4y8xqlhw";
cargoSha256 = "0b8wf12bjsy334g04sv3knw8f177xsmh7lrkyvx9gnn0fax0lmnr";
nativeBuildInputs = [ pkg-config ];

2
pkgs/applications/networking/browsers/castor/default.nix
View file

@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "0rwg1w7srjwa23mkypl8zk6674nhph4xsc6nc01f6g5k959szylr";
};
cargoSha256 = "0yn2kfiaz6d8wc8rdqli2pwffp5vb1v3zi7520ysrd5b6fc2csf2";
cargoSha256 = "0dm3walwi3vzpk69l7nz6yl6w49676x8pjnigpn67q4bn7lpaqb1";
nativeBuildInputs = [
pkg-config

2
pkgs/applications/networking/browsers/chromium/common.nix
View file

@ -137,7 +137,7 @@ let
ninja pkg-config
python2WithPackages perl nodejs
gnutar which
llvmPackages.lldClang.bintools
llvmPackages.bintools
] ++ lib.optionals (chromiumVersionAtLeast "92") [
python3WithPackages
];

28
pkgs/applications/networking/browsers/firefox/common.nix
View file

@ -98,16 +98,22 @@ let
# clang LTO on Darwin is broken so the stdenv is not being changed.
# Target the LLVM version that rustc -Vv reports it is built with for LTO.
# rustPackages_1_45 -> LLVM 10, rustPackages -> LLVM 11
llvmPackages = if stdenv.isDarwin
then buildPackages.llvmPackages
else if lib.versionAtLeast rustc.llvm.version "11"
then buildPackages.llvmPackages_11
else buildPackages.llvmPackages_10;
llvmPackages0 =
/**/ if stdenv.isDarwin
then buildPackages.llvmPackages
else if lib.versionAtLeast rustc.llvm.version "11"
then buildPackages.llvmPackages_11
else buildPackages.llvmPackages_10;
# Force the use of lld and other llvm tools for LTO
llvmPackages = llvmPackages0.override {
bootBintoolsNoLibc = null;
bootBintools = null;
};
# When LTO for Darwin is fixed, the following will need updating as lld
# doesn't work on it. For now it is fine since ltoSupport implies no Darwin.
buildStdenv = if ltoSupport
then overrideCC stdenv llvmPackages.lldClang
then overrideCC stdenv llvmPackages.clangUseLLVM
else stdenv;
nss_pkg = if lib.versionOlder ffversion "83" then nss_3_53 else nss;
@ -321,11 +327,11 @@ buildStdenv.mkDerivation ({
"BUILD_OFFICIAL=1"
]
++ lib.optionals ltoSupport [
"AR=${llvmPackages.bintools}/bin/llvm-ar"
"LLVM_OBJDUMP=${llvmPackages.bintools}/bin/llvm-objdump"
"NM=${llvmPackages.bintools}/bin/llvm-nm"
"RANLIB=${llvmPackages.bintools}/bin/llvm-ranlib"
"STRIP=${llvmPackages.bintools}/bin/llvm-strip"
"AR=${buildStdenv.cc.bintools.bintools}/bin/llvm-ar"
"LLVM_OBJDUMP=${buildStdenv.cc.bintools.bintools}/bin/llvm-objdump"
"NM=${buildStdenv.cc.bintools.bintools}/bin/llvm-nm"
"RANLIB=${buildStdenv.cc.bintools.bintools}/bin/llvm-ranlib"
"STRIP=${buildStdenv.cc.bintools.bintools}/bin/llvm-strip"
]
++ extraMakeFlags;

2
pkgs/applications/networking/cluster/click/default.nix
View file

@ -13,7 +13,7 @@ buildRustPackage rec {
sha256 = "18mpzvvww2g6y2d3m8wcfajzdshagihn59k03xvcknd5d8zxagl3";
};
cargoSha256 = "1f9yn4pvp58laylngdrfdkwygisnzkhkm7pndf6l33k3aqxhz5mm";
cargoSha256 = "16r5rwdbqyb5xrjc55i30xb20crpyjc75zn10xxjkicmvrpwydp6";
buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];

2
pkgs/applications/networking/cluster/habitat/default.nix
View file

@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "0rwi0lkmhlq4i8fba3s9nd9ajhz2dqxzkgfp5i8y0rvbfmhmfd6b";
};
cargoSha256 = "08sncz0jgsr2s821j3s4bk7d54xqwmnld7m57avavym1xqvsnbmy";
cargoSha256 = "1c058sjgd79ps8ahvxp25qyc3a6b2csb41vamrphv9ygai60mng6";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libsodium libarchive openssl zeromq ];

2
pkgs/applications/networking/cluster/kubernix/default.nix
View file

@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "04dzfdzjwcwwaw9min322g30q0saxpq5kqzld4f22fmk820ki6gp";
};
cargoSha256 = "17agwqx7nhzi124yq1s6zpqb227drrhp9c11r3jbicc08dz88bwg";
cargoSha256 = "133h6mkz9aylhligy16pfjzsl94xxj0rk2zjm08dhg0inj84z3yv";
doCheck = false;
meta = with lib; {

2
pkgs/applications/networking/dyndns/cfdyndns/default.nix
View file

@ -12,7 +12,7 @@ buildRustPackage rec {
sha256 = "1fba0w2979dmc2wyggqx4fj52rrl1s2vpjk6mkj1811a848l1hdi";
};
cargoSha256 = "04ryin24z3pfxjxy4smngy66xs7k85g6gdzsl77cij8ifb29im99";
cargoSha256 = "06qbagq4gvm5vk846lxskli02z9lqxsvis6ndq29bj0b9yyvdkay";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];

2
pkgs/applications/networking/feedreaders/newsboat/default.nix
View file

@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "0a0g9km515kipqmz6c09aj3lgy3nkzqwgnp87fh8f2vr098fn144";
};
cargoSha256 = "11dn1ixc7i29cv8kpqfkmikdqzr2v79vlyfxcvjwhgd0r34w4xhn";
cargoSha256 = "03g14npkisz159gibhfxj7l36vzm7cvg355hndzpxzvhf5r5yjqg";
# TODO: Check if that's still needed
postPatch = lib.optionalString stdenv.isDarwin ''

2
pkgs/applications/networking/irc/tiny/default.nix
View file

@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "07a50shv6k4fwl2gmv4j0maxaqqkjpwwmqkxkqs0gvx38lc5f7m7";
};
cargoSha256 = "009jqizj4qg1bqslna35myxcark40hwlqsz58fbps9nsgp1i0hq2";
cargoSha256 = "0npkcprcqy2pn7k64jzwg41vk9id6yzw211xw203h80cc5444igr";
cargoPatches = [
# Fix Cargo.lock version. Remove with the next release.

2
pkgs/applications/networking/ncgopher/default.nix
View file

@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-Yny5zZe5x7/pWda839HcFkHFuL/jl1Q7ykTZzKy871I=";
};
cargoSha256 = "sha256-IsRaDhnRamMSbtXG1r1j0jZYjFiSjRdwOaUVyqy4ZJw=";
cargoSha256 = "sha256-C4V1WsAUFtr+N64zyBk1V0E8gTM/U54q03J6Nj8ReLk=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [

36
pkgs/applications/networking/opsdroid/default.nix Normal file
View file

@ -0,0 +1,36 @@
{ lib, fetchFromGitHub, python3Packages }:
python3Packages.buildPythonPackage rec {
pname = "opsdroid";
version = "0.22.0";
src = fetchFromGitHub {
owner = "opsdroid";
repo = "opsdroid";
rev = "v${version}";
sha256 = "003gpzdjfz2jrwx2bkkd1k2mr7yjpaw5s7fy5l0hw72f9zimznd0";
};
disabled = !python3Packages.isPy3k;
# tests folder is not included in release
doCheck = false;
propagatedBuildInputs = with python3Packages; [
click Babel opsdroid_get_image_size slackclient webexteamssdk bleach
parse emoji puremagic yamale nbformat websockets pycron nbconvert
aiohttp matrix-api-async aioredis aiosqlite arrow pyyaml motor regex
mattermostdriver setuptools voluptuous ibm-watson tailer multidict
watchgod get-video-properties appdirs bitstring matrix-nio
];
passthru.python = python3Packages.python;
meta = with lib; {
description = "An open source chat-ops bot framework";
homepage = "https://opsdroid.dev";
maintainers = with maintainers; [ fpletz globin willibutz lheckemann ];
license = licenses.asl20;
platforms = platforms.unix;
};
}

2
pkgs/applications/networking/p2p/synapse-bt/default.nix
View file

@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "01npv3zwia5d534zdwisd9xfng507adv4qkljf8z0zm0khqqn71a";
};
cargoSha256 = "0lhhdzq4sadnp2pnbq309d1mb7ggbf24k5ivlchrjhllbim1wmdz";
cargoSha256 = "0sy0vlpkj967g9lyyh7ska8cpw5xh0g04kj071a32idrqc3dcjb1";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]

2
pkgs/applications/networking/wg-bond/default.nix
View file

@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
hash = "sha256:04k0maxy39k7qzcsqsv1byddsmjszmnyjffrf22nzbvml83p3l0y";
};
cargoSha256 = "1v2az0v6l8mqryvq3898hm7bpvqdd2c4kpv6ck7932jfjyna512k";
cargoSha256 = "1nlzhkhk1y0jhj6n3wn4dm783ldsxn7dk0d2xjx6ylczf9z3gp12";
nativeBuildInputs = [ makeWrapper ];
postInstall = ''

2
pkgs/applications/office/espanso/default.nix
View file

@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "1q47r43midkq9574gl8gdv3ylvrnbhdc39rrw4y4yk6jbdf5wwkm";
};
cargoSha256 = "0mxksifjagx25qkyg6ym0zlhal8014j8iim54cd44ndbkkiqlyxc";
cargoSha256 = "0ba5skn5s6qh0blf6bvivzvqc2l8v488l9n3x98pmf6nygrikfdb";
nativeBuildInputs = [
extra-cmake-modules

2
pkgs/applications/office/watson/default.nix
View file

@ -19,7 +19,7 @@ buildPythonApplication rec {
'';
checkInputs = [ pytestCheckHook pytest-mock mock pytest-datafiles ];
propagatedBuildInputs = [ arrow_1 click click-didyoumean requests ];
propagatedBuildInputs = [ arrow click click-didyoumean requests ];
nativeBuildInputs = [ installShellFiles ];
meta = with lib; {

2
pkgs/applications/radio/noaa-apt/default.nix
View file

@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec {
pango
];
cargoSha256 = "0w4rbbz8lsh31xkgibzndiic47690nfcjrn1411dskf7ali6djy8";
cargoSha256 = "167q9w45lh05l27cdssg8sfz3qfskfaxayzjy6q1cj50jrn0gq13";
preBuild = ''
# Used by macro pointing to resource location at compile time.

Some files were not shown because too many files have changed in this diff Show more