Merge staging-next into master

This commit is contained in:
Frederik Rietdijk 2021-02-26 11:07:01 +01:00
commit fdc872fa20
492 changed files with 3399 additions and 2236 deletions

View file

@ -611,7 +611,7 @@ Using the example above, the analagous pytestCheckHook usage would be:
"update"
];
disabledTestFiles = [
disabledTestPaths = [
"tests/test_failing.py"
];
```

View file

@ -223,7 +223,7 @@ sometimes it may be necessary to disable this so the tests run consecutively.
```nix
rustPlatform.buildRustPackage {
/* ... */
cargoParallelTestThreads = false;
dontUseCargoParallelTests = true;
}
```
@ -264,6 +264,198 @@ rustPlatform.buildRustPackage rec {
}
```
## Compiling non-Rust packages that include Rust code
Several non-Rust packages incorporate Rust code for performance- or
security-sensitive parts. `rustPlatform` exposes several functions and
hooks that can be used to integrate Cargo in non-Rust packages.
### Vendoring of dependencies
Since network access is not allowed in sandboxed builds, Rust crate
dependencies need to be retrieved using a fetcher. `rustPlatform`
provides the `fetchCargoTarball` fetcher, which vendors all
dependencies of a crate. For example, given a source path `src`
containing `Cargo.toml` and `Cargo.lock`, `fetchCargoTarball`
can be used as follows:
```nix
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
hash = "sha256-BoHIN/519Top1NUBjpB/oEMqi86Omt3zTQcXFWqrek0=";
};
```
The `src` attribute is required, as well as a hash specified through
one of the `sha256` or `hash` attributes. The following optional
attributes can also be used:
* `name`: the name that is used for the dependencies tarball. If
`name` is not specified, then the name `cargo-deps` will be used.
* `sourceRoot`: when the `Cargo.lock`/`Cargo.toml` are in a
subdirectory, `sourceRoot` specifies the relative path to these
files.
* `patches`: patches to apply before vendoring. This is useful when
the `Cargo.lock`/`Cargo.toml` files need to be patched before
vendoring.
### Hooks
`rustPlatform` provides the following hooks to automate Cargo builds:
* `cargoSetupHook`: configure Cargo to use depenencies vendored
through `fetchCargoTarball`. This hook uses the `cargoDeps`
environment variable to find the vendored dependencies. If a project
already vendors its dependencies, the variable `cargoVendorDir` can
be used instead. When the `Cargo.toml`/`Cargo.lock` files are not in
`sourceRoot`, then the optional `cargoRoot` is used to specify the
Cargo root directory relative to `sourceRoot`.
* `cargoBuildHook`: use Cargo to build a crate. If the crate to be
built is a crate in e.g. a Cargo workspace, the relative path to the
crate to build can be set through the optional `buildAndTestSubdir`
environment variable. Additional Cargo build flags can be passed
through `cargoBuildFlags`.
* `maturinBuildHook`: use [Maturin](https://github.com/PyO3/maturin)
to build a Python wheel. Similar to `cargoBuildHook`, the optional
variable `buildAndTestSubdir` can be used to build a crate in a
Cargo workspace. Additional maturin flags can be passed through
`maturinBuildFlags`.
* `cargoCheckHook`: run tests using Cargo. Additional flags can be
passed to Cargo using `checkFlags` and `checkFlagsArray`. By
default, tests are run in parallel. This can be disabled by setting
`dontUseCargoParallelTests`.
* `cargoInstallHook`: install binaries and static/shared libraries
that were built using `cargoBuildHook`.
### Examples
#### Python package using `setuptools-rust`
For Python packages using `setuptools-rust`, you can use
`fetchCargoTarball` and `cargoSetupHook` to retrieve and set up Cargo
dependencies. The build itself is then performed by
`buildPythonPackage`.
The following example outlines how the `tokenizers` Python package is
built. Since the Python package is in the `source/bindings/python`
directory of the *tokenizers* project's source archive, we use
`sourceRoot` to point the tooling to this directory:
```nix
{ fetchFromGitHub
, buildPythonPackage
, rustPlatform
, setuptools-rust
}:
buildPythonPackage rec {
pname = "tokenizers";
version = "0.10.0";
src = fetchFromGitHub {
owner = "huggingface";
repo = pname;
rev = "python-v${version}";
hash = "sha256-rQ2hRV52naEf6PvRsWVCTN7B1oXAQGmnpJw4iIdhamw=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src sourceRoot;
name = "${pname}-${version}";
hash = "sha256-BoHIN/519Top1NUBjpB/oEMqi86Omt3zTQcXFWqrek0=";
};
sourceRoot = "source/bindings/python";
nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [
cargoSetupHook
rust.cargo
rust.rustc
]);
# ...
}
```
In some projects, the Rust crate is not in the main Python source
directory. In such cases, the `cargoRoot` attribute can be used to
specify the crate's directory relative to `sourceRoot`. In the
following example, the crate is in `src/rust`, as specified in the
`cargoRoot` attribute. Note that we also need to specify the correct
path for `fetchCargoTarball`.
```nix
{ buildPythonPackage
, fetchPypi
, rustPlatform
, setuptools-rust
, openssl
}:
buildPythonPackage rec {
pname = "cryptography";
version = "3.4.2"; # Also update the hash in vectors.nix
src = fetchPypi {
inherit pname version;
sha256 = "1i1mx5y9hkyfi9jrrkcw804hmkcglxi6rmf7vin7jfnbr2bf4q64";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
sourceRoot = "${pname}-${version}/${cargoRoot}";
name = "${pname}-${version}";
hash = "sha256-PS562W4L1NimqDV2H0jl5vYhL08H9est/pbIxSdYVfo=";
};
cargoRoot = "src/rust";
# ...
}
```
#### Python package using `maturin`
Python packages that use [Maturin](https://github.com/PyO3/maturin)
can be built with `fetchCargoTarball`, `cargoSetupHook`, and
`maturinBuildHook`. For example, the following (partial) derivation
builds the `retworkx` Python package. `fetchCargoTarball` and
`cargoSetupHook` are used to fetch and set up the crate dependencies.
`maturinBuildHook` is used to perform the build.
```nix
{ lib
, buildPythonPackage
, rustPlatform
, fetchFromGitHub
}:
buildPythonPackage rec {
pname = "retworkx";
version = "0.6.0";
src = fetchFromGitHub {
owner = "Qiskit";
repo = "retworkx";
rev = version;
sha256 = "11n30ldg3y3y6qxg3hbj837pnbwjkqw3nxq6frds647mmmprrd20";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-heOBK8qi2nuc/Ib+I/vLzZ1fUUD/G/KTw9d7M4Hz5O0=";
};
format = "pyproject";
nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ];
# ...
}
```
## Compiling Rust crates using Nix instead of Cargo
### Simple operation

View file

@ -3,7 +3,8 @@
stdenv.mkDerivation {
name = "nixpkgs-lint-1";
buildInputs = [ makeWrapper perl perlPackages.XMLSimple ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ perl perlPackages.XMLSimple ];
dontUnpack = true;
buildPhase = "true";

View file

@ -93,17 +93,7 @@ in
(if i.useDHCP != null then i.useDHCP else false));
address = forEach (interfaceIps i)
(ip: "${ip.address}/${toString ip.prefixLength}");
# IPv6PrivacyExtensions=kernel seems to be broken with networkd.
# Instead of using IPv6PrivacyExtensions=kernel, configure it according to the value of
# `tempAddress`:
networkConfig.IPv6PrivacyExtensions = {
# generate temporary addresses and use them by default
"default" = true;
# generate temporary addresses but keep using the standard EUI-64 ones by default
"enabled" = "prefer-public";
# completely disable temporary addresses
"disabled" = false;
}.${i.tempAddress};
networkConfig.IPv6PrivacyExtensions = "kernel";
linkConfig = optionalAttrs (i.macAddress != null) {
MACAddress = i.macAddress;
} // optionalAttrs (i.mtu != null) {

View file

@ -9,7 +9,8 @@
sha256 = "18k0hwlqky5x4y461fxmw77gvz7z8jyrvxicrqphsgvwwinzy732";
};
buildInputs = [ makeWrapper python3 alsaUtils timidity ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ python3 alsaUtils timidity ];
patchPhase = ''
sed -i 's@/usr/bin/aplaymidi@/${alsaUtils}/bin/aplaymidi@g' mma-splitrec

View file

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
else
throw "baudline isn't supported (yet?) on ${stdenv.hostPlatform.system}";
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
# Prebuilt binary distribution.
# "patchelf --set-rpath" seems to break the application (cannot start), using

View file

@ -17,7 +17,7 @@ stdenv.mkDerivation {
patchShebangs ./install.sh
'';
buildInputs = [ bash makeWrapper ];
nativeBuildInputs = [ bash makeWrapper ];
installPhase = ''
./install.sh --prefix=$out/bin

View file

@ -24,7 +24,7 @@ let
./clementine-spotify-blob.patch
];
nativeBuildInputs = [ cmake pkg-config ];
nativeBuildInputs = [ cmake pkg-config makeWrapper ];
buildInputs = [
boost
@ -68,7 +68,7 @@ let
inherit src patches nativeBuildInputs postPatch;
# gst_plugins needed for setup-hooks
buildInputs = buildInputs ++ [ makeWrapper ] ++ gst_plugins;
buildInputs = buildInputs ++ gst_plugins;
preConfigure = ''
rm -rf ext/{,lib}clementine-spotifyblob
@ -102,7 +102,7 @@ let
# Use the same patches and sources as Clementine
inherit src nativeBuildInputs patches postPatch;
buildInputs = buildInputs ++ [ libspotify makeWrapper ];
buildInputs = buildInputs ++ [ libspotify ];
# Only build and install the Spotify blob
preBuild = ''
cd ext/clementine-spotifyblob

View file

@ -11,7 +11,8 @@ stdenv.mkDerivation {
sha256 = "0y045my65hr3hjyx13jrnyg6g3wb41phqb1m7azc4l6vx6r4124b";
};
buildInputs = [ makeWrapper pythonPackages.mpd2 ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ pythonPackages.mpd2 ];
dontBuild = true;

View file

@ -5,7 +5,7 @@ symlinkJoin {
paths = [ deadbeef ] ++ plugins;
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
postBuild = ''
wrapProgram $out/bin/deadbeef \

View file

@ -30,7 +30,7 @@ let
inherit src;
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
passthru = {
inherit wrap wrapWithBuildEnv;
@ -159,8 +159,7 @@ let
stdenv.mkDerivation ((faust2ApplBase args) // {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ pkg-config makeWrapper ];
propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs;
@ -195,7 +194,7 @@ let
in stdenv.mkDerivation ((faust2ApplBase args) // {
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
postFixup = ''
for script in "$out"/bin/*; do

View file

@ -168,8 +168,7 @@ let
stdenv.mkDerivation ((faust2ApplBase args) // {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ pkg-config makeWrapper ];
propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs;
@ -209,7 +208,7 @@ let
in stdenv.mkDerivation ((faust2ApplBase args) // {
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
postFixup = ''
for script in "$out"/bin/*; do

View file

@ -53,7 +53,7 @@ stdenv.mkDerivation {
};
dontBuild = true;
buildInputs = [ dpkg makeWrapper ];
nativeBuildInputs = [ dpkg makeWrapper ];
unpackPhase = ''
dpkg -x $src .

View file

@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0g5v74cm0q3p3pzl6xmnp4rqayaymfli7c6z8s78h9rgd24fwbvn";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 makeWrapper ]
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [ fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 ]
++ (with perlPackages; [ perl XMLParser ]);
NIX_LDFLAGS = "-ldl";

View file

@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
# http://permalink.gmane.org/gmane.linux.redhat.fedora.extras.cvs/822346
patches = [ ./socket.patch ./gcc-47.patch ];
buildInputs = [ alsaLib gtk2 libjack2 libxml2 makeWrapper
pkg-config readline ];
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [ alsaLib gtk2 libjack2 libxml2 readline ];
propagatedBuildInputs = [ libuuid ];
NIX_LDFLAGS = "-lm -lpthread -luuid";

View file

@ -11,8 +11,8 @@ in stdenv.mkDerivation rec {
sha256 = "1r71h4yg775m4gax4irrvygmrsclgn503ykmc2qwjsxa42ri4n2n";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ makeWrapper MMA libjack2 libsmf python pyGtkGlade pygtksourceview ];
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [ MMA libjack2 libsmf python pyGtkGlade pygtksourceview ];
patchPhase = ''
sed -i 's@/usr/@${MMA}/@g' src/main/config/linuxband.rc.in

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mda-lv2";
version = "1.2.4";
version = "1.2.6";
src = fetchurl {
url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
sha256 = "1a3cv6w5xby9yn11j695rbh3c4ih7rxfxmkca9s1324ljphh06m8";
sha256 = "sha256-zWYRcCSuBJzzrKg/npBKcCdyJOI6lp9yqcXQEKSYV9s=";
};
nativeBuildInputs = [ pkg-config wafHook python3 ];

View file

@ -7,7 +7,7 @@ in symlinkJoin {
paths = [ puredata ] ++ plugins;
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
postBuild = ''
wrapProgram $out/bin/pd \

View file

@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "16kanzp5i353x972zjkwgi3m8z90wc58613mlfzb0n01djdnm6k5";
};
buildInputs = [ perlPackages.perl makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ perlPackages.perl ];
dontBuild = true;

View file

@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
preConfigure = "patchShebangs .";
configureFlags = [ "--enable-cli" ];
buildInputs = [ ruby cdparanoia makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ ruby cdparanoia ];
postInstall = ''
wrapProgram "$out/bin/rrip_cli" \
--prefix PATH : "${ruby}/bin" \

View file

@ -81,7 +81,8 @@ stdenv.mkDerivation {
sha512 = "5b3d5d1f52a554c8e775b8aed16ef84e96bf3b61a2b53266e10d3c47e341899310af13cc8513b04424fc14532e36543a6fae677f80a036e3f51c75166d8d53d1";
};
buildInputs = [ squashfsTools makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ squashfsTools ];
dontStrip = true;
dontPatchELF = true;

View file

@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0107b5j1gf7dwp7qb4w2snj4bqiyps53d66qzl2rwj4jfpakws5a";
};
buildInputs = [ alsaLib libX11 makeWrapper tcl tk ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ alsaLib libX11 tcl tk ];
configurePhase = ''
mkdir -p $out/bin

View file

@ -162,7 +162,7 @@ in rec {
# Eclipse.
name = (lib.meta.appendToName "with-plugins" eclipse).name;
in
runCommand name { buildInputs = [ makeWrapper ]; } ''
runCommand name { nativeBuildInputs = [ makeWrapper ]; } ''
mkdir -p $out/bin $out/etc
# Prepare an eclipse.ini with the plugin directory.

View file

@ -9,7 +9,7 @@ in
symlinkJoin {
name = "kakoune-${kakoune.version}";
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
paths = [ kakoune ] ++ requestedPlugins;

View file

@ -29,7 +29,8 @@ in
inherit sha256;
};
buildInputs = [ makeWrapper libXScrnSaver ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ libXScrnSaver ];
desktopItem = makeDesktopItem {
name = "kodestudio";

View file

@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
sha256 = metadata.sha256;
};
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin

View file

@ -106,7 +106,7 @@ let
preferLocalBuild = true;
buildInputs = [makeWrapper];
nativeBuildInputs = [ makeWrapper ];
passthru = { unwrapped = neovim; };
meta = neovim.meta // {

View file

@ -56,7 +56,8 @@ stdenv.mkDerivation {
ln -s ${desktopItem}/share/applications/* $out/share/applications
'';
buildInputs = [ makeWrapper perl python unzip libicns imagemagick ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ perl python unzip libicns imagemagick ];
meta = {
description = "An integrated development environment for Java, C, C++ and PHP";

View file

@ -10,8 +10,8 @@ stdenv.mkDerivation {
sha256 = "08y5haclgxvcii3hpdvn1ah8qd0f3n8xgxxs8zryj02b8n7cz3vx";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [mono gtk-sharp-2_0 makeWrapper gnome2.libglade gtk2 ];
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [mono gtk-sharp-2_0 gnome2.libglade gtk2 ];
installPhase = ''
mkdir -p $out/bin $out/lib/supertux-editor

View file

@ -29,7 +29,7 @@ let
"/Applications/MacVim.app/Contents/MacOS"
"/Applications/MacVim.app/Contents/bin"
];
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
# We need to do surgery on the resulting app. We can't just make a wrapper for vim because this
# is a GUI app. We need to copy the actual GUI executable image as AppKit uses the loaded image's
# path to locate the bundle. We can use symlinks for other executables and resources though.

View file

@ -57,7 +57,8 @@ in
# When no extensions are requested, we simply redirect to the original
# non-wrapped vscode executable.
runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" {
buildInputs = [ vscode makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ vscode ];
dontPatchELF = true;
dontStrip = true;
meta = vscode.meta;

View file

@ -11,7 +11,7 @@ in symlinkJoin {
paths = [ gimp ] ++ selectedPlugins;
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
postBuild = ''
for each in gimp-${versionBranch} gimp-console-${versionBranch}; do

View file

@ -12,7 +12,7 @@ symlinkJoin {
paths = [ glimpse ] ++ selectedPlugins;
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
postBuild = ''
for each in glimpse-${versionBranch} glimpse-console-${versionBranch}; do

View file

@ -15,7 +15,8 @@ let
url = "https://wsr.imagej.net/distros/cross-platform/ij150.zip";
sha256 = "97aba6fc5eb908f5160243aebcdc4965726693cb1353d9c0d71b8f5dd832cb7b";
};
buildInputs = [ unzip makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ unzip ];
inherit jre;
# JAR files that are intended to be used by other packages

View file

@ -10,7 +10,7 @@ symlinkJoin {
paths = [ inkscape ] ++ inkscapeExtensions;
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
postBuild = ''
rm -f $out/bin/inkscape

View file

@ -17,7 +17,7 @@ let
tesseractWithData = tesseractBase.overrideAttrs (_: {
inherit tesseractBase tessdata;
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildCommand = ''
makeWrapper {$tesseractBase,$out}/bin/tesseract --set-default TESSDATA_PREFIX $out/share/tessdata

View file

@ -38,7 +38,7 @@ in
sourceRoot = "Unigine_Valley-${version}";
instPath = "lib/unigine/valley";
buildInputs = [file makeWrapper];
nativeBuildInputs = [file makeWrapper];
libPath = lib.makeLibraryPath [
stdenv.cc.cc # libstdc++.so.6

View file

@ -2,9 +2,9 @@
mkDerivation, lib, kdepimTeam,
extra-cmake-modules,
qtwebengine,
grantlee,
grantlee, grantleetheme,
kdbusaddons, ki18n, kiconthemes, kio, kitemmodels, ktextwidgets, prison,
akonadi, akonadi-mime, kcontacts, kmime,
akonadi, akonadi-mime, kcontacts, kmime, libkleo,
}:
mkDerivation {
@ -16,9 +16,9 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
qtwebengine
grantlee
grantlee grantleetheme
kdbusaddons ki18n kiconthemes kio kitemmodels ktextwidgets prison
akonadi-mime kcontacts kmime
akonadi-mime kcontacts kmime libkleo
];
propagatedBuildInputs = [ akonadi ];
outputs = [ "out" "dev" ];

View file

@ -1,6 +1,6 @@
From 90969b9b36400d47b1afe761fb8468c1acb8a04a Mon Sep 17 00:00:00 2001
From f4d718502ecd8242500078a7783e27caba72871e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 13 Jul 2020 11:41:19 -0500
Date: Sun, 31 Jan 2021 11:00:03 -0600
Subject: [PATCH 1/3] akonadi paths
---
@ -11,10 +11,10 @@ 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 23b4a1f..c13b658 100644
index 31e0cf2..6436e87 100644
--- a/src/akonadicontrol/agentmanager.cpp
+++ b/src/akonadicontrol/agentmanager.cpp
@@ -61,7 +61,7 @@ public:
@@ -48,7 +48,7 @@ public:
[]() {
QCoreApplication::instance()->exit(255);
});
@ -23,7 +23,7 @@ index 23b4a1f..c13b658 100644
}
~StorageProcessControl() override
@@ -84,7 +84,7 @@ public:
@@ -70,7 +70,7 @@ public:
[]() {
qCCritical(AKONADICONTROL_LOG) << "Failed to start AgentServer!";
});
@ -33,10 +33,10 @@ index 23b4a1f..c13b658 100644
~AgentServerProcessControl() override
diff --git a/src/akonadicontrol/agentprocessinstance.cpp b/src/akonadicontrol/agentprocessinstance.cpp
index 4e58f7e..e8bb532 100644
index c98946c..aa307ca 100644
--- a/src/akonadicontrol/agentprocessinstance.cpp
+++ b/src/akonadicontrol/agentprocessinstance.cpp
@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const AgentType &agentInfo)
@@ -49,7 +49,7 @@ bool AgentProcessInstance::start(const AgentType &agentInfo)
} else {
Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher);
const QStringList arguments = QStringList() << executable << identifier();
@ -46,10 +46,10 @@ index 4e58f7e..e8bb532 100644
}
return true;
diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
index cac40f5..527649b 100644
index d595a3a..99324f6 100644
--- a/src/server/storage/dbconfigmysql.cpp
+++ b/src/server/storage/dbconfigmysql.cpp
@@ -83,7 +83,6 @@ bool DbConfigMysql::init(QSettings &settings)
@@ -69,7 +69,6 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
// determine default settings depending on the driver
QString defaultHostName;
QString defaultOptions;
@ -57,7 +57,7 @@ index cac40f5..527649b 100644
QString defaultCleanShutdownCommand;
#ifndef Q_OS_WIN
@@ -92,16 +91,7 @@ bool DbConfigMysql::init(QSettings &settings)
@@ -78,16 +77,7 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
#endif
const bool defaultInternalServer = true;
@ -75,7 +75,7 @@ index cac40f5..527649b 100644
if (!mysqladminPath.isEmpty()) {
#ifndef Q_OS_WIN
defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/%4 shutdown")
@@ -111,10 +101,10 @@ bool DbConfigMysql::init(QSettings &settings)
@@ -97,10 +87,10 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
#endif
}
@ -88,7 +88,7 @@ index cac40f5..527649b 100644
qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath;
mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool();
@@ -131,7 +121,7 @@ bool DbConfigMysql::init(QSettings &settings)
@@ -117,7 +107,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();
@ -97,7 +97,7 @@ index cac40f5..527649b 100644
mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString();
settings.endGroup();
@@ -141,9 +131,6 @@ bool DbConfigMysql::init(QSettings &settings)
@@ -127,9 +117,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");
}
@ -107,17 +107,17 @@ index cac40f5..527649b 100644
qCDebug(AKONADISERVER_LOG) << "Using mysqld:" << mMysqldPath;
@@ -152,9 +139,6 @@ bool DbConfigMysql::init(QSettings &settings)
settings.setValue(QStringLiteral("Name"), mDatabaseName);
settings.setValue(QStringLiteral("Host"), mHostName);
settings.setValue(QStringLiteral("Options"), mConnectionOptions);
- if (!mMysqldPath.isEmpty()) {
- settings.setValue(QStringLiteral("ServerPath"), mMysqldPath);
- }
settings.setValue(QStringLiteral("StartServer"), mInternalServer);
settings.endGroup();
settings.sync();
@@ -209,7 +193,7 @@ bool DbConfigMysql::startInternalServer()
@@ -139,9 +126,6 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
settings.setValue(QStringLiteral("Name"), mDatabaseName);
settings.setValue(QStringLiteral("Host"), mHostName);
settings.setValue(QStringLiteral("Options"), mConnectionOptions);
- if (!mMysqldPath.isEmpty()) {
- settings.setValue(QStringLiteral("ServerPath"), mMysqldPath);
- }
settings.setValue(QStringLiteral("StartServer"), mInternalServer);
settings.endGroup();
settings.sync();
@@ -214,7 +198,7 @@ bool DbConfigMysql::startInternalServer()
#endif
// generate config file
@ -127,10 +127,10 @@ index cac40f5..527649b 100644
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 09cdbd5..1c8996b 100644
index dd273fc..05288d9 100644
--- a/src/server/storage/dbconfigpostgresql.cpp
+++ b/src/server/storage/dbconfigpostgresql.cpp
@@ -141,9 +141,7 @@ bool DbConfigPostgresql::init(QSettings &settings)
@@ -127,9 +127,7 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings)
// determine default settings depending on the driver
QString defaultHostName;
QString defaultOptions;
@ -140,7 +140,7 @@ index 09cdbd5..1c8996b 100644
QString defaultPgData;
#ifndef Q_WS_WIN // We assume that PostgreSQL is running as service on Windows
@@ -154,12 +152,8 @@ bool DbConfigPostgresql::init(QSettings &settings)
@@ -140,12 +138,8 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings)
mInternalServer = settings.value(QStringLiteral("QPSQL/StartServer"), defaultInternalServer).toBool();
if (mInternalServer) {
@ -154,7 +154,7 @@ index 09cdbd5..1c8996b 100644
defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data"));
}
@@ -178,20 +172,14 @@ bool DbConfigPostgresql::init(QSettings &settings)
@@ -164,20 +158,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,14 +177,14 @@ index 09cdbd5..1c8996b 100644
qCDebug(AKONADISERVER_LOG) << "Found pg_upgrade:" << mPgUpgradePath;
mPgData = settings.value(QStringLiteral("PgData"), defaultPgData).toString();
if (mPgData.isEmpty()) {
@@ -207,7 +195,6 @@ bool DbConfigPostgresql::init(QSettings &settings)
settings.setValue(QStringLiteral("Port"), mHostPort);
}
settings.setValue(QStringLiteral("Options"), mConnectionOptions);
- settings.setValue(QStringLiteral("ServerPath"), mServerPath);
settings.setValue(QStringLiteral("InitDbPath"), mInitDbPath);
settings.setValue(QStringLiteral("StartServer"), mInternalServer);
settings.endGroup();
@@ -194,7 +182,6 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings)
settings.setValue(QStringLiteral("Port"), mHostPort);
}
settings.setValue(QStringLiteral("Options"), mConnectionOptions);
- settings.setValue(QStringLiteral("ServerPath"), mServerPath);
settings.setValue(QStringLiteral("InitDbPath"), mInitDbPath);
settings.setValue(QStringLiteral("StartServer"), mInternalServer);
settings.endGroup();
--
2.25.4
2.29.2

View file

@ -1,6 +1,6 @@
From b8c6a2a017321649db8fec553a644b8da2300514 Mon Sep 17 00:00:00 2001
From badd4be311afd37a99126c60490f1ae5daced6c4 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 13 Jul 2020 11:41:35 -0500
Date: Sun, 31 Jan 2021 11:00:15 -0600
Subject: [PATCH 2/3] akonadi timestamps
---
@ -8,10 +8,10 @@ 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 527649b..08c3dd4 100644
index 99324f6..3c170a8 100644
--- a/src/server/storage/dbconfigmysql.cpp
+++ b/src/server/storage/dbconfigmysql.cpp
@@ -235,8 +235,7 @@ bool DbConfigMysql::startInternalServer()
@@ -240,8 +240,7 @@ bool DbConfigMysql::startInternalServer()
bool confUpdate = false;
QFile actualFile(actualConfig);
// update conf only if either global (or local) is newer than actual
@ -22,5 +22,5 @@ index 527649b..08c3dd4 100644
QFile localFile(localConfig);
if (globalFile.open(QFile::ReadOnly) && actualFile.open(QFile::WriteOnly)) {
--
2.25.4
2.29.2

View file

@ -1,6 +1,6 @@
From 7afe018382cf68b477b35f87b666424d62d19ef4 Mon Sep 17 00:00:00 2001
From 82bfa975af60757374ffad787e56a981d6df0f98 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 13 Jul 2020 11:41:55 -0500
Date: Sun, 31 Jan 2021 11:01:24 -0600
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 d927471..83a74c0 100644
index 4bb5fec..35720b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -330,9 +330,6 @@ configure_package_config_file(
@@ -343,9 +343,6 @@ configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake"
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
@ -23,29 +23,23 @@ index d927471..83a74c0 100644
install(FILES
diff --git a/KF5AkonadiConfig.cmake.in b/KF5AkonadiConfig.cmake.in
index 421e1df..e3abf27 100644
index bcf7320..1574319 100644
--- a/KF5AkonadiConfig.cmake.in
+++ b/KF5AkonadiConfig.cmake.in
@@ -24,8 +24,8 @@ if(BUILD_TESTING)
find_dependency(Qt5Test "@QT_REQUIRED_VERSION@")
endif()
@@ -1,10 +1,10 @@
@PACKAGE_INIT@
-set_and_check(AKONADI_DBUS_INTERFACES_DIR "@PACKAGE_AKONADI_DBUS_INTERFACES_INSTALL_DIR@")
-set_and_check(AKONADI_INCLUDE_DIR "@PACKAGE_AKONADI_INCLUDE_DIR@")
+set_and_check(AKONADI_DBUS_INTERFACES_DIR "@AKONADI_DBUS_INTERFACES_INSTALL_DIR@")
+set_and_check(AKONADI_INCLUDE_DIR "@AKONADI_INCLUDE_DIR@")
find_dependency(Boost "@Boost_MINIMUM_VERSION@")
@@ -33,7 +33,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiTargets.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiMacros.cmake)
# The directory where akonadi-xml.xsd and kcfg2dbus.xsl are installed
-set(KF5Akonadi_DATA_DIR "@PACKAGE_KF5Akonadi_DATA_DIR@")
+set(KF5Akonadi_DATA_DIR "@KF5Akonadi_DATA_DIR@")
####################################################################################
# CMAKE_AUTOMOC
# set the directories
if(NOT AKONADI_INSTALL_DIR)
--
2.25.4
2.29.2

View file

@ -3,7 +3,7 @@
extra-cmake-modules, shared-mime-info, qtbase, accounts-qt,
boost, kaccounts-integration, kcompletion, kconfigwidgets, kcrash, kdbusaddons,
kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mysql, qttools,
signond,
signond, lzma,
}:
mkDerivation {
@ -21,7 +21,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
buildInputs = [
kaccounts-integration kcompletion kconfigwidgets kcrash kdbusaddons kdesignerplugin
ki18n kiconthemes kio kwindowsystem accounts-qt qttools signond
ki18n kiconthemes kio kwindowsystem lzma accounts-qt qttools signond
];
propagatedBuildInputs = [ boost kitemmodels ];
outputs = [ "out" "dev" ];

View file

@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam, fetchpatch,
extra-cmake-modules, kdoctools,
akonadi, akonadi-calendar, akonadi-mime, akonadi-notes, kcalutils, kdepim-apps-libs,
akonadi, akonadi-calendar, akonadi-mime, akonadi-notes, kcalutils,
kholidays, kidentitymanagement, kmime, pimcommon, qttools,
}:
@ -11,16 +11,9 @@ mkDerivation {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
patches = [
# Patch for Qt 5.15.2 until version 20.12.0
(fetchpatch {
url = "https://invent.kde.org/pim/calendarsupport/-/commit/b4193facb223bd5b73a65318dec8ced51b66adf7.patch";
sha256 = "sha256:1da11rqbxxrl06ld3avc41p064arz4n6w5nxq8r008v8ws3s64dy";
})
];
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi akonadi-mime akonadi-notes kcalutils kdepim-apps-libs kholidays pimcommon qttools
akonadi akonadi-mime akonadi-notes kcalutils kholidays pimcommon qttools
];
propagatedBuildInputs = [ akonadi-calendar kidentitymanagement kmime ];
outputs = [ "out" "dev" ];

View file

@ -109,10 +109,9 @@ let
kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {};
kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {};
kdenlive = callPackage ./kdenlive.nix {};
kdenlive = callPackage ./kdenlive {};
kdepim-runtime = callPackage ./kdepim-runtime {};
kdepim-addons = callPackage ./kdepim-addons.nix {};
kdepim-apps-libs = callPackage ./kdepim-apps-libs {};
kdf = callPackage ./kdf.nix {};
kdialog = callPackage ./kdialog.nix {};
kdiamond = callPackage ./kdiamond.nix {};

View file

@ -5,7 +5,7 @@
kcompletion, kconfig, kcoreaddons, kdelibs4support, kdbusaddons,
kfilemetadata, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications,
kparts, ktexteditor, kwindowsystem, phonon, solid,
wayland, qtwayland
wayland, qtbase, qtwayland
}:
mkDerivation {
@ -13,6 +13,7 @@ mkDerivation {
meta = {
license = with lib.licenses; [ gpl2 fdl12 ];
maintainers = [ lib.maintainers.ttuegel ];
broken = lib.versionOlder qtbase.version "5.14";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedUserEnvPkgs = [ baloo ];

View file

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

View file

@ -1,7 +1,7 @@
{
mkDerivation, lib,
extra-cmake-modules,
ffmpeg_3, kio
ffmpeg_3, kio, taglib
}:
mkDerivation {
@ -11,5 +11,5 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ ffmpeg_3 kio ];
buildInputs = [ ffmpeg_3 kio taglib ];
}

View file

@ -1,7 +1,7 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
kio, kparts, kxmlgui, qtscript, solid
kio, kparts, kxmlgui, qtbase, qtscript, solid
}:
mkDerivation {
@ -9,6 +9,7 @@ mkDerivation {
meta = {
license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ fridh vcunat ];
broken = lib.versionOlder qtbase.version "5.13";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [

View file

@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, akonadi-mime, calendarsupport, eventviews, kdepim-apps-libs,
akonadi, akonadi-mime, calendarsupport, eventviews,
kdiagram, kldap, kmime, pimcommon, qtbase
}:
@ -13,7 +13,7 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi akonadi-mime calendarsupport eventviews kdepim-apps-libs kdiagram
akonadi akonadi-mime calendarsupport eventviews kdiagram
kldap kmime pimcommon qtbase
];
outputs = [ "out" "dev" ];

View file

@ -2,7 +2,7 @@
mkDerivation, lib, kdepimTeam, fetchpatch,
extra-cmake-modules, kdoctools,
akonadi, akonadi-search, grantlee, grantleetheme, kcmutils, kcompletion,
kcrash, kdbusaddons, kdepim-apps-libs, ki18n, kontactinterface, kparts,
kcrash, kdbusaddons, ki18n, kontactinterface, kparts,
kpimtextedit, kxmlgui, libkdepim, libkleo, mailcommon, pimcommon, prison,
qgpgme, qtbase,
}:
@ -13,17 +13,10 @@ mkDerivation {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
patches = [
# Patch for Qt 5.15.2 until version 20.12.0
(fetchpatch {
url = "https://invent.kde.org/pim/kaddressbook/-/commit/8aee8d40ae2a1c920d3520163d550d3b49720226.patch";
sha256 = "sha256:0dsy119cd5w9khiwgk6fb7xnjzmj94rfphf327k331lf15zq4853";
})
];
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi akonadi-search grantlee grantleetheme kcmutils kcompletion kcrash
kdbusaddons kdepim-apps-libs ki18n kontactinterface kparts kpimtextedit
kdbusaddons ki18n kontactinterface kparts kpimtextedit
kxmlgui libkdepim libkleo mailcommon pimcommon prison qgpgme qtbase
];
}

View file

@ -3,12 +3,13 @@
extra-cmake-modules,
kauth, kcodecs, kcompletion, kconfig, kconfigwidgets, kdbusaddons, kdoctools,
kguiaddons, ki18n, kiconthemes, kjobwidgets, kcmutils, kdelibs4support, kio,
knotifications, kservice, kwidgetsaddons, kwindowsystem, kxmlgui, phonon,
kguiaddons, ki18n, kiconthemes, kidletime, kjobwidgets, kcmutils,
kdelibs4support, kio, knotifications, knotifyconfig, kservice, kwidgetsaddons,
kwindowsystem, kxmlgui, phonon,
kimap, akonadi, akonadi-contacts, akonadi-mime, kalarmcal, kcalendarcore, kcalutils,
kholidays, kidentitymanagement, libkdepim, mailcommon, kmailtransport, kmime,
pimcommon, kpimtextedit, kdepim-apps-libs, messagelib,
pimcommon, kpimtextedit, messagelib,
qtx11extras,
@ -24,12 +25,13 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kauth kcodecs kcompletion kconfig kconfigwidgets kdbusaddons kdoctools
kguiaddons ki18n kiconthemes kjobwidgets kcmutils kdelibs4support kio
knotifications kservice kwidgetsaddons kwindowsystem kxmlgui phonon
kguiaddons ki18n kiconthemes kidletime kjobwidgets kcmutils kdelibs4support
kio knotifications knotifyconfig kservice kwidgetsaddons kwindowsystem
kxmlgui phonon
kimap akonadi akonadi-contacts akonadi-mime kalarmcal kcalendarcore kcalutils
kholidays kidentitymanagement libkdepim mailcommon kmailtransport kmime
pimcommon kpimtextedit kdepim-apps-libs messagelib
kimap akonadi akonadi-contacts akonadi-mime kalarmcal kcalendarcore
kcalutils kholidays kidentitymanagement libkdepim mailcommon kmailtransport
kmime pimcommon kpimtextedit messagelib
qtx11extras
];

View file

@ -3,7 +3,7 @@
extra-cmake-modules, kdoctools,
gettext,
kcoreaddons, kconfig, kdbusaddons, kwidgetsaddons, kitemviews, kcompletion,
python
qtbase, python
}:
mkDerivation {
@ -11,6 +11,7 @@ mkDerivation {
meta = {
license = with lib.licenses; [ gpl2 ];
maintainers = [ lib.maintainers.rittelle ];
broken = lib.versionOlder qtbase.version "5.13";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [

View file

@ -1,7 +1,7 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
kcoreaddons, ki18n, kio, kwidgetsaddons, samba
kcoreaddons, kdeclarative, ki18n, kio, kwidgetsaddons, samba, qtbase,
}:
mkDerivation {
@ -9,7 +9,8 @@ mkDerivation {
meta = {
license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ];
broken = lib.versionOlder qtbase.version "5.13";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kcoreaddons ki18n kio kwidgetsaddons samba ];
buildInputs = [ kcoreaddons kdeclarative ki18n kio kwidgetsaddons samba ];
}

View file

@ -3,7 +3,7 @@
extra-cmake-modules, shared-mime-info,
akonadi-import-wizard, akonadi-notes, calendarsupport, eventviews,
incidenceeditor, kcalendarcore, kcalutils, kconfig, kdbusaddons, kdeclarative,
kdepim-apps-libs, kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar,
kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar,
libksieve, mailcommon, mailimporter, messagelib, poppler, prison, kpkpass,
kitinerary, kontactinterface
}:
@ -18,7 +18,7 @@ mkDerivation {
buildInputs = [
akonadi-import-wizard akonadi-notes calendarsupport eventviews
incidenceeditor kcalendarcore kcalutils kconfig kdbusaddons kdeclarative
kdepim-apps-libs kholidays ki18n kmime ktexteditor ktnef libgravatar
kholidays ki18n kmime ktexteditor ktnef libgravatar
libksieve mailcommon mailimporter messagelib poppler prison kpkpass
kitinerary kontactinterface
];

View file

@ -1,20 +0,0 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, akonadi-contacts, grantlee, grantleetheme, kconfig, kconfigwidgets,
kcontacts, ki18n, kiconthemes, kio, libkleo, pimcommon, prison,
}:
mkDerivation {
pname = "kdepim-apps-libs";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi akonadi-contacts grantlee grantleetheme kconfig kconfigwidgets
kcontacts ki18n kiconthemes kio libkleo pimcommon prison
];
outputs = [ "out" "dev" ];
}

View file

@ -2,7 +2,7 @@
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi-search, kbookmarks, kcalutils, kcmutils, kcompletion, kconfig,
kconfigwidgets, kcoreaddons, kdelibs4support, kdepim-apps-libs, libkdepim,
kconfigwidgets, kcoreaddons, kdelibs4support, libkdepim,
kdepim-runtime, kguiaddons, ki18n, kiconthemes, kinit, kio, kldap,
kmail-account-wizard, kmailtransport, knotifications, knotifyconfig,
kontactinterface, kparts, kpty, kservice, ktextwidgets, ktnef, kwallet,
@ -19,7 +19,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi-search kbookmarks kcalutils kcmutils kcompletion kconfig
kconfigwidgets kcoreaddons kdelibs4support kdepim-apps-libs kguiaddons ki18n
kconfigwidgets kcoreaddons kdelibs4support kguiaddons ki18n
kiconthemes kinit kio kldap kmail-account-wizard kmailtransport libkdepim
knotifications knotifyconfig kontactinterface kparts kpty kservice
ktextwidgets ktnef kwidgetsaddons kwindowsystem kxmlgui libgravatar

View file

@ -12,15 +12,5 @@ mkDerivation {
buildInputs = [
kiconthemes kparts ktexteditor kwidgetsaddons libkomparediff2
];
patches = [
(fetchpatch {
# Portaway from Obsolete methods of QPrinter
# Part of v20.12.0
url = "https://invent.kde.org/sdk/kompare/-/commit/68d3eee36c48a2f44ccfd3f9e5a36311b829104b.patch";
sha256 = "B2i5n5cUDjCqTEF0OyTb1+LhPa5yWCnFycwijf35kwU=";
})
];
outputs = [ "out" "dev" ];
}

View file

@ -2,7 +2,7 @@
, mkDerivation
, extra-cmake-modules, kdoctools
, kdelibs4support, kcmutils, khtml, kdesu
, qtwebkit, qtwebengine, qtx11extras, qtscript, qtwayland
, qtbase, qtwebkit, qtwebengine, qtx11extras, qtscript, qtwayland
}:
mkDerivation {
@ -24,5 +24,6 @@ mkDerivation {
meta = {
license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ ];
broken = lib.versionOlder qtbase.version "5.13";
};
}

View file

@ -3,7 +3,7 @@
extra-cmake-modules, kdoctools,
qtwebengine,
kcmutils, kcrash, kdbusaddons, kparts, kwindowsystem,
akonadi, grantleetheme, kdepim-apps-libs, kontactinterface, kpimtextedit,
akonadi, grantleetheme, kontactinterface, kpimtextedit,
mailcommon, libkdepim, pimcommon
}:
@ -17,7 +17,7 @@ mkDerivation {
buildInputs = [
qtwebengine
kcmutils kcrash kdbusaddons kparts kwindowsystem
akonadi grantleetheme kdepim-apps-libs kontactinterface kpimtextedit
akonadi grantleetheme kontactinterface kpimtextedit
mailcommon libkdepim pimcommon
];
}

View file

@ -5,7 +5,7 @@
phonon,
knewstuff,
akonadi-calendar, akonadi-contacts, akonadi-notes, akonadi-search,
calendarsupport, eventviews, incidenceeditor, kcalutils, kdepim-apps-libs,
calendarsupport, eventviews, incidenceeditor, kcalutils,
kholidays, kidentitymanagement, kldap, kmailtransport, kontactinterface,
kpimtextedit, pimcommon,
}:
@ -22,7 +22,7 @@ mkDerivation {
phonon
knewstuff
akonadi-calendar akonadi-contacts akonadi-notes akonadi-search
calendarsupport eventviews incidenceeditor kcalutils kdepim-apps-libs
calendarsupport eventviews incidenceeditor kcalutils
kholidays kidentitymanagement kldap kmailtransport kontactinterface
kpimtextedit pimcommon
];

View file

@ -5,6 +5,7 @@
, shared-mime-info
, libkdegames
, freecell-solver
, black-hole-solver
}:
mkDerivation {
@ -14,6 +15,7 @@ mkDerivation {
shared-mime-info
];
buildInputs = [
black-hole-solver
knewstuff
libkdegames
freecell-solver

View file

@ -2,7 +2,7 @@
mkDerivation, lib,
extra-cmake-modules, kdoctools, makeWrapper,
kcmutils, kcompletion, kconfig, kdnssd, knotifyconfig, kwallet, kwidgetsaddons,
kwindowsystem, libvncserver, freerdp
kwindowsystem, libvncserver, freerdp, qtbase,
}:
mkDerivation {
@ -21,5 +21,6 @@ mkDerivation {
license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ];
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.linux;
broken = lib.versionOlder qtbase.version "5.14";
};
}

View file

@ -3,7 +3,7 @@
extra-cmake-modules, kdoctools,
akonadi, akonadi-mime, akonadi-notes, akonadi-search, gpgme, grantlee,
grantleetheme, karchive, kcodecs, kconfig, kconfigwidgets, kcontacts,
kdepim-apps-libs, kiconthemes, kidentitymanagement, kio, kjobwidgets, kldap,
kiconthemes, kidentitymanagement, kio, kjobwidgets, kldap,
kmailtransport, kmbox, kmime, kwindowsystem, libgravatar, libkdepim, libkleo,
pimcommon, qca-qt5, qtwebengine, syntax-highlighting
}:
@ -17,7 +17,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi-notes akonadi-search gpgme grantlee grantleetheme karchive kcodecs
kconfig kconfigwidgets kdepim-apps-libs kiconthemes kio kjobwidgets kldap
kconfig kconfigwidgets kiconthemes kio kjobwidgets kldap
kmailtransport kmbox kmime kwindowsystem libgravatar libkdepim qca-qt5
syntax-highlighting
];

File diff suppressed because it is too large Load diff

View file

@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
inherit pname;
version = "2019-08-10";
buildInputs = [ swiProlog makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ swiProlog ];
src = fetchFromGitHub {
owner = "Attempto";

View file

@ -0,0 +1,24 @@
From e7446c9bcb47674c9d0ee3b5bab129e9b86eb1c9 Mon Sep 17 00:00:00 2001
From: Walter Franzini <walter.franzini@gmail.com>
Date: Fri, 7 Jun 2019 17:57:11 +0200
Subject: [PATCH] musl does not support rewind pipe, make it build anyway
---
src/formats.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/formats.c b/src/formats.c
index f3efe764..477bf451 100644
--- a/src/formats.c
+++ b/src/formats.c
@@ -424,7 +424,6 @@ static void UNUSED rewind_pipe(FILE * fp)
/* To fix this #error, either simply remove the #error line and live without
* file-type detection with pipes, or add support for your compiler in the
* lines above. Test with cat monkey.wav | ./sox --info - */
- #error FIX NEEDED HERE
#define NO_REWIND_PIPE
(void)fp;
#endif
--
2.19.2

View file

@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
# configure.ac uses pkg-config only to locate libopusfile
nativeBuildInputs = optional enableOpusfile pkg-config;
patches = [ ./0001-musl-rewind-pipe-workaround.patch ];
buildInputs =
optional (enableAlsa && stdenv.isLinux) alsaLib ++
optional enableLibao libao ++

View file

@ -8,7 +8,8 @@ stdenv.mkDerivation {
sha256 = "1yx9s1j47cq0v40cwq2gn7bdizpw46l95ba4zl9z4gg31mfvm807";
};
buildInputs = [ snack tcl tk makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ snack tcl tk ];
installPhase = ''
mkdir -p $out/{bin,nix-support,share/wavesurfer/}

View file

@ -22,7 +22,7 @@ stdenv.mkDerivation {
sha256 = "044nxgd3ic2qr6hgq5nymn3dyf5i4s8mv5z4az6jvwlrjnvbg8cp";
};
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
patchPhase = ''
patchShebangs install.sh

View file

@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
sed '1i#include <cmath>' -i src/Transformer/SpectrumCircleTransformer.cpp
'';
nativeBuildInputs = [ cmake ];
nativeBuildInputs = [ cmake makeWrapper ];
buildInputs = [ fftw ncurses5 libpulseaudio makeWrapper ];
buildInputs = [ fftw ncurses5 libpulseaudio ];
buildFlags = [ "ENABLE_PULSE=1" ];

View file

@ -27,8 +27,7 @@ stdenv.mkDerivation rec {
'';
makeFlags = [ "PREFIX=$(out)" ];
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ xsel clipnotify ];
nativeBuildInputs = [ makeWrapper xsel clipnotify ];
postFixup = ''
sed -i "$out/bin/clipctl" -e 's,clipmenud\$,\.clipmenud-wrapped\$,'

View file

@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-aabIH894WihsBTo1LzIBzIZxxyhRYVxLcHpDQwmwmOU=";
};
buildInputs = [ aspellEnv fortune gnugrep makeWrapper tk tre ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ aspellEnv fortune gnugrep tk tre ];
patches = [ ./dict.patch ];

View file

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "13ycr6ppyrz9rq7dasabjdk8lcsxdj3krb4j7d2jmbh2hij1rdvf";
};
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/opt

View file

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "0sl54fsb2gz6dy0bwdscpdq1ab6ph5b7zald3bwzgkqsvna7p1jr";
} else throw "Unsupported architecture";
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
cp -r ./ $out
mkdir $out/oldbin

View file

@ -23,7 +23,8 @@ stdenv.mkDerivation {
dontUnpack = true;
buildInputs = lib.optionals (!stdenv.isDarwin) [ jre makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = lib.optionals (!stdenv.isDarwin) [ jre ];
installPhase =
if stdenv.isDarwin then ''

View file

@ -12,7 +12,8 @@ with builtins; buildDotnetPackage rec {
sourceRoot = ".";
buildInputs = [ unzip makeWrapper icoutils ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ unzip icoutils ];
patches = [
(substituteAll {

View file

@ -17,7 +17,8 @@ stdenv.mkDerivation {
wrapProgram $out/bin/mpvc --prefix PATH : "${socat}/bin/"
'';
buildInputs = [ socat makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ socat ];
meta = with lib; {
description = "A mpc-like control interface for mpv";

View file

@ -9,7 +9,8 @@ stdenv.mkDerivation {
sha256 = "0axz7r30p34z5hgvdglznc82g7yvm3g56dv5190jixskx6ba58rs";
};
buildInputs = [ unzip makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ unzip ];
unpackCmd = "unzip -o $curSrc"; # tries to go interactive without -o

View file

@ -18,7 +18,8 @@ stdenv.mkDerivation {
cd $out; unzip $src
'';
buildInputs = [unzip makeWrapper];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ unzip ];
installPhase = ''
dir=$(echo $out/OpenJUMP-*)

View file

@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "0vy5vgbp45ai957gaby2dj1hvmbxfdlfnwcanwqm9f8q16qipdbq";
};
buildInputs = [ ant jdk makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ ant jdk ];
buildPhase = ''
export ANT_OPTS=-Dbuild.sysclasspath=ignore
${ant}/bin/ant -f openproj_build/build.xml

View file

@ -19,7 +19,7 @@
sha256 = "0fw952kdh1gn00y6sx2ag0rnb2paxq9ikg4bzgmbj7rrd1c6l2k9";
};
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildCommand = ''
mkdir -p "$out/lib/SideQuest" "$out/bin"

View file

@ -49,7 +49,8 @@ let
patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_x11.so
'';
buildInputs = [ ant jdk8 makeWrapper p7zip gtk3 gsettings-desktop-schemas ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ ant jdk8 p7zip gtk3 gsettings-desktop-schemas ];
buildPhase = ''
runHook preBuild

View file

@ -35,7 +35,8 @@ let
categories = "Graphics;2DGraphics;3DGraphics;";
};
buildInputs = [ ant jdk8 makeWrapper gtk3 gsettings-desktop-schemas ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ ant jre jdk8 gtk3 gsettings-desktop-schemas ];
postPatch = ''
sed -i -e 's,../SweetHome3D,${application.src},g' build.xml

View file

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
installPhase = ''

View file

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "075vqnha21rhr1b61dim7dqlfwm1yffyzcaa83s36rpk9r5sddzx";
};
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
installFlags = [ "PREFIX=$(out)" ];

View file

@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
})
];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [ intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils
libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2
] ++ lib.optional withMapnik mapnik
++ lib.optional withGeoClue geoclue2

View file

@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "08pgjvd2vvmqk3h641x63nxp7wqimb9r30889mkyfh2agc62sjbc";
};
buildInputs = [ tcl tk xlibsWrapper makeWrapper ]
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ tcl tk xlibsWrapper ]
++ lib.optionals stdenv.isDarwin [ Cocoa ];
hardeningDisable = [ "format" ];

View file

@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0700lf6hx7dg88wq1yll7zjvf9gbwh06xff20yffkxb289y0pai5";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [libX11 makeWrapper libXaw];
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [libX11 libXaw];
# Without this, it gets Xmu as a dependency, but without rpath entry
NIX_LDFLAGS = "-lXmu";

View file

@ -4,8 +4,7 @@ symlinkJoin {
paths = with zathura_core; [ man dev out ] ++ plugins;
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
postBuild = let
fishCompletion = "share/fish/vendor_completions.d/zathura.fish";

View file

@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec {
postInstall = "make PREFIX=$out copy-data";
# Sometimes tests fail when run in parallel
cargoParallelTestThreads = false;
dontUseCargoParallelThreads = true;
meta = with lib; {
description = "A graphical client for plain-text protocols written in Rust with GTK. It currently supports the Gemini, Gopher and Finger protocols";

View file

@ -28,7 +28,7 @@ let
url = "https://www.charlesproxy.com/assets/release/${version}/charles-proxy-${version}.tar.gz";
inherit sha256;
};
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
makeWrapper ${jdk8.jre}/bin/java $out/bin/charles \

View file

@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
sha256 = "1a9w5k0207fysgpxx6db3a00fs5hdc2ncx99x4ccy2s0v5ndc66g";
};
buildInputs = [ makeWrapper jre pythonPackages.python pythonPackages.numpy ]
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jre pythonPackages.python pythonPackages.numpy ]
++ optional RSupport R;
untarDir = "${pname}-${version}-bin-without-hadoop";

View file

@ -14,7 +14,7 @@ buildGoPackage rec {
"agent/cli-main"
];
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
src = fetchFromGitHub {
rev = version;

View file

@ -117,7 +117,7 @@ let
else
lib.appendToName "with-plugins" (stdenv.mkDerivation {
inherit (terraform) name meta;
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildCommand = pluginDir + ''
mkdir -p $out/bin/

View file

@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "13lzvjli6kbsnkd7lf0rm71l2mnz38pxk76ia9yrjb6clfhlbb73";
};
buildInputs = [ makeWrapper pkg-config luajit openssl libpcap pcre libdnet daq zlib flex bison libtirpc ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ pkg-config luajit openssl libpcap pcre libdnet daq zlib flex bison libtirpc ];
NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ];

View file

@ -26,7 +26,8 @@ buildGoModule rec {
doCheck = false;
buildInputs = [ makeWrapper olm ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ olm ];
# Upstream issue: https://github.com/tulir/gomuks/issues/260
patches = lib.optional stdenv.isLinux (substituteAll {

View file

@ -47,7 +47,7 @@ in stdenv.mkDerivation {
sha256 = "03pz8wskafn848yvciq29kwdvqcgjrk6sjnm8nk9acl89xf0sn96";
};
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildCommand = ''
ar x $src

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