Merge staging into staging-next
This commit is contained in:
Frederik Rietdijk
commit
bef6fcbb4d
|
|
@ -121,12 +121,13 @@ let
|
|||
copy_bin_and_libs ${pkgs.mdadm}/sbin/mdmon
|
||||
|
||||
# Copy udev.
|
||||
copy_bin_and_libs ${udev}/lib/systemd/systemd-udevd
|
||||
copy_bin_and_libs ${udev}/lib/systemd/systemd-sysctl
|
||||
copy_bin_and_libs ${udev}/bin/udevadm
|
||||
copy_bin_and_libs ${udev}/lib/systemd/systemd-sysctl
|
||||
for BIN in ${udev}/lib/udev/*_id; do
|
||||
copy_bin_and_libs $BIN
|
||||
done
|
||||
# systemd-udevd is only a symlink to udevadm these days
|
||||
ln -sf udevadm $out/bin/systemd-udevd
|
||||
|
||||
# Copy modprobe.
|
||||
copy_bin_and_libs ${pkgs.kmod}/bin/kmod
|
||||
|
|
|
|||
|
|
@ -903,11 +903,9 @@ in
|
|||
)
|
||||
]);
|
||||
passwd = (mkMerge [
|
||||
[ "mymachines" ]
|
||||
(mkAfter [ "systemd" ])
|
||||
]);
|
||||
group = (mkMerge [
|
||||
[ "mymachines" ]
|
||||
(mkAfter [ "systemd" ])
|
||||
]);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -144,9 +144,10 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
|||
)
|
||||
|
||||
output = machine.succeed("systemctl show | grep Watchdog")
|
||||
assert "RuntimeWatchdogUSec=30s" in output
|
||||
assert "RebootWatchdogUSec=10m" in output
|
||||
assert "KExecWatchdogUSec=5m" in output
|
||||
# assert "RuntimeWatchdogUSec=30s" in output
|
||||
# for some reason RuntimeWatchdogUSec, doesn't seem to be updated in here.
|
||||
assert "RebootWatchdogUSec=10min" in output
|
||||
assert "KExecWatchdogUSec=5min" in output
|
||||
|
||||
# Test systemd cryptsetup support
|
||||
with subtest("systemd successfully reads /etc/crypttab and unlocks volumes"):
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, pkgconfig, systemd ? null, libobjc, IOKit, fetchpatch }:
|
||||
{ stdenv, lib, fetchurl, pkgconfig, systemd ? null, libobjc, IOKit, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libusb-1.0.19";
|
||||
|
|
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
|||
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
|
||||
|
||||
preFixup = stdenv.lib.optionalString stdenv.isLinux ''
|
||||
sed 's,-ludev,-L${systemd.lib}/lib -ludev,' -i $out/lib/libusb-1.0.la
|
||||
sed 's,-ludev,-L${lib.getLib systemd}/lib -ludev,' -i $out/lib/libusb-1.0.la
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# currently needs to be installed into an environment and needs a `kbuildsycoca5` run afterwards for plugin discovery
|
||||
{
|
||||
mkDerivation, fetchFromGitHub, lib, makeWrapper,
|
||||
mkDerivation, fetchFromGitHub, fetchpatch, lib, makeWrapper,
|
||||
cmake, extra-cmake-modules, pkgconfig,
|
||||
libkcddb, kconfig, kconfigwidgets, ki18n, kdelibs4support, kio, solid, kwidgetsaddons, kxmlgui,
|
||||
qtbase, phonon,
|
||||
|
|
@ -53,6 +53,15 @@ mkDerivation rec {
|
|||
rev = "v" + version;
|
||||
sha256 = "1g2khdsjmsi4zzynkq8chd11cbdhjzmi37r9jhpal0b730nq9x7l";
|
||||
};
|
||||
patches = [
|
||||
# already merged into master, so it can go during the next release
|
||||
(fetchpatch {
|
||||
url = "https://patch-diff.githubusercontent.com/raw/dfaust/soundkonverter/pull/87.patch";
|
||||
sha256 = "sha256-XIpD4ZMTZVcu+F27OtpRy51H+uQgpd5l22IZ6XsD64w=";
|
||||
name = "soundkonverter_taglib.patch";
|
||||
stripLen = 1;
|
||||
})
|
||||
];
|
||||
enableParallelBuilding = true;
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig kdelibs4support makeWrapper ];
|
||||
propagatedBuildInputs = [ libkcddb kconfig kconfigwidgets ki18n kdelibs4support kio solid kwidgetsaddons kxmlgui qtbase phonon];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, gtk2, glib, gdk-pixbuf, alsaLib, nss, nspr, gconf
|
||||
{ stdenv, lib, fetchurl, gtk2, glib, gdk-pixbuf, alsaLib, nss, nspr, gconf
|
||||
, cups, libgcrypt_1_5, systemd, dbus, libXdamage, expat }:
|
||||
with stdenv.lib;
|
||||
|
||||
|
|
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
|||
rmdir $out/usr
|
||||
ln -sf $out/opt/brackets/brackets $out/bin/brackets
|
||||
|
||||
ln -s ${systemd.lib}/lib/libudev.so.1 $out/opt/brackets/lib/libudev.so.0
|
||||
ln -s ${lib.getLib systemd}/lib/libudev.so.1 $out/opt/brackets/lib/libudev.so.0
|
||||
|
||||
substituteInPlace $out/opt/brackets/brackets.desktop \
|
||||
--replace "Exec=/opt/brackets/brackets" "Exec=brackets"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, zlib, glib, alsaLib, makeDesktopItem
|
||||
{ stdenv, lib, fetchurl, zlib, glib, alsaLib, makeDesktopItem
|
||||
, dbus, gtk2, atk, pango, freetype, fontconfig, libgnome-keyring3, gdk-pixbuf
|
||||
, cairo, cups, expat, libgpgerror, nspr, gnome2, nss, xorg, systemd, libnotify
|
||||
}:
|
||||
|
|
@ -45,9 +45,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
mv $out/share/LightTable/light $out/bin/light
|
||||
|
||||
ln -sf ${systemd.lib}/lib/libudev.so.1 $out/share/LightTable/libudev.so.0
|
||||
ln -sf ${lib.getLib systemd}/lib/libudev.so.1 $out/share/LightTable/libudev.so.0
|
||||
substituteInPlace $out/bin/light \
|
||||
--replace "/usr/lib/x86_64-linux-gnu" "${systemd.lib}/lib" \
|
||||
--replace "/usr/lib/x86_64-linux-gnu" "${lib.getLib systemd}/lib" \
|
||||
--replace "/lib/x86_64-linux-gnu" "$out/share/LightTable" \
|
||||
--replace 'HERE=`dirname $(readlink -f $0)`' "HERE=$out/share/LightTable"
|
||||
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ in
|
|||
else [ gtk2 at-spi2-atk wrapGAppsHook ] ++ atomEnv.packages)
|
||||
++ [ libsecret libXScrnSaver ];
|
||||
|
||||
runtimeDependencies = lib.optional (stdenv.isLinux) [ systemd.lib fontconfig.lib ];
|
||||
runtimeDependencies = lib.optional (stdenv.isLinux) [ (lib.getLib systemd) fontconfig.lib ];
|
||||
|
||||
nativeBuildInputs = lib.optional (!stdenv.isDarwin) autoPatchelfHook;
|
||||
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
runtimeDependencies = [
|
||||
systemd.lib
|
||||
(lib.getLib systemd)
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ lib
|
||||
{ stdenv
|
||||
, lib
|
||||
, mkDerivation
|
||||
, fetchurl
|
||||
, cmake
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, extra-cmake-modules
|
||||
|
||||
# common deps
|
||||
|
|
@ -9,6 +10,7 @@
|
|||
|
||||
# client deps
|
||||
, qtbase
|
||||
, qtkeychain
|
||||
, qtmultimedia
|
||||
, qtsvg
|
||||
, qttools
|
||||
|
|
@ -23,6 +25,8 @@
|
|||
# optional server deps
|
||||
, libmicrohttpd
|
||||
, libsodium
|
||||
, withSystemd ? stdenv.isLinux
|
||||
, systemd ? null
|
||||
|
||||
# options
|
||||
, buildClient ? true
|
||||
|
|
@ -35,11 +39,9 @@
|
|||
with lib;
|
||||
|
||||
let
|
||||
commonDeps = [
|
||||
karchive
|
||||
];
|
||||
clientDeps = [
|
||||
qtbase
|
||||
qtkeychain
|
||||
qtmultimedia
|
||||
qtsvg
|
||||
qttools
|
||||
|
|
@ -49,40 +51,57 @@ let
|
|||
libvpx # WebM video export
|
||||
miniupnpc # automatic port forwarding
|
||||
];
|
||||
|
||||
serverDeps = [
|
||||
# optional:
|
||||
libmicrohttpd # HTTP admin api
|
||||
libsodium # ext-auth support
|
||||
];
|
||||
] ++ optional withSystemd systemd;
|
||||
|
||||
kisDeps = [
|
||||
qtx11extras
|
||||
];
|
||||
|
||||
boolToFlag = bool:
|
||||
if bool then "ON" else "OFF";
|
||||
|
||||
in mkDerivation rec {
|
||||
pname = "drawpile";
|
||||
version = "2.1.17";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://drawpile.net/files/src/drawpile-${version}.tar.gz";
|
||||
sha256 = "11lhn1mymhqk9g5sh384xhj3qw8h9lv88pr768y9q6kg3sl7nzzf";
|
||||
src = fetchFromGitHub {
|
||||
owner = "drawpile";
|
||||
repo = "drawpile";
|
||||
rev = "${version}";
|
||||
sha256 = "sha256-AFFY+FcY9ExAur13OoWR9285RZtBe6jnRIrwi5raiCM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
patches = [
|
||||
# fix for libmicrohttpd 0.9.71
|
||||
(fetchpatch {
|
||||
url = "https://github.com/drawpile/Drawpile/commit/ed1a75deb113da2d1df91a28f557509c4897130e.diff";
|
||||
sha256 = "sha256-54wabH5F3Hf+6vv9rpCwCRdhjSaUFtuF/mE1/U+CpOA=";
|
||||
name = "mhdfix.patch"; })
|
||||
];
|
||||
buildInputs =
|
||||
commonDeps ++
|
||||
optionals buildClient clientDeps ++
|
||||
optionals buildServer serverDeps ++
|
||||
optionals enableKisTablet kisDeps ;
|
||||
|
||||
cmakeFlags =
|
||||
optional (!buildClient ) "-DCLIENT=off" ++
|
||||
optional (!buildServer ) "-DSERVER=off" ++
|
||||
optional (!buildServerGui ) "-DSERVERGUI=off" ++
|
||||
optional ( buildExtraTools) "-DTOOLS=on" ++
|
||||
optional ( enableKisTablet) "-DKIS_TABLET=on";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
|
||||
buildInputs = [
|
||||
karchive
|
||||
]
|
||||
++ optionals buildClient clientDeps
|
||||
++ optionals buildServer serverDeps
|
||||
++ optionals enableKisTablet kisDeps;
|
||||
|
||||
cmakeFlags = [
|
||||
"-Wno-dev"
|
||||
"-DINITSYS=systemd"
|
||||
"-DCLIENT=${boolToFlag buildClient}"
|
||||
"-DSERVER=${boolToFlag buildServer}"
|
||||
"-DSERVERGUI=${boolToFlag buildServerGui}"
|
||||
"-DTOOLS=${boolToFlag buildExtraTools}"
|
||||
"-DKIS_TABLET=${boolToFlag enableKisTablet}"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "A collaborative drawing program that allows multiple users to sketch on the same canvas simultaneously";
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ in stdenv.mkDerivation rec {
|
|||
$out/opt/pencil/pencil
|
||||
|
||||
# fix missing libudev
|
||||
ln -s ${systemd.lib}/lib/libudev.so.1 $out/opt/pencil/libudev.so.1
|
||||
ln -s ${lib.getLib systemd}/lib/libudev.so.1 $out/opt/pencil/libudev.so.1
|
||||
wrapProgram $out/opt/pencil/pencil \
|
||||
--prefix LD_LIBRARY_PATH : $out/opt/pencil
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
mkDerivation, lib, kdepimTeam,
|
||||
extra-cmake-modules, kdoctools,
|
||||
akonadi, akonadi-calendar, akonadi-mime, kcalutils, kdepim-apps-libs,
|
||||
akonadi, akonadi-calendar, akonadi-mime, akonadi-notes, kcalutils, kdepim-apps-libs,
|
||||
kholidays, kidentitymanagement, kmime, pimcommon, qttools,
|
||||
}:
|
||||
|
||||
|
|
@ -13,7 +13,7 @@ mkDerivation {
|
|||
};
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [
|
||||
akonadi akonadi-mime kcalutils kdepim-apps-libs kholidays pimcommon qttools
|
||||
akonadi akonadi-mime akonadi-notes kcalutils kdepim-apps-libs kholidays pimcommon qttools
|
||||
];
|
||||
propagatedBuildInputs = [ akonadi-calendar kidentitymanagement kmime ];
|
||||
outputs = [ "out" "dev" ];
|
||||
|
|
|
|||
|
|
@ -100,7 +100,6 @@ let
|
|||
kcalutils = callPackage ./kcalutils.nix {};
|
||||
kcharselect = callPackage ./kcharselect.nix {};
|
||||
kcolorchooser = callPackage ./kcolorchooser.nix {};
|
||||
kdav = callPackage ./kdav.nix {};
|
||||
kdebugsettings = callPackage ./kdebugsettings.nix {};
|
||||
kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {};
|
||||
kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
WGET_ARGS=(http://download.kde.org/stable/release-service/20.04.3/src)
|
||||
WGET_ARGS=(http://download.kde.org/stable/release-service/20.08.0/src)
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ mkDerivation {
|
|||
maintainers = kdepimTeam;
|
||||
};
|
||||
output = [ "out" "dev" ];
|
||||
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [
|
||||
grantlee ki18n kiconthemes knewstuff kservice kxmlgui qtbase
|
||||
|
|
|
|||
|
|
@ -1,155 +0,0 @@
|
|||
diff --git a/src/grantleetheme.cpp b/src/grantleetheme.cpp
|
||||
index 27d5bc8..8d43140 100644
|
||||
--- a/src/grantleetheme.cpp
|
||||
+++ b/src/grantleetheme.cpp
|
||||
@@ -46,7 +46,7 @@ ThemePrivate::ThemePrivate(const ThemePrivate &other)
|
||||
, description(other.description)
|
||||
, name(other.name)
|
||||
, dirName(other.dirName)
|
||||
- , absolutePath(other.absolutePath)
|
||||
+ , absolutePaths(other.absolutePaths)
|
||||
, author(other.author)
|
||||
, email(other.email)
|
||||
, loader(other.loader)
|
||||
@@ -64,12 +64,15 @@ void ThemePrivate::setupEngine()
|
||||
|
||||
void ThemePrivate::setupLoader()
|
||||
{
|
||||
- // Get the parent dir with themes, we set the theme directory separately
|
||||
- QDir dir(absolutePath);
|
||||
- dir.cdUp();
|
||||
+ QStringList templateDirs;
|
||||
+ for (const QString& path : absolutePaths) {
|
||||
+ QDir dir(path);
|
||||
+ dir.cdUp();
|
||||
+ templateDirs << dir.absolutePath();
|
||||
+ }
|
||||
|
||||
loader = QSharedPointer<GrantleeTheme::QtResourceTemplateLoader>::create();
|
||||
- loader->setTemplateDirs({ dir.absolutePath() });
|
||||
+ loader->setTemplateDirs(templateDirs);
|
||||
loader->setTheme(dirName);
|
||||
|
||||
if (!sEngine) {
|
||||
@@ -121,7 +124,7 @@ Theme::Theme(const QString &themePath, const QString &dirName, const QString &de
|
||||
KConfigGroup group(&config, QStringLiteral("Desktop Entry"));
|
||||
if (group.isValid()) {
|
||||
d->dirName = dirName;
|
||||
- d->absolutePath = themePath;
|
||||
+ d->absolutePaths = QStringList(themePath);
|
||||
d->name = group.readEntry("Name", QString());
|
||||
d->description = group.readEntry("Description", QString());
|
||||
d->themeFileName = group.readEntry("FileName", QString());
|
||||
@@ -140,7 +143,7 @@ Theme::~Theme()
|
||||
|
||||
bool Theme::operator==(const Theme &other) const
|
||||
{
|
||||
- return isValid() && other.isValid() && d->absolutePath == other.absolutePath();
|
||||
+ return isValid() && other.isValid() && d->absolutePaths == other.absolutePaths();
|
||||
}
|
||||
|
||||
Theme &Theme::operator=(const Theme &other)
|
||||
@@ -184,7 +187,12 @@ QString Theme::dirName() const
|
||||
|
||||
QString Theme::absolutePath() const
|
||||
{
|
||||
- return d->absolutePath;
|
||||
+ return d->absolutePaths.first();
|
||||
+}
|
||||
+
|
||||
+QStringList Theme::absolutePaths() const
|
||||
+{
|
||||
+ return d->absolutePaths;
|
||||
}
|
||||
|
||||
QString Theme::author() const
|
||||
@@ -223,6 +231,13 @@ QString Theme::render(const QString &templateName, const QVariantHash &data, con
|
||||
return result;
|
||||
}
|
||||
|
||||
+void Theme::addThemeDir(const QString& path)
|
||||
+{
|
||||
+ QDir dir(path);
|
||||
+ dir.cdUp();
|
||||
+ d->absolutePaths << dir.absolutePath();
|
||||
+}
|
||||
+
|
||||
void Theme::addPluginPath(const QString &path)
|
||||
{
|
||||
if (!ThemePrivate::sEngine) {
|
||||
diff --git a/src/grantleetheme.h b/src/grantleetheme.h
|
||||
index a25c27b..be38299 100644
|
||||
--- a/src/grantleetheme.h
|
||||
+++ b/src/grantleetheme.h
|
||||
@@ -48,11 +48,14 @@ public:
|
||||
Q_REQUIRED_RESULT QStringList displayExtraVariables() const;
|
||||
Q_REQUIRED_RESULT QString dirName() const;
|
||||
Q_REQUIRED_RESULT QString absolutePath() const;
|
||||
+ Q_REQUIRED_RESULT QStringList absolutePaths() const;
|
||||
Q_REQUIRED_RESULT QString author() const;
|
||||
Q_REQUIRED_RESULT QString authorEmail() const;
|
||||
|
||||
Q_REQUIRED_RESULT QString render(const QString &templateName, const QVariantHash &data, const QByteArray &applicationDomain = QByteArray());
|
||||
|
||||
+ void addThemeDir(const QString&);
|
||||
+
|
||||
static void addPluginPath(const QString &path);
|
||||
|
||||
private:
|
||||
diff --git a/src/grantleetheme_p.h b/src/grantleetheme_p.h
|
||||
index eb73dcb..00510e9 100644
|
||||
--- a/src/grantleetheme_p.h
|
||||
+++ b/src/grantleetheme_p.h
|
||||
@@ -43,7 +43,7 @@ public:
|
||||
QString description;
|
||||
QString name;
|
||||
QString dirName;
|
||||
- QString absolutePath;
|
||||
+ QStringList absolutePaths;
|
||||
QString author;
|
||||
QString email;
|
||||
|
||||
diff --git a/src/grantleethememanager.cpp b/src/grantleethememanager.cpp
|
||||
index 606d717..dc99041 100644
|
||||
--- a/src/grantleethememanager.cpp
|
||||
+++ b/src/grantleethememanager.cpp
|
||||
@@ -125,25 +125,18 @@ public:
|
||||
|
||||
for (const QString &directory : qAsConst(themesDirectories)) {
|
||||
QDirIterator dirIt(directory, QStringList(), QDir::AllDirs | QDir::NoDotAndDotDot);
|
||||
- QStringList alreadyLoadedThemeName;
|
||||
while (dirIt.hasNext()) {
|
||||
dirIt.next();
|
||||
const QString dirName = dirIt.fileName();
|
||||
GrantleeTheme::Theme theme = q->loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName);
|
||||
if (theme.isValid()) {
|
||||
QString themeName = theme.name();
|
||||
- if (alreadyLoadedThemeName.contains(themeName)) {
|
||||
- int i = 2;
|
||||
- const QString originalName(theme.name());
|
||||
- while (alreadyLoadedThemeName.contains(themeName)) {
|
||||
- themeName = originalName + QStringLiteral(" (%1)").arg(i);
|
||||
- ++i;
|
||||
- }
|
||||
- theme.d->name = themeName;
|
||||
+ QMap<QString, GrantleeTheme::Theme>::iterator i = themes.find(dirName);
|
||||
+ if (i != themes.end()) {
|
||||
+ i.value().addThemeDir(dirIt.filePath());
|
||||
+ } else {
|
||||
+ themes.insert(dirName, theme);
|
||||
}
|
||||
- alreadyLoadedThemeName << themeName;
|
||||
- themes.insert(dirName, theme);
|
||||
- //qDebug()<<" theme.name()"<<theme.name();
|
||||
}
|
||||
}
|
||||
watch->addDir(directory);
|
||||
@@ -366,7 +359,7 @@ QString ThemeManager::pathFromThemes(const QString &themesRelativePath, const QS
|
||||
GrantleeTheme::Theme theme = loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName);
|
||||
if (theme.isValid()) {
|
||||
if (dirName == themeName) {
|
||||
- return theme.absolutePath();
|
||||
+ return theme.absolutePaths().first();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1 +0,0 @@
|
|||
grantlee-merge-theme-dirs.patch
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
mkDerivation, lib, kdepimTeam,
|
||||
extra-cmake-modules, kdoctools,
|
||||
akonadi, akonadi-mime, calendarsupport, eventviews, kdepim-apps-libs,
|
||||
kdiagram, kldap, kmime, qtbase,
|
||||
kdiagram, kldap, kmime, pimcommon, qtbase
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
|
|
@ -14,7 +14,7 @@ mkDerivation {
|
|||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [
|
||||
akonadi akonadi-mime calendarsupport eventviews kdepim-apps-libs kdiagram
|
||||
kldap kmime qtbase
|
||||
kldap kmime pimcommon qtbase
|
||||
];
|
||||
outputs = [ "out" "dev" ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ mkDerivation {
|
|||
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
|
||||
maintainers = kdepimTeam;
|
||||
};
|
||||
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [
|
||||
akonadi akonadi-contacts grantlee grantleetheme kconfig kconfigwidgets
|
||||
|
|
|
|||
|
|
@ -1,62 +0,0 @@
|
|||
Index: kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp
|
||||
===================================================================
|
||||
--- kdepim-apps-libs-17.04.0.orig/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp
|
||||
+++ kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp
|
||||
@@ -50,9 +50,9 @@ public:
|
||||
mTemplateLoader.clear();
|
||||
}
|
||||
|
||||
- void changeGrantleePath(const QString &path)
|
||||
+ void changeGrantleePath(const QStringList &paths)
|
||||
{
|
||||
- mTemplateLoader->setTemplateDirs(QStringList() << path);
|
||||
+ mTemplateLoader->setTemplateDirs(paths);
|
||||
mEngine->addTemplateLoader(mTemplateLoader);
|
||||
|
||||
mSelfcontainedTemplate = mEngine->loadByName(QStringLiteral("contactgroup.html"));
|
||||
@@ -86,12 +86,12 @@ GrantleeContactGroupFormatter::~Grantlee
|
||||
|
||||
void GrantleeContactGroupFormatter::setAbsoluteThemePath(const QString &path)
|
||||
{
|
||||
- d->changeGrantleePath(path);
|
||||
+ d->changeGrantleePath(QStringList(path));
|
||||
}
|
||||
|
||||
void GrantleeContactGroupFormatter::setGrantleeTheme(const GrantleeTheme::Theme &theme)
|
||||
{
|
||||
- d->changeGrantleePath(theme.absolutePath());
|
||||
+ d->changeGrantleePath(theme.absolutePaths());
|
||||
}
|
||||
|
||||
inline static void setHashField(QVariantHash &hash, const QString &name, const QString &value)
|
||||
Index: kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp
|
||||
===================================================================
|
||||
--- kdepim-apps-libs-17.04.0.orig/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp
|
||||
+++ kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp
|
||||
@@ -74,9 +74,9 @@ public:
|
||||
mTemplateLoader.clear();
|
||||
}
|
||||
|
||||
- void changeGrantleePath(const QString &path)
|
||||
+ void changeGrantleePath(const QStringList &paths)
|
||||
{
|
||||
- mTemplateLoader->setTemplateDirs(QStringList() << path);
|
||||
+ mTemplateLoader->setTemplateDirs(paths);
|
||||
mEngine->addTemplateLoader(mTemplateLoader);
|
||||
|
||||
mSelfcontainedTemplate = mEngine->loadByName(QStringLiteral("contact.html"));
|
||||
@@ -112,12 +112,12 @@ GrantleeContactFormatter::~GrantleeConta
|
||||
|
||||
void GrantleeContactFormatter::setAbsoluteThemePath(const QString &path)
|
||||
{
|
||||
- d->changeGrantleePath(path);
|
||||
+ d->changeGrantleePath(QStringList(path));
|
||||
}
|
||||
|
||||
void GrantleeContactFormatter::setGrantleeTheme(const GrantleeTheme::Theme &theme)
|
||||
{
|
||||
- d->changeGrantleePath(theme.absolutePath());
|
||||
+ d->changeGrantleePath(theme.absolutePaths());
|
||||
}
|
||||
|
||||
void GrantleeContactFormatter::setForceDisableQRCode(bool b)
|
||||
|
|
@ -1 +0,0 @@
|
|||
kdepim-apps-libs-grantlee-merge-theme-dirs.patch
|
||||
|
|
@ -4,8 +4,8 @@
|
|||
shared-mime-info,
|
||||
akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes,
|
||||
kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement,
|
||||
kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig,
|
||||
pimcommon, qtwebengine, libkgapi, qtnetworkauth, qtspeech, qtxmlpatterns,
|
||||
kimap, kldap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig,
|
||||
pimcommon, qtwebengine, libkgapi, qca-qt5, qtnetworkauth, qtspeech, qtxmlpatterns,
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
|
|
@ -18,7 +18,7 @@ mkDerivation {
|
|||
buildInputs = [
|
||||
akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes
|
||||
kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap
|
||||
kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine
|
||||
pimcommon libkgapi qtnetworkauth qtspeech qtxmlpatterns
|
||||
kldap kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine
|
||||
pimcommon libkgapi qca-qt5 qtnetworkauth qtspeech qtxmlpatterns
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,5 +27,4 @@ mkDerivation {
|
|||
kdepim-addons
|
||||
];
|
||||
propagatedUserEnvPkgs = [ kdepim-runtime kwallet akonadi ];
|
||||
patches = [ ./kmail.patch ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,24 +0,0 @@
|
|||
diff --git a/agents/archivemailagent/CMakeLists.txt b/agents/archivemailagent/CMakeLists.txt
|
||||
index 48ed076..9c56896 100644
|
||||
--- a/agents/archivemailagent/CMakeLists.txt
|
||||
+++ b/agents/archivemailagent/CMakeLists.txt
|
||||
@@ -22,6 +22,7 @@ ki18n_wrap_ui(libarchivemailagent_SRCS ui/archivemailwidget.ui )
|
||||
add_library(archivemailagent STATIC ${libarchivemailagent_SRCS})
|
||||
target_link_libraries(archivemailagent
|
||||
KF5::MailCommon
|
||||
+ KF5::Libkdepim
|
||||
KF5::I18n
|
||||
KF5::Notifications
|
||||
KF5::IconThemes
|
||||
diff --git a/agents/followupreminderagent/CMakeLists.txt b/agents/followupreminderagent/CMakeLists.txt
|
||||
index a56b730..83604cf 100644
|
||||
--- a/agents/followupreminderagent/CMakeLists.txt
|
||||
+++ b/agents/followupreminderagent/CMakeLists.txt
|
||||
@@ -23,6 +23,7 @@ target_link_libraries(followupreminderagent
|
||||
KF5::AkonadiMime
|
||||
KF5::AkonadiAgentBase
|
||||
KF5::DBusAddons
|
||||
+ KF5::FollowupReminder
|
||||
KF5::XmlGui
|
||||
KF5::KIOWidgets
|
||||
KF5::Notifications
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
qtwebengine,
|
||||
kcmutils, kcrash, kdbusaddons, kparts, kwindowsystem,
|
||||
akonadi, grantleetheme, kdepim-apps-libs, kontactinterface, kpimtextedit,
|
||||
mailcommon, libkdepim
|
||||
mailcommon, libkdepim, pimcommon
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
|
|
@ -18,6 +18,6 @@ mkDerivation {
|
|||
qtwebengine
|
||||
kcmutils kcrash kdbusaddons kparts kwindowsystem
|
||||
akonadi grantleetheme kdepim-apps-libs kontactinterface kpimtextedit
|
||||
mailcommon libkdepim
|
||||
mailcommon libkdepim pimcommon
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
mkDerivation, lib, kdepimTeam,
|
||||
extra-cmake-modules, kdoctools,
|
||||
akonadi, akonadi-mime, karchive, kcompletion, kconfig, kcoreaddons, ki18n,
|
||||
kmime, kxmlgui, libkdepim
|
||||
kmime, kxmlgui, libkdepim, pimcommon
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
|
|
@ -14,6 +14,6 @@ mkDerivation {
|
|||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [
|
||||
akonadi akonadi-mime karchive kcompletion kconfig kcoreaddons ki18n kmime
|
||||
kxmlgui libkdepim
|
||||
kxmlgui libkdepim pimcommon
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
mkDerivation, lib, kdepimTeam,
|
||||
extra-cmake-modules, kdoctools,
|
||||
akonadi, akonadi-contacts, akonadi-mime, grantlee, karchive, kcodecs,
|
||||
akonadi, akonadi-contacts, akonadi-mime, akonadi-search, grantlee, karchive, kcmutils, kcodecs,
|
||||
kcompletion, kconfig, kconfigwidgets, kcontacts, kdbusaddons,
|
||||
kiconthemes, kimap, kio, kitemmodels, kjobwidgets, knewstuff, kpimtextedit,
|
||||
kiconthemes, kimap, kio, kitemmodels, kjobwidgets, kldap, knewstuff, kpimtextedit,
|
||||
kpurpose, kwallet, kwindowsystem, libkdepim, qtwebengine
|
||||
}:
|
||||
|
||||
|
|
@ -15,12 +15,12 @@ mkDerivation {
|
|||
};
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [
|
||||
akonadi-mime grantlee karchive kcodecs kcompletion kconfigwidgets
|
||||
kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kpimtextedit
|
||||
akonadi-mime grantlee karchive kcmutils kcodecs kcompletion kconfigwidgets
|
||||
kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kldap kpimtextedit
|
||||
kpurpose kwallet kwindowsystem libkdepim qtwebengine
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
akonadi akonadi-contacts kconfig kcontacts kimap
|
||||
akonadi akonadi-contacts akonadi-search kconfig kcontacts kimap
|
||||
];
|
||||
outputs = [ "out" "dev" ];
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -23,6 +23,8 @@ in mkDerivation rec {
|
|||
|
||||
propagatedBuildInputs = [ kconfig kcrash kinit kjsembed ];
|
||||
|
||||
NIX_LDFLAGS = "-ltag";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A powerful batch renamer for KDE";
|
||||
homepage = "https://kde.org/applications/utilities/krename/";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, libxkbcommon
|
||||
, systemd
|
||||
|
|
@ -50,7 +51,7 @@ stdenv.mkDerivation rec {
|
|||
postFixup = ''
|
||||
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
|
||||
--add-flags $out/opt/obinskit/resources/app.asar \
|
||||
--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib libxkbcommon systemd.lib xorg.libXt ]}"
|
||||
--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib libxkbcommon (lib.getLib systemd) xorg.libXt ]}"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
, fetchurl
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, lib
|
||||
, stdenv
|
||||
, udev
|
||||
, wrapGAppsHook
|
||||
|
|
@ -82,7 +83,7 @@ let
|
|||
'';
|
||||
|
||||
runtimeDependencies = [
|
||||
udev.lib
|
||||
(lib.getLib udev)
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, gnutar
|
||||
{ stdenv, lib, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, gnutar
|
||||
|
||||
# default dependencies
|
||||
, bzip2, flac, speex, libopus
|
||||
|
|
@ -197,7 +197,7 @@ let
|
|||
sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \
|
||||
chrome/browser/shell_integration_linux.cc
|
||||
|
||||
sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \
|
||||
sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \
|
||||
device/udev_linux/udev?_loader.cc
|
||||
|
||||
sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ in stdenv.mkDerivation rec {
|
|||
# This is a little tricky. Without it the app starts then crashes. Then it
|
||||
# brings up the crash report, which also crashes. `strace -f` hints at a
|
||||
# missing libudev.so.0.
|
||||
systemd.lib
|
||||
(lib.getLib systemd)
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, gnutar
|
||||
{ stdenv, lib, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, gnutar
|
||||
|
||||
# default dependencies
|
||||
, bzip2, flac, speex, libopus
|
||||
|
|
@ -197,7 +197,7 @@ let
|
|||
sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \
|
||||
chrome/browser/shell_integration_linux.cc
|
||||
|
||||
sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \
|
||||
sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \
|
||||
device/udev_linux/udev?_loader.cc
|
||||
|
||||
sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, rpmextract
|
||||
, libnotify
|
||||
|
|
@ -62,7 +63,7 @@ stdenv.mkDerivation rec {
|
|||
expat
|
||||
gdk-pixbuf
|
||||
dbus
|
||||
udev.lib
|
||||
(lib.getLib udev)
|
||||
freetype
|
||||
nspr
|
||||
glib
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, makeWrapper
|
||||
, wrapGAppsHook
|
||||
, autoPatchelfHook
|
||||
|
|
@ -64,7 +65,7 @@ stdenv.mkDerivation {
|
|||
expat
|
||||
stdenv.cc.cc
|
||||
];
|
||||
runtimeDependencies = [ udev.lib libnotify ];
|
||||
runtimeDependencies = [ (lib.getLib udev) libnotify ];
|
||||
|
||||
unpackPhase = "dpkg-deb -x $src .";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, xdg_utils, dpkg, makeWrapper, autoPatchelfHook
|
||||
{ stdenv, lib, fetchurl, xdg_utils, dpkg, makeWrapper, autoPatchelfHook
|
||||
, libXtst, libXScrnSaver, gtk3, nss, alsaLib, udev, libnotify, wrapGAppsHook
|
||||
}:
|
||||
|
||||
|
|
@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook wrapGAppsHook ];
|
||||
buildInputs = [ libXtst libXScrnSaver gtk3 nss alsaLib ];
|
||||
runtimeDependencies = [ udev.lib libnotify ];
|
||||
runtimeDependencies = [ (lib.getLib udev) libnotify ];
|
||||
|
||||
unpackPhase = "dpkg-deb -x $src .";
|
||||
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ in stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
runtimeDependencies = [
|
||||
systemd.lib
|
||||
(lib.getLib systemd)
|
||||
libnotify
|
||||
libdbusmenu
|
||||
];
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
runtimeDependencies = [
|
||||
systemd.lib
|
||||
(lib.getLib systemd)
|
||||
pulseaudio
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, rpmextract, autoPatchelfHook
|
||||
{ stdenv, lib, fetchurl, rpmextract, autoPatchelfHook
|
||||
, xorg, gtk3, gnome2, nss, alsaLib, udev, libnotify
|
||||
, wrapGAppsHook }:
|
||||
|
||||
|
|
@ -24,7 +24,7 @@ in stdenv.mkDerivation {
|
|||
]) ++ [
|
||||
gtk3 nss alsaLib
|
||||
];
|
||||
runtimeDependencies = [ udev.lib libnotify ];
|
||||
runtimeDependencies = [ (lib.getLib udev) libnotify ];
|
||||
|
||||
unpackPhase = ''
|
||||
rpmextract $src
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ in stdenv.mkDerivation {
|
|||
alsaLib gtk3 nss
|
||||
];
|
||||
|
||||
runtimeDependencies = [ udev.lib libnotify ];
|
||||
runtimeDependencies = [ (getLib udev) libnotify ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/opt/wavebox
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, stdenv
|
||||
, lib
|
||||
, udev
|
||||
, wrapGAppsHook
|
||||
, cpio
|
||||
|
|
@ -107,7 +108,7 @@ let
|
|||
'';
|
||||
|
||||
runtimeDependencies = [
|
||||
udev.lib
|
||||
(lib.getLib udev)
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, autoPatchelfHook
|
||||
, alsaLib
|
||||
|
|
@ -45,7 +46,7 @@ stdenv.mkDerivation rec {
|
|||
runtimeDependencies = [
|
||||
coreutils
|
||||
openssl
|
||||
udev.lib
|
||||
(lib.getLib udev)
|
||||
];
|
||||
|
||||
unpackPhase = ''
|
||||
|
|
|
|||
|
|
@ -307,7 +307,7 @@ stdenv.mkDerivation rec {
|
|||
# package a Thunderbird >=71.0 since XUL shouldn't be anymore (in use)?
|
||||
postFixup = ''
|
||||
local xul="$out/lib/thunderbird/libxul.so"
|
||||
patchelf --set-rpath "${libnotify}/lib:${systemd.lib}/lib:$(patchelf --print-rpath $xul)" $xul
|
||||
patchelf --set-rpath "${libnotify}/lib:${lib.getLib systemd}/lib:$(patchelf --print-rpath $xul)" $xul
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
|
|
|||
|
|
@ -301,7 +301,7 @@ stdenv.mkDerivation rec {
|
|||
# package a Thunderbird >=71.0 since XUL shouldn't be anymore (in use)?
|
||||
postFixup = ''
|
||||
local xul="$out/lib/thunderbird/libxul.so"
|
||||
patchelf --set-rpath "${libnotify}/lib:${systemd.lib}/lib:$(patchelf --print-rpath $xul)" $xul
|
||||
patchelf --set-rpath "${libnotify}/lib:${lib.getLib systemd}/lib:$(patchelf --print-rpath $xul)" $xul
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, makeWrapper, fetchurl, dpkg
|
||||
{ stdenv, lib, makeWrapper, fetchurl, dpkg
|
||||
, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype
|
||||
, gdk-pixbuf, glib, gnome2, pango, nspr, nss, gtk3
|
||||
, xorg, autoPatchelfHook, systemd, libnotify, libappindicator
|
||||
|
|
@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
unpackPhase = "dpkg-deb -x $src .";
|
||||
|
||||
runtimeDependencies = [ systemd.lib libnotify libappindicator ];
|
||||
runtimeDependencies = [ (lib.getLib systemd) libnotify libappindicator ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
|
|||
openssl'
|
||||
pango
|
||||
speex
|
||||
systemd.lib
|
||||
(lib.getLib systemd)
|
||||
stdenv.cc.cc
|
||||
xorg.libXaw
|
||||
xorg.libXmu
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, stdenv
|
||||
, lib
|
||||
, udev
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
|
@ -50,7 +51,7 @@ stdenv.mkDerivation rec {
|
|||
cp "${desktopItem}/share/applications/"* "$out/share/applications"
|
||||
'';
|
||||
|
||||
runtimeDependencies = [ udev.lib ];
|
||||
runtimeDependencies = [ (lib.getLib udev) ];
|
||||
|
||||
postFixup = ''
|
||||
makeWrapper $out/opt/Termius/termius-app $out/bin/termius-app \
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
knotifications, knotifyconfig, kparts, ktextwidgets, kwallet, kwidgetsaddons,
|
||||
kwindowsystem, kxmlgui, sonnet, threadweaver,
|
||||
kcontacts, akonadi, akonadi-calendar, akonadi-contacts,
|
||||
eigen, git, gsl, ilmbase, kproperty, kreport, lcms2, marble, libgit2, libodfgen,
|
||||
eigen, git, gsl, ilmbase, kproperty, kreport, lcms2, marble, pcre, libgit2, libodfgen,
|
||||
librevenge, libvisio, libwpd, libwpg, libwps, okular, openexr, openjpeg, phonon,
|
||||
poppler, pstoedit, qca-qt5, vc
|
||||
# TODO: package Spnav, m2mml LibEtonyek, Libqgit2
|
||||
|
|
@ -15,18 +15,14 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "calligra";
|
||||
version = "3.1.0";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0w782k0hprpb6viixnqz34sp0z5csv3prdby46z22qqkcipcs638";
|
||||
sha256 = "sha256-flViKGZdeeZ8Bi/RFz1mdvCw187v3W4bC8+aeB6nCVE=";
|
||||
};
|
||||
|
||||
patches = [ ./qt5_11.patch ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
|
||||
buildInputs = [
|
||||
boost qtwebkit qtx11extras shared-mime-info
|
||||
|
|
@ -35,7 +31,7 @@ mkDerivation rec {
|
|||
kjobwidgets kcmutils kdelibs4support kio kross knotifications knotifyconfig kparts
|
||||
ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui sonnet threadweaver
|
||||
kcontacts akonadi akonadi-calendar akonadi-contacts
|
||||
eigen git gsl ilmbase kproperty kreport lcms2 marble libgit2 libodfgen librevenge
|
||||
eigen git gsl ilmbase kproperty kreport lcms2 marble pcre libgit2 libodfgen librevenge
|
||||
libvisio libwpd libwpg libwps okular openexr openjpeg phonon poppler qca-qt5 vc
|
||||
];
|
||||
|
||||
|
|
@ -43,13 +39,10 @@ mkDerivation rec {
|
|||
|
||||
NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
|
||||
|
||||
postInstall = ''
|
||||
for i in $out/bin/*; do
|
||||
wrapProgram $i \
|
||||
--prefix PATH ':' "${pstoedit.out}/bin" \
|
||||
--prefix XDG_DATA_DIRS ':' "${breeze-icons}/share"
|
||||
done
|
||||
'';
|
||||
qtWrapperArgs = [
|
||||
"--prefix PATH : ${lib.getBin pstoedit}/bin"
|
||||
"--prefix XDG_DATA_DIRS : ${breeze-icons}/share"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A suite of productivity applications";
|
||||
|
|
@ -64,7 +57,5 @@ mkDerivation rec {
|
|||
maintainers = with maintainers; [ phreedom ebzzry zraexy ];
|
||||
platforms = platforms.linux;
|
||||
license = with licenses; [ gpl2 lgpl2 ];
|
||||
hydraPlatforms = [];
|
||||
broken = true; # fails to start, kde home not found
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,32 @@
|
|||
{ lib, mkDerivation, fetchFromGitHub, extra-cmake-modules
|
||||
, kwindowsystem, plasma-framework }:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "plasma-applet-caffeine-plus";
|
||||
version = "1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qunxyz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/Nz0kSDGok7GjqSQtjH/8q/u6blVTFPO6kfjEyt/jEo=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
kwindowsystem plasma-framework
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-Wno-dev"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Disable screensaver and auto suspend";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
inherit (src.meta) homepage;
|
||||
inherit (kwindowsystem.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
mkDerivation,
|
||||
mkDerivation, lib,
|
||||
extra-cmake-modules, kdoctools,
|
||||
qtbase,
|
||||
kcmutils, kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui,
|
||||
plasma-framework, plasma-workspace, qtx11extras
|
||||
}:
|
||||
|
|
@ -13,5 +14,5 @@ mkDerivation {
|
|||
plasma-framework plasma-workspace qtx11extras
|
||||
];
|
||||
outputs = [ "bin" "dev" "out" ];
|
||||
enableParallelBuilding = false;
|
||||
meta.broken = lib.versionOlder qtbase.version "5.14";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
, enableLTO ? true
|
||||
, texinfo ? null
|
||||
, perl ? null # optional, for texi2pod (then pod2man)
|
||||
, gmp, mpfr, libmpc, gettext, which
|
||||
, gmp, mpfr, libmpc, gettext, which, patchelf
|
||||
, libelf # optional, for link-time optimizations (LTO)
|
||||
, isl ? null # optional, for the Graphite optimization framework.
|
||||
, zlib ? null
|
||||
|
|
@ -151,11 +151,14 @@ stdenv.mkDerivation ({
|
|||
|
||||
# For building runtime libs
|
||||
depsBuildTarget =
|
||||
if hostPlatform == buildPlatform then [
|
||||
targetPackages.stdenv.cc.bintools # newly-built gcc will be used
|
||||
] else assert targetPlatform == hostPlatform; [ # build != host == target
|
||||
stdenv.cc
|
||||
];
|
||||
(
|
||||
if hostPlatform == buildPlatform then [
|
||||
targetPackages.stdenv.cc.bintools # newly-built gcc will be used
|
||||
] else assert targetPlatform == hostPlatform; [ # build != host == target
|
||||
stdenv.cc
|
||||
]
|
||||
)
|
||||
++ optional targetPlatform.isLinux patchelf;
|
||||
|
||||
buildInputs = [
|
||||
gmp mpfr libmpc libelf
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
, enableLTO ? true
|
||||
, texinfo ? null
|
||||
, perl ? null # optional, for texi2pod (then pod2man); required for Java
|
||||
, gmp, mpfr, libmpc, gettext, which
|
||||
, gmp, mpfr, libmpc, gettext, which, patchelf
|
||||
, libelf # optional, for link-time optimizations (LTO)
|
||||
, cloog ? null, isl ? null # optional, for the Graphite optimization framework.
|
||||
, zlib ? null, boehmgc ? null
|
||||
|
|
@ -160,11 +160,14 @@ stdenv.mkDerivation ({
|
|||
|
||||
# For building runtime libs
|
||||
depsBuildTarget =
|
||||
if hostPlatform == buildPlatform then [
|
||||
targetPackages.stdenv.cc.bintools # newly-built gcc will be used
|
||||
] else assert targetPlatform == hostPlatform; [ # build != host == target
|
||||
stdenv.cc
|
||||
];
|
||||
(
|
||||
if hostPlatform == buildPlatform then [
|
||||
targetPackages.stdenv.cc.bintools # newly-built gcc will be used
|
||||
] else assert targetPlatform == hostPlatform; [ # build != host == target
|
||||
stdenv.cc
|
||||
]
|
||||
)
|
||||
++ optional targetPlatform.isLinux patchelf;
|
||||
|
||||
buildInputs = [
|
||||
gmp mpfr libmpc libelf
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
, enableLTO ? true
|
||||
, texinfo ? null
|
||||
, perl ? null # optional, for texi2pod (then pod2man); required for Java
|
||||
, gmp, mpfr, libmpc, gettext, which
|
||||
, gmp, mpfr, libmpc, gettext, which, patchelf
|
||||
, libelf # optional, for link-time optimizations (LTO)
|
||||
, cloog ? null, isl ? null # optional, for the Graphite optimization framework.
|
||||
, zlib ? null, boehmgc ? null
|
||||
|
|
@ -173,11 +173,14 @@ stdenv.mkDerivation ({
|
|||
|
||||
# For building runtime libs
|
||||
depsBuildTarget =
|
||||
if hostPlatform == buildPlatform then [
|
||||
targetPackages.stdenv.cc.bintools # newly-built gcc will be used
|
||||
] else assert targetPlatform == hostPlatform; [ # build != host == target
|
||||
stdenv.cc
|
||||
];
|
||||
(
|
||||
if hostPlatform == buildPlatform then [
|
||||
targetPackages.stdenv.cc.bintools # newly-built gcc will be used
|
||||
] else assert targetPlatform == hostPlatform; [ # build != host == target
|
||||
stdenv.cc
|
||||
]
|
||||
)
|
||||
++ optional targetPlatform.isLinux patchelf;
|
||||
|
||||
buildInputs = [
|
||||
gmp mpfr libmpc libelf
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
, texinfo ? null
|
||||
, flex
|
||||
, perl ? null # optional, for texi2pod (then pod2man); required for Java
|
||||
, gmp, mpfr, libmpc, gettext, which
|
||||
, gmp, mpfr, libmpc, gettext, which, patchelf
|
||||
, libelf # optional, for link-time optimizations (LTO)
|
||||
, isl ? null # optional, for the Graphite optimization framework.
|
||||
, zlib ? null, boehmgc ? null
|
||||
|
|
@ -191,11 +191,14 @@ stdenv.mkDerivation ({
|
|||
|
||||
# For building runtime libs
|
||||
depsBuildTarget =
|
||||
if hostPlatform == buildPlatform then [
|
||||
targetPackages.stdenv.cc.bintools # newly-built gcc will be used
|
||||
] else assert targetPlatform == hostPlatform; [ # build != host == target
|
||||
stdenv.cc
|
||||
];
|
||||
(
|
||||
if hostPlatform == buildPlatform then [
|
||||
targetPackages.stdenv.cc.bintools # newly-built gcc will be used
|
||||
] else assert targetPlatform == hostPlatform; [ # build != host == target
|
||||
stdenv.cc
|
||||
]
|
||||
)
|
||||
++ optional targetPlatform.isLinux patchelf;
|
||||
|
||||
buildInputs = [
|
||||
gmp mpfr libmpc libelf
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
, enableLTO ? true
|
||||
, texinfo ? null
|
||||
, perl ? null # optional, for texi2pod (then pod2man)
|
||||
, gmp, mpfr, libmpc, gettext, which
|
||||
, gmp, mpfr, libmpc, gettext, which, patchelf
|
||||
, libelf # optional, for link-time optimizations (LTO)
|
||||
, isl ? null # optional, for the Graphite optimization framework.
|
||||
, zlib ? null
|
||||
|
|
@ -158,11 +158,14 @@ stdenv.mkDerivation ({
|
|||
|
||||
# For building runtime libs
|
||||
depsBuildTarget =
|
||||
if hostPlatform == buildPlatform then [
|
||||
targetPackages.stdenv.cc.bintools # newly-built gcc will be used
|
||||
] else assert targetPlatform == hostPlatform; [ # build != host == target
|
||||
stdenv.cc
|
||||
];
|
||||
(
|
||||
if hostPlatform == buildPlatform then [
|
||||
targetPackages.stdenv.cc.bintools # newly-built gcc will be used
|
||||
] else assert targetPlatform == hostPlatform; [ # build != host == target
|
||||
stdenv.cc
|
||||
]
|
||||
)
|
||||
++ optional targetPlatform.isLinux patchelf;
|
||||
|
||||
buildInputs = [
|
||||
gmp mpfr libmpc libelf
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
, enableLTO ? true
|
||||
, texinfo ? null
|
||||
, perl ? null # optional, for texi2pod (then pod2man)
|
||||
, gmp, mpfr, libmpc, gettext, which
|
||||
, gmp, mpfr, libmpc, gettext, which, patchelf
|
||||
, libelf # optional, for link-time optimizations (LTO)
|
||||
, isl ? null # optional, for the Graphite optimization framework.
|
||||
, zlib ? null
|
||||
|
|
@ -148,11 +148,14 @@ stdenv.mkDerivation ({
|
|||
|
||||
# For building runtime libs
|
||||
depsBuildTarget =
|
||||
if hostPlatform == buildPlatform then [
|
||||
targetPackages.stdenv.cc.bintools # newly-built gcc will be used
|
||||
] else assert targetPlatform == hostPlatform; [ # build != host == target
|
||||
stdenv.cc
|
||||
];
|
||||
(
|
||||
if hostPlatform == buildPlatform then [
|
||||
targetPackages.stdenv.cc.bintools # newly-built gcc will be used
|
||||
] else assert targetPlatform == hostPlatform; [ # build != host == target
|
||||
stdenv.cc
|
||||
]
|
||||
)
|
||||
++ optional targetPlatform.isLinux patchelf;
|
||||
|
||||
buildInputs = [
|
||||
gmp mpfr libmpc libelf
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
, enableLTO ? true
|
||||
, texinfo ? null
|
||||
, perl ? null # optional, for texi2pod (then pod2man)
|
||||
, gmp, mpfr, libmpc, gettext, which
|
||||
, gmp, mpfr, libmpc, gettext, which, patchelf
|
||||
, libelf # optional, for link-time optimizations (LTO)
|
||||
, isl ? null # optional, for the Graphite optimization framework.
|
||||
, zlib ? null
|
||||
|
|
@ -158,11 +158,14 @@ stdenv.mkDerivation ({
|
|||
|
||||
# For building runtime libs
|
||||
depsBuildTarget =
|
||||
if hostPlatform == buildPlatform then [
|
||||
targetPackages.stdenv.cc.bintools # newly-built gcc will be used
|
||||
] else assert targetPlatform == hostPlatform; [ # build != host == target
|
||||
stdenv.cc
|
||||
];
|
||||
(
|
||||
if hostPlatform == buildPlatform then [
|
||||
targetPackages.stdenv.cc.bintools # newly-built gcc will be used
|
||||
] else assert targetPlatform == hostPlatform; [ # build != host == target
|
||||
stdenv.cc
|
||||
]
|
||||
)
|
||||
++ optional targetPlatform.isLinux patchelf;
|
||||
|
||||
buildInputs = [
|
||||
gmp mpfr libmpc libelf
|
||||
|
|
|
|||
|
|
@ -241,7 +241,7 @@ postInstall() {
|
|||
# More dependencies with the previous gcc or some libs (gccbug stores the build command line)
|
||||
rm -rf $out/bin/gccbug
|
||||
|
||||
if type "patchelf"; then
|
||||
if [[ buildConfig == *"linux"* ]]; then
|
||||
# Take out the bootstrap-tools from the rpath, as it's not needed at all having $out
|
||||
for i in $(find "$out"/libexec/gcc/*/*/* -type f -a \! -name '*.la'); do
|
||||
PREV_RPATH=`patchelf --print-rpath "$i"`
|
||||
|
|
@ -250,6 +250,16 @@ postInstall() {
|
|||
done
|
||||
fi
|
||||
|
||||
if [[ targetConfig == *"linux"* ]]; then
|
||||
# For some reason, when building for linux on darwin, the libs retain
|
||||
# RPATH to $out.
|
||||
for i in "$lib"/"$targetConfig"/lib/{libtsan,libasan,libubsan}.so.*.*.*; do
|
||||
PREV_RPATH=`patchelf --print-rpath "$i"`
|
||||
NEW_RPATH=`echo "$PREV_RPATH" | sed "s,:${out}[^:]*,,g"`
|
||||
patchelf --set-rpath "$NEW_RPATH" "$i" && echo OK
|
||||
done
|
||||
fi
|
||||
|
||||
if type "install_name_tool"; then
|
||||
for i in "${!outputLib}"/lib/*.*.dylib; do
|
||||
install_name_tool -id "$i" "$i" || true
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "enchant";
|
||||
version = "2.2.8";
|
||||
version = "2.2.9";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "0m9m564qqwbssvvf7y3dlz1yxzqsjiqy1yd2zsmb3l0d7y2y5df7";
|
||||
sha256 = "0g1gf86jzxxhnhkn7jvgi0k9agzav2zr8pjnpgdwpvgmfci3v6mj";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -146,6 +146,7 @@ let
|
|||
kbookmarks = callPackage ./kbookmarks.nix {};
|
||||
kcmutils = callPackage ./kcmutils {};
|
||||
kconfigwidgets = callPackage ./kconfigwidgets {};
|
||||
kdav = callPackage ./kdav.nix {};
|
||||
kdeclarative = callPackage ./kdeclarative.nix {};
|
||||
kded = callPackage ./kded.nix {};
|
||||
kdesignerplugin = callPackage ./kdesignerplugin.nix {};
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
WGET_ARGS=(https://download.kde.org/stable/frameworks/5.71/)
|
||||
WGET_ARGS=(https://download.kde.org/stable/frameworks/5.73/)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
mkDerivation, lib, kdepimTeam,
|
||||
mkDerivation, lib,
|
||||
extra-cmake-modules, kdoctools,
|
||||
kcoreaddons, kio, qtxmlpatterns,
|
||||
}:
|
||||
|
|
@ -8,7 +8,6 @@ mkDerivation {
|
|||
name = "kdav";
|
||||
meta = {
|
||||
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
|
||||
maintainers = kdepimTeam;
|
||||
};
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [ kcoreaddons kio qtxmlpatterns ];
|
||||
|
|
@ -9,13 +9,6 @@ let
|
|||
self = mkDerivation {
|
||||
name = "krunner";
|
||||
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
|
||||
patches = [
|
||||
# Un-deprecate virtual method to restore binary compatibility.
|
||||
(assert !(lib.versionOlder "5.72" self.version); fetchpatch {
|
||||
url = "https://invent.kde.org/frameworks/krunner/-/commit/8f7ce559b84ee0c21de0256e6591793e4b95f411.diff";
|
||||
sha256 = "124xqxpgmc5fdn1mcf8x1564pqc5y81j7lhzcirql2xcs0sbcyby";
|
||||
})
|
||||
];
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [
|
||||
kconfig kcoreaddons ki18n kio kservice qtdeclarative solid
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
mkDerivation, lib, propagateBin,
|
||||
extra-cmake-modules,
|
||||
qtbase, wayland, wayland-protocols
|
||||
plasma-wayland-protocols, qtbase, wayland, wayland-protocols
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
|
|
@ -11,7 +11,7 @@ mkDerivation {
|
|||
broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
|
||||
};
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [ wayland wayland-protocols ];
|
||||
buildInputs = [ plasma-wayland-protocols wayland wayland-protocols ];
|
||||
propagatedBuildInputs = [ qtbase ];
|
||||
setupHook = propagateBin; # XDG_CONFIG_DIRS
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,659 +4,667 @@
|
|||
|
||||
{
|
||||
attica = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/attica-5.71.0.tar.xz";
|
||||
sha256 = "9e24fd7f58c66879a05e056b781637196eea69d3276ed470643c505f9fd46d3d";
|
||||
name = "attica-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/attica-5.73.0.tar.xz";
|
||||
sha256 = "011240a6ff59e2b39bcf6d4ba6128e6e60c6318c185e7316a71cfec28e69c69a";
|
||||
name = "attica-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
baloo = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/baloo-5.71.0.tar.xz";
|
||||
sha256 = "23378213d00ecf1f26eeb417987984f5a63bbd643359403dfd20638cbc1ec84b";
|
||||
name = "baloo-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/baloo-5.73.0.tar.xz";
|
||||
sha256 = "887077ae3e090d673d2ffe7eb869a0ab6f5d14e9dae2dccd619e4689699a2dfe";
|
||||
name = "baloo-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
bluez-qt = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/bluez-qt-5.71.0.tar.xz";
|
||||
sha256 = "7014e946f16db62218fe8e9af808999922d447034355f17b9e09b31321e53bad";
|
||||
name = "bluez-qt-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/bluez-qt-5.73.0.tar.xz";
|
||||
sha256 = "70264edb82b2627c0ec3740374b90b8402e0f432fe4a10650fa3d22191d8cfd4";
|
||||
name = "bluez-qt-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
breeze-icons = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/breeze-icons-5.71.0.tar.xz";
|
||||
sha256 = "72217c46e071b204a80ff8064b1b7319c7a7f9f0b08e69d8add2065e5d301155";
|
||||
name = "breeze-icons-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/breeze-icons-5.73.0.tar.xz";
|
||||
sha256 = "b6caff26f69008a3e0d53ae5fcfcf070b70ad1b17d407daecbbabeb6a606a08b";
|
||||
name = "breeze-icons-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
extra-cmake-modules = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/extra-cmake-modules-5.71.0.tar.xz";
|
||||
sha256 = "64f41c0b4b3164c7be8fcab5c0181253d97d1e9d62455fd540cb463afd051878";
|
||||
name = "extra-cmake-modules-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/extra-cmake-modules-5.73.0.tar.xz";
|
||||
sha256 = "c5e3ef0253f7d5ab3adf9185950e34fd620a3d5baaf3bcc15892f971fc3274c4";
|
||||
name = "extra-cmake-modules-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
frameworkintegration = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/frameworkintegration-5.71.0.tar.xz";
|
||||
sha256 = "f5ba2d5c363dcb09177424b82d9a59ce0f0a6b2dea372799dcba000452764961";
|
||||
name = "frameworkintegration-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/frameworkintegration-5.73.0.tar.xz";
|
||||
sha256 = "21ef7f1a6d48f9fb14ccac9bc37e803c92cf83c9e235a5ca8bd7eb08fd0a6fb3";
|
||||
name = "frameworkintegration-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kactivities = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kactivities-5.71.0.tar.xz";
|
||||
sha256 = "b4e63fec6532e4bdc41470985cea46b0a88c1b2298b80286cbf0ed2d2139b66f";
|
||||
name = "kactivities-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kactivities-5.73.0.tar.xz";
|
||||
sha256 = "5098f2535175ac12da91568ca554e3f5d970ae05415da1a8ba17305cb8ac3a1a";
|
||||
name = "kactivities-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kactivities-stats = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kactivities-stats-5.71.0.tar.xz";
|
||||
sha256 = "79fe4f674d7bae457ce6af0357104a8691f5822963b0ef1f99cd5a43e3666978";
|
||||
name = "kactivities-stats-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kactivities-stats-5.73.0.tar.xz";
|
||||
sha256 = "df4b00c52e83608b2dd7345cd220143e07b65cb431cead5e9abb1e4ffd6ecd5a";
|
||||
name = "kactivities-stats-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kapidox = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kapidox-5.71.0.tar.xz";
|
||||
sha256 = "da75660fc2808f38441ec0f59d3c58ce29fcfdcea29e251308a11a92546f1ed5";
|
||||
name = "kapidox-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kapidox-5.73.0.tar.xz";
|
||||
sha256 = "b49ff6673906817ed95a3de56535594de02a9f95bcb2726abe52d0c0e0161be5";
|
||||
name = "kapidox-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
karchive = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/karchive-5.71.0.tar.xz";
|
||||
sha256 = "cc81e856365dec2bcf3ec78aa01d42347ca390a2311ea12050f309dfbdb09624";
|
||||
name = "karchive-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/karchive-5.73.0.tar.xz";
|
||||
sha256 = "25481ebbba8f58d9ab45bde804ab0d873c45550b482e27e7856b362cd9aa434f";
|
||||
name = "karchive-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kauth = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kauth-5.71.0.tar.xz";
|
||||
sha256 = "a0de83bd662e20253011216ab8cba597f8db7429f8706237e7307580125025b5";
|
||||
name = "kauth-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kauth-5.73.0.tar.xz";
|
||||
sha256 = "e334705bfc3f81c5e2f66315d40badd26d88426128432788f790ebefce1694d9";
|
||||
name = "kauth-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kbookmarks = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kbookmarks-5.71.0.tar.xz";
|
||||
sha256 = "e00db1e62a769863a1bf90bb508f108f2740298aa40173cad34ef34a1c23a01a";
|
||||
name = "kbookmarks-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kbookmarks-5.73.0.tar.xz";
|
||||
sha256 = "b925ec1b8a1b4a2b7f2526fdbc7761de065b3c9573e41ac274773ed1b576aa51";
|
||||
name = "kbookmarks-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kcalendarcore = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kcalendarcore-5.71.0.tar.xz";
|
||||
sha256 = "d5138db971f6be606be8ae7d761bad778af3cacada8e85fb2f469190c347cd94";
|
||||
name = "kcalendarcore-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kcalendarcore-5.73.0.tar.xz";
|
||||
sha256 = "e3486b41b833c0ba72f839d8a61bdffaf9b3ece3da20f478c2981b3296e7b713";
|
||||
name = "kcalendarcore-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kcmutils = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kcmutils-5.71.0.tar.xz";
|
||||
sha256 = "27743a81e9aa48baac12bb844e48d3098250699122ed6040b1e3c50a5e8f276d";
|
||||
name = "kcmutils-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kcmutils-5.73.0.tar.xz";
|
||||
sha256 = "b28bf672bbe21e8d1b4e6ea924c1bb318c81c43dcbb86bebb3f5775e18945ca9";
|
||||
name = "kcmutils-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kcodecs = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kcodecs-5.71.0.tar.xz";
|
||||
sha256 = "3392c4df652e3a44a2b941ccb419dee9521642e503104de403ec1c6be9f43a28";
|
||||
name = "kcodecs-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kcodecs-5.73.0.tar.xz";
|
||||
sha256 = "3bcb22b4f3b2f164759ab912d117c3b4b50695ae38d524f2cfb79a29488cce67";
|
||||
name = "kcodecs-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kcompletion = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kcompletion-5.71.0.tar.xz";
|
||||
sha256 = "bf0b6ce1ee133900f169662dbd35da6f766d3e4e02c0c102a9402e20450a22a4";
|
||||
name = "kcompletion-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kcompletion-5.73.0.tar.xz";
|
||||
sha256 = "72b0650e5ae9f30ad4ec30b55e660c826d93edfda0ef4f9436f226cbb8a9705a";
|
||||
name = "kcompletion-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kconfig = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kconfig-5.71.0.tar.xz";
|
||||
sha256 = "618ff0d168abf8fb73dc83431b9a76f7859d522bea100ff07c7e1632e129e3f4";
|
||||
name = "kconfig-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kconfig-5.73.0.tar.xz";
|
||||
sha256 = "6046bbb8da5f3261aac7f868bfa8a8ce1015a3a8257fe0b2d37dce9e2bc3952e";
|
||||
name = "kconfig-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kconfigwidgets = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kconfigwidgets-5.71.0.tar.xz";
|
||||
sha256 = "5778523c49a5294e9376ce8ee6db1a51ffaa506418a19e8632f73287a596276f";
|
||||
name = "kconfigwidgets-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kconfigwidgets-5.73.0.tar.xz";
|
||||
sha256 = "ed8a0a8158f895aebd46c4a725f77178d942cd9476a864a615a9df343da51f8e";
|
||||
name = "kconfigwidgets-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kcontacts = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kcontacts-5.71.0.tar.xz";
|
||||
sha256 = "57f511a624406b27a7de25c83deb4104c95e851f9fda4f6d94450155ab08f4bd";
|
||||
name = "kcontacts-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kcontacts-5.73.0.tar.xz";
|
||||
sha256 = "4351bf80f5a5417ba7e99fe557a851d1c7173fd7511fc1426375c66692e748bb";
|
||||
name = "kcontacts-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kcoreaddons = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kcoreaddons-5.71.0.tar.xz";
|
||||
sha256 = "e95008b032e299cf47f596739d9236701e2f55e507734f33b8ea497882fd130b";
|
||||
name = "kcoreaddons-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kcoreaddons-5.73.0.tar.xz";
|
||||
sha256 = "24a7713eaef2f40e648a586e22b030192321f9fecdbae77013b00446fa0d6d51";
|
||||
name = "kcoreaddons-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kcrash = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kcrash-5.71.0.tar.xz";
|
||||
sha256 = "526242aa9fde7cff11ecaa88bf75d6fbbfc412f46bf19a7a9e185f2adb616005";
|
||||
name = "kcrash-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kcrash-5.73.0.tar.xz";
|
||||
sha256 = "49b6f4d6109ddf3a6b93f833f59483e5a1a748e4b829c4739fdaaaef59c9b583";
|
||||
name = "kcrash-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdav = {
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.73/kdav-5.73.0.tar.xz";
|
||||
sha256 = "03c8af96e7bb1b1d2d633e54c6362c7c2de078b8aba5654042b7a11d968efa31";
|
||||
name = "kdav-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdbusaddons = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kdbusaddons-5.71.0.tar.xz";
|
||||
sha256 = "b441f525248d9d675333cebedf97ee0232a3a9b7aa9aff84d825dfcdb3bcd23c";
|
||||
name = "kdbusaddons-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kdbusaddons-5.73.0.tar.xz";
|
||||
sha256 = "f7f7e57b4d4650cf90a191b08b1fe874d0005c34163b9177dcc787415841e8ba";
|
||||
name = "kdbusaddons-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdeclarative = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kdeclarative-5.71.0.tar.xz";
|
||||
sha256 = "ace0e52f561a9cfba1de4b77144a0a68037a1229530fb39070dc837da80ac8f8";
|
||||
name = "kdeclarative-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kdeclarative-5.73.0.tar.xz";
|
||||
sha256 = "713ae2ea41e1bac8f6d47cffa376d62c7805eb3e4cc41c3168c1f1b2ca70a598";
|
||||
name = "kdeclarative-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kded = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kded-5.71.0.tar.xz";
|
||||
sha256 = "404c8caae0f4abe2ef85c2e82b5db2b14ae4b607fa30e4f16d15dad53c269fcc";
|
||||
name = "kded-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kded-5.73.0.tar.xz";
|
||||
sha256 = "f21647a5f35eebaa9bf12b5d5da25c24611c1971f94f27c510d22a48c79b0895";
|
||||
name = "kded-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdelibs4support = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/portingAids/kdelibs4support-5.71.0.tar.xz";
|
||||
sha256 = "1110ed68a29e38059d195817735d58df45e59b57fa9ac48ef2036c1037a23fb7";
|
||||
name = "kdelibs4support-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/portingAids/kdelibs4support-5.73.0.tar.xz";
|
||||
sha256 = "ca6f58c97b331d130a555b950c36cd7f625ca923fd185b0f73e20ac5b98c5d9b";
|
||||
name = "kdelibs4support-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdesignerplugin = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/portingAids/kdesignerplugin-5.71.0.tar.xz";
|
||||
sha256 = "e77a96c2a6cd518f3040e9366f013f0128200791b6c93c3c5b2310af16fb040b";
|
||||
name = "kdesignerplugin-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/portingAids/kdesignerplugin-5.73.0.tar.xz";
|
||||
sha256 = "379db9fd0ec135706630dbd54e1b446e51dd3b64189754c281993d761c1d20b2";
|
||||
name = "kdesignerplugin-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdesu = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kdesu-5.71.0.tar.xz";
|
||||
sha256 = "b183e67c089b02f984284b5eb3c05f7216d289bef7ae08a9e6c6f991b2a1a23a";
|
||||
name = "kdesu-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kdesu-5.73.0.tar.xz";
|
||||
sha256 = "4dd07697decad6a544025178732bd279ef64766e1929a2135f6de58b1092944d";
|
||||
name = "kdesu-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdewebkit = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/portingAids/kdewebkit-5.71.0.tar.xz";
|
||||
sha256 = "04b8b90734ddf6d5e72ffa69707d473e1d1f8605ba06d4ceca83f4a1d195c65d";
|
||||
name = "kdewebkit-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/portingAids/kdewebkit-5.73.0.tar.xz";
|
||||
sha256 = "d8208c4f7a98b6749c793649e2e5fbe3939e253289a9f6b74b559f6546b34b0b";
|
||||
name = "kdewebkit-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdnssd = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kdnssd-5.71.0.tar.xz";
|
||||
sha256 = "bc269f0a74eee99d6c49550fc608450ced753a599cd03f77ea577af4c2e87958";
|
||||
name = "kdnssd-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kdnssd-5.73.0.tar.xz";
|
||||
sha256 = "bee7f654f704d928b1219b75a289042474c1450e9f8acb02a905a4a177bc5b7d";
|
||||
name = "kdnssd-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kdoctools = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kdoctools-5.71.0.tar.xz";
|
||||
sha256 = "1e2fcaa97a014e82f68c0c36591ce84568ead7abd59b66e534789103e162cd09";
|
||||
name = "kdoctools-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kdoctools-5.73.0.tar.xz";
|
||||
sha256 = "d8dd74776d47e009d4a204d69a78428603ca99317095d7b7edca49c3d93b1b5d";
|
||||
name = "kdoctools-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kemoticons = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kemoticons-5.71.0.tar.xz";
|
||||
sha256 = "20bcb111971cc2e8c17b38a0c20aff7cf453174f885c4b4bcc5899141113e2fc";
|
||||
name = "kemoticons-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kemoticons-5.73.0.tar.xz";
|
||||
sha256 = "0c0a26b029a8fd3d8db97bac931feb7834912aa2f7680660e98d91e868d10778";
|
||||
name = "kemoticons-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kfilemetadata = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kfilemetadata-5.71.0.tar.xz";
|
||||
sha256 = "2e302958065157c1f9ea4a189bbca40b7dbed019767a3380e34e0b6a633c75fe";
|
||||
name = "kfilemetadata-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kfilemetadata-5.73.0.tar.xz";
|
||||
sha256 = "1ae217aab920741e445211e20b1b60dfcf80f4a6d1864aa63321dac7c3802894";
|
||||
name = "kfilemetadata-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kglobalaccel = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kglobalaccel-5.71.0.tar.xz";
|
||||
sha256 = "218d77aa4f6089d57932d627c4a46a8a4a5e964c2bfcee0d1c54338c25c7a06c";
|
||||
name = "kglobalaccel-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kglobalaccel-5.73.0.tar.xz";
|
||||
sha256 = "0062db9adde4dab0be6b64430010c0a5653355d0d1680abc9ec8e71988ff871f";
|
||||
name = "kglobalaccel-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kguiaddons = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kguiaddons-5.71.0.tar.xz";
|
||||
sha256 = "c1f7bf540a689319962275916c0434f47ba5ed8f7d46a78704393163e32eccd2";
|
||||
name = "kguiaddons-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kguiaddons-5.73.0.tar.xz";
|
||||
sha256 = "45b4c5e0195abd79930635bbf20886b15b1b68b13fe4c56068579b91ef147350";
|
||||
name = "kguiaddons-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kholidays = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kholidays-5.71.0.tar.xz";
|
||||
sha256 = "5469718d6ede7edb2ab06bbaff8af01567ba77ffe2160c2c2d47c666cfebf417";
|
||||
name = "kholidays-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kholidays-5.73.0.tar.xz";
|
||||
sha256 = "b0ae4b77aa7c183959bc18baa09a1a4f7208fcad2a238c1590377bf6cf8b68ab";
|
||||
name = "kholidays-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
khtml = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/portingAids/khtml-5.71.0.tar.xz";
|
||||
sha256 = "df8d2a4776f98e1490a21e71e31a2ea7694bc7452da35f88623b19214b6e1c10";
|
||||
name = "khtml-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/portingAids/khtml-5.73.0.tar.xz";
|
||||
sha256 = "378a5aaa6c796d313a63b4cf1365cdd980f2bc21e9033354f2f1317d1db9c262";
|
||||
name = "khtml-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
ki18n = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/ki18n-5.71.0.tar.xz";
|
||||
sha256 = "f2fc8c40c10576da8b74070b7dc8e752fdd04204cb2bfe522f37a0458fbaf881";
|
||||
name = "ki18n-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/ki18n-5.73.0.tar.xz";
|
||||
sha256 = "97eef22d6cdd65c57edfe54fa9760a69005e15b7d8f4270f6185916c33e14689";
|
||||
name = "ki18n-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kiconthemes = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kiconthemes-5.71.0.tar.xz";
|
||||
sha256 = "3fa986207e9d967840bd7a3f1af1e4d0105905012a0e4cf56f7ef1b3740b3496";
|
||||
name = "kiconthemes-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kiconthemes-5.73.0.tar.xz";
|
||||
sha256 = "4490109a0a42675e4cd3497433e10fd4be24ef644a283edf46b308314d130356";
|
||||
name = "kiconthemes-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kidletime = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kidletime-5.71.0.tar.xz";
|
||||
sha256 = "1bcacd6c9ec8d65f93434f51d865723a50609ec074f88da2890a8f37ea8d207d";
|
||||
name = "kidletime-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kidletime-5.73.0.tar.xz";
|
||||
sha256 = "52a8af3f061101c406a592ec277a2c84846e3910af1d3dbfc3e15beb9cfd24a2";
|
||||
name = "kidletime-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kimageformats = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kimageformats-5.71.0.tar.xz";
|
||||
sha256 = "0d6d6a8664e4a01df27e9970ec9ec10a92c1d43a00a3e9ef0471d740b4c93d94";
|
||||
name = "kimageformats-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kimageformats-5.73.0.tar.xz";
|
||||
sha256 = "473d0f67d5357bbf08aa4f4504ceaceabc720b1f5433b456ddc5f8ad0d7e3b8b";
|
||||
name = "kimageformats-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kinit = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kinit-5.71.0.tar.xz";
|
||||
sha256 = "6ea625bced2c19b0f3e5bb504775dd6764358f02412364a16cbad731c5c299b6";
|
||||
name = "kinit-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kinit-5.73.0.tar.xz";
|
||||
sha256 = "0c61e90f3db83b4dc5f2438cf7880a02b600a5739cb05e5ee372aeff98b8b770";
|
||||
name = "kinit-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kio = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kio-5.71.0.tar.xz";
|
||||
sha256 = "b972c8dede50be3e89babb5a536054759db2a87003e6df770c598c7c1c94b8d6";
|
||||
name = "kio-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kio-5.73.0.tar.xz";
|
||||
sha256 = "05da159e6cf5ef9aa4dd7ede86ce28a5581624a1b3f0b4718c5b7e30c4aa2a66";
|
||||
name = "kio-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kirigami2 = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kirigami2-5.71.0.tar.xz";
|
||||
sha256 = "f323efb96a809dc9e572a0e68e04c4f485fc27f9ae65ffa3988830e348151356";
|
||||
name = "kirigami2-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kirigami2-5.73.0.tar.xz";
|
||||
sha256 = "9b2a097071f77804f6f2f2a478e5db602c8b5fee00de34fc44842f31223401bb";
|
||||
name = "kirigami2-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kitemmodels = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kitemmodels-5.71.0.tar.xz";
|
||||
sha256 = "68205f09d63a916f236e2b3b729c0055377d852de48f7cf29fa7174ca97b84e7";
|
||||
name = "kitemmodels-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kitemmodels-5.73.0.tar.xz";
|
||||
sha256 = "6569e289ac9263d87ef6641fe2f3914b9ace6814832ac9c61825b1c6805ae371";
|
||||
name = "kitemmodels-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kitemviews = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kitemviews-5.71.0.tar.xz";
|
||||
sha256 = "2843ef166ff5bf69c1132bbc09545b59ad208313c0acad71d0cd951fde1d33de";
|
||||
name = "kitemviews-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kitemviews-5.73.0.tar.xz";
|
||||
sha256 = "ec29707d789bee58c47ee538319560a168642f69e96cacb78818825e47177727";
|
||||
name = "kitemviews-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kjobwidgets = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kjobwidgets-5.71.0.tar.xz";
|
||||
sha256 = "63f3b2fc1c062b1a485ff543e2d5afa68a9f9a918676bf3a6a5dc8f56f5f30e3";
|
||||
name = "kjobwidgets-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kjobwidgets-5.73.0.tar.xz";
|
||||
sha256 = "61d105c8f17dcfb85ad6c1e3bd2423ebeb430b9c290d193229bc953ac174f2bf";
|
||||
name = "kjobwidgets-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kjs = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/portingAids/kjs-5.71.0.tar.xz";
|
||||
sha256 = "702224482139e500da1ea4e0d2b5132bf762f87f426f294587a0f2f47b9a9734";
|
||||
name = "kjs-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/portingAids/kjs-5.73.0.tar.xz";
|
||||
sha256 = "97b52557212a33d59a4b3a8c34ea8a94cd5f840fb0798e770164d3cb1e755be5";
|
||||
name = "kjs-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kjsembed = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/portingAids/kjsembed-5.71.0.tar.xz";
|
||||
sha256 = "9352a31b5f735d71d6db4b09825ca01adb337e37f2b0cfce48c679e932238486";
|
||||
name = "kjsembed-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/portingAids/kjsembed-5.73.0.tar.xz";
|
||||
sha256 = "cc9896930c01a6bdbfaddada9516380c9a54e5d719836f1788d8e3a74108e1d3";
|
||||
name = "kjsembed-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kmediaplayer = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/portingAids/kmediaplayer-5.71.0.tar.xz";
|
||||
sha256 = "72492a6c877dded4f2333f140c025fdc4a271a68695c635c0dbc09b08d832eca";
|
||||
name = "kmediaplayer-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/portingAids/kmediaplayer-5.73.0.tar.xz";
|
||||
sha256 = "69aa3bbedfc8b9a0dd9f4ac260cded9d7b5894477bf4b5b09065d0aae8e44ab2";
|
||||
name = "kmediaplayer-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
knewstuff = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/knewstuff-5.71.0.tar.xz";
|
||||
sha256 = "aba867855d69641f73db30405e787fc9ea22e3386a45be9626ba84cbe208f855";
|
||||
name = "knewstuff-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/knewstuff-5.73.0.tar.xz";
|
||||
sha256 = "7669e62973f7e228975a07f15bb1c7f716edd81ce82d5f578a80b1f501abda1e";
|
||||
name = "knewstuff-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
knotifications = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/knotifications-5.71.0.tar.xz";
|
||||
sha256 = "b900146340621d54f6113600e85d287b28225d82515affb8690704433e5d0440";
|
||||
name = "knotifications-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/knotifications-5.73.0.tar.xz";
|
||||
sha256 = "c8e9f36716db33baca93a0386d3bb6426408eee3843eb5854bdd8ad7579f372c";
|
||||
name = "knotifications-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
knotifyconfig = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/knotifyconfig-5.71.0.tar.xz";
|
||||
sha256 = "226b7f956f7013027621c4018b4376b76129ea4195df67fc7df4435c54baf50e";
|
||||
name = "knotifyconfig-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/knotifyconfig-5.73.0.tar.xz";
|
||||
sha256 = "641a167a58856e99036d44b3e7472b44cdfbbf68e5d75b9af988d0b71dc10af4";
|
||||
name = "knotifyconfig-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kpackage = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kpackage-5.71.0.tar.xz";
|
||||
sha256 = "c4b924e7c506cb75bdaaf68bd881e79a73999bd6436f29157f56c76f32b48cba";
|
||||
name = "kpackage-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kpackage-5.73.0.tar.xz";
|
||||
sha256 = "480b1e11733fe272d1a5680afea39bcc940f01bd3d1267be0981e3c92e098c4f";
|
||||
name = "kpackage-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kparts = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kparts-5.71.0.tar.xz";
|
||||
sha256 = "d038f97dfdccdd85dbac09c0f64cf852191ec2e535fd7928740e03d4ffe63b90";
|
||||
name = "kparts-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kparts-5.73.0.tar.xz";
|
||||
sha256 = "5546d2a474c80a601ba013642775682b087d086bd26d0b0d025b68d680c98bf2";
|
||||
name = "kparts-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kpeople = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kpeople-5.71.0.tar.xz";
|
||||
sha256 = "d63d5f5cbbedc2e4ef85fa8c2ff4adcd5cb9e05d1d1ee0e7b2c2d151193f5403";
|
||||
name = "kpeople-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kpeople-5.73.0.tar.xz";
|
||||
sha256 = "9e0d3119c168f7843251c808cc149de15c1fd692062f431972023fdaa84d21c4";
|
||||
name = "kpeople-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kplotting = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kplotting-5.71.0.tar.xz";
|
||||
sha256 = "84bacfbd86105e454f3d97f4ac4062e2f992556fca66d2c73806d1d12095bec1";
|
||||
name = "kplotting-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kplotting-5.73.0.tar.xz";
|
||||
sha256 = "b5055ed9a3149c059623d88875816e9fac8d6d25d29fdfd48e0d8a16dfe01b14";
|
||||
name = "kplotting-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kpty = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kpty-5.71.0.tar.xz";
|
||||
sha256 = "7629d35ff783aff8fe801db30eb146efe50620f7500c4f7f1bf7d2619568c6b9";
|
||||
name = "kpty-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kpty-5.73.0.tar.xz";
|
||||
sha256 = "d3bf99062589dbd1dbe302c8ed2528845f245e7f0f17ca865cdd100f7589ce9c";
|
||||
name = "kpty-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kquickcharts = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kquickcharts-5.71.0.tar.xz";
|
||||
sha256 = "a1befe13903676a9779030b02b91da9889540e689e1f6a0afd54ff484109642a";
|
||||
name = "kquickcharts-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kquickcharts-5.73.0.tar.xz";
|
||||
sha256 = "e37e13a5d907d872679eab38ba8e983b2fb98a11e07a3c15d32cfaad09075cfe";
|
||||
name = "kquickcharts-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kross = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/portingAids/kross-5.71.0.tar.xz";
|
||||
sha256 = "ac42ed4ec39ddaea0a4668803271f6f5de513fcdd1243d02b296544ab601bb1c";
|
||||
name = "kross-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/portingAids/kross-5.73.0.tar.xz";
|
||||
sha256 = "aa27b434da981f64c40985a61ee041417667844c6077c9fb52456635be67546e";
|
||||
name = "kross-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
krunner = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/krunner-5.71.0.tar.xz";
|
||||
sha256 = "fb3ce4c587a1b114550487b5716f0aba53b775018b6eef2ae48b8d6fdda40952";
|
||||
name = "krunner-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/krunner-5.73.0.tar.xz";
|
||||
sha256 = "b4e8427083b6546327eeb36b05a7e438e58f922d4cc5ae0c24cd8241924e9e09";
|
||||
name = "krunner-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kservice = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kservice-5.71.0.tar.xz";
|
||||
sha256 = "6b7f4784cb514ec966f3cb01d26aa2dbdfd2425919efa57a4efa6117fcafc9ce";
|
||||
name = "kservice-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kservice-5.73.0.tar.xz";
|
||||
sha256 = "a64bf7543870240f0d8f8c2bcf43759d98962ba94a4ed34bd23232df25bb408b";
|
||||
name = "kservice-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
ktexteditor = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/ktexteditor-5.71.0.tar.xz";
|
||||
sha256 = "6e50b6669b288f8e624cba11bca53b78748faf6cb978628f02664038cfa294da";
|
||||
name = "ktexteditor-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/ktexteditor-5.73.0.tar.xz";
|
||||
sha256 = "032b3ac31aa099ed67471f78401d13cf318646b0b9b5e20bb94796ac3ed6cf18";
|
||||
name = "ktexteditor-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
ktextwidgets = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/ktextwidgets-5.71.0.tar.xz";
|
||||
sha256 = "0a7fae03d8b59ec8a4f7c49a228536ea4121bd3d8f19fb1ff9831ada428509f4";
|
||||
name = "ktextwidgets-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/ktextwidgets-5.73.0.tar.xz";
|
||||
sha256 = "2a8b086fce8136b5b4af4a28b417343fb66148c1961e5d65bf40ccae2d4386e5";
|
||||
name = "ktextwidgets-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kunitconversion = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kunitconversion-5.71.0.tar.xz";
|
||||
sha256 = "65bfba8e88e2cf6de40e06ce24fe5f48948cc92f16ce78eb8538de532dcf36cb";
|
||||
name = "kunitconversion-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kunitconversion-5.73.0.tar.xz";
|
||||
sha256 = "97d008e8bdb2d1f89d2093294a8be0b13b0e0160658fa7d3de6c99a5fd5e2935";
|
||||
name = "kunitconversion-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kwallet = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kwallet-5.71.0.tar.xz";
|
||||
sha256 = "d53b5bc4bbe054101b012d63672efc30af6a5aea58f467037cab4735b6ace9b5";
|
||||
name = "kwallet-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kwallet-5.73.0.tar.xz";
|
||||
sha256 = "4a9c8a538054fc51b30679d5180d09bb6d12a833f595a8d6875b6d4c29074de1";
|
||||
name = "kwallet-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kwayland = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kwayland-5.71.0.tar.xz";
|
||||
sha256 = "369ba54b485214687e719bc9216e3bb50849df3af9a3ec0e95cf5d5687c847c2";
|
||||
name = "kwayland-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kwayland-5.73.0.tar.xz";
|
||||
sha256 = "ee34a490a7bbc5e83eb36a6ac70492a76cb054d3077d0a8db216fd8b07f27bfe";
|
||||
name = "kwayland-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kwidgetsaddons = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kwidgetsaddons-5.71.0.tar.xz";
|
||||
sha256 = "897077995bcf4125d0f90d2964500e718d2a3fd5f117e1b7906177ad13a5082e";
|
||||
name = "kwidgetsaddons-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kwidgetsaddons-5.73.0.tar.xz";
|
||||
sha256 = "0722d853747b85ca7d46f278dc99c28b872185406b97b811523c1aa9b5e75eb6";
|
||||
name = "kwidgetsaddons-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kwindowsystem = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kwindowsystem-5.71.0.tar.xz";
|
||||
sha256 = "a3613aea6fa73ebc53f28c011a6bca31ed157e29f85df767e617c44399360cda";
|
||||
name = "kwindowsystem-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kwindowsystem-5.73.0.tar.xz";
|
||||
sha256 = "0e27ad2cd5e4699efdc02daec181b4ffb0b9e31ec4c96f0f67899804aebbcde8";
|
||||
name = "kwindowsystem-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kxmlgui = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/kxmlgui-5.71.0.tar.xz";
|
||||
sha256 = "2e4b2563daeedf35a54d38002c05d7c39017a36c0b8a19c236ea87324eebf7cc";
|
||||
name = "kxmlgui-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/kxmlgui-5.73.0.tar.xz";
|
||||
sha256 = "093131f5f51497ec61e99bd3e19de9421643d3f6ddf0099a823a3d624596ebcb";
|
||||
name = "kxmlgui-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
kxmlrpcclient = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/portingAids/kxmlrpcclient-5.71.0.tar.xz";
|
||||
sha256 = "5947de8ec9cd57d8ccf6ea8a764066733d2633d93e11f94ecfb47a75e1e7a91f";
|
||||
name = "kxmlrpcclient-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/portingAids/kxmlrpcclient-5.73.0.tar.xz";
|
||||
sha256 = "c0d089c389f59bb7cb6fba629f3e122e70fda19a69f419ff8bd1d9fcee95a047";
|
||||
name = "kxmlrpcclient-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
modemmanager-qt = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/modemmanager-qt-5.71.0.tar.xz";
|
||||
sha256 = "b2e5e2a8b8fe2e9fb22bb7dc77177a975727991c6c0ee19d5a9b0a2ab513531d";
|
||||
name = "modemmanager-qt-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/modemmanager-qt-5.73.0.tar.xz";
|
||||
sha256 = "87f3864b2b53b4e309bca1feefa613455f60e4699969a569694f6813447e1fcd";
|
||||
name = "modemmanager-qt-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
networkmanager-qt = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/networkmanager-qt-5.71.0.tar.xz";
|
||||
sha256 = "7fe6a0c9d9b25c434c6a200de19f722d942165252cc9161f1d8fcddf64147034";
|
||||
name = "networkmanager-qt-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/networkmanager-qt-5.73.0.tar.xz";
|
||||
sha256 = "b909feafc0a9a18b59744e0f1973c5357f67bbd50b59afa82cf55955dae7d41f";
|
||||
name = "networkmanager-qt-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
oxygen-icons5 = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/oxygen-icons5-5.71.0.tar.xz";
|
||||
sha256 = "a75a82164e2af5b6f269a386762ff2abba052dbfca18c9aed8d738c9cd958b04";
|
||||
name = "oxygen-icons5-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/oxygen-icons5-5.73.0.tar.xz";
|
||||
sha256 = "662cd9644e393c69dccb538cdd4280253be812f80704c992ada228c0c32c2bbc";
|
||||
name = "oxygen-icons5-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-framework = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/plasma-framework-5.71.0.tar.xz";
|
||||
sha256 = "a54c8603ca261c89609a3009536a9217ce3415a7fd63527ed36f266399613067";
|
||||
name = "plasma-framework-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/plasma-framework-5.73.0.tar.xz";
|
||||
sha256 = "e5415143f0a08cd75cf758b0692021d2a2febdcb1364e2aa1e5c8fbeee148c93";
|
||||
name = "plasma-framework-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
prison = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/prison-5.71.0.tar.xz";
|
||||
sha256 = "44762ee7a3993bd7527f0b33ee09bacc1d5a518641b79932e5490a511ac7e87f";
|
||||
name = "prison-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/prison-5.73.0.tar.xz";
|
||||
sha256 = "a2b135ffdf1af240366f3fb077c02c02094fb1706c6e84fab5186802544a5b87";
|
||||
name = "prison-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
purpose = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/purpose-5.71.0.tar.xz";
|
||||
sha256 = "de0531a84f671a15fe4a6348220e922a3230178554e26baf392a1f295044e4be";
|
||||
name = "purpose-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/purpose-5.73.0.tar.xz";
|
||||
sha256 = "6f4d440cb708b636430e3206f879ca5c2e6cdfcf62f92ce173d43e291fbeed32";
|
||||
name = "purpose-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
qqc2-desktop-style = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/qqc2-desktop-style-5.71.0.tar.xz";
|
||||
sha256 = "b968ce6fc7c1d111aa2c63584dddc0f74e9066a0b4ea26d1194e46e2f7b38700";
|
||||
name = "qqc2-desktop-style-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/qqc2-desktop-style-5.73.0.tar.xz";
|
||||
sha256 = "290b3637be0c3740e92cdbb1421aef8bf1a8df36218f9d7d120e8422d14c3fdd";
|
||||
name = "qqc2-desktop-style-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
solid = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/solid-5.71.0.tar.xz";
|
||||
sha256 = "72a7bdd8306ec4cda5f504819e0ff3f8baca6530fa04e33f10b6b89dc010505b";
|
||||
name = "solid-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/solid-5.73.0.tar.xz";
|
||||
sha256 = "7366b64438a1ca7a42126e67d352e371227b46418ce961321d358f2eb90c0933";
|
||||
name = "solid-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
sonnet = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/sonnet-5.71.0.tar.xz";
|
||||
sha256 = "cd663b3e1b23aef58d85f72dfdc92aaae33f358b22ad1fc36fde6c66eb7f0e72";
|
||||
name = "sonnet-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/sonnet-5.73.0.tar.xz";
|
||||
sha256 = "009f76fc4317e407d30c4e162a807d620a95217f5db271a14b1f9fc4339d232c";
|
||||
name = "sonnet-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
syndication = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/syndication-5.71.0.tar.xz";
|
||||
sha256 = "c515fd48d3736b55c8e7990c72471bfddd55363c4bcb049713be741eaa7b07e0";
|
||||
name = "syndication-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/syndication-5.73.0.tar.xz";
|
||||
sha256 = "2a65972ef5183edb0bd8b3804dae129ae8f4a4469287711e77fc636e90b8a954";
|
||||
name = "syndication-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
syntax-highlighting = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/syntax-highlighting-5.71.0.tar.xz";
|
||||
sha256 = "845ae0c7b8523c23c3ad704a6c551260a358d96b0094a5c2b062879e58173f84";
|
||||
name = "syntax-highlighting-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/syntax-highlighting-5.73.0.tar.xz";
|
||||
sha256 = "51ed4a68ba42d0dc88d91a0c11ac55ada199b7e93b0ff74b80b5e9304fe8901b";
|
||||
name = "syntax-highlighting-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
threadweaver = {
|
||||
version = "5.71.0";
|
||||
version = "5.73.0";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/frameworks/5.71/threadweaver-5.71.0.tar.xz";
|
||||
sha256 = "039e73d70f38af38a63235cfb554111ee0d58a6ac168bff0745f0d029c5c528d";
|
||||
name = "threadweaver-5.71.0.tar.xz";
|
||||
url = "${mirror}/stable/frameworks/5.73/threadweaver-5.73.0.tar.xz";
|
||||
sha256 = "7e1152a1cf73f841c3be5d73cb0d5e6e29ec700be859c94275c5c00e49488d38";
|
||||
name = "threadweaver-5.73.0.tar.xz";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,15 +3,12 @@
|
|||
, libatasmart, parted
|
||||
, utillinux }:
|
||||
|
||||
let
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kpmcore";
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
|
||||
url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
|
||||
sha256 = "0s6v0jfrhjg31ri5p6h9n4w29jvasf5dj954j3vfpzl91lygmmmq";
|
||||
};
|
||||
|
||||
|
|
@ -24,12 +21,14 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
utillinux # needs blkid (note that this is not provided by utillinux-compat)
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
maintainers = with lib.maintainers; [ peterhoeg ];
|
||||
# The build requires at least Qt 5.12:
|
||||
broken = lib.versionOlder qtbase.version "5.12.0";
|
||||
# The build requires at least Qt 5.14:
|
||||
broken = lib.versionOlder qtbase.version "5.14";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libpipeline-1.5.1";
|
||||
name = "libpipeline-1.5.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://savannah/libpipeline/${name}.tar.gz";
|
||||
sha256 = "0bwh5xz5f2czwb7f564jz1mp4znm8pldnvf65fs0hpw4gmmp0cyn";
|
||||
sha256 = "1c5dl017xil2ssb6a5vg927bnsbc9vymfgi9ahvqbb8gypx0igsx";
|
||||
};
|
||||
|
||||
patches = stdenv.lib.optionals stdenv.isDarwin [ ./fix-on-osx.patch ];
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
{ stdenv, fetchurl, getopt, makeWrapper, utillinux }:
|
||||
{ stdenv, fetchurl, getopt, makeWrapper, utillinux, gperf }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libseccomp";
|
||||
version = "2.4.3";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz";
|
||||
sha256 = "07crwxqzvl5k2b90a47ii9wgvi09s9hsy5b5jddw9ylp351d25fg";
|
||||
sha256 = "1wql62cg8f95cwpy057cl764nni9g4sdn5lqj68x22kjs8w71yhz";
|
||||
};
|
||||
|
||||
outputs = [ "out" "lib" "dev" "man" ];
|
||||
|
||||
buildInputs = [ getopt makeWrapper ];
|
||||
buildInputs = [ getopt makeWrapper gperf ];
|
||||
|
||||
patchPhase = ''
|
||||
patchShebangs .
|
||||
|
|
@ -25,13 +25,14 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with stdenv.lib; {
|
||||
description = "High level library for the Linux Kernel seccomp filter";
|
||||
homepage = "https://github.com/seccomp/libseccomp";
|
||||
license = licenses.lgpl21;
|
||||
platforms = platforms.linux;
|
||||
homepage = "https://github.com/seccomp/libseccomp";
|
||||
license = licenses.lgpl21;
|
||||
platforms = platforms.linux;
|
||||
badPlatforms = [
|
||||
"alpha-linux"
|
||||
"riscv64-linux" "riscv32-linux"
|
||||
"sparc-linux" "sparc64-linux"
|
||||
"riscv32-linux"
|
||||
"sparc-linux"
|
||||
"sparc64-linux"
|
||||
];
|
||||
maintainers = with maintainers; [ thoughtpolice ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, CoreServices ? null
|
||||
, buildPackages }:
|
||||
|
||||
let version = "4.27"; in
|
||||
let version = "4.28"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "nspr";
|
||||
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
|
||||
sha256 = "16z82qc1l4cqn66p59ai0dy9ycllywn4jlxhip1a605bns952jbd";
|
||||
sha256 = "0miv8ggil1xdywxw2sxaa05kqw7ahjgaimf7zjc6y2x8367grpk3";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ let
|
|||
url = "http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz";
|
||||
sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";
|
||||
};
|
||||
version = "3.55";
|
||||
version = "3.56";
|
||||
underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
|
|
@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz";
|
||||
sha256 = "0100hm7n1xrp144xy665z46s0wf1jpkqkncc6bk2w22snhyjwsgw";
|
||||
sha256 = "174f0ki2f8szkgv02jlsg2ci332sl9dabr2vcwnyjp1vxplf0xgq";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,24 @@
|
|||
{ mkDerivation, fetchurl, lib
|
||||
, extra-cmake-modules
|
||||
, qtbase
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "plasma-wayland-protocols";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-xUkzg9EVFxw0NeqaIbOWaGBjKoRFRP+sj1SJBDalHTg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
|
||||
buildInputs = [ qtbase ];
|
||||
|
||||
meta = {
|
||||
description = "Plasma Wayland Protocols";
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
platforms = qtbase.meta.platforms;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qca-qt5";
|
||||
version = "2.2.1";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.kde.org/stable/qca/${version}/qca-${version}.tar.xz";
|
||||
sha256 = "00kv1vsrc8fp556hm8s6yw3240vx3l4067q6vfxrb3gdwgcd45np";
|
||||
sha256 = "sha256-wThREJq+/EYjNwmJ+uOnRb9rGss8KhOolYU5gj6XTks=";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl qtbase ];
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
darwin, libiconv,
|
||||
|
||||
dbus, fontconfig, freetype, glib, harfbuzz, icu, libX11, libXcomposite,
|
||||
libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng, libtiff,
|
||||
libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng,
|
||||
libxcb, libxkbcommon, libxml2, libxslt, openssl, pcre16, pcre2, sqlite, udev,
|
||||
xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm,
|
||||
zlib,
|
||||
|
|
@ -48,7 +48,7 @@ stdenv.mkDerivation {
|
|||
harfbuzz icu
|
||||
|
||||
# Image formats
|
||||
libjpeg libpng libtiff
|
||||
libjpeg libpng
|
||||
(if compareVersion "5.9.0" < 0 then pcre16 else pcre2)
|
||||
]
|
||||
++ (
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ qtModule, qtbase }:
|
||||
{ qtModule, qtbase, libtiff }:
|
||||
|
||||
qtModule {
|
||||
name = "qtimageformats";
|
||||
qtInputs = [ qtbase ];
|
||||
propagatedBuildInputs = [ libtiff ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ qtModule {
|
|||
''
|
||||
# Patch library paths in Chromium sources
|
||||
+ optionalString (!stdenv.isDarwin) ''
|
||||
sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \
|
||||
sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \
|
||||
src/3rdparty/chromium/device/udev_linux/udev?_loader.cc
|
||||
|
||||
sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
|
||||
|
|
|
|||
|
|
@ -3,7 +3,9 @@
|
|||
, isPy3k
|
||||
, fetchPypi
|
||||
, pytest
|
||||
, markupsafe }:
|
||||
, markupsafe
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Jinja2";
|
||||
|
|
@ -15,7 +17,7 @@ buildPythonPackage rec {
|
|||
};
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
propagatedBuildInputs = [ markupsafe ];
|
||||
propagatedBuildInputs = [ markupsafe setuptools ];
|
||||
|
||||
# Multiple tests run out of stack space on 32bit systems with python2.
|
||||
# See https://github.com/pallets/jinja/issues/1158
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ buildPythonPackage rec {
|
|||
|
||||
postPatch = ''
|
||||
substituteInPlace src/pyudev/_ctypeslib/utils.py \
|
||||
--replace "find_library(name)" "'${systemd.lib}/lib/libudev.so'"
|
||||
--replace "find_library(name)" "'${lib.getLib systemd}/lib/libudev.so'"
|
||||
'';
|
||||
|
||||
checkInputs = [ pytest mock hypothesis docutils ];
|
||||
|
|
|
|||
|
|
@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
|
|||
+ lib.optionalString useNcurses "-cursesUI"
|
||||
+ lib.optionalString withQt5 "-qt5UI"
|
||||
+ lib.optionalString useQt4 "-qt4UI";
|
||||
version = "3.18.1";
|
||||
version = "3.18.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
|
||||
# compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt
|
||||
sha256 = "0215srmc9l7ygwdpfms8yx0wbd96qgz2d58ykmdiarvysf5k7qy0";
|
||||
sha256 = "0zhxsnxm5d8wdarz2gs3r41r1dfrnh35ki75fa684gaxfzy40kjx";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -37,12 +37,6 @@ stdenv.mkDerivation rec {
|
|||
# Derived from https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d
|
||||
./libuv-application-services.patch
|
||||
|
||||
# TODO: Remove this patch for a regression once CMake 3.18.2 is out:
|
||||
(fetchpatch { # PCH: Avoid Apple-specific architecture flags on other platforms
|
||||
url = "https://gitlab.kitware.com/cmake/cmake/-/commit/70ce1ad64a04a244bb1c03753da0752c61fc3a37.patch";
|
||||
sha256 = "0jcdgv48j0dd4nlhyy3j0s3h6bcbrq2yg1mdhpgfqrb2y3p91fky";
|
||||
})
|
||||
|
||||
] ++ lib.optional stdenv.isCygwin ./3.2.2-cygwin.patch;
|
||||
|
||||
outputs = [ "out" ];
|
||||
|
|
@ -116,8 +110,17 @@ stdenv.mkDerivation rec {
|
|||
doCheck = false; # fails
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.cmake.org/";
|
||||
homepage = "https://cmake.org/";
|
||||
changelog = "https://cmake.org/cmake/help/v${lib.versions.majorMinor version}/"
|
||||
+ "release/${lib.versions.majorMinor version}.html";
|
||||
description = "Cross-Platform Makefile Generator";
|
||||
longDescription = ''
|
||||
CMake is an open-source, cross-platform family of tools designed to
|
||||
build, test and package software. CMake is used to control the software
|
||||
compilation process using simple platform and compiler independent
|
||||
configuration files, and generate native makefiles and workspaces that
|
||||
can be used in the compiler environment of your choice.
|
||||
'';
|
||||
platforms = if useQt4 then qt4.meta.platforms else platforms.all;
|
||||
maintainers = with maintainers; [ ttuegel lnl7 ];
|
||||
license = licenses.bsd3;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, buildEnv, makeWrapper
|
||||
{ stdenv, lib, fetchurl, buildEnv, makeWrapper
|
||||
, xorg, alsaLib, dbus, glib, gtk2, atk, pango, freetype, fontconfig
|
||||
, gdk-pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap
|
||||
, libnotify}:
|
||||
|
|
@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
|
|||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nw
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nwjc
|
||||
|
||||
ln -s ${systemd.lib}/lib/libudev.so $out/share/nwjs/libudev.so.0
|
||||
ln -s ${lib.getLib systemd}/lib/libudev.so $out/share/nwjs/libudev.so.0
|
||||
|
||||
patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}:$out/share/nwjs" $out/share/nwjs/nw
|
||||
patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/nwjs" $out/share/nwjs/nwjc
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, buildEnv, makeWrapper
|
||||
{ stdenv, lib, fetchurl, buildEnv, makeWrapper
|
||||
|
||||
, xorg, alsaLib, dbus, glib, gtk3, atk, pango, freetype, fontconfig
|
||||
, gdk-pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap
|
||||
|
|
@ -61,7 +61,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nw
|
||||
|
||||
ln -s ${systemd.lib}/lib/libudev.so $out/share/nwjs/libudev.so.0
|
||||
ln -s ${lib.getLib systemd}/lib/libudev.so $out/share/nwjs/libudev.so.0
|
||||
|
||||
libpath="$out/share/nwjs/lib/"
|
||||
for f in "$libpath"/*.so; do
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, desktop-file-utils
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
|
|
@ -50,7 +51,7 @@ stdenv.mkDerivation rec {
|
|||
wrapGAppsHook
|
||||
gnome3.adwaita-icon-theme
|
||||
];
|
||||
buildInputs = [ glib gtk3 pango polkit systemd.dev systemd.lib libdazzle ];
|
||||
buildInputs = [ glib gtk3 pango polkit systemd.dev (lib.getLib systemd) libdazzle ];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dsystemdunitdir=lib/systemd/system"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchzip, autoPatchelfHook, xorg, gtk2, gnome2, gtk3, nss, alsaLib, udev, unzip, wrapGAppsHook }:
|
||||
{ stdenv, lib, fetchzip, autoPatchelfHook, xorg, gtk2, gnome2, gtk3, nss, alsaLib, udev, unzip, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cypress";
|
||||
|
|
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
|||
nss gtk2 alsaLib gnome2.GConf gtk3 unzip
|
||||
];
|
||||
|
||||
runtimeDependencies = [ udev.lib ];
|
||||
runtimeDependencies = [ (lib.getLib udev) ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/opt/cypress
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "klavaro";
|
||||
version = "3.10";
|
||||
version = "3.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/klavaro/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0jnzdrndiq6m0bwgid977z5ghp4q61clwdlzfpx4fd2ml5x3iq95";
|
||||
sha256 = "1rkxaqb62w4mv86fcnmr32lq6y0h4hh92wmsy5ddb9a8jnzx6r7w";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ intltool makeWrapper pkgconfig ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchFromGitHub, elk6Version, buildGoPackage, libpcap, systemd }:
|
||||
{ stdenv, lib, fetchFromGitHub, elk6Version, buildGoPackage, libpcap, systemd }:
|
||||
|
||||
let beat = package : extraArgs : buildGoPackage (rec {
|
||||
name = "${package}-${version}";
|
||||
|
|
@ -46,7 +46,7 @@ in {
|
|||
journal entries from Linuxes with systemd.
|
||||
'';
|
||||
buildInputs = [ systemd.dev ];
|
||||
postFixup = let libPath = stdenv.lib.makeLibraryPath [ systemd.lib ]; in ''
|
||||
postFixup = let libPath = stdenv.lib.makeLibraryPath [ (lib.getLib systemd) ]; in ''
|
||||
patchelf --set-rpath ${libPath} "$out/bin/journalbeat"
|
||||
'';
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchFromGitHub, elk7Version, buildGoPackage, libpcap, systemd }:
|
||||
{ stdenv, lib, fetchFromGitHub, elk7Version, buildGoPackage, libpcap, systemd }:
|
||||
|
||||
let beat = package : extraArgs : buildGoPackage (rec {
|
||||
name = "${package}-${version}";
|
||||
|
|
@ -45,7 +45,7 @@ in {
|
|||
journal entries from Linuxes with systemd.
|
||||
'';
|
||||
buildInputs = [ systemd.dev ];
|
||||
postFixup = let libPath = stdenv.lib.makeLibraryPath [ systemd.lib ]; in ''
|
||||
postFixup = let libPath = stdenv.lib.makeLibraryPath [ (lib.getLib systemd) ]; in ''
|
||||
patchelf --set-rpath ${libPath} "$out/bin/journalbeat"
|
||||
'';
|
||||
};
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
} :
|
||||
|
||||
let
|
||||
version = "30.0";
|
||||
version = "31.0";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
pname = "rdma-core";
|
||||
|
|
@ -14,7 +14,7 @@ in stdenv.mkDerivation {
|
|||
owner = "linux-rdma";
|
||||
repo = "rdma-core";
|
||||
rev = "v${version}";
|
||||
sha256 = "1czfh6s0qz2cv2k7ha7nr9qiwcrj5lvwqnvyrvsds463m8ndpg12";
|
||||
sha256 = "0qr8a25ylmkwfgyj519zvl74q16bhf4895xjich2r98rl2yg0qdl";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig pandoc docutils makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 22f46f55c81d84e83a4614856d84e63c8400165c Mon Sep 17 00:00:00 2001
|
||||
From 54fb14592fc41752c3cd26552c974dd1ad4b9e73 Mon Sep 17 00:00:00 2001
|
||||
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
|
||||
Date: Tue, 8 Jan 2013 15:46:30 +0100
|
||||
Subject: [PATCH 01/18] Start device units for uninitialised encrypted devices
|
||||
|
|
@ -13,7 +13,7 @@ unit. (However, this ignores the fsck unit, so it's not perfect...)
|
|||
1 file changed, 4 deletions(-)
|
||||
|
||||
diff --git a/rules.d/99-systemd.rules.in b/rules.d/99-systemd.rules.in
|
||||
index c34b606216..3ab8c1c3fe 100644
|
||||
index 1c60eec587..b2486da130 100644
|
||||
--- a/rules.d/99-systemd.rules.in
|
||||
+++ b/rules.d/99-systemd.rules.in
|
||||
@@ -17,10 +17,6 @@ SUBSYSTEM=="ubi", TAG+="systemd"
|
||||
|
|
@ -28,5 +28,5 @@ index c34b606216..3ab8c1c3fe 100644
|
|||
SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}!="crypto_LUKS", SYMLINK+="gpt-auto-root"
|
||||
SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}=="crypto_LUKS", SYMLINK+="gpt-auto-root-luks"
|
||||
--
|
||||
2.26.2
|
||||
2.27.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From e5b2b1e90d055068936336f6f01639bcde251b96 Mon Sep 17 00:00:00 2001
|
||||
From d52880eeae09aaacd308430499f55810157b1a6d Mon Sep 17 00:00:00 2001
|
||||
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
|
||||
Date: Fri, 12 Apr 2013 13:16:57 +0200
|
||||
Subject: [PATCH 02/18] Don't try to unmount /nix or /nix/store
|
||||
|
|
@ -12,7 +12,7 @@ https://github.com/NixOS/nixos/issues/126
|
|||
2 files changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c
|
||||
index b19127be09..f9adca1100 100644
|
||||
index 806dda8475..0220741c91 100644
|
||||
--- a/src/shared/fstab-util.c
|
||||
+++ b/src/shared/fstab-util.c
|
||||
@@ -40,6 +40,8 @@ bool fstab_is_extrinsic(const char *mount, const char *opts) {
|
||||
|
|
@ -38,5 +38,5 @@ index 8a5e80eeaa..fab35ed6f3 100644
|
|||
|| path_equal(path, "/usr")
|
||||
#endif
|
||||
--
|
||||
2.26.2
|
||||
2.27.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From ca7f6286c518d7ef3877458bbdf8e01f5518ab0e Mon Sep 17 00:00:00 2001
|
||||
From 794073e466a3b6c8e138f0e6d15c8d6465a1a4a9 Mon Sep 17 00:00:00 2001
|
||||
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
|
||||
Date: Wed, 16 Apr 2014 10:59:28 +0200
|
||||
Subject: [PATCH 03/18] Fix NixOS containers
|
||||
|
|
@ -10,10 +10,10 @@ container, so checking early whether it exists will fail.
|
|||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
|
||||
index 51d0c2a75b..4d3451ff3b 100644
|
||||
index 3b9493f232..0117a9939d 100644
|
||||
--- a/src/nspawn/nspawn.c
|
||||
+++ b/src/nspawn/nspawn.c
|
||||
@@ -5017,6 +5017,7 @@ static int run(int argc, char *argv[]) {
|
||||
@@ -5122,6 +5122,7 @@ static int run(int argc, char *argv[]) {
|
||||
goto finish;
|
||||
}
|
||||
} else {
|
||||
|
|
@ -21,7 +21,7 @@ index 51d0c2a75b..4d3451ff3b 100644
|
|||
const char *p, *q;
|
||||
|
||||
if (arg_pivot_root_new)
|
||||
@@ -5031,6 +5032,7 @@ static int run(int argc, char *argv[]) {
|
||||
@@ -5136,6 +5137,7 @@ static int run(int argc, char *argv[]) {
|
||||
r = -EINVAL;
|
||||
goto finish;
|
||||
}
|
||||
|
|
@ -30,5 +30,5 @@ index 51d0c2a75b..4d3451ff3b 100644
|
|||
|
||||
} else {
|
||||
--
|
||||
2.26.2
|
||||
2.27.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From c87cc5b1cf9c37f195e6b362352279e14289554e Mon Sep 17 00:00:00 2001
|
||||
From caa8dcfa87cf2e46a7a1cce9c16f929916cf9186 Mon Sep 17 00:00:00 2001
|
||||
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
|
||||
Date: Thu, 1 May 2014 14:10:10 +0200
|
||||
Subject: [PATCH 04/18] Look for fsck in the right place
|
||||
|
|
@ -21,5 +21,5 @@ index 80f7107b9d..74e48a385f 100644
|
|||
cmdline[i++] = "-T";
|
||||
|
||||
--
|
||||
2.26.2
|
||||
2.27.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 450c133c1815b473136b2a5540f9213fef5506ee Mon Sep 17 00:00:00 2001
|
||||
From e5d73359928b79bd846bda29ce61fe276d8c0b76 Mon Sep 17 00:00:00 2001
|
||||
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
|
||||
Date: Fri, 19 Dec 2014 14:46:17 +0100
|
||||
Subject: [PATCH 05/18] Add some NixOS-specific unit directories
|
||||
|
|
@ -10,51 +10,36 @@ persistent, mutable units (used for Dysnomia).
|
|||
|
||||
Also, remove /usr and /lib as these don't exist on NixOS.
|
||||
---
|
||||
src/core/systemd.pc.in | 4 ++--
|
||||
src/shared/path-lookup.c | 18 +++++-------------
|
||||
2 files changed, 7 insertions(+), 15 deletions(-)
|
||||
src/basic/path-lookup.c | 20 +++++---------------
|
||||
src/core/systemd.pc.in | 5 +++--
|
||||
2 files changed, 8 insertions(+), 17 deletions(-)
|
||||
|
||||
diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in
|
||||
index 8331832c7a..bedb97115d 100644
|
||||
--- a/src/core/systemd.pc.in
|
||||
+++ b/src/core/systemd.pc.in
|
||||
@@ -17,8 +17,8 @@ systemduserunitdir=${prefix}/lib/systemd/user
|
||||
systemduserpresetdir=${prefix}/lib/systemd/user-preset
|
||||
systemdsystemconfdir=${sysconfdir}/systemd/system
|
||||
systemduserconfdir=${sysconfdir}/systemd/user
|
||||
-systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/run/systemd/system:/usr/local/lib/systemd/system:${systemdsystemunitdir}:/usr/lib/systemd/system:/lib/systemd/system
|
||||
-systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/run/systemd/user:/usr/local/lib/systemd/user:/usr/local/share/systemd/user:${systemduserunitdir}:/usr/lib/systemd/user:/usr/share/systemd/user
|
||||
+systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/etc/systemd-mutable/system:/nix/var/nix/profiles/default/lib/systemd/system:/run/systemd/system:${systemdsystemunitdir}
|
||||
+systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/etc/systemd-mutable/user:/nix/var/nix/profiles/default/lib/systemd/user:/run/systemd/user:${systemduserunitdir}
|
||||
systemdsystemgeneratordir=${rootprefix}/lib/systemd/system-generators
|
||||
systemdusergeneratordir=${prefix}/lib/systemd/user-generators
|
||||
systemdsystemgeneratorpath=/run/systemd/system-generators:/etc/systemd/system-generators:/usr/local/lib/systemd/system-generators:${systemdsystemgeneratordir}
|
||||
diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c
|
||||
index 48e0eec09a..a9d38f16d0 100644
|
||||
--- a/src/shared/path-lookup.c
|
||||
+++ b/src/shared/path-lookup.c
|
||||
@@ -98,17 +98,14 @@ int xdg_user_data_dir(char **ret, const char *suffix) {
|
||||
diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c
|
||||
index 52968dee34..bba2eb09b8 100644
|
||||
--- a/src/basic/path-lookup.c
|
||||
+++ b/src/basic/path-lookup.c
|
||||
@@ -94,17 +94,14 @@ int xdg_user_data_dir(char **ret, const char *suffix) {
|
||||
}
|
||||
|
||||
static const char* const user_data_unit_paths[] = {
|
||||
- "/usr/local/lib/systemd/user",
|
||||
- "/usr/local/share/systemd/user",
|
||||
USER_DATA_UNIT_PATH,
|
||||
USER_DATA_UNIT_DIR,
|
||||
- "/usr/lib/systemd/user",
|
||||
- "/usr/share/systemd/user",
|
||||
NULL
|
||||
};
|
||||
|
||||
static const char* const user_config_unit_paths[] = {
|
||||
USER_CONFIG_UNIT_PATH,
|
||||
USER_CONFIG_UNIT_DIR,
|
||||
"/etc/systemd/user",
|
||||
+ "/etc/systemd-mutable/user",
|
||||
NULL
|
||||
};
|
||||
|
||||
@@ -604,15 +601,14 @@ int lookup_paths_init(
|
||||
@@ -616,15 +613,14 @@ int lookup_paths_init(
|
||||
persistent_config,
|
||||
SYSTEM_CONFIG_UNIT_PATH,
|
||||
SYSTEM_CONFIG_UNIT_DIR,
|
||||
"/etc/systemd/system",
|
||||
+ "/etc/systemd-mutable/system",
|
||||
+ "/nix/var/nix/profiles/default/lib/systemd/system",
|
||||
|
|
@ -70,9 +55,9 @@ index 48e0eec09a..a9d38f16d0 100644
|
|||
STRV_IFNOTNULL(generator_late));
|
||||
break;
|
||||
|
||||
@@ -628,14 +624,12 @@ int lookup_paths_init(
|
||||
@@ -640,14 +636,12 @@ int lookup_paths_init(
|
||||
persistent_config,
|
||||
USER_CONFIG_UNIT_PATH,
|
||||
USER_CONFIG_UNIT_DIR,
|
||||
"/etc/systemd/user",
|
||||
+ "/etc/systemd-mutable/user",
|
||||
+ "/nix/var/nix/profiles/default/lib/systemd/user",
|
||||
|
|
@ -82,26 +67,58 @@ index 48e0eec09a..a9d38f16d0 100644
|
|||
- "/usr/local/share/systemd/user",
|
||||
- "/usr/share/systemd/user",
|
||||
- "/usr/local/lib/systemd/user",
|
||||
USER_DATA_UNIT_PATH,
|
||||
USER_DATA_UNIT_DIR,
|
||||
- "/usr/lib/systemd/user",
|
||||
STRV_IFNOTNULL(generator_late));
|
||||
break;
|
||||
|
||||
@@ -824,14 +818,12 @@ char **generator_binary_paths(UnitFileScope scope) {
|
||||
case UNIT_FILE_SYSTEM:
|
||||
return strv_new("/run/systemd/system-generators",
|
||||
"/etc/systemd/system-generators",
|
||||
- "/usr/local/lib/systemd/system-generators",
|
||||
SYSTEM_GENERATOR_PATH);
|
||||
@@ -797,7 +791,6 @@ char **generator_binary_paths(UnitFileScope scope) {
|
||||
case UNIT_FILE_SYSTEM:
|
||||
add = strv_new("/run/systemd/system-generators",
|
||||
"/etc/systemd/system-generators",
|
||||
- "/usr/local/lib/systemd/system-generators",
|
||||
SYSTEM_GENERATOR_DIR);
|
||||
break;
|
||||
|
||||
case UNIT_FILE_GLOBAL:
|
||||
case UNIT_FILE_USER:
|
||||
return strv_new("/run/systemd/user-generators",
|
||||
"/etc/systemd/user-generators",
|
||||
- "/usr/local/lib/systemd/user-generators",
|
||||
USER_GENERATOR_PATH);
|
||||
@@ -805,7 +798,6 @@ char **generator_binary_paths(UnitFileScope scope) {
|
||||
case UNIT_FILE_USER:
|
||||
add = strv_new("/run/systemd/user-generators",
|
||||
"/etc/systemd/user-generators",
|
||||
- "/usr/local/lib/systemd/user-generators",
|
||||
USER_GENERATOR_DIR);
|
||||
break;
|
||||
|
||||
default:
|
||||
@@ -844,12 +836,10 @@ char **env_generator_binary_paths(bool is_system) {
|
||||
if (is_system)
|
||||
add = strv_new("/run/systemd/system-environment-generators",
|
||||
"/etc/systemd/system-environment-generators",
|
||||
- "/usr/local/lib/systemd/system-environment-generators",
|
||||
SYSTEM_ENV_GENERATOR_DIR);
|
||||
else
|
||||
add = strv_new("/run/systemd/user-environment-generators",
|
||||
"/etc/systemd/user-environment-generators",
|
||||
- "/usr/local/lib/systemd/user-environment-generators",
|
||||
USER_ENV_GENERATOR_DIR);
|
||||
|
||||
if (!add)
|
||||
diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in
|
||||
index 8424837824..b1c541bc52 100644
|
||||
--- a/src/core/systemd.pc.in
|
||||
+++ b/src/core/systemd.pc.in
|
||||
@@ -38,10 +38,11 @@ systemdsystemconfdir=${systemd_system_conf_dir}
|
||||
systemd_user_conf_dir=${sysconfdir}/systemd/user
|
||||
systemduserconfdir=${systemd_user_conf_dir}
|
||||
|
||||
-systemd_system_unit_path=${systemd_system_conf_dir}:/etc/systemd/system:/run/systemd/system:/usr/local/lib/systemd/system:${systemd_system_unit_dir}:/usr/lib/systemd/system:/lib/systemd/system
|
||||
+systemd_system_unit_path=${systemd_system_conf_dir}:/etc/systemd/system:/etc/systemd-mutable/system:/nix/var/nix/profiles/default/lib/systemd/system:/run/systemd/system:${systemdsystemunitdir}
|
||||
systemdsystemunitpath=${systemd_system_unit_path}
|
||||
|
||||
-systemd_user_unit_path=${systemd_user_conf_dir}:/etc/systemd/user:/run/systemd/user:/usr/local/lib/systemd/user:/usr/local/share/systemd/user:${systemd_user_unit_dir}:/usr/lib/systemd/user:/usr/share/systemd/user
|
||||
+systemd_user_unit_path=${systemd_user_conf_dir}:/etc/systemd/user:/etc/systemd-mutable/user:/nix/var/nix/profiles/default/lib/systemd/user:/run/systemd/user:${systemduserunitdir}
|
||||
+
|
||||
systemduserunitpath=${systemd_user_unit_path}
|
||||
|
||||
systemd_system_generator_dir=${root_prefix}/lib/systemd/system-generators
|
||||
--
|
||||
2.26.2
|
||||
2.27.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From f88a9bb1e6080b539ed0116caa9781e7f6755f54 Mon Sep 17 00:00:00 2001
|
||||
From 1a3de021d9b8da060a77af6e26d2b61bafefda74 Mon Sep 17 00:00:00 2001
|
||||
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
|
||||
Date: Mon, 11 May 2015 15:39:38 +0200
|
||||
Subject: [PATCH 06/18] Get rid of a useless message in user sessions
|
||||
|
|
@ -13,10 +13,10 @@ in containers.
|
|||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/core/unit.c b/src/core/unit.c
|
||||
index c306183555..3db39fa435 100644
|
||||
index 2c09def06f..c70540e1a3 100644
|
||||
--- a/src/core/unit.c
|
||||
+++ b/src/core/unit.c
|
||||
@@ -2043,7 +2043,8 @@ static void unit_check_binds_to(Unit *u) {
|
||||
@@ -2150,7 +2150,8 @@ static void unit_check_binds_to(Unit *u) {
|
||||
}
|
||||
|
||||
assert(other);
|
||||
|
|
@ -27,5 +27,5 @@ index c306183555..3db39fa435 100644
|
|||
/* A unit we need to run is gone. Sniff. Let's stop this. */
|
||||
r = manager_add_job(u->manager, JOB_STOP, u, JOB_FAIL, NULL, &error, NULL);
|
||||
--
|
||||
2.26.2
|
||||
2.27.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
From e2b25ce3606d05ff8a387185c41ab32fb2a36161 Mon Sep 17 00:00:00 2001
|
||||
From 6c12e0d2afe80563e692fc1f2f545a487c83418c Mon Sep 17 00:00:00 2001
|
||||
From: Gabriel Ebner <gebner@gebner.org>
|
||||
Date: Sun, 6 Dec 2015 14:26:36 +0100
|
||||
Subject: [PATCH 07/18] hostnamed, localed, timedated: disable methods that
|
||||
change system settings.
|
||||
|
||||
---
|
||||
src/hostname/hostnamed.c | 9 +++++++++
|
||||
src/hostname/hostnamed.c | 6 ++++++
|
||||
src/locale/localed.c | 9 +++++++++
|
||||
src/timedate/timedated.c | 10 ++++++++++
|
||||
3 files changed, 28 insertions(+)
|
||||
3 files changed, 25 insertions(+)
|
||||
|
||||
diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
|
||||
index 21f6471495..8c5af7619f 100644
|
||||
index 7f6607a527..b5a9388916 100644
|
||||
--- a/src/hostname/hostnamed.c
|
||||
+++ b/src/hostname/hostnamed.c
|
||||
@@ -478,6 +481,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_
|
||||
@@ -626,6 +626,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
|
|
@ -23,8 +23,8 @@ index 21f6471495..8c5af7619f 100644
|
|||
+
|
||||
name = empty_to_null(name);
|
||||
|
||||
if (streq_ptr(name, c->data[PROP_STATIC_HOSTNAME]))
|
||||
@@ -535,6 +541,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess
|
||||
context_read_etc_hostname(c);
|
||||
@@ -685,6 +688,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
|
|
@ -33,12 +33,12 @@ index 21f6471495..8c5af7619f 100644
|
|||
+
|
||||
name = empty_to_null(name);
|
||||
|
||||
if (streq_ptr(name, c->data[prop]))
|
||||
context_read_machine_info(c);
|
||||
diff --git a/src/locale/localed.c b/src/locale/localed.c
|
||||
index 09f16d25f4..c1cb87cef1 100644
|
||||
index 715ce5cac7..014f7dcf6c 100644
|
||||
--- a/src/locale/localed.c
|
||||
+++ b/src/locale/localed.c
|
||||
@@ -275,6 +275,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er
|
||||
@@ -317,6 +317,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
|
|
@ -46,9 +46,9 @@ index 09f16d25f4..c1cb87cef1 100644
|
|||
+ "Changing system settings via systemd is not supported on NixOS.");
|
||||
+
|
||||
/* If single locale without variable name is provided, then we assume it is LANG=. */
|
||||
if (strv_length(l) == 1 && !strchr(*l, '=')) {
|
||||
if (!locale_is_valid(*l))
|
||||
@@ -410,6 +413,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro
|
||||
if (strv_length(l) == 1 && !strchr(l[0], '=')) {
|
||||
if (!locale_is_valid(l[0]))
|
||||
@@ -432,6 +435,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
|
|
@ -58,7 +58,7 @@ index 09f16d25f4..c1cb87cef1 100644
|
|||
keymap = empty_to_null(keymap);
|
||||
keymap_toggle = empty_to_null(keymap_toggle);
|
||||
|
||||
@@ -586,6 +592,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err
|
||||
@@ -606,6 +612,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
|
|
@ -69,10 +69,10 @@ index 09f16d25f4..c1cb87cef1 100644
|
|||
model = empty_to_null(model);
|
||||
variant = empty_to_null(variant);
|
||||
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
|
||||
index 5e2fb50d83..63865f557c 100644
|
||||
index c467b85477..3e78b2f575 100644
|
||||
--- a/src/timedate/timedated.c
|
||||
+++ b/src/timedate/timedated.c
|
||||
@@ -652,6 +652,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error *
|
||||
@@ -646,6 +646,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error *
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
|
|
@ -83,7 +83,7 @@ index 5e2fb50d83..63865f557c 100644
|
|||
if (!timezone_is_valid(z, LOG_DEBUG))
|
||||
return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid or not installed time zone '%s'", z);
|
||||
|
||||
@@ -731,6 +735,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error
|
||||
@@ -725,6 +729,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
|
|
@ -93,7 +93,7 @@ index 5e2fb50d83..63865f557c 100644
|
|||
if (lrtc == c->local_rtc)
|
||||
return sd_bus_reply_method_return(m, NULL);
|
||||
|
||||
@@ -923,6 +930,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error
|
||||
@@ -917,6 +924,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
|
|
@ -104,5 +104,5 @@ index 5e2fb50d83..63865f557c 100644
|
|||
if (r < 0)
|
||||
return r;
|
||||
--
|
||||
2.26.2
|
||||
2.27.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 5a6aad633a7ceffd62b009ce0c4ab6673129f7ff Mon Sep 17 00:00:00 2001
|
||||
From 1e40be83eca9a831509ae764081c2252934478c3 Mon Sep 17 00:00:00 2001
|
||||
From: Nikolay Amiantov <ab@fmap.me>
|
||||
Date: Thu, 7 Jul 2016 02:47:13 +0300
|
||||
Subject: [PATCH 08/18] Fix hwdb paths
|
||||
|
|
@ -28,5 +28,5 @@ index b3febdbb31..eba00a5bc7 100644
|
|||
_public_ int sd_hwdb_new(sd_hwdb **ret) {
|
||||
_cleanup_(sd_hwdb_unrefp) sd_hwdb *hwdb = NULL;
|
||||
--
|
||||
2.26.2
|
||||
2.27.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From b509dbd302a7933ae0002f44b99aac6a1fd5775b Mon Sep 17 00:00:00 2001
|
||||
From 5e235e1f720f37fc5581b40c9a13d365368e74a8 Mon Sep 17 00:00:00 2001
|
||||
From: Nikolay Amiantov <ab@fmap.me>
|
||||
Date: Tue, 11 Oct 2016 13:12:08 +0300
|
||||
Subject: [PATCH 09/18] Change /usr/share/zoneinfo to /etc/zoneinfo
|
||||
|
|
@ -35,10 +35,10 @@ index 0f1652ee2e..71c4f95c2e 100644
|
|||
<literal>Etc/UTC</literal>. The resulting link should lead to the
|
||||
corresponding binary
|
||||
diff --git a/src/basic/time-util.c b/src/basic/time-util.c
|
||||
index 105584e2e7..5238f69931 100644
|
||||
index 15cc1b8851..d0abde5933 100644
|
||||
--- a/src/basic/time-util.c
|
||||
+++ b/src/basic/time-util.c
|
||||
@@ -1217,7 +1217,7 @@ int get_timezones(char ***ret) {
|
||||
@@ -1259,7 +1259,7 @@ int get_timezones(char ***ret) {
|
||||
n_allocated = 2;
|
||||
n_zones = 1;
|
||||
|
||||
|
|
@ -47,7 +47,7 @@ index 105584e2e7..5238f69931 100644
|
|||
if (f) {
|
||||
for (;;) {
|
||||
_cleanup_free_ char *line = NULL;
|
||||
@@ -1312,7 +1312,7 @@ bool timezone_is_valid(const char *name, int log_level) {
|
||||
@@ -1354,7 +1354,7 @@ bool timezone_is_valid(const char *name, int log_level) {
|
||||
if (p - name >= PATH_MAX)
|
||||
return false;
|
||||
|
||||
|
|
@ -56,7 +56,7 @@ index 105584e2e7..5238f69931 100644
|
|||
|
||||
fd = open(t, O_RDONLY|O_CLOEXEC);
|
||||
if (fd < 0) {
|
||||
@@ -1410,7 +1410,7 @@ int get_timezone(char **ret) {
|
||||
@@ -1452,7 +1452,7 @@ int get_timezone(char **ret) {
|
||||
if (r < 0)
|
||||
return r; /* returns EINVAL if not a symlink */
|
||||
|
||||
|
|
@ -66,10 +66,10 @@ index 105584e2e7..5238f69931 100644
|
|||
return -EINVAL;
|
||||
|
||||
diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
|
||||
index 901fbf0815..b57bdd8fbe 100644
|
||||
index a3f442518e..feff49e280 100644
|
||||
--- a/src/firstboot/firstboot.c
|
||||
+++ b/src/firstboot/firstboot.c
|
||||
@@ -431,7 +431,7 @@ static int process_timezone(void) {
|
||||
@@ -459,7 +459,7 @@ static int process_timezone(void) {
|
||||
if (isempty(arg_timezone))
|
||||
return 0;
|
||||
|
||||
|
|
@ -79,10 +79,10 @@ index 901fbf0815..b57bdd8fbe 100644
|
|||
(void) mkdir_parents(etc_localtime, 0755);
|
||||
if (symlink(e, etc_localtime) < 0)
|
||||
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
|
||||
index 4d3451ff3b..1adb91335c 100644
|
||||
index 0117a9939d..d86445b40f 100644
|
||||
--- a/src/nspawn/nspawn.c
|
||||
+++ b/src/nspawn/nspawn.c
|
||||
@@ -1657,8 +1657,8 @@ static int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t u
|
||||
@@ -1699,8 +1699,8 @@ static int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t u
|
||||
static const char *timezone_from_path(const char *path) {
|
||||
return PATH_STARTSWITH_SET(
|
||||
path,
|
||||
|
|
@ -94,10 +94,10 @@ index 4d3451ff3b..1adb91335c 100644
|
|||
|
||||
static bool etc_writable(void) {
|
||||
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
|
||||
index 63865f557c..8021a8b753 100644
|
||||
index 3e78b2f575..de5477a08f 100644
|
||||
--- a/src/timedate/timedated.c
|
||||
+++ b/src/timedate/timedated.c
|
||||
@@ -264,7 +264,7 @@ static int context_read_data(Context *c) {
|
||||
@@ -269,7 +269,7 @@ static int context_read_data(Context *c) {
|
||||
|
||||
r = get_timezone(&t);
|
||||
if (r == -EINVAL)
|
||||
|
|
@ -106,7 +106,7 @@ index 63865f557c..8021a8b753 100644
|
|||
else if (r < 0)
|
||||
log_warning_errno(r, "Failed to get target of /etc/localtime: %m");
|
||||
|
||||
@@ -288,7 +288,7 @@ static int context_write_data_timezone(Context *c) {
|
||||
@@ -293,7 +293,7 @@ static int context_write_data_timezone(Context *c) {
|
||||
|
||||
if (isempty(c->zone) || streq(c->zone, "UTC")) {
|
||||
|
||||
|
|
@ -115,7 +115,7 @@ index 63865f557c..8021a8b753 100644
|
|||
|
||||
if (unlink("/etc/localtime") < 0 && errno != ENOENT)
|
||||
return -errno;
|
||||
@@ -296,9 +296,9 @@ static int context_write_data_timezone(Context *c) {
|
||||
@@ -301,9 +301,9 @@ static int context_write_data_timezone(Context *c) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -128,5 +128,5 @@ index 63865f557c..8021a8b753 100644
|
|||
return -ENOMEM;
|
||||
|
||||
--
|
||||
2.26.2
|
||||
2.27.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From b5665ef8b9266c662c3a137df1ef1721cdff346e Mon Sep 17 00:00:00 2001
|
||||
From 141d1d7acf5f018df86f0a5f7fbe49a8e928fd73 Mon Sep 17 00:00:00 2001
|
||||
From: Imuli <i@imu.li>
|
||||
Date: Wed, 19 Oct 2016 08:46:47 -0400
|
||||
Subject: [PATCH 10/18] localectl: use /etc/X11/xkb for list-x11-*
|
||||
|
|
@ -10,10 +10,10 @@ NixOS has an option to link the xkb data files to /etc/X11, but not to
|
|||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/locale/localectl.c b/src/locale/localectl.c
|
||||
index 6f2d37d222..7aa2310d48 100644
|
||||
index e0664de826..c521f33a2a 100644
|
||||
--- a/src/locale/localectl.c
|
||||
+++ b/src/locale/localectl.c
|
||||
@@ -286,7 +286,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) {
|
||||
@@ -277,7 +277,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) {
|
||||
} state = NONE, look_for;
|
||||
int r;
|
||||
|
||||
|
|
@ -23,5 +23,5 @@ index 6f2d37d222..7aa2310d48 100644
|
|||
return log_error_errno(errno, "Failed to open keyboard mapping list. %m");
|
||||
|
||||
--
|
||||
2.26.2
|
||||
2.27.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From be6b5c37779302384079b22b7fd767daad878fa9 Mon Sep 17 00:00:00 2001
|
||||
From db3946f465c0066fb1775a92c1fcc6450134904d Mon Sep 17 00:00:00 2001
|
||||
From: Franz Pletz <fpletz@fnordicwalking.de>
|
||||
Date: Sun, 11 Feb 2018 04:37:44 +0100
|
||||
Subject: [PATCH 11/18] build: don't create statedir and don't touch prefixdir
|
||||
|
|
@ -8,10 +8,10 @@ Subject: [PATCH 11/18] build: don't create statedir and don't touch prefixdir
|
|||
1 file changed, 3 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index c09115e06a..62eba4186c 100644
|
||||
index dbbddb68e2..bbeb23223d 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -3184,9 +3184,6 @@ install_data('LICENSE.GPL2',
|
||||
@@ -3369,9 +3369,6 @@ install_data('LICENSE.GPL2',
|
||||
'src/libsystemd/sd-bus/GVARIANT-SERIALIZATION',
|
||||
install_dir : docdir)
|
||||
|
||||
|
|
@ -20,7 +20,7 @@ index c09115e06a..62eba4186c 100644
|
|||
-
|
||||
############################################################
|
||||
|
||||
meson_check_help = find_program('tools/meson-check-help.sh')
|
||||
check_help = find_program('tools/check-help.sh')
|
||||
--
|
||||
2.26.2
|
||||
2.27.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 9262f52b0e30cf8c39d9f7684a8c0e8fd4887cd5 Mon Sep 17 00:00:00 2001
|
||||
From 245af064c4d315d868cc12201b3663f61702cce3 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
|
||||
Date: Mon, 26 Feb 2018 14:25:57 +0000
|
||||
Subject: [PATCH 12/18] Install default configuration into $out/share/factory
|
||||
|
|
@ -31,10 +31,10 @@ store again, while having executables looking up files in /etc.
|
|||
17 files changed, 29 insertions(+), 26 deletions(-)
|
||||
|
||||
diff --git a/hwdb.d/meson.build b/hwdb.d/meson.build
|
||||
index 4df6dabf89..02d8d69095 100644
|
||||
index 5c77387a26..6404bc01ba 100644
|
||||
--- a/hwdb.d/meson.build
|
||||
+++ b/hwdb.d/meson.build
|
||||
@@ -27,7 +27,7 @@ if conf.get('ENABLE_HWDB') == 1
|
||||
@@ -43,7 +43,7 @@ if conf.get('ENABLE_HWDB') == 1
|
||||
install_dir : udevhwdbdir)
|
||||
|
||||
meson.add_install_script('sh', '-c',
|
||||
|
|
@ -44,10 +44,10 @@ index 4df6dabf89..02d8d69095 100644
|
|||
meson.add_install_script('sh', '-c',
|
||||
'test -n "$DESTDIR" || @0@/systemd-hwdb update'
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 62eba4186c..b0b2edbb5a 100644
|
||||
index bbeb23223d..1a9c56fad2 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -154,6 +154,9 @@ udevhwdbdir = join_paths(udevlibexecdir, 'hwdb.d')
|
||||
@@ -163,6 +163,9 @@ udevhwdbdir = join_paths(udevlibexecdir, 'hwdb.d')
|
||||
catalogdir = join_paths(prefixdir, 'lib/systemd/catalog')
|
||||
kernelinstalldir = join_paths(prefixdir, 'lib/kernel/install.d')
|
||||
factorydir = join_paths(datadir, 'factory')
|
||||
|
|
@ -57,7 +57,7 @@ index 62eba4186c..b0b2edbb5a 100644
|
|||
bootlibdir = join_paths(prefixdir, 'lib/systemd/boot/efi')
|
||||
testsdir = join_paths(prefixdir, 'lib/systemd/tests')
|
||||
systemdstatedir = join_paths(localstatedir, 'lib/systemd')
|
||||
@@ -2511,7 +2514,7 @@ if conf.get('ENABLE_BINFMT') == 1
|
||||
@@ -2651,7 +2654,7 @@ if conf.get('ENABLE_BINFMT') == 1
|
||||
meson.add_install_script('sh', '-c',
|
||||
mkdir_p.format(binfmtdir))
|
||||
meson.add_install_script('sh', '-c',
|
||||
|
|
@ -66,16 +66,16 @@ index 62eba4186c..b0b2edbb5a 100644
|
|||
endif
|
||||
|
||||
if conf.get('ENABLE_REPART') == 1
|
||||
@@ -2612,7 +2615,7 @@ executable('systemd-sleep',
|
||||
install_dir : rootlibexecdir)
|
||||
@@ -2767,7 +2770,7 @@ executable(
|
||||
install_dir : rootlibexecdir)
|
||||
|
||||
install_data('src/sleep/sleep.conf',
|
||||
- install_dir : pkgsysconfdir)
|
||||
+ install_dir : factorypkgconfdir)
|
||||
|
||||
exe = executable('systemd-sysctl',
|
||||
'src/sysctl/sysctl.c',
|
||||
@@ -2924,7 +2927,7 @@ if conf.get('HAVE_KMOD') == 1
|
||||
public_programs += executable(
|
||||
'systemd-sysctl',
|
||||
@@ -3101,7 +3104,7 @@ if conf.get('HAVE_KMOD') == 1
|
||||
meson.add_install_script('sh', '-c',
|
||||
mkdir_p.format(modulesloaddir))
|
||||
meson.add_install_script('sh', '-c',
|
||||
|
|
@ -83,8 +83,8 @@ index 62eba4186c..b0b2edbb5a 100644
|
|||
+ mkdir_p.format(join_paths(factoryconfdir, 'modules-load.d')))
|
||||
endif
|
||||
|
||||
exe = executable('systemd-nspawn',
|
||||
@@ -3167,7 +3170,7 @@ install_subdir('factory/etc',
|
||||
public_programs += executable(
|
||||
@@ -3352,7 +3355,7 @@ install_subdir('factory/etc',
|
||||
install_dir : factorydir)
|
||||
|
||||
install_data('xorg/50-systemd-user.sh',
|
||||
|
|
@ -94,10 +94,10 @@ index 62eba4186c..b0b2edbb5a 100644
|
|||
install_dir : modprobedir)
|
||||
install_data('LICENSE.GPL2',
|
||||
diff --git a/network/meson.build b/network/meson.build
|
||||
index 544dcf4387..1828c50863 100644
|
||||
index 99a650eac3..8105a4e48d 100644
|
||||
--- a/network/meson.build
|
||||
+++ b/network/meson.build
|
||||
@@ -10,7 +10,7 @@ if conf.get('ENABLE_NETWORKD') == 1
|
||||
@@ -11,7 +11,7 @@ if conf.get('ENABLE_NETWORKD') == 1
|
||||
install_dir : networkdir)
|
||||
|
||||
meson.add_install_script('sh', '-c',
|
||||
|
|
@ -107,10 +107,10 @@ index 544dcf4387..1828c50863 100644
|
|||
|
||||
install_data('99-default.link',
|
||||
diff --git a/src/core/meson.build b/src/core/meson.build
|
||||
index 3586838f59..02ddf1a123 100644
|
||||
index fa95108523..60ee0e31c1 100644
|
||||
--- a/src/core/meson.build
|
||||
+++ b/src/core/meson.build
|
||||
@@ -179,8 +179,8 @@ libcore = static_library(
|
||||
@@ -183,8 +183,8 @@ libcore = static_library(
|
||||
systemd_sources = files('main.c')
|
||||
|
||||
in_files = [['macros.systemd', rpmmacrosdir],
|
||||
|
|
@ -121,7 +121,7 @@ index 3586838f59..02ddf1a123 100644
|
|||
['systemd.pc', pkgconfigdatadir],
|
||||
['triggers.systemd', '']]
|
||||
|
||||
@@ -212,6 +212,6 @@ meson.add_install_script('sh', '-c', mkdir_p.format(systemsleepdir))
|
||||
@@ -216,6 +216,6 @@ meson.add_install_script('sh', '-c', mkdir_p.format(systemsleepdir))
|
||||
meson.add_install_script('sh', '-c', mkdir_p.format(systemgeneratordir))
|
||||
meson.add_install_script('sh', '-c', mkdir_p.format(usergeneratordir))
|
||||
|
||||
|
|
@ -180,15 +180,16 @@ index 5796f77cac..75d975c260 100644
|
|||
if get_option('create-log-dirs')
|
||||
meson.add_install_script(
|
||||
diff --git a/src/kernel-install/meson.build b/src/kernel-install/meson.build
|
||||
index 261c3aaae4..dbc5e23513 100644
|
||||
index 9ae342dfba..65df666337 100644
|
||||
--- a/src/kernel-install/meson.build
|
||||
+++ b/src/kernel-install/meson.build
|
||||
@@ -11,4 +11,4 @@ install_data('00-entry-directory.install',
|
||||
install_dir : kernelinstalldir)
|
||||
@@ -14,5 +14,5 @@ if want_kernel_install
|
||||
install_dir : kernelinstalldir)
|
||||
|
||||
meson.add_install_script('sh', '-c',
|
||||
- mkdir_p.format(join_paths(sysconfdir, 'kernel/install.d')))
|
||||
+ mkdir_p.format(join_paths(factoryconfdir, 'kernel/install.d')))
|
||||
meson.add_install_script('sh', '-c',
|
||||
- mkdir_p.format(join_paths(sysconfdir, 'kernel/install.d')))
|
||||
+ mkdir_p.format(join_paths(factoryconfdir, 'kernel/install.d')))
|
||||
endif
|
||||
diff --git a/src/login/meson.build b/src/login/meson.build
|
||||
index 0a7d3d5440..ff90149c1c 100644
|
||||
--- a/src/login/meson.build
|
||||
|
|
@ -203,10 +204,10 @@ index 0a7d3d5440..ff90149c1c 100644
|
|||
install_data('org.freedesktop.login1.conf',
|
||||
install_dir : dbuspolicydir)
|
||||
diff --git a/src/network/meson.build b/src/network/meson.build
|
||||
index c1c02cfda1..1bfa79a03b 100644
|
||||
index b3a88d9910..be56d1e9d7 100644
|
||||
--- a/src/network/meson.build
|
||||
+++ b/src/network/meson.build
|
||||
@@ -201,7 +201,7 @@ if conf.get('ENABLE_NETWORKD') == 1
|
||||
@@ -229,7 +229,7 @@ if conf.get('ENABLE_NETWORKD') == 1
|
||||
endif
|
||||
|
||||
install_data('networkd.conf',
|
||||
|
|
@ -227,10 +228,10 @@ index adbac24b54..e9dc88dfa2 100644
|
|||
+ install_dir : factorypkgconfdir)
|
||||
endif
|
||||
diff --git a/src/resolve/meson.build b/src/resolve/meson.build
|
||||
index c4d8d4e5d9..f550c289a5 100644
|
||||
index 92b67b6333..ac5b9a0b0a 100644
|
||||
--- a/src/resolve/meson.build
|
||||
+++ b/src/resolve/meson.build
|
||||
@@ -170,7 +170,7 @@ if conf.get('ENABLE_RESOLVE') == 1
|
||||
@@ -168,7 +168,7 @@ if conf.get('ENABLE_RESOLVE') == 1
|
||||
output : 'resolved.conf',
|
||||
configuration : substs)
|
||||
install_data(resolved_conf,
|
||||
|
|
@ -253,10 +254,10 @@ index e5c118c8db..19235df9ca 100644
|
|||
install_dir : dbuspolicydir)
|
||||
install_data('org.freedesktop.timesync1.service',
|
||||
diff --git a/src/udev/meson.build b/src/udev/meson.build
|
||||
index 173b10be50..82638cf5a9 100644
|
||||
index aa23b07090..ad004d803a 100644
|
||||
--- a/src/udev/meson.build
|
||||
+++ b/src/udev/meson.build
|
||||
@@ -187,7 +187,7 @@ foreach prog : [['ata_id/ata_id.c'],
|
||||
@@ -186,7 +186,7 @@ foreach prog : [['ata_id/ata_id.c'],
|
||||
endforeach
|
||||
|
||||
install_data('udev.conf',
|
||||
|
|
@ -265,7 +266,7 @@ index 173b10be50..82638cf5a9 100644
|
|||
|
||||
configure_file(
|
||||
input : 'udev.pc.in',
|
||||
@@ -196,7 +196,7 @@ configure_file(
|
||||
@@ -195,7 +195,7 @@ configure_file(
|
||||
install_dir : pkgconfigdatadir == 'no' ? '' : pkgconfigdatadir)
|
||||
|
||||
meson.add_install_script('sh', '-c',
|
||||
|
|
@ -285,10 +286,10 @@ index 3f072e3db7..bd9f843eba 100644
|
|||
- mkdir_p.format(join_paths(sysconfdir, 'sysctl.d')))
|
||||
+ mkdir_p.format(join_paths(factoryconfdir, 'sysctl.d')))
|
||||
diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build
|
||||
index e77f46d06b..04d2ef621d 100644
|
||||
index 0a9582d8b9..3c56ca7d83 100644
|
||||
--- a/tmpfiles.d/meson.build
|
||||
+++ b/tmpfiles.d/meson.build
|
||||
@@ -57,5 +57,5 @@ endforeach
|
||||
@@ -58,5 +58,5 @@ endforeach
|
||||
if enable_tmpfiles
|
||||
meson.add_install_script(
|
||||
'sh', '-c',
|
||||
|
|
@ -296,7 +297,7 @@ index e77f46d06b..04d2ef621d 100644
|
|||
+ mkdir_p.format(join_paths(factoryconfdir, 'tmpfiles.d')))
|
||||
endif
|
||||
diff --git a/units/meson.build b/units/meson.build
|
||||
index ea91f0cc9e..8622054ca5 100644
|
||||
index aa2ed115ea..12e2925226 100644
|
||||
--- a/units/meson.build
|
||||
+++ b/units/meson.build
|
||||
@@ -323,7 +323,7 @@ install_data('user-.slice.d/10-defaults.conf',
|
||||
|
|
@ -309,5 +310,5 @@ index ea91f0cc9e..8622054ca5 100644
|
|||
join_paths(dbussystemservicedir, 'org.freedesktop.systemd1.service'),
|
||||
join_paths(dbussessionservicedir, 'org.freedesktop.systemd1.service'))
|
||||
--
|
||||
2.26.2
|
||||
2.27.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 05c2761f6a981c8576fc47a3dd8beb5a2af3ef09 Mon Sep 17 00:00:00 2001
|
||||
From bfaa53731ffe984c93c5321099d1341b5059f029 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Rammhold <andreas@rammhold.de>
|
||||
Date: Fri, 2 Nov 2018 21:15:42 +0100
|
||||
Subject: [PATCH 13/18] inherit systemd environment when calling generators.
|
||||
|
|
@ -16,10 +16,10 @@ executables that are being called from managers.
|
|||
1 file changed, 8 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/core/manager.c b/src/core/manager.c
|
||||
index 4412e7a849..b799eeca95 100644
|
||||
index 41e0d73736..d02de06f09 100644
|
||||
--- a/src/core/manager.c
|
||||
+++ b/src/core/manager.c
|
||||
@@ -3901,9 +3901,14 @@ static int manager_run_generators(Manager *m) {
|
||||
@@ -4095,9 +4095,14 @@ static int manager_run_generators(Manager *m) {
|
||||
argv[4] = NULL;
|
||||
|
||||
RUN_WITH_UMASK(0022)
|
||||
|
|
@ -38,5 +38,5 @@ index 4412e7a849..b799eeca95 100644
|
|||
|
||||
finish:
|
||||
--
|
||||
2.26.2
|
||||
2.27.0
|
||||
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue