Merge staging-next into staging

This commit is contained in:
github-actions[bot]
2022-06-15 12:02:14 +00:00
committed by GitHub
73 changed files with 5598 additions and 1764 deletions
+1
View File
@@ -462,6 +462,7 @@ rec {
config = addFreeformType (addMeta (m.config or {}));
}
else
lib.throwIfNot (isAttrs m) "module ${file} (${key}) does not look like a module."
{ _file = toString m._file or file;
key = toString m.key or key;
disabledModules = m.disabledModules or [];
+7
View File
@@ -194,6 +194,13 @@ checkConfigOutput '^"submodule"$' options.submodule.type.description ./declare-s
## Paths should be allowed as values and work as expected
checkConfigOutput '^true$' config.submodule.enable ./declare-submoduleWith-path.nix
## deferredModule
# default module is merged into nodes.foo
checkConfigOutput '"beta"' config.nodes.foo.settingsDict.c ./deferred-module.nix
# errors from the default module are reported with accurate location
checkConfigError 'In `the-file-that-contains-the-bad-config.nix, via option default'\'': "bogus"' config.nodes.foo.bottom ./deferred-module.nix
checkConfigError '.*lib/tests/modules/deferred-module-error.nix, via option deferred [(]:anon-1:anon-1:anon-1[)] does not look like a module.' config.result ./deferred-module-error.nix
# Check the file location information is propagated into submodules
checkConfigOutput the-file.nix config.submodule.internalFiles.0 ./submoduleFiles.nix
@@ -0,0 +1,20 @@
{ config, lib, ... }:
let
inherit (lib) types mkOption setDefaultModuleLocation evalModules;
inherit (types) deferredModule lazyAttrsOf submodule str raw enum;
in
{
options = {
deferred = mkOption {
type = deferredModule;
};
result = mkOption {
default = (evalModules { modules = [ config.deferred ]; }).config.result;
};
};
config = {
deferred = { ... }:
# this should be an attrset, so this fails
true;
};
}
+58
View File
@@ -0,0 +1,58 @@
{ lib, ... }:
let
inherit (lib) types mkOption setDefaultModuleLocation;
inherit (types) deferredModule lazyAttrsOf submodule str raw enum;
in
{
imports = [
# generic module, declaring submodules:
# - nodes.<name>
# - default
# where all nodes include the default
({ config, ... }: {
_file = "generic.nix";
options.nodes = mkOption {
type = lazyAttrsOf (submodule { imports = [ config.default ]; });
default = {};
};
options.default = mkOption {
type = deferredModule;
default = { };
description = ''
Module that is included in all nodes.
'';
};
})
{
_file = "default-1.nix";
default = { config, ... }: {
options.settingsDict = lib.mkOption { type = lazyAttrsOf str; default = {}; };
options.bottom = lib.mkOption { type = enum []; };
};
}
{
_file = "default-a-is-b.nix";
default = ./define-settingsDict-a-is-b.nix;
}
{
_file = "nodes-foo.nix";
nodes.foo.settingsDict.b = "beta";
}
{
_file = "the-file-that-contains-the-bad-config.nix";
default.bottom = "bogus";
}
{
_file = "nodes-foo-c-is-a.nix";
nodes.foo = { config, ... }: {
settingsDict.c = config.settingsDict.a;
};
}
];
}
@@ -0,0 +1,3 @@
{ config, ... }: {
settingsDict.a = config.settingsDict.b;
}
+30
View File
@@ -539,6 +539,36 @@ rec {
modules = toList modules;
};
# A module to be imported in some other part of the configuration.
deferredModule = deferredModuleWith { };
# A module to be imported in some other part of the configuration.
# `staticModules`' options will be added to the documentation, unlike
# options declared via `config`.
deferredModuleWith = attrs@{ staticModules ? [] }: mkOptionType {
name = "deferredModule";
description = "module";
check = x: isAttrs x || isFunction x || path.check x;
merge = loc: defs: {
imports = staticModules ++ map (def: lib.setDefaultModuleLocation "${def.file}, via option ${showOption loc}" def.value) defs;
};
inherit (submoduleWith { modules = staticModules; })
getSubOptions
getSubModules;
substSubModules = m: deferredModuleWith (attrs // {
staticModules = m;
});
functor = defaultFunctor "deferredModuleWith" // {
type = types.deferredModuleWith;
payload = {
inherit staticModules;
};
binOp = lhs: rhs: {
staticModules = lhs.staticModules ++ rhs.staticModules;
};
};
};
# The type of a type!
optionType = mkOptionType {
name = "optionType";
@@ -220,6 +220,25 @@ Value types are types that take a value parameter.
requires using a function:
`the-submodule = { ... }: { options = { ... }; }`.
`types.deferredModule`
: Whereas `submodule` represents an option tree, `deferredModule` represents
a module value, such as a module file or a configuration.
It can be set multiple times.
Module authors can use its value in `imports`, in `submoduleWith`'s `modules`
or in `evalModules`' `modules` parameter, among other places.
Note that `imports` must be evaluated before the module fixpoint. Because
of this, deferred modules can only be imported into "other" fixpoints, such
as submodules.
One use case for this type is the type of a "default" module that allow the
user to affect all submodules in an `attrsOf submodule` at once. This is
more convenient and discoverable than expecting the module user to
type-merge with the `attrsOf submodule` option.
## Composed Types {#sec-option-types-composed}
Composed types are types that take a type as parameter. `listOf
@@ -427,6 +427,43 @@
</itemizedlist>
</listitem>
</varlistentry>
<varlistentry>
<term>
<literal>types.deferredModule</literal>
</term>
<listitem>
<para>
Whereas <literal>submodule</literal> represents an option
tree, <literal>deferredModule</literal> represents a module
value, such as a module file or a configuration.
</para>
<para>
It can be set multiple times.
</para>
<para>
Module authors can use its value in
<literal>imports</literal>, in
<literal>submoduleWith</literal><quote>s
<literal>modules</literal> or in
<literal>evalModules</literal></quote>
<literal>modules</literal> parameter, among other places.
</para>
<para>
Note that <literal>imports</literal> must be evaluated
before the module fixpoint. Because of this, deferred
modules can only be imported into <quote>other</quote>
fixpoints, such as submodules.
</para>
<para>
One use case for this type is the type of a
<quote>default</quote> module that allow the user to affect
all submodules in an <literal>attrsOf submodule</literal> at
once. This is more convenient and discoverable than
expecting the module user to type-merge with the
<literal>attrsOf submodule</literal> option.
</para>
</listitem>
</varlistentry>
</variablelist>
</section>
<section xml:id="sec-option-types-composed">
+2 -1
View File
@@ -1031,7 +1031,8 @@ in
'';
serviceConfig = {
WorkingDirectory = cfg.workDir;
StateDirectory = [ cfg.workDir cfg.configuration.uploadsPath ];
StateDirectory = [ (builtins.replaceStrings [ "/var/lib/" ] [ "" ] cfg.workDir) ];
ReadWritePaths = [ cfg.configuration.uploadsPath ];
ExecStart = "${cfg.package}/bin/hedgedoc";
EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ];
Environment = [
@@ -50,10 +50,6 @@ in
Note that this should be a last resort; patching the package is preferred (see GPaste).
'';
apply = list: list ++
[
pkgs.pantheon.pantheon-agent-geoclue2
];
};
extraWingpanelIndicators = mkOption {
@@ -96,6 +92,9 @@ in
config = mkMerge [
(mkIf cfg.enable {
services.xserver.desktopManager.pantheon.sessionPath = utils.removePackagesByName [
pkgs.pantheon.pantheon-agent-geoclue2
] config.environment.pantheon.excludePackages;
services.xserver.displayManager.sessionPackages = [ pkgs.pantheon.elementary-session-settings ];
@@ -177,19 +176,28 @@ in
networking.networkmanager.enable = mkDefault true;
# Global environment
environment.systemPackages = with pkgs; [
environment.systemPackages = (with pkgs.pantheon; [
elementary-session-settings
elementary-settings-daemon
gala
gnome-settings-daemon
(switchboard-with-plugs.override {
plugs = cfg.extraSwitchboardPlugs;
})
(wingpanel-with-indicators.override {
indicators = cfg.extraWingpanelIndicators;
})
]) ++ utils.removePackagesByName ((with pkgs; [
desktop-file-utils
glib
glib # for gsettings program
gnome-menus
gnome.adwaita-icon-theme
gtk3.out
hicolor-icon-theme
gtk3.out # for gtk-launch program
onboard
qgnomeplatform
shared-mime-info
sound-theme-freedesktop
xdg-user-dirs
] ++ (with pkgs.pantheon; [
xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
]) ++ (with pkgs.pantheon; [
# Artwork
elementary-gtk-theme
elementary-icon-theme
@@ -199,31 +207,21 @@ in
# Desktop
elementary-default-settings
elementary-dock
elementary-session-settings
elementary-shortcut-overlay
gala
(switchboard-with-plugs.override {
plugs = cfg.extraSwitchboardPlugs;
})
(wingpanel-with-indicators.override {
indicators = cfg.extraWingpanelIndicators;
})
# Services
elementary-capnet-assist
elementary-notifications
elementary-settings-daemon
gnome-settings-daemon
pantheon-agent-geoclue2
pantheon-agent-polkit
]);
programs.evince.enable = mkDefault true;
programs.file-roller.enable = mkDefault true;
])) config.environment.pantheon.excludePackages;
# Settings from elementary-default-settings
environment.etc."gtk-3.0/settings.ini".source = "${pkgs.pantheon.elementary-default-settings}/etc/gtk-3.0/settings.ini";
xdg.mime.enable = true;
xdg.icons.enable = true;
xdg.portal.enable = true;
xdg.portal.extraPortals = with pkgs.pantheon; [
elementary-files
@@ -271,6 +269,9 @@ in
})
(mkIf serviceCfg.apps.enable {
programs.evince.enable = mkDefault true;
programs.file-roller.enable = mkDefault true;
environment.systemPackages = utils.removePackagesByName ([
pkgs.gnome.gnome-font-viewer
] ++ (with pkgs.pantheon; [
@@ -234,11 +234,11 @@ in
(mkIf (cfg.enable || cfg.mobile.enable) {
security.wrappers = {
kcheckpass = {
kscreenlocker_greet = {
setuid = true;
owner = "root";
group = "root";
source = "${getBin libsForQt5.kscreenlocker}/libexec/kcheckpass";
source = "${getBin libsForQt5.kscreenlocker}/libexec/kscreenlocker_greet";
};
start_kdeinit = {
setuid = true;
@@ -9,16 +9,16 @@ let
in buildGoModule rec {
pname = "go-ethereum";
version = "1.10.17";
version = "1.10.18";
src = fetchFromGitHub {
owner = "ethereum";
repo = pname;
rev = "v${version}";
sha256 = "sha256-GBlrg4wOiqEQTZC3CtfAZbIvS16/pSjEedEDrPGNUtY=";
sha256 = "1jfyhzklznjrdki6m8wjgqzp63b6n6vy7ws3l0al58zkaybnpikw";
};
vendorSha256 = "sha256-D4odWuGFipSvbKbNlA6PkTo3rWGTCptJcn/7V7ZA7qs=";
vendorSha256 = "10xpxz8ybgwqizqy9d3phza8mlxxpsbk4qsf271r7ls4qr5q1wxz";
doCheck = false;
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "lightning-loop";
version = "0.18.0-beta";
version = "0.19.1-beta";
src = fetchFromGitHub {
owner = "lightninglabs";
repo = "loop";
rev = "v${version}";
sha256 = "1kg5nlvb4lb3cjn84wcylhq0l73d2n6rg4n1srnxmgs96v41y78f";
sha256 = "08jn1ybh9l9qy4j9b3psvgk7b869aaabpxh73v81980qflb9snnc";
};
vendorSha256 = "0q3wbjfaqdj29sjlhx6fhc0p4d12aa31s6ia36jalcvf659ybb0l";
vendorSha256 = "0wirlf43jl888bh2qxis1ihsr1g2lp2rx7p100dsb3imqbm25q3b";
subPackages = [ "cmd/loop" "cmd/loopd" ];
@@ -12696,6 +12696,18 @@ final: prev:
meta.homepage = "https://github.com/catppuccin/nvim/";
};
catppuccin-vim = buildVimPluginFrom2Nix {
pname = "catppuccin-vim";
version = "2022-06-06";
src = fetchFromGitHub {
owner = "catppuccin";
repo = "vim";
rev = "eaac7edb19ff11ce049513ac184fff7493817c1f";
sha256 = "181jfbw3msf1pccykabnniqry28ikassj39rc36hyz1vii1dq1d0";
};
meta.homepage = "https://github.com/catppuccin/vim/";
};
chad = buildVimPluginFrom2Nix {
pname = "chad";
version = "2022-06-09";
@@ -657,6 +657,7 @@ https://github.com/vhda/verilog_systemverilog.vim/,,
https://github.com/vifm/vifm.vim/,,
https://github.com/dracula/vim/,,dracula-vim
https://github.com/embark-theme/vim/,,embark-vim
https://github.com/catppuccin/vim/,HEAD,catppuccin-vim
https://github.com/Konfekt/vim-CtrlXA/,,
https://github.com/konfekt/vim-DetectSpellLang/,,
https://github.com/dpelle/vim-LanguageTool/,,
@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "drawio";
version = "19.0.2";
version = "19.0.3";
src = fetchurl {
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm";
sha256 = "46b4e7269628100ea3c083dee75308d9746780e46eac15d2c5495fdeece7e323";
sha256 = "be456d396a19dcb8881ad4bff315197306ae05cca5e47332a1e5ad572948614e";
};
nativeBuildInputs = [
@@ -229,6 +229,10 @@ in
Filters/Enhance/Wavelet sharpen
*/
name = "wavelet-sharpen-0.1.2";
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: interface.o:(.bss+0xe0): multiple definition of `fimg'; plugin.o:(.bss+0x40): first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
NIX_LDFLAGS = "-lm";
src = fetchurl {
url = "https://github.com/pixlsus/registry.gimp.org_static/raw/master/registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz";
@@ -250,6 +254,15 @@ in
rev = "v${version}";
sha256 = "81ajdZ2zQi/THxnBlSeT36tVTEzrS1YqLGpHMhFTKAo=";
};
patches = [
# Pull upstream fix for -fno-common toolchain support:
# https://github.com/carlobaldassi/gimp-lqr-plugin/pull/6
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/carlobaldassi/gimp-lqr-plugin/commit/ae3464a82e1395fc577cc94999bdc7c4a7bb35f1.patch";
sha256 = "EdjZWM6U1bhUmsOnLA8iJ4SFKuAXHIfNPzxZqel+JrY=";
})
];
};
gmic = pkgs.gmic-qt.override {
+1 -1
View File
@@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/release-service/22.04.1/src -A '*.tar.xz' )
WGET_ARGS=( https://download.kde.org/stable/release-service/22.04.2/src -A '*.tar.xz' )
File diff suppressed because it is too large Load Diff
+6
View File
@@ -18,6 +18,12 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
# Workaround build failure on -fno-common toolchains:
# ld: gmtp-preferences.o:src/main.h:72: multiple definition of
# `scrolledwindowMain'; gmtp-about.o:src/main.h:72: first defined here
# TODO: can be removed when 1.4.0 is released.
#NIX_CFLAGS_COMPILE = "-fcommon";
preFixup = ''
gappsWrapperArgs+=(--add-flags "--datapath $out/share");
'';
@@ -25,11 +25,11 @@ let
in
stdenv.mkDerivation rec {
pname = "PortfolioPerformance";
version = "0.58.3";
version = "0.58.4";
src = fetchurl {
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
sha256 = "sha256-hm7iIYv4egd79G+LfetFSFLQRnfechJIY3k5Dys63vY=";
sha256 = "sha256-Png9OcO5dzoeKp826FwdM7zkovuOnSYMnGw5weT2eJU=";
};
nativeBuildInputs = [
+10 -1
View File
@@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, python3, installShellFiles }:
{ lib, fetchFromGitHub, python3, installShellFiles, fetchpatch }:
with python3.pkgs;
@@ -13,6 +13,15 @@ buildPythonApplication rec {
sha256 = "sha256-/AASYeMkt18KPJljAjNPRYOpg/T5xuM10LJq4LrFD0g=";
};
patches = [
# https://github.com/TailorDev/Watson/pull/473
(fetchpatch {
name = "fix-completion.patch";
url = "https://github.com/TailorDev/Watson/commit/43ad061a981eb401c161266f497e34df891a5038.patch";
sha256 = "sha256-v8/asP1wooHKjyy9XXB4Rtf6x+qmGDHpRoHEne/ZCxc=";
})
];
postInstall = ''
installShellCompletion --bash --name watson watson.completion
installShellCompletion --zsh --name _watson watson.zsh-completion
@@ -22,6 +22,11 @@ stdenv.mkDerivation rec {
sha256 = "0l6hpfgy5r4yardilmdrggsnn1fbfww516sk5a90g1740cd435x5";
};
# Workaround build failure on -fno-common toolchains:
# ld: subtitles.o:src/coriander.h:110: multiple definition of
# `main_window'; main.o:src/coriander.h:110: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
preConfigure = ''
cp ${automake}/share/automake-*/mkinstalldirs .
'';
@@ -23,6 +23,11 @@ stdenv.mkDerivation rec {
})
];
# Workaround build failure on -fno-common toolchains:
# ld: mpris-interface.o:src/playlist.h:32: multiple definition of
# `plclose'; gui.o:src/playlist.h:32: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
meta = with lib; {
description = "Gnome MPlayer, a simple GUI for MPlayer";
homepage = "https://sites.google.com/site/kdekorte2/gnomemplayer";
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "conmon";
version = "2.1.1";
version = "2.1.2";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = "v${version}";
sha256 = "sha256-HzLRwJwzvXhQOcmBp55I54sAnCKPeQw99H/XMOegOHo=";
sha256 = "sha256-WxRMY43Z9OytY1kc91VVmqLn5cl0UC/0Zj8x3vpsaBQ=";
};
nativeBuildInputs = [ pkg-config ];
+1 -1
View File
@@ -35,7 +35,7 @@ let
read ref_path
if [ "$ref_path" != "$path" ]
then
echo " (builtins.storePath $ref_path)"
echo " (builtins.storePath (/. + \"$ref_path\"))"
fi
count=$(($count - 1))
done
@@ -16,6 +16,7 @@ build_lib() {
--out-dir target/lib \
-L dependency=target/deps \
--cap-lints allow \
$LINK \
$LIB_RUSTC_OPTS \
$BUILD_OUT_DIR \
$EXTRA_BUILD \
@@ -97,7 +98,6 @@ setup_link_paths() {
if [[ ! -z "$i" ]]; then
for library in $i; do
echo "-l $library" >> target/link
echo "-l $library" >> target/link.final
done
fi
done
@@ -548,6 +548,10 @@ let
};
};
brotliCrates = (callPackage ./brotli-crates.nix {});
rcgenCrates = callPackage ./rcgen-crates.nix {
# Suppress deprecation warning
buildRustCrate = null;
};
tests = lib.mapAttrs (key: value: mkTest (value // lib.optionalAttrs (!value?crateName) { crateName = key; })) cases;
in tests // rec {
@@ -645,6 +649,16 @@ let
} ''
test -e ${pkg}/bin/brotli-decompressor && touch $out
'';
rcgenTest = let
pkg = rcgenCrates.rootCrate.build;
in runCommand "run-rcgen-test-cmd" {
nativeBuildInputs = [ pkg ];
} (if stdenv.hostPlatform == stdenv.buildPlatform then ''
${pkg}/bin/rcgen && touch $out
'' else ''
test -x '${pkg}/bin/rcgen' && touch $out
'');
};
test = releaseTools.aggregate {
name = "buildRustCrate-tests";
File diff suppressed because it is too large Load Diff
-1
View File
@@ -124,7 +124,6 @@ let
ksystemstats = callPackage ./ksystemstats.nix {};
kwallet-pam = callPackage ./kwallet-pam.nix {};
kwayland-integration = callPackage ./kwayland-integration.nix {};
kwayland-server = callPackage ./kwayland-server {};
kwin = callPackage ./kwin {};
kwrited = callPackage ./kwrited.nix {};
layer-shell-qt = callPackage ./layer-shell-qt.nix {};
+1 -1
View File
@@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/plasma/5.24.5/ -A '*.tar.xz' )
WGET_ARGS=( https://download.kde.org/stable/plasma/5.25.0/ -A '*.tar.xz' )
@@ -1,25 +0,0 @@
From 80bca7370d4b8bafcf18abcda30f02e190f419a4 Mon Sep 17 00:00:00 2001
From: Tom Hall <tahall256@protonmail.ch>
Date: Sat, 29 Aug 2020 19:14:30 +0100
Subject: [PATCH] Use KDE_INSTALL_TARGETS_DEFAULT_ARGS when installing targets
---
src/server/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index 0f99682..35e3601 100644
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -356,7 +356,7 @@ set_target_properties(KWaylandServer PROPERTIES VERSION ${KWAYLANDSERVER_VERSI
SOVERSION ${KWAYLANDSERVER_SOVERSION}
)
-install(TARGETS KWaylandServer EXPORT KWaylandServerTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS KWaylandServer EXPORT KWaylandServerTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
set(SERVER_LIB_HEADERS
${CMAKE_CURRENT_BINARY_DIR}/KWaylandServer/kwaylandserver_export.h
--
2.26.2
@@ -1,18 +0,0 @@
{
mkDerivation, lib, cmake,
extra-cmake-modules, kdoctools,
kwayland, plasma-wayland-protocols,
wayland, wayland-protocols, qtbase
}:
mkDerivation {
pname = "kwayland-server";
nativeBuildInputs = [
cmake
extra-cmake-modules #kdoctools
];
buildInputs = [
kwayland plasma-wayland-protocols wayland wayland-protocols
];
patches = [ ./0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch ];
}
@@ -13,7 +13,7 @@ Co-authored-by: Yaroslav Bolyukin <iam@lach.pw>
---
src/nixos_utils.h | 41 +++++++++++++++++++++++++++++++++++++++++
src/service_utils.h | 4 +++-
src/waylandclient.cpp | 5 ++++-
src/waylandwindow.cpp | 5 ++++-
3 files changed, 48 insertions(+), 2 deletions(-)
create mode 100644 src/nixos_utils.h
@@ -87,10 +87,10 @@ index 8a70c1f..475b15d 100644
// needed to be able to use the logging category in a header static function
static QLoggingCategory KWIN_UTILS ("KWIN_UTILS", QtWarningMsg);
const auto servicesFound = KApplicationTrader::query([&executablePath] (const KService::Ptr &service) {
diff --git a/src/waylandclient.cpp b/src/waylandclient.cpp
diff --git a/src/waylandwindow.cpp b/src/waylandwindow.cpp
index fd2c0c1..ae8cf96 100644
--- a/src/waylandclient.cpp
+++ b/src/waylandclient.cpp
--- a/src/waylandwindow.cpp
+++ b/src/waylandwindow.cpp
@@ -10,6 +10,7 @@
#include "screens.h"
#include "wayland_server.h"
@@ -99,9 +99,9 @@ index fd2c0c1..ae8cf96 100644
#include <KWaylandServer/display.h>
#include <KWaylandServer/clientbuffer.h>
@@ -173,7 +174,9 @@ void WaylandClient::updateIcon()
@@ -173,7 +174,9 @@ void WaylandWindow::updateIcon()
void WaylandClient::updateResourceName()
void WaylandWindow::updateResourceName()
{
- const QFileInfo fileInfo(surface()->client()->executablePath());
+ const QString in_path = surface()->client()->executablePath();
@@ -4,22 +4,22 @@ Date: Mon, 27 Jan 2020 05:31:23 -0600
Subject: [PATCH 2/3] xwayland
---
src/xwl/xwayland.cpp | 2 +-
src/xwayland/xwaylandlauncher.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/xwl/xwayland.cpp b/src/xwl/xwayland.cpp
diff --git a/src/xwayland/xwaylandlauncher.cpp b/src/xwayland/xwaylandlauncher.cpp
index 57efdde..a211a58 100644
--- a/src/xwl/xwayland.cpp
+++ b/src/xwl/xwayland.cpp
@@ -124,7 +124,7 @@ void Xwayland::start()
--- a/src/xwayland/xwaylandlauncher.cpp
+++ b/src/xwayland/xwaylandlauncher.cpp
@@ -163,7 +163,7 @@ void Xwayland::start()
m_xwaylandProcess = new Process(this);
m_xwaylandProcess = new QProcess(this);
m_xwaylandProcess->setProcessChannelMode(QProcess::ForwardedErrorChannel);
- m_xwaylandProcess->setProgram(QStringLiteral("Xwayland"));
+ m_xwaylandProcess->setProgram(QLatin1String(NIXPKGS_XWAYLAND));
QProcessEnvironment env = m_app->processStartupEnvironment();
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
env.insert("WAYLAND_SOCKET", QByteArray::number(wlfd));
env.insert("EGL_PLATFORM", QByteArrayLiteral("DRM"));
if (qEnvironmentVariableIsSet("KWIN_XWAYLAND_DEBUG")) {
--
2.29.2
+10 -2
View File
@@ -4,6 +4,7 @@
libepoxy, lcms2, libICE, libSM, libcap, libdrm, libinput, libxkbcommon, mesa,
pipewire, udev, wayland, xcb-util-cursor, xwayland,
plasma-wayland-protocols, wayland-protocols, libxcvt,
qtdeclarative, qtmultimedia, qtquickcontrols2, qtscript, qtsensors,
qtvirtualkeyboard, qtx11extras,
@@ -11,8 +12,9 @@
breeze-qt5, kactivities, kcompletion, kcmutils, kconfig, kconfigwidgets,
kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n,
kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage,
krunner, kscreenlocker, kservice, kwayland, kwayland-server, kwidgetsaddons,
krunner, kscreenlocker, kservice, kwayland, kwidgetsaddons,
kwindowsystem, kxmlgui, plasma-framework, libqaccessibilityclient,
python3
}:
# TODO (ttuegel): investigate qmlplugindump failure
@@ -23,6 +25,7 @@ mkDerivation {
buildInputs = [
libepoxy lcms2 libICE libSM libcap libdrm libinput libxkbcommon mesa pipewire
udev wayland xcb-util-cursor xwayland
libxcvt plasma-wayland-protocols wayland-protocols
qtdeclarative qtmultimedia qtquickcontrols2 qtscript qtsensors
qtvirtualkeyboard qtx11extras
@@ -30,11 +33,16 @@ mkDerivation {
breeze-qt5 kactivities kcmutils kcompletion kconfig kconfigwidgets
kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes
kidletime kinit kio knewstuff knotifications kpackage krunner kscreenlocker
kservice kwayland kwayland-server kwidgetsaddons kwindowsystem kxmlgui
kservice kwayland kwidgetsaddons kwindowsystem kxmlgui
plasma-framework libqaccessibilityclient
];
outputs = [ "out" "dev" ];
postPatch = ''
patchShebangs src/effects/strip-effect-metadata.py
'';
patches = [
./0001-follow-symlinks.patch
./0002-xwayland.patch
@@ -2,7 +2,8 @@
mkDerivation,
extra-cmake-modules,
breeze-qt5, kconfig, kconfigwidgets, kiconthemes, kio, knotifications,
kwayland, libXcursor, qtquickcontrols2
kwayland, libXcursor, qtquickcontrols2, wayland, wayland-protocols,
plasma-wayland-protocols
}:
# TODO: install Noto Sans and Oxygen Mono fonts with plasma-integration
@@ -12,6 +13,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
breeze-qt5 kconfig kconfigwidgets kiconthemes kio knotifications kwayland
libXcursor qtquickcontrols2
libXcursor qtquickcontrols2 wayland wayland-protocols
plasma-wayland-protocols
];
}
@@ -57,7 +57,7 @@ mkDerivation {
# QT_INSTALL_BINS refers to qtbase, and qdbus is in qttools
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace 'query_qmake(QtBinariesDir QT_INSTALL_BINS)' 'set(QtBinariesDir "${lib.getBin qttools}/bin")'
--replace 'ecm_query_qt(QtBinariesDir QT_INSTALL_BINS)' 'set(QtBinariesDir "${lib.getBin qttools}/bin")'
'';
NIX_CFLAGS_COMPILE = [
+220 -220
View File
@@ -4,427 +4,427 @@
{
bluedevil = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/bluedevil-5.24.5.tar.xz";
sha256 = "1yhynfpgm2cwvimh63hihg5dm0hzjp20364bvjyyh108830rjsf9";
name = "bluedevil-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/bluedevil-5.25.0.tar.xz";
sha256 = "18iaxyfjgs7zk972aajxww372sj6azqx5flnxbs7m9zmrg687d2v";
name = "bluedevil-5.25.0.tar.xz";
};
};
breeze = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/breeze-5.24.5.tar.xz";
sha256 = "18zhm9my0vhwiq95v3p48z8s5m4a5c7kw8n144ykqlm51nssc9c5";
name = "breeze-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/breeze-5.25.0.tar.xz";
sha256 = "0kph45sasp0zvccp4sblglg9b851a8jxi8zsjbj2vpfrwrmyyv4l";
name = "breeze-5.25.0.tar.xz";
};
};
breeze-grub = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/breeze-grub-5.24.5.tar.xz";
sha256 = "02lcv23l3zr0g6nggmrxz4pgq852fir9yramhaxmcg634pxiacni";
name = "breeze-grub-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/breeze-grub-5.25.0.tar.xz";
sha256 = "1i5a32spn0kdrdnbd3za3fjchk006l46ybn41h2fbrzq908yh44w";
name = "breeze-grub-5.25.0.tar.xz";
};
};
breeze-gtk = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/breeze-gtk-5.24.5.tar.xz";
sha256 = "0c25z69lyjczm05jraqk2f09sipkhpsz5zirwzqdq3apip06qw93";
name = "breeze-gtk-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/breeze-gtk-5.25.0.tar.xz";
sha256 = "0hnyslgngqsywaqbfx845wfdpdvqymizvjyryi10sbki80fmdbmc";
name = "breeze-gtk-5.25.0.tar.xz";
};
};
breeze-plymouth = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/breeze-plymouth-5.24.5.tar.xz";
sha256 = "044sbffr4sqvgkfbraa4rvlsih7zz9b300hipp33mwhpzyjjcpdc";
name = "breeze-plymouth-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/breeze-plymouth-5.25.0.tar.xz";
sha256 = "1b3qlw99d2rqpay47188bc0yqzp95s8g6skx7znxq8cxgg7ck24j";
name = "breeze-plymouth-5.25.0.tar.xz";
};
};
discover = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/discover-5.24.5.tar.xz";
sha256 = "18a8z9ifyyjmmc620dsh491vb1q3q9bxd8gfjf5k87mgwmg1wmwk";
name = "discover-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/discover-5.25.0.tar.xz";
sha256 = "0ws0hvxnbf3mwy5lsyv56b73vjdswhy8lh01sx33xmgpbnyykqni";
name = "discover-5.25.0.tar.xz";
};
};
drkonqi = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/drkonqi-5.24.5.tar.xz";
sha256 = "1ps1p8pvp51rswynbv337qr3qj2z7r7kd9qpxgcrha9pql01h5gy";
name = "drkonqi-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/drkonqi-5.25.0.tar.xz";
sha256 = "123snx7hfk9m7ds1vk047g3q5lkfmn00w5668xvpqr7yqw9w78fh";
name = "drkonqi-5.25.0.tar.xz";
};
};
kactivitymanagerd = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/kactivitymanagerd-5.24.5.tar.xz";
sha256 = "0j6d50cjry4j3vzxb6hd4w95y2h3l0yfhyrhl693njr64aq7d4pa";
name = "kactivitymanagerd-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/kactivitymanagerd-5.25.0.tar.xz";
sha256 = "1iwrjf090s47mwl6rlk3fjk96bkrz56mvbk6d474b1f2n2ymqibm";
name = "kactivitymanagerd-5.25.0.tar.xz";
};
};
kde-cli-tools = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/kde-cli-tools-5.24.5.tar.xz";
sha256 = "0afksrxd6mq9rcvh3g8y05kl0la4wmn1yksif8p1bcxpd4sdvw77";
name = "kde-cli-tools-5.24.5.tar.xz";
};
};
kde-gtk-config = {
version = "5.24.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/kde-gtk-config-5.24.5.tar.xz";
sha256 = "0sg8kqlkklvjhj69z5wzhvi0hddxa192j4vc4wc9hmfl1wirr8cq";
name = "kde-gtk-config-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/kde-cli-tools-5.25.0.tar.xz";
sha256 = "0j3cib7yzmixsq2v2kymdz9sip8qxgq1x3ns86xlcwcl4fh77mqy";
name = "kde-cli-tools-5.25.0.tar.xz";
};
};
kdecoration = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/kdecoration-5.24.5.tar.xz";
sha256 = "1hjjl6k09zi8n9nblbcm69c3br6d4dhzaw55xyygglaz6kb8fc17";
name = "kdecoration-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/kdecoration-5.25.0.tar.xz";
sha256 = "1g7l8vbcbrh20nq4s4ac1a0bmf0kb4r0b4mzqcndn6yjwab4z7c8";
name = "kdecoration-5.25.0.tar.xz";
};
};
kde-gtk-config = {
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.0/kde-gtk-config-5.25.0.tar.xz";
sha256 = "1dg45brjwh7v83d9pm21vhn27mx0lsnbp7ry9f1mkzy509v461fb";
name = "kde-gtk-config-5.25.0.tar.xz";
};
};
kdeplasma-addons = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/kdeplasma-addons-5.24.5.tar.xz";
sha256 = "03p8wmsb5nl7j6kwl6j8nwlf6v7snh933jyglgp2vnclqp1jpd9x";
name = "kdeplasma-addons-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/kdeplasma-addons-5.25.0.tar.xz";
sha256 = "0i5pxg95v7dr3in7mswnx53zkg5c05q3ijb1yqdlj4a3k6ln26nr";
name = "kdeplasma-addons-5.25.0.tar.xz";
};
};
kgamma5 = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/kgamma5-5.24.5.tar.xz";
sha256 = "1i7i3dc5qfb3v9hz9w9hszr8jbbdbfq0b59a4bh1p6xakxx8k1l0";
name = "kgamma5-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/kgamma5-5.25.0.tar.xz";
sha256 = "0rzlf8dr6zj7bcbgdga0d6h9k7aw7d2ra7awzvyq7w2rx8i40ra0";
name = "kgamma5-5.25.0.tar.xz";
};
};
khotkeys = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/khotkeys-5.24.5.tar.xz";
sha256 = "06m7yrs75arwdfrkpkn9b5kiz2xlrsxlpsjr18j1pjhxras0f8vs";
name = "khotkeys-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/khotkeys-5.25.0.tar.xz";
sha256 = "0m2fr3mfqqaprcqd0b31ilz4r0d2mlvc4jwn6ax1fww4inzfa261";
name = "khotkeys-5.25.0.tar.xz";
};
};
kinfocenter = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/kinfocenter-5.24.5.tar.xz";
sha256 = "0c2bq7m8c9r17s8qalp4cdz1qimzwnvh9wrba4rqcmxwbv043ln1";
name = "kinfocenter-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/kinfocenter-5.25.0.tar.xz";
sha256 = "1wzl0qbpj4zkhv56l86fqf7agp29jf7ljxn0na6x1sd7wqqj2hp6";
name = "kinfocenter-5.25.0.tar.xz";
};
};
kmenuedit = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/kmenuedit-5.24.5.tar.xz";
sha256 = "02il6bhayjni0jsx1d1cnmxv5yc7r0d02s2v6cs87fbdrnl7d9vq";
name = "kmenuedit-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/kmenuedit-5.25.0.tar.xz";
sha256 = "080mffhym2yxpk2jdaynz7gzhr0s2ca0qhg8xhilzvf4r3qlmv1j";
name = "kmenuedit-5.25.0.tar.xz";
};
};
kscreen = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/kscreen-5.24.5.tar.xz";
sha256 = "1g5mlc78giq8zrpyq6d2jhqgyj6yh2nhbqv6wjm9cdbq4nnm3hyr";
name = "kscreen-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/kscreen-5.25.0.tar.xz";
sha256 = "0cna20n9yizkm60wrr03bd048gd7q0wznn1h5sz5y3m4svvxm2qb";
name = "kscreen-5.25.0.tar.xz";
};
};
kscreenlocker = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/kscreenlocker-5.24.5.tar.xz";
sha256 = "13prkdwxd200ps4cy6rf2n4g9ll6fp1f93dk1njr9ilzbj2a2w1j";
name = "kscreenlocker-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/kscreenlocker-5.25.0.tar.xz";
sha256 = "0hi077325694dqxikvsf3vrhabk6bja02n3fy9jxv5znaaf6a0hf";
name = "kscreenlocker-5.25.0.tar.xz";
};
};
ksshaskpass = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/ksshaskpass-5.24.5.tar.xz";
sha256 = "1jw3hfnlplqsss1h49p5f3722qc22ln22sahs5ypsxszmqihpqiz";
name = "ksshaskpass-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/ksshaskpass-5.25.0.tar.xz";
sha256 = "0bkngywr50sd0vzw73zzbwlnzv2fwpni7w7c8m6xfl64vb8629bh";
name = "ksshaskpass-5.25.0.tar.xz";
};
};
ksystemstats = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/ksystemstats-5.24.5.tar.xz";
sha256 = "1xsrlwm1hhagwjyjm240bfmri24z88v95m9pz95dpbcllkwdib0b";
name = "ksystemstats-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/ksystemstats-5.25.0.tar.xz";
sha256 = "0dcx198iamdh6llqk9z5mzc76cgra93m4w669jwrzgwnib8is8ji";
name = "ksystemstats-5.25.0.tar.xz";
};
};
kwallet-pam = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/kwallet-pam-5.24.5.tar.xz";
sha256 = "1smclklxcfbxxxi3lgw2p6wmvj50fg40323j1b8p5z731ywdk3i3";
name = "kwallet-pam-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/kwallet-pam-5.25.0.tar.xz";
sha256 = "19lxih5ywrvk76wir4xa4zp0adp7am412g02wya8zw21pabni2zi";
name = "kwallet-pam-5.25.0.tar.xz";
};
};
kwayland-integration = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/kwayland-integration-5.24.5.tar.xz";
sha256 = "1v12631xdjdp2wkjvyls8g0sv18amy7g4mddrh45pybhpc3rcsl0";
name = "kwayland-integration-5.24.5.tar.xz";
};
};
kwayland-server = {
version = "5.24.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/kwayland-server-5.24.5.tar.xz";
sha256 = "0ydj6p489psqblqd88lk04q62qn1spa1m0zdjq8d32a4g4lvxnid";
name = "kwayland-server-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/kwayland-integration-5.25.0.tar.xz";
sha256 = "0lgnlfm48jm5rbmdwipkmagy0r1x9v1y10vidpcd26ldaql2lixk";
name = "kwayland-integration-5.25.0.tar.xz";
};
};
kwin = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/kwin-5.24.5.tar.xz";
sha256 = "10mgbs1mbhjzbwx07q77wdzhj11yc156j75fbvy8mszb9hjiappk";
name = "kwin-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/kwin-5.25.0.tar.xz";
sha256 = "03r8zmwjc74hc506kzasx9a3cbygnacdw1mjmkk39wl4599w4xai";
name = "kwin-5.25.0.tar.xz";
};
};
kwrited = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/kwrited-5.24.5.tar.xz";
sha256 = "0gfjvj8wnfgb3s2daz7xpg9flc8xv6hk12z6ckbchq71w4gs6132";
name = "kwrited-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/kwrited-5.25.0.tar.xz";
sha256 = "1cxfgf26kdbp84wk190s6j4hi62gp928nvyiclgxja1ha4f3yzsb";
name = "kwrited-5.25.0.tar.xz";
};
};
layer-shell-qt = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/layer-shell-qt-5.24.5.tar.xz";
sha256 = "0ydjfxrkmpi052gfhkccsp9m5az3z6qiggb5wx6cjz39q06614gm";
name = "layer-shell-qt-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/layer-shell-qt-5.25.0.tar.xz";
sha256 = "1wyijkk45mzrd2glsilv0748vi5vcdyhkbfm367v9rbyszwhsv9j";
name = "layer-shell-qt-5.25.0.tar.xz";
};
};
libkscreen = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/libkscreen-5.24.5.tar.xz";
sha256 = "1jbgq1ddl0q5y8cx4m7k5q38gl0kxv929wxr3hn3vr906fpiiwbz";
name = "libkscreen-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/libkscreen-5.25.0.tar.xz";
sha256 = "0b6qsni1nls29apdkhavxy980mxk46wrp9fizarsvvsgkahl5m8v";
name = "libkscreen-5.25.0.tar.xz";
};
};
libksysguard = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/libksysguard-5.24.5.tar.xz";
sha256 = "1v21xckvwx6xkiqihv3pc2ps5mmc4ahp5vadxm3lrh0pdqxb6v5h";
name = "libksysguard-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/libksysguard-5.25.0.tar.xz";
sha256 = "1z210jv0354midbqbcipdirilrhpcmhy5s5cy7jvgmmivarr0mrl";
name = "libksysguard-5.25.0.tar.xz";
};
};
milou = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/milou-5.24.5.tar.xz";
sha256 = "1rh5zy1x427cv07zmikmh0rmviz7vcvnz2pyravyfzaxay5lwnf1";
name = "milou-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/milou-5.25.0.tar.xz";
sha256 = "166m0w8yn6dz00g6h40zyjklr6zf0yrskg6q48593l8f35kmqzdl";
name = "milou-5.25.0.tar.xz";
};
};
oxygen = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/oxygen-5.24.5.tar.xz";
sha256 = "1gh06wwm6gdjpsbjlxnrrlgsfd5w7lb0pddcml9l2w0dvlgfyn1v";
name = "oxygen-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/oxygen-5.25.0.tar.xz";
sha256 = "0kq8h3zi07h0j0y6n0q6nkbf3sa2pxvyvy7hyxbbvl4b8s4h3asf";
name = "oxygen-5.25.0.tar.xz";
};
};
oxygen-sounds = {
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.0/oxygen-sounds-5.25.0.tar.xz";
sha256 = "1qk4ff5knjpznj5zbpvzd3wjbpbzmijaxrwqsr7q663i0rjx82b4";
name = "oxygen-sounds-5.25.0.tar.xz";
};
};
plasma-browser-integration = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/plasma-browser-integration-5.24.5.tar.xz";
sha256 = "1xybyn6vsahr5j0g57bsfxmz78w35ibzavcax1inrdlnb7sblrqv";
name = "plasma-browser-integration-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/plasma-browser-integration-5.25.0.tar.xz";
sha256 = "1qcaxchwlqsjs9fwksc185n3pr7c8wp74m0abbbv1g0qkwwkfww5";
name = "plasma-browser-integration-5.25.0.tar.xz";
};
};
plasma-desktop = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/plasma-desktop-5.24.5.tar.xz";
sha256 = "0iic01iwg4bkp8sfp4mbm5lvbj98wjcyi0k79jfr1sx78dn7jn5g";
name = "plasma-desktop-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/plasma-desktop-5.25.0.tar.xz";
sha256 = "1ib8j6pv720ky3v7pcyjzdn4cyi0201kcrpxj4adv2hsj3qc3lv3";
name = "plasma-desktop-5.25.0.tar.xz";
};
};
plasma-disks = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/plasma-disks-5.24.5.tar.xz";
sha256 = "1x3lm5cnwa51i8kcmp7pq29fpa9za3ypsmmldf2jbisawjnrb50k";
name = "plasma-disks-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/plasma-disks-5.25.0.tar.xz";
sha256 = "10fz7biz0p7ipdxjllwjcja8d3mf7wf4af0gi0yh0pwr5yj8yn68";
name = "plasma-disks-5.25.0.tar.xz";
};
};
plasma-firewall = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/plasma-firewall-5.24.5.tar.xz";
sha256 = "0mk9plb1rwng77qy55c7y7ga4fkafan89bf4vqsc4i9nfn49d944";
name = "plasma-firewall-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/plasma-firewall-5.25.0.tar.xz";
sha256 = "0m8lh6lfr7a9w33wcj4li01b82vfw7smv5l1sigri5zx0ahpkqdc";
name = "plasma-firewall-5.25.0.tar.xz";
};
};
plasma-integration = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/plasma-integration-5.24.5.tar.xz";
sha256 = "0ynzx99jn4fqzbrv9mav0sw06rzf7mm1rv17g17vsxijwbhr0i6d";
name = "plasma-integration-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/plasma-integration-5.25.0.tar.xz";
sha256 = "1a069wcjfxw1rvb285lln19yg18f1k0003snmrmfbisbv5f7475q";
name = "plasma-integration-5.25.0.tar.xz";
};
};
plasma-mobile = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/plasma-mobile-5.24.5.tar.xz";
sha256 = "0400rwx4pbz4kfy06f2vxchlf9vr6dx71wsi6vir3vdmvl43yazd";
name = "plasma-mobile-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/plasma-mobile-5.25.0.tar.xz";
sha256 = "00d63zb8n3iza8q2a1pgk0v63bzzq3yky71ij3bmm08a405w2ad8";
name = "plasma-mobile-5.25.0.tar.xz";
};
};
plasma-nano = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/plasma-nano-5.24.5.tar.xz";
sha256 = "0zxvqzg1p6ci6581bh4nhsq2p6pq66pmvs93zlj89ml4am176213";
name = "plasma-nano-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/plasma-nano-5.25.0.tar.xz";
sha256 = "0hcki7qz1xldnm70x5qwrp7knqzyq3kzwjasiqpbz9vc5l4rxxyz";
name = "plasma-nano-5.25.0.tar.xz";
};
};
plasma-nm = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/plasma-nm-5.24.5.tar.xz";
sha256 = "0adl5wfrz16hc7j64830cx1ga0bh9zd8bff95a30zdiggp7jc45f";
name = "plasma-nm-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/plasma-nm-5.25.0.tar.xz";
sha256 = "10350qnsap1m1jcmga331pis8076lpk9kkg9141xrlsy8kbf36ad";
name = "plasma-nm-5.25.0.tar.xz";
};
};
plasma-pa = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/plasma-pa-5.24.5.tar.xz";
sha256 = "1lgq2lydl65bh01043ji7kkignrb5lfcvbhy0g4g7lw778whv3q6";
name = "plasma-pa-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/plasma-pa-5.25.0.tar.xz";
sha256 = "0shp4y08ry8ql02akdmwzzn7yaiddbhsp3h2jqmh401q14n374m8";
name = "plasma-pa-5.25.0.tar.xz";
};
};
plasma-sdk = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/plasma-sdk-5.24.5.tar.xz";
sha256 = "0d35sckjvi77b3475pfh1ixdsdx0m7b0hbsx5rbjgj4b05cdpm0w";
name = "plasma-sdk-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/plasma-sdk-5.25.0.tar.xz";
sha256 = "0z72gyxp5ddcn9ilyflp781a60vgpck3l91prxaphhgn3js0al9r";
name = "plasma-sdk-5.25.0.tar.xz";
};
};
plasma-systemmonitor = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/plasma-systemmonitor-5.24.5.tar.xz";
sha256 = "1vx0w5kmnp3chhydas7ijy8h1xf6dggd1ryhbr3k9qz2qihxfsqm";
name = "plasma-systemmonitor-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/plasma-systemmonitor-5.25.0.tar.xz";
sha256 = "131hzqhhc4a0531p2xjabcbjp9cgkzir2sxvx8mb7xa5i213qjfr";
name = "plasma-systemmonitor-5.25.0.tar.xz";
};
};
plasma-tests = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/plasma-tests-5.24.5.tar.xz";
sha256 = "1aqmmix0ds9vg4cjj8dagaya10ainhcciixamdylz1p7vgzpsrkx";
name = "plasma-tests-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/plasma-tests-5.25.0.tar.xz";
sha256 = "1cgkfg1psnl74h2v5napv4fzxa7d997d8zzkkpy5sg89isxidcjq";
name = "plasma-tests-5.25.0.tar.xz";
};
};
plasma-thunderbolt = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/plasma-thunderbolt-5.24.5.tar.xz";
sha256 = "1q0r9l2b06qkbyxa25lvqdwz0rgcjvp48gwkw0xhhaf6fyaai1cl";
name = "plasma-thunderbolt-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/plasma-thunderbolt-5.25.0.tar.xz";
sha256 = "04h1rmc4ha62sgljs1gy4kafip611rd54sx6siagz5wicjq0fahi";
name = "plasma-thunderbolt-5.25.0.tar.xz";
};
};
plasma-vault = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/plasma-vault-5.24.5.tar.xz";
sha256 = "16cyzyfzwqwqsg7hhg576acvxvbd12b7mznvicrrqnyf4wvw68l1";
name = "plasma-vault-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/plasma-vault-5.25.0.tar.xz";
sha256 = "1afqvnfbznazbyik8m1sj04a2qfihvhjn7pv1kbpzj83yca00zvq";
name = "plasma-vault-5.25.0.tar.xz";
};
};
plasma-workspace = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/plasma-workspace-5.24.5.tar.xz";
sha256 = "1xk4424az7sgb0kyysr1s2x756vj4km50xxzkn1s1kxyw28jd4dr";
name = "plasma-workspace-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/plasma-workspace-5.25.0.tar.xz";
sha256 = "1hbv0w6vkqdrr3dr3cndg8c049x9fpxg9siw2ggbxz30kvc64m2n";
name = "plasma-workspace-5.25.0.tar.xz";
};
};
plasma-workspace-wallpapers = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/plasma-workspace-wallpapers-5.24.5.tar.xz";
sha256 = "0aabmd4zswmzdy958y1yq0yp1v9i8kzl959d6r4pwi0lmhr6g6qi";
name = "plasma-workspace-wallpapers-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/plasma-workspace-wallpapers-5.25.0.tar.xz";
sha256 = "0lvqf53a4cy3vzm2kmxwnjlrvhfdb7s9vqq1x3cmagaq9d6zkb70";
name = "plasma-workspace-wallpapers-5.25.0.tar.xz";
};
};
plymouth-kcm = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/plymouth-kcm-5.24.5.tar.xz";
sha256 = "04m4129hxgq4g9v8gvi8q0hzhqzd866j3j1ffxs5vfd27r155wcr";
name = "plymouth-kcm-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/plymouth-kcm-5.25.0.tar.xz";
sha256 = "0h6qrqz2mvb0b1x5z74a8knh7dr8g5lwz8dzwypbsa7ahfj877x5";
name = "plymouth-kcm-5.25.0.tar.xz";
};
};
polkit-kde-agent = {
version = "1-5.24.5";
version = "1-5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/polkit-kde-agent-1-5.24.5.tar.xz";
sha256 = "0w78c59nm71xnd5prm035z94r5bzlqr0fyri43a8vrfyyb21r9l9";
name = "polkit-kde-agent-1-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/polkit-kde-agent-1-5.25.0.tar.xz";
sha256 = "0ph3i46xn2273anhbszxjn51rkngsmy588ayhjqx0a19wmfw7qk9";
name = "polkit-kde-agent-1-5.25.0.tar.xz";
};
};
powerdevil = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/powerdevil-5.24.5.tar.xz";
sha256 = "1wr3rk318j93rnyh24icl4yxdj40zasymlddc71ram80fswa2k4n";
name = "powerdevil-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/powerdevil-5.25.0.tar.xz";
sha256 = "1fqgnc5l2vxf310i41l4ggcjwjq1jp8c4wngfb8jl3nn6lqkmdki";
name = "powerdevil-5.25.0.tar.xz";
};
};
qqc2-breeze-style = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/qqc2-breeze-style-5.24.5.tar.xz";
sha256 = "1m0xnx46zkv1dlwkgns1ibgsl934jbcfz35jlm4p8l6n1y2jcjyg";
name = "qqc2-breeze-style-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/qqc2-breeze-style-5.25.0.tar.xz";
sha256 = "0jw2zk9rrfdb3g983c85c4q539277p0cl2y165zb63p2hrcy44cz";
name = "qqc2-breeze-style-5.25.0.tar.xz";
};
};
sddm-kcm = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/sddm-kcm-5.24.5.tar.xz";
sha256 = "15z5hfpczi73vqjfj9z2ai2r4187fyrvfnikcfb18g2bdh1n54ng";
name = "sddm-kcm-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/sddm-kcm-5.25.0.tar.xz";
sha256 = "0mj101qsmp3405ir6qnkfc8gm6f3vzy0gdg6zv465mh8fs8yvcf4";
name = "sddm-kcm-5.25.0.tar.xz";
};
};
systemsettings = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/systemsettings-5.24.5.tar.xz";
sha256 = "1rg9zx7fhrg91nlarv0cz384agbik47sccj7hhshnxnq1czvawjv";
name = "systemsettings-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/systemsettings-5.25.0.tar.xz";
sha256 = "1a3x0gig7ixk52hqa7jr85l7xypj8rjaashk8xnq9zmvxlk6idng";
name = "systemsettings-5.25.0.tar.xz";
};
};
xdg-desktop-portal-kde = {
version = "5.24.5";
version = "5.25.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.5/xdg-desktop-portal-kde-5.24.5.tar.xz";
sha256 = "1zn6wln8pccj1x3labms7xippn6xgv4aamwpmzk2rvwss9jwz75m";
name = "xdg-desktop-portal-kde-5.24.5.tar.xz";
url = "${mirror}/stable/plasma/5.25.0/xdg-desktop-portal-kde-5.25.0.tar.xz";
sha256 = "1632pglnz8yv86sgrmmr8zv3h38mw8bk21cshw63bbcfvxmvl88m";
name = "xdg-desktop-portal-kde-5.25.0.tar.xz";
};
};
}
+42
View File
@@ -0,0 +1,42 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, python3
}:
stdenv.mkDerivation rec {
pname = "catch2";
version = "3.0.1";
src = fetchFromGitHub {
owner = "catchorg";
repo = "Catch2";
rev = "v${version}";
hash = "sha256-GcMkAgSfQnWs8wQeQD4ZMxJZED8V7FWBU04qMCutlPo=";
};
nativeBuildInputs = [
cmake
];
cmakeFlags = [
"-DCATCH_DEVELOPMENT_BUILD=ON"
"-DCATCH_BUILD_TESTING=${if doCheck then "ON" else "OFF"}"
];
doCheck = true;
checkInputs = [
python3
];
meta = {
description = "Modern, C++-native, test framework for unit-tests";
homepage = "https://github.com/catchorg/Catch2";
changelog = "https://github.com/catchorg/Catch2/blob/${src.rev}/docs/release-notes.md";
license = lib.licenses.boost;
maintainers = with lib.maintainers; [ dotlambda ];
platforms = lib.platforms.unix;
};
}
@@ -2,18 +2,18 @@
, stdenv
, fetchFromGitHub
, cmake
, catch2
, catch2_3
}:
stdenv.mkDerivation rec {
pname = "jarowinkler-cpp";
version = "1.0.0";
version = "1.0.1";
src = fetchFromGitHub {
owner = "maxbachmann";
repo = "jarowinkler-cpp";
rev = "v${version}";
hash = "sha256-6dIyCyoPs/2wHyGqlE+NC0pwz5ggS5edhN4Jbltx0jg=";
hash = "sha256-3/x0fyaDJTouBKbif0ALgMzht6HMEGHNw8g8zQlUcNk=";
};
nativeBuildInputs = [
@@ -21,15 +21,14 @@ stdenv.mkDerivation rec {
];
cmakeFlags = lib.optionals doCheck [
"-DRAPIDFUZZ_BUILD_TESTING=ON"
"-DJARO_WINKLER_BUILD_TESTING=ON"
];
checkInputs = [
catch2
catch2_3
];
# uses unreleased Catch2 version 3
doCheck = false;
doCheck = true;
meta = {
description = "Fast Jaro and Jaro-Winkler distance";
@@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/frameworks/5.94/ -A '*.tar.xz' )
WGET_ARGS=( https://download.kde.org/stable/frameworks/5.95/ -A '*.tar.xz' )
+332 -332
View File
@@ -4,667 +4,667 @@
{
attica = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/attica-5.94.0.tar.xz";
sha256 = "0rgg5n7m0bw5ir6k5bvq4r9k1s05xas42bdsh0h8352pvackcagn";
name = "attica-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/attica-5.95.0.tar.xz";
sha256 = "0g3kbjjvdfry23d6ss79bc1k2f6wijy9n3ymxyq7blmr5cyzjq6n";
name = "attica-5.95.0.tar.xz";
};
};
baloo = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/baloo-5.94.0.tar.xz";
sha256 = "0fi7p586322h8x0f83x98kxkfs5klvv8h9d8sr3jmhq3b0p1ii4x";
name = "baloo-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/baloo-5.95.0.tar.xz";
sha256 = "1zg2s4r74mamfl5dj97yg6c6hah3n5snq4wafy0j9w8y4lmajhcd";
name = "baloo-5.95.0.tar.xz";
};
};
bluez-qt = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/bluez-qt-5.94.0.tar.xz";
sha256 = "0ch6rkifx7vrgljz73vvaah09mw17jpb7i7yl2z7lwjy17mnyxvy";
name = "bluez-qt-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/bluez-qt-5.95.0.tar.xz";
sha256 = "051prfbbzrisr9g0dh9rd5js02w36ddl95v7ak1pv64kzp1dybi3";
name = "bluez-qt-5.95.0.tar.xz";
};
};
breeze-icons = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/breeze-icons-5.94.0.tar.xz";
sha256 = "1fx3nfzn4ky8cy91d9ywhpmv09az6hw6j1jc63585fjd6z93y2ry";
name = "breeze-icons-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/breeze-icons-5.95.0.tar.xz";
sha256 = "0bx9680pz1ffnzrm2bmcsdb61scdc4hg3h94s6zb3wgcanvpqiqs";
name = "breeze-icons-5.95.0.tar.xz";
};
};
extra-cmake-modules = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/extra-cmake-modules-5.94.0.tar.xz";
sha256 = "0yfjg3bci0yj6bwgs2sg34jyw51rz4mi207wfnkcz65rwa68lm13";
name = "extra-cmake-modules-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/extra-cmake-modules-5.95.0.tar.xz";
sha256 = "0nmdj6n7hsxz88s4w1qqbbd7b1031l79fdvqiqz3an19v44j787z";
name = "extra-cmake-modules-5.95.0.tar.xz";
};
};
frameworkintegration = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/frameworkintegration-5.94.0.tar.xz";
sha256 = "19psnjxs19xbf7fvhmpd8wq400wsh74iyqarwxd7chnjz3msnr4s";
name = "frameworkintegration-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/frameworkintegration-5.95.0.tar.xz";
sha256 = "04dzy1acjgjrsryjq05lwrhph25fi363qg09gc45q0zy38zwbi55";
name = "frameworkintegration-5.95.0.tar.xz";
};
};
kactivities = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kactivities-5.94.0.tar.xz";
sha256 = "1pss8h7w3yhdaz1p0a3w6nk3qyr734r5p1m1nfxskcmf7nx5xpaj";
name = "kactivities-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kactivities-5.95.0.tar.xz";
sha256 = "1mxlmwy1radgklm4mh7rm309v6j7bw1kwfms5jmmv08anrlj5hg3";
name = "kactivities-5.95.0.tar.xz";
};
};
kactivities-stats = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kactivities-stats-5.94.0.tar.xz";
sha256 = "0h13xwlgpfz7kbwg7fjcjdm8mvh04y84jaa3327k83w3kl87vzl3";
name = "kactivities-stats-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kactivities-stats-5.95.0.tar.xz";
sha256 = "0lyad8rh0d4dxcm4azg4i60mdlcfi3hsgdpss9lgzcqhnama6mjj";
name = "kactivities-stats-5.95.0.tar.xz";
};
};
kapidox = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kapidox-5.94.0.tar.xz";
sha256 = "0xsmwm35jfz7nzxzjs0aa86hhy0l71y9l2xmx2d1gqxz742m59qw";
name = "kapidox-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kapidox-5.95.0.tar.xz";
sha256 = "0f0q0f705adrfhzpq0fkgxqhx6qs8dd0fwsfj0f6764kf2w0xxz5";
name = "kapidox-5.95.0.tar.xz";
};
};
karchive = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/karchive-5.94.0.tar.xz";
sha256 = "1r71apql80gzgknqqflsvmksm4mr6bqlmkpviqb9qr3s8fjqgkam";
name = "karchive-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/karchive-5.95.0.tar.xz";
sha256 = "0jfmrndpkg6axci65y89y13y9iczc1wwp0va47m5210xpwhcx30y";
name = "karchive-5.95.0.tar.xz";
};
};
kauth = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kauth-5.94.0.tar.xz";
sha256 = "0na1svylmkzk2vd3pmg9scfgyvbv1lsfz9bkhbw5vym8d6nx1zlw";
name = "kauth-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kauth-5.95.0.tar.xz";
sha256 = "0fjgffdw7r637sv5h37h5k8kd128p8bxfrwwgpjdhl9gzkrvc5iy";
name = "kauth-5.95.0.tar.xz";
};
};
kbookmarks = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kbookmarks-5.94.0.tar.xz";
sha256 = "0z2ibxrpap40wbabgls8jbyrr11v32ml7l5b0gasp6vfdymrkjwc";
name = "kbookmarks-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kbookmarks-5.95.0.tar.xz";
sha256 = "1w2m7bjkn6c1d0jn936qbidkkq80flvzp5jvv8sbxbnr6v3rmykp";
name = "kbookmarks-5.95.0.tar.xz";
};
};
kcalendarcore = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kcalendarcore-5.94.0.tar.xz";
sha256 = "0aq4gkbj2vf6j7636jac1bs0pzdcqvra9m22ny4vhkr1x3i1marv";
name = "kcalendarcore-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kcalendarcore-5.95.0.tar.xz";
sha256 = "10194vpkw19by7cl5r6fcj9vv241n1s6xpm15pqgalhgznj6qskq";
name = "kcalendarcore-5.95.0.tar.xz";
};
};
kcmutils = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kcmutils-5.94.0.tar.xz";
sha256 = "029ksln66n1g993zp4vfh2bmg8ws1cy2r89fhbj25jydj1lyz33r";
name = "kcmutils-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kcmutils-5.95.0.tar.xz";
sha256 = "0m0b7ymh8xix4psa0l58g7g53b7clzma5chr5bjvwc22fxxhbp8r";
name = "kcmutils-5.95.0.tar.xz";
};
};
kcodecs = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kcodecs-5.94.0.tar.xz";
sha256 = "1yg7p18z4fac4k4gprncw2v4nv547431dpi6lc2ry98x3kxykh5w";
name = "kcodecs-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kcodecs-5.95.0.tar.xz";
sha256 = "0d4mnfqzixqd91n3cfhis3ppzp9kxfkhgp7v5h6miaknc5ib0yz2";
name = "kcodecs-5.95.0.tar.xz";
};
};
kcompletion = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kcompletion-5.94.0.tar.xz";
sha256 = "193fz8xpmlcyrhmlllzprd0r8pq1b70dikrf1hmkbghbcm0kvl8s";
name = "kcompletion-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kcompletion-5.95.0.tar.xz";
sha256 = "1wi8zbjcklc1yzljwpy32lla4jhv0w4vylv93nygqjdcp414kb4f";
name = "kcompletion-5.95.0.tar.xz";
};
};
kconfig = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kconfig-5.94.0.tar.xz";
sha256 = "1mxk3jlixxamki6gl46i1ndlkqyad88yl0707c44znbhy0292vcf";
name = "kconfig-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kconfig-5.95.0.tar.xz";
sha256 = "1w9icxfbxa6wkjlc6qs6lj00gjid797s6k20x09blgc7lhqgccpx";
name = "kconfig-5.95.0.tar.xz";
};
};
kconfigwidgets = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kconfigwidgets-5.94.0.tar.xz";
sha256 = "025m5zw060jclar73gw9j8jmqzyk0y9wgdgrcw70yjzlgximy19m";
name = "kconfigwidgets-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kconfigwidgets-5.95.0.tar.xz";
sha256 = "0llx74g252d4w2j6qdyxwgbkkbsjcm5z5mghz0cx1vpn2hgz7drb";
name = "kconfigwidgets-5.95.0.tar.xz";
};
};
kcontacts = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kcontacts-5.94.0.tar.xz";
sha256 = "1y2jc9b2k7mmhv8z2bpc45dhnj9njarrk9k8y6f28w5jv7gigwzp";
name = "kcontacts-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kcontacts-5.95.0.tar.xz";
sha256 = "1jad89h7yhp0ba7w43s6m6fzcclsfc6dmzqmj1zi52jlllh37mqh";
name = "kcontacts-5.95.0.tar.xz";
};
};
kcoreaddons = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kcoreaddons-5.94.0.tar.xz";
sha256 = "02qirq0hwz5233yfxsp0fp0ww0l8gyv86x5ybaqsjshd0z7bc42w";
name = "kcoreaddons-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kcoreaddons-5.95.0.tar.xz";
sha256 = "04rwqw5b8lspnbvfxl995shdrmm6dqlglk2vc2gh03ykcpj7pkwg";
name = "kcoreaddons-5.95.0.tar.xz";
};
};
kcrash = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kcrash-5.94.0.tar.xz";
sha256 = "1x9wy1qzcyyyk6hsii39hy6yvrffvw62d6lfdjdnxbf2m0n7kis8";
name = "kcrash-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kcrash-5.95.0.tar.xz";
sha256 = "1y7rs59h61zsasdas2r5y8q3r1vblvymykzihw0wjf6qnzx8pz74";
name = "kcrash-5.95.0.tar.xz";
};
};
kdav = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kdav-5.94.0.tar.xz";
sha256 = "0gjv6dbsl25805ks3a4y8z5dcwx48wcy4s87bnp137q0w731w8cb";
name = "kdav-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kdav-5.95.0.tar.xz";
sha256 = "09sg4h1vjsy0ncvaq4wb4m66l71ndx9rh3wrsa3273pp4lyvszbm";
name = "kdav-5.95.0.tar.xz";
};
};
kdbusaddons = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kdbusaddons-5.94.0.tar.xz";
sha256 = "1s6syhzqy0l5v31r94rzbzqygpwsz6ym7dlxggmg3mnagh8k058a";
name = "kdbusaddons-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kdbusaddons-5.95.0.tar.xz";
sha256 = "0qx4h365isw8vkbn632gfw39b81gjczvd6ldcwfdfj9ldgwxxzz7";
name = "kdbusaddons-5.95.0.tar.xz";
};
};
kdeclarative = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kdeclarative-5.94.0.tar.xz";
sha256 = "023bvl93ia8nwl3swr98n71gz4xwsq87v29kj8ng950rcyknr6gj";
name = "kdeclarative-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kdeclarative-5.95.0.tar.xz";
sha256 = "1qm0nnxmnldla8z7wz4sjl5bd5bqgql29qbm982gsbyx1z4c9l64";
name = "kdeclarative-5.95.0.tar.xz";
};
};
kded = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kded-5.94.0.tar.xz";
sha256 = "1igk8in16i29jckqyf5dqn83h2hx727d8n35j7jq2ky6x2in2k9g";
name = "kded-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kded-5.95.0.tar.xz";
sha256 = "0hdfx8yl66sck6j339q9417s2yvcpr5r27klgw4phz89hca8h6wr";
name = "kded-5.95.0.tar.xz";
};
};
kdelibs4support = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/portingAids/kdelibs4support-5.94.0.tar.xz";
sha256 = "0cv0lzcgyny2xravgdsbpjz5j5jlp7202dk077nxblv60yqfn9np";
name = "kdelibs4support-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/portingAids/kdelibs4support-5.95.0.tar.xz";
sha256 = "0pnm8hw96f2jvcy5fjd2pr8x52d8zmzvm0f4wjb5hcq5jf55596n";
name = "kdelibs4support-5.95.0.tar.xz";
};
};
kdesignerplugin = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/portingAids/kdesignerplugin-5.94.0.tar.xz";
sha256 = "00walz1w0mx1jqx7yx76qyig5k1n39mh6xmq4qg317rsgzj53l3b";
name = "kdesignerplugin-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/portingAids/kdesignerplugin-5.95.0.tar.xz";
sha256 = "1zz1jl2cdxs5jwl21hr89c5wgnpdn1wf0ww5hkss4mmgssr32pgw";
name = "kdesignerplugin-5.95.0.tar.xz";
};
};
kdesu = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kdesu-5.94.0.tar.xz";
sha256 = "1qfwm4l30iy4gy4df8gf7i8mg11szv2c4s60jgfqqk5bxcil6jch";
name = "kdesu-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kdesu-5.95.0.tar.xz";
sha256 = "1b63rsb21pjxy0zd2gxarbrm5xsvf8mbf4fnja7ghadck43jnx1f";
name = "kdesu-5.95.0.tar.xz";
};
};
kdewebkit = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/portingAids/kdewebkit-5.94.0.tar.xz";
sha256 = "0n8df6y84hd4b3iwfjxk7h06avigq3vgcksi8jh8kjvwwvl77jlv";
name = "kdewebkit-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/portingAids/kdewebkit-5.95.0.tar.xz";
sha256 = "0b6ykwdb52zvgmcs79drgk8i44gib2si80x6p0sc9adpbk1nwqgj";
name = "kdewebkit-5.95.0.tar.xz";
};
};
kdnssd = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kdnssd-5.94.0.tar.xz";
sha256 = "0qs8jr506aq9i39p8smjsiswjh5zspap3dsvmh7bhayrhgzs5sr8";
name = "kdnssd-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kdnssd-5.95.0.tar.xz";
sha256 = "10v8w1c7sskf5x956qbfwvca55qwk48jcaa2gv7wrb19bj0dms67";
name = "kdnssd-5.95.0.tar.xz";
};
};
kdoctools = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kdoctools-5.94.0.tar.xz";
sha256 = "1x6j7h1lg4bbr1jjb8nl4jsl0v9lcc5h4hg3svkk9rn5x3zn2kpm";
name = "kdoctools-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kdoctools-5.95.0.tar.xz";
sha256 = "10isqvlhfqlhl8w46hhn7nmy8yhdi30z99pks8qm75pp3grx0mkg";
name = "kdoctools-5.95.0.tar.xz";
};
};
kemoticons = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kemoticons-5.94.0.tar.xz";
sha256 = "00hkwg63pqz7m10sybcyknn246nr7np62hxg2iayf5x0fmfv2zgs";
name = "kemoticons-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kemoticons-5.95.0.tar.xz";
sha256 = "0wpl0bd3xd613wyhl11b2gvrh9dkwvl32ik64hzjmq9c7xik3a1n";
name = "kemoticons-5.95.0.tar.xz";
};
};
kfilemetadata = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kfilemetadata-5.94.0.tar.xz";
sha256 = "1rkp95bx4yvg6qia2lq4vmmlnc3s9lvy7yfw149k77il60d3nmvz";
name = "kfilemetadata-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kfilemetadata-5.95.0.tar.xz";
sha256 = "018120fygj482capdbl6p30i31b1lhc7zcvdi6l200lcv5n0anvy";
name = "kfilemetadata-5.95.0.tar.xz";
};
};
kglobalaccel = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kglobalaccel-5.94.0.tar.xz";
sha256 = "1s9md2iz03xhxpx4sacygqqcqqys6z9aa0xjvqy9gl3jd88h0jx3";
name = "kglobalaccel-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kglobalaccel-5.95.0.tar.xz";
sha256 = "1jq4b6ln7ch6dkj9ki30pn3aga6q0kbzrmw3xv1xwdy1r931xjlk";
name = "kglobalaccel-5.95.0.tar.xz";
};
};
kguiaddons = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kguiaddons-5.94.0.tar.xz";
sha256 = "0wrqjxqnrngn85wga4prxyl2jr6wvp4vsxxa5v1wndwd4skq4cgj";
name = "kguiaddons-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kguiaddons-5.95.0.tar.xz";
sha256 = "037j1vn151xp76ylrd690fwavf49nqs3f6jy2zq658n4jyxskwn7";
name = "kguiaddons-5.95.0.tar.xz";
};
};
kholidays = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kholidays-5.94.0.tar.xz";
sha256 = "0p85i8l157616an8p1iaydzy575wh47qn3cfq7imhxlxki9kadz5";
name = "kholidays-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kholidays-5.95.0.tar.xz";
sha256 = "01zdl4l0gnzl4fvxbgzqygffnliy1ldnzf3rf931if7pqpcyffak";
name = "kholidays-5.95.0.tar.xz";
};
};
khtml = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/portingAids/khtml-5.94.0.tar.xz";
sha256 = "0ycvzqj1xdjbwwgqp97siljxbk5fig8ijrydjcnirg1g98l2mgcq";
name = "khtml-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/portingAids/khtml-5.95.0.tar.xz";
sha256 = "01iyrgx322wi2sqlcfkij95yxgv54q1mbpxiv3m814xx85iqljsk";
name = "khtml-5.95.0.tar.xz";
};
};
ki18n = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/ki18n-5.94.0.tar.xz";
sha256 = "0jll112q4wrcjrd8wmspf95a0a1aqxkhv1390i9yhw1m6hr86nhc";
name = "ki18n-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/ki18n-5.95.0.tar.xz";
sha256 = "0va28798xj1xk0agggxc8g96kd1ygigfsi438ni4qb54d7fpxmsx";
name = "ki18n-5.95.0.tar.xz";
};
};
kiconthemes = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kiconthemes-5.94.0.tar.xz";
sha256 = "14s9h6mk3f4qg97bj0d3b6j7x80jhnlb4kdx9bpp9jvwrlfxhwnr";
name = "kiconthemes-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kiconthemes-5.95.0.tar.xz";
sha256 = "1sy34s7vf915vwnighvfvzdlzk58vwc5pkhjry9hncvkw5wlmrnd";
name = "kiconthemes-5.95.0.tar.xz";
};
};
kidletime = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kidletime-5.94.0.tar.xz";
sha256 = "1s73nk23js4ly679pq5c4lbry8sgvh0dzf5fyrn8dj6fbda3s756";
name = "kidletime-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kidletime-5.95.0.tar.xz";
sha256 = "05wjx19lgwnf5mbw9vx34mf0a2wfg3vkrkv96f5a9hir58j0q3ds";
name = "kidletime-5.95.0.tar.xz";
};
};
kimageformats = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kimageformats-5.94.0.tar.xz";
sha256 = "0m2ffzlgjl4sz1plf1lpsxvkni1nr93rq8kab2frbj8x15n652di";
name = "kimageformats-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kimageformats-5.95.0.tar.xz";
sha256 = "1zmqvgl768lyysszq8pc00a2m1ipdbra5a2rhmn250n610b02yi5";
name = "kimageformats-5.95.0.tar.xz";
};
};
kinit = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kinit-5.94.0.tar.xz";
sha256 = "0qdw3qz9zbp3i19zgal8wffwiylib3d3ydmfih7dqdx8rq4zk67f";
name = "kinit-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kinit-5.95.0.tar.xz";
sha256 = "0yzhkfj724lc25cab97lywsshm0180kcmgw1991zzbhikjnyfnyc";
name = "kinit-5.95.0.tar.xz";
};
};
kio = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kio-5.94.0.tar.xz";
sha256 = "16yhj3wh57gc0azqq01ssqzg0nqa6f904p68jl6p6ifq967bzh45";
name = "kio-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kio-5.95.0.tar.xz";
sha256 = "11vnwcfb65a8x2hrb0xp89bvljgapjzm5vffy6q4j4pcbbgz1iwp";
name = "kio-5.95.0.tar.xz";
};
};
kirigami2 = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kirigami2-5.94.0.tar.xz";
sha256 = "0fcf8ah4vh7arb3iavpk0psy81agyj6vfg8s9sgk7ssz6aipvwnp";
name = "kirigami2-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kirigami2-5.95.0.tar.xz";
sha256 = "078fm14y9k0nsdxkci7k25l11zd2zd6r6nbhfmsfhn6hb4dbz77g";
name = "kirigami2-5.95.0.tar.xz";
};
};
kitemmodels = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kitemmodels-5.94.0.tar.xz";
sha256 = "12ag11m7sf23h9nd41jvpws7cakzwicvawckdx1vmch2fnwz4pvh";
name = "kitemmodels-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kitemmodels-5.95.0.tar.xz";
sha256 = "1mr2dd7aj1vi1nkm8c93adyj51ins2kynmp0dsh8gzbf0sh338bm";
name = "kitemmodels-5.95.0.tar.xz";
};
};
kitemviews = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kitemviews-5.94.0.tar.xz";
sha256 = "0bmm71lm59spxwc0hrw1yd7m0a8qs55yydijld57zq4wf55k6xav";
name = "kitemviews-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kitemviews-5.95.0.tar.xz";
sha256 = "1zi2vchnxjy9spxg0405lg5616sf4j6c847zckmh66w6vxq41nvj";
name = "kitemviews-5.95.0.tar.xz";
};
};
kjobwidgets = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kjobwidgets-5.94.0.tar.xz";
sha256 = "01xh880avavzbbrk65y6gsn011w6pbsk7ian753az1i8m3y4akq1";
name = "kjobwidgets-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kjobwidgets-5.95.0.tar.xz";
sha256 = "0v8l46wjmkcy1ifbfc3w05qahy5lnpjrhyxziszbs05wc3yglprf";
name = "kjobwidgets-5.95.0.tar.xz";
};
};
kjs = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/portingAids/kjs-5.94.0.tar.xz";
sha256 = "06rw7gch4hw2kib4v9p5zzlkz8n3wjifdrxhwywcqy5rvsi18gpr";
name = "kjs-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/portingAids/kjs-5.95.0.tar.xz";
sha256 = "1g2yg4p32q0s7rdx98ig7hk11f0awn14xzwid0xfi64wvdfz65ss";
name = "kjs-5.95.0.tar.xz";
};
};
kjsembed = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/portingAids/kjsembed-5.94.0.tar.xz";
sha256 = "0bpnvvz0gc8j5ywljhc8i5ws6f6inds710xwxvp9ymqgkm3kgkpk";
name = "kjsembed-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/portingAids/kjsembed-5.95.0.tar.xz";
sha256 = "1cbvfvp6dnbgh14156gpcl9fds8dxbkxcn9svhkfha4157zwq7xb";
name = "kjsembed-5.95.0.tar.xz";
};
};
kmediaplayer = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/portingAids/kmediaplayer-5.94.0.tar.xz";
sha256 = "1310v2krzgxz7ghcws83p47hrlap7qxpnc38l5y3j7g21kgzdw8b";
name = "kmediaplayer-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/portingAids/kmediaplayer-5.95.0.tar.xz";
sha256 = "1qxh43qamvcr6wzhj2rnlhvdyp6hkyx98iwbygsr46g41nhc7ygv";
name = "kmediaplayer-5.95.0.tar.xz";
};
};
knewstuff = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/knewstuff-5.94.0.tar.xz";
sha256 = "0vrkj2p9pqp49ph0rpy45dawli3j4mbcncw3x45d8rmbk57h3kda";
name = "knewstuff-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/knewstuff-5.95.0.tar.xz";
sha256 = "0px9di3973bm8vjnikfjhqlfwsj5q4phidzc0s23x941nrv3d0gq";
name = "knewstuff-5.95.0.tar.xz";
};
};
knotifications = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/knotifications-5.94.0.tar.xz";
sha256 = "1gs39fvk0rylrlxsvym8pb58c8106fqbvrx3bp3rdw355giirmf8";
name = "knotifications-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/knotifications-5.95.0.tar.xz";
sha256 = "0hl1q0rz5g35vzxczaf5lap5pj9h7a8s706220s7b6z89mi8c95x";
name = "knotifications-5.95.0.tar.xz";
};
};
knotifyconfig = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/knotifyconfig-5.94.0.tar.xz";
sha256 = "0449pb1j2m3jxafvv53qyrma309g3xm3q7fxxlpqxaw2fjd9i1db";
name = "knotifyconfig-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/knotifyconfig-5.95.0.tar.xz";
sha256 = "1s1npl1h22b2pp2r43f0h2jmlrgrlf2sf33zc3acxhalvg9zwgkd";
name = "knotifyconfig-5.95.0.tar.xz";
};
};
kpackage = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kpackage-5.94.0.tar.xz";
sha256 = "057lpas5d9m43rshp36p2dmrwpk14saa5n7jg5l0zcf940lrqk2d";
name = "kpackage-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kpackage-5.95.0.tar.xz";
sha256 = "0pv0zyazf0bawj8wh4jz3m7kny84vana5a6w0s1ff4z2igqib11z";
name = "kpackage-5.95.0.tar.xz";
};
};
kparts = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kparts-5.94.0.tar.xz";
sha256 = "1fkbs0gfcg6ps5az0anf03w961xm9vmq0pd8br7yip4p387i5985";
name = "kparts-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kparts-5.95.0.tar.xz";
sha256 = "097zr2mn2l5rlgv6alhs1gyrig2vzvsgzikv6dspdhh4f3ydz962";
name = "kparts-5.95.0.tar.xz";
};
};
kpeople = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kpeople-5.94.0.tar.xz";
sha256 = "0x2jdb9x1fss95bzra51dz902q8h78qgq4j5j4c3agi2ihvvlzi1";
name = "kpeople-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kpeople-5.95.0.tar.xz";
sha256 = "0002yhlzvwmhmdcnx48xc5q577r9yxq5jv978avx7axl4fmxjzi9";
name = "kpeople-5.95.0.tar.xz";
};
};
kplotting = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kplotting-5.94.0.tar.xz";
sha256 = "1ah6fsskdnkh6m2nyjm64rxqfyxgg6jj0ydcqivq1m81hrhnsgbq";
name = "kplotting-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kplotting-5.95.0.tar.xz";
sha256 = "0jyip5s2razcg8rfg4li3a14bisqbfzh1x6zc2z90vg8cgihqjny";
name = "kplotting-5.95.0.tar.xz";
};
};
kpty = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kpty-5.94.0.tar.xz";
sha256 = "1jj6aw0zlbw5mljv2q990m62y381aqjih7pvqnjsdk2licqn16jn";
name = "kpty-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kpty-5.95.0.tar.xz";
sha256 = "0pjzb7n8y3frp3b88caqhrnzfckkrgq1rq0j1n298ym78pjq077n";
name = "kpty-5.95.0.tar.xz";
};
};
kquickcharts = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kquickcharts-5.94.0.tar.xz";
sha256 = "0a4mxb7wkqjq3iclhxnb7pkikb7yj2y4lyb080cni2wknjyzlr9h";
name = "kquickcharts-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kquickcharts-5.95.0.tar.xz";
sha256 = "09fkhxm3vx488xiiqm9wg7vwcqyj7k54rxrgk8pc2gjbg2af22bs";
name = "kquickcharts-5.95.0.tar.xz";
};
};
kross = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/portingAids/kross-5.94.0.tar.xz";
sha256 = "0j9dchgldl0z2xi25r82fcflvqp05njgscpqjzmddpih4nyjas8x";
name = "kross-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/portingAids/kross-5.95.0.tar.xz";
sha256 = "05brnf4dy8vrrqsv1394g26wr593857zf808pjr3mj97pkbgszjm";
name = "kross-5.95.0.tar.xz";
};
};
krunner = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/krunner-5.94.0.tar.xz";
sha256 = "1lfbnwhk74b42cs5vnlx36mrrlnj9s2qqnca5zggk10837dbrc1j";
name = "krunner-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/krunner-5.95.0.tar.xz";
sha256 = "0w0nc0a0i6bbgsp1l6iky6lixhyyzgq1p8rxas72dbrjbs541lb0";
name = "krunner-5.95.0.tar.xz";
};
};
kservice = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kservice-5.94.0.tar.xz";
sha256 = "0civwkm4wknrh30674lw2mag46m0jdpzjabfpqf0n1m4q1gi1b8s";
name = "kservice-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kservice-5.95.0.tar.xz";
sha256 = "1rh48ij8vh72q7v9dlawgqb4kwvdgj8xl45hpn9dfx43h2iyjwfw";
name = "kservice-5.95.0.tar.xz";
};
};
ktexteditor = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/ktexteditor-5.94.0.tar.xz";
sha256 = "1dmkw5am89pjzazs2s9f1yv5lni0aa3hxr6w46w8lwbx2sbrjbfq";
name = "ktexteditor-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/ktexteditor-5.95.0.tar.xz";
sha256 = "0yrykpangay6jb74hbr6i6m0v88dshy078qxd2myvj4gx8xbdrfm";
name = "ktexteditor-5.95.0.tar.xz";
};
};
ktextwidgets = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/ktextwidgets-5.94.0.tar.xz";
sha256 = "0rnqkqwq9zffxh6swpd5riyir21rpdbm5mf1cqy4qvsjrgdfxz24";
name = "ktextwidgets-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/ktextwidgets-5.95.0.tar.xz";
sha256 = "0vjyq80nn8g4xxsq6d3z5lphl2ikg64jbl5c59q5vsnkkg4j534x";
name = "ktextwidgets-5.95.0.tar.xz";
};
};
kunitconversion = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kunitconversion-5.94.0.tar.xz";
sha256 = "0jc0lffaz1wq26a251vgk6c16lqfqdkb81p789016ifv4kqz1bg4";
name = "kunitconversion-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kunitconversion-5.95.0.tar.xz";
sha256 = "079ljkgmx5nkhs29rinbrld4scy2k69fjnbia2jfwijy0slac00g";
name = "kunitconversion-5.95.0.tar.xz";
};
};
kwallet = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kwallet-5.94.0.tar.xz";
sha256 = "0ciabsayzy2r1aknwgns7s9759y2kfrxwmzycwxm9rsffm16ndh1";
name = "kwallet-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kwallet-5.95.0.tar.xz";
sha256 = "1gk55ny4zxhwq78gn8da4zwcjxvwf5z9y7dipiam0ybkwjz2pkrd";
name = "kwallet-5.95.0.tar.xz";
};
};
kwayland = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kwayland-5.94.0.tar.xz";
sha256 = "0di6rax4mdismqa4fzx30rj5y2ds211b7kwir6cff76qnkhxi95j";
name = "kwayland-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kwayland-5.95.0.tar.xz";
sha256 = "0ba71k97qp5czg4d07pp75gfrkp5rgmvd2y9vv7n6mhfrgqsd3rb";
name = "kwayland-5.95.0.tar.xz";
};
};
kwidgetsaddons = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kwidgetsaddons-5.94.0.tar.xz";
sha256 = "0cix00d2dbbb3l523xri4is4xvbf3bn6vg10yyjrhqjxqqayv3k7";
name = "kwidgetsaddons-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kwidgetsaddons-5.95.0.tar.xz";
sha256 = "0b3i47p6495pz9nph85qliscbxsrpq76s9a37bkb8nv1wf3nyyw3";
name = "kwidgetsaddons-5.95.0.tar.xz";
};
};
kwindowsystem = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kwindowsystem-5.94.0.tar.xz";
sha256 = "0y1wlhm3ng2pb970hvgsyv6gn3irrkw5y9nmvzx28gxcx7abgssj";
name = "kwindowsystem-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kwindowsystem-5.95.0.tar.xz";
sha256 = "1wxvhi8jwvnvgg5pyj6q6gqs24akzmjdw76g57qcfgq95a9byszi";
name = "kwindowsystem-5.95.0.tar.xz";
};
};
kxmlgui = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/kxmlgui-5.94.0.tar.xz";
sha256 = "1mlxc4wdqnh77g7j0hxrg9jfrdjk9sh3bahp10r17l8fzwq1g8s3";
name = "kxmlgui-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/kxmlgui-5.95.0.tar.xz";
sha256 = "16rk1fb8n0ay3g305qmjfhrv6zq7fbilq02386wwgdczg98x8r8h";
name = "kxmlgui-5.95.0.tar.xz";
};
};
kxmlrpcclient = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/portingAids/kxmlrpcclient-5.94.0.tar.xz";
sha256 = "10hz8nijhih0n3z83n3khy2hdflsjq8i4q0y9jjpqp1d0b5rbb35";
name = "kxmlrpcclient-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/portingAids/kxmlrpcclient-5.95.0.tar.xz";
sha256 = "1ldykbr4x582k43b8bh01zzxbdfzyz2ckpqd9hpq9iab4njlh6gw";
name = "kxmlrpcclient-5.95.0.tar.xz";
};
};
modemmanager-qt = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/modemmanager-qt-5.94.0.tar.xz";
sha256 = "1wmz27713kh2i2m227008f412dcf65nvnnax60hrg2nkp8vdqa3r";
name = "modemmanager-qt-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/modemmanager-qt-5.95.0.tar.xz";
sha256 = "0n9majjny43gic3s73v317wxyfzicf1j2cd7ly7fb1wpm5l9684x";
name = "modemmanager-qt-5.95.0.tar.xz";
};
};
networkmanager-qt = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/networkmanager-qt-5.94.0.tar.xz";
sha256 = "00k5k1xv53hf24k9w3sd5am64zz5zph3fx63q6xpf3pz371qq80j";
name = "networkmanager-qt-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/networkmanager-qt-5.95.0.tar.xz";
sha256 = "0wkk6kblbvazplfr7wwzb552jv3560ng80wp56kihnagxkhch491";
name = "networkmanager-qt-5.95.0.tar.xz";
};
};
oxygen-icons5 = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/oxygen-icons5-5.94.0.tar.xz";
sha256 = "1l6izhrqqvf5vh2ib8zf1fjh5d9i9ri5jg9x3k1wi0xp7yy9sg90";
name = "oxygen-icons5-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/oxygen-icons5-5.95.0.tar.xz";
sha256 = "1993sy7a4zvw5nbzjc9ii67f9wsba683szi39rl3gl6iy17i3lrd";
name = "oxygen-icons5-5.95.0.tar.xz";
};
};
plasma-framework = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/plasma-framework-5.94.0.tar.xz";
sha256 = "0apd2n453yk8ifv6zq6845rwsacm1vpw9xwv26a221k1gfggpsvc";
name = "plasma-framework-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/plasma-framework-5.95.0.tar.xz";
sha256 = "0px54bymfvwl9cyd31vgnmn1h87w1fwzqmdis3hv4q2yk2anqnsz";
name = "plasma-framework-5.95.0.tar.xz";
};
};
prison = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/prison-5.94.0.tar.xz";
sha256 = "1jyi0vd5msj7cf2jv21ibpp8lkn5yvd5wv3rbnkdnqwzamw7jq4r";
name = "prison-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/prison-5.95.0.tar.xz";
sha256 = "0i3gczd1qmxd80m4pra3fgzg1q7xvv6kfmf7c9a24misc02vwvb1";
name = "prison-5.95.0.tar.xz";
};
};
purpose = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/purpose-5.94.0.tar.xz";
sha256 = "1axk852xpiz1a67b5zh08r01zr6x15k0sd7np9564s9agybzzbbk";
name = "purpose-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/purpose-5.95.0.tar.xz";
sha256 = "002py7c162991p40hsyiqpafd6zfd5amr2b9khw0bkf72ckj0936";
name = "purpose-5.95.0.tar.xz";
};
};
qqc2-desktop-style = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/qqc2-desktop-style-5.94.0.tar.xz";
sha256 = "0j3y1vnqv12lz33vrif6fb5nc3sk5z52fsw77i12xhlkpq6j258b";
name = "qqc2-desktop-style-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/qqc2-desktop-style-5.95.0.tar.xz";
sha256 = "04vkwbdlm141zgm46y1h2ypkf5w8lcbj6xbbmrkii6crv8g88ass";
name = "qqc2-desktop-style-5.95.0.tar.xz";
};
};
solid = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/solid-5.94.0.tar.xz";
sha256 = "01qiz8l12jw9rd085swx2kbbjaci6lnqx323a6g4nskbwc0x93lx";
name = "solid-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/solid-5.95.0.tar.xz";
sha256 = "0vind63kb4kl4741fy0h9rcj7579w80csmkz4ldiik50gl8hjjjc";
name = "solid-5.95.0.tar.xz";
};
};
sonnet = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/sonnet-5.94.0.tar.xz";
sha256 = "0k27nxk20i4r9sa6gy56r4s7dnn51igbyvzz3nwvcswdfij0lmwc";
name = "sonnet-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/sonnet-5.95.0.tar.xz";
sha256 = "18praj54sgnmsgqhmwp0w2jvs78k5i9j831dxfjnrzmc2ncgn1aw";
name = "sonnet-5.95.0.tar.xz";
};
};
syndication = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/syndication-5.94.0.tar.xz";
sha256 = "0nv88hhdy8r42ghm2r0pskshihjqc46zx8x61rk5x3c9skj153j5";
name = "syndication-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/syndication-5.95.0.tar.xz";
sha256 = "0dh8hikdfd7xdvp3rqi453v10gxq0sf5z3hzb0xsgx1y402z9mfc";
name = "syndication-5.95.0.tar.xz";
};
};
syntax-highlighting = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/syntax-highlighting-5.94.0.tar.xz";
sha256 = "19p5vn6rrhqlhzjs73zagzzdbcrj5jl37n7x35lq6m83llr171yg";
name = "syntax-highlighting-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/syntax-highlighting-5.95.0.tar.xz";
sha256 = "00j88xgya0xcwrg1n0kzp5ba2f3ppp8whw66fzpksahzfvcwm71x";
name = "syntax-highlighting-5.95.0.tar.xz";
};
};
threadweaver = {
version = "5.94.0";
version = "5.95.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.94/threadweaver-5.94.0.tar.xz";
sha256 = "1ig1m00bpil0qixa3kshd8smijyasr7svps97d1pwfy5c8d47n47";
name = "threadweaver-5.94.0.tar.xz";
url = "${mirror}/stable/frameworks/5.95/threadweaver-5.95.0.tar.xz";
sha256 = "0gnxy97az0jy88rl2ly5f858yzwml9la1hkln9nvh8c7q2girc5s";
name = "threadweaver-5.95.0.tar.xz";
};
};
}
@@ -1,21 +0,0 @@
{ lib, stdenv, fetchurl, cmake, qt4 }:
stdenv.mkDerivation rec {
pname = "libbluedevil";
# bluedevil must have the same major version (x.y) as libbluedevil!
# do not update this package without checking bluedevil
version = "2.1";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
sha256 = "0p4f0brhcz9gfxfd6114fa5x6swfdmgzv350xwncdr0s1qnamk8c";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ qt4 ];
meta = {
platforms = lib.platforms.unix;
license = lib.licenses.gpl2Plus;
};
}
@@ -2,20 +2,29 @@
, stdenv
, fetchFromGitHub
, cmake
, catch2
, catch2_3
}:
stdenv.mkDerivation rec {
pname = "rapidfuzz-cpp";
version = "1.0.1";
version = "1.0.2";
src = fetchFromGitHub {
owner = "maxbachmann";
repo = "rapidfuzz-cpp";
rev = "v${version}";
hash = "sha256-331iW0nu5MlxuKNTgMkRSASnglxn+hEWBhRMnw0lY2Y=";
hash = "sha256-Tf7nEMXiem21cvQHPnYnCvOOLg0KBBnNQDaYIcHcm2g=";
};
patches = lib.optionals doCheck [
./dont-fetch-project-options.patch
];
postPatch = ''
substituteInPlace test/CMakeLists.txt \
--replace WARNINGS_AS_ERRORS ""
'';
nativeBuildInputs = [
cmake
];
@@ -25,11 +34,10 @@ stdenv.mkDerivation rec {
];
checkInputs = [
catch2
catch2_3
];
# uses unreleased Catch2 version 3
doCheck = false;
doCheck = true;
meta = {
description = "Rapid fuzzy string matching in C++ using the Levenshtein Distance";
@@ -0,0 +1,58 @@
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 5ba4464..ad72319 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -12,39 +12,10 @@ else()
FetchContent_MakeAvailable(Catch2)
endif()
-# include aminya & jason turner's C++ best practices recommended cmake project utilities
-include(FetchContent)
-FetchContent_Declare(_project_options URL https://github.com/aminya/project_options/archive/refs/tags/v0.20.0.zip)
-FetchContent_MakeAvailable(_project_options)
-include(${_project_options_SOURCE_DIR}/Index.cmake)
-
-project_options(
- # ENABLE_CACHE
- # ENABLE_CONAN
- WARNINGS_AS_ERRORS
- # ENABLE_CPPCHECK
- # ENABLE_CLANG_TIDY
- # ENABLE_INCLUDE_WHAT_YOU_USE
- # ENABLE_COVERAGE
- # ENABLE_PCH
- # PCH_HEADERS <Eigen/Dense> <fmt/core.h> <vector> <utility> <string> <string_view>
- # ENABLE_DOXYGEN
- # ENABLE_IPO
- # ENABLE_USER_LINKER
- # ENABLE_BUILD_WITH_TIME_TRACE
- # ENABLE_UNITY
- # ENABLE_SANITIZER_ADDRESS
- # ENABLE_SANITIZER_LEAK
- # ENABLE_SANITIZER_UNDEFINED_BEHAVIOR
- # ENABLE_SANITIZER_THREAD
- # ENABLE_SANITIZER_MEMORY
- # CLANG_WARNINGS "-Weverything"
-)
-
function(rapidfuzz_add_test test)
add_executable(test_${test} tests-${test}.cpp)
target_link_libraries(test_${test} ${PROJECT_NAME})
- target_link_libraries(test_${test} Catch2::Catch2WithMain project_warnings)
+ target_link_libraries(test_${test} Catch2::Catch2WithMain)
add_test(NAME ${test} COMMAND test_${test})
endfunction()
diff --git a/test/distance/CMakeLists.txt b/test/distance/CMakeLists.txt
index 2a70054..7a43c88 100644
--- a/test/distance/CMakeLists.txt
+++ b/test/distance/CMakeLists.txt
@@ -1,7 +1,7 @@
function(rapidfuzz_add_test test)
add_executable(test_${test} tests-${test}.cpp)
target_link_libraries(test_${test} ${PROJECT_NAME})
- target_link_libraries(test_${test} Catch2::Catch2WithMain project_warnings)
+ target_link_libraries(test_${test} Catch2::Catch2WithMain)
add_test(NAME ${test} COMMAND test_${test})
endfunction()
@@ -2,13 +2,12 @@
buildDunePackage rec {
pname = "tsort";
useDune2 = true;
version = "2.0.0";
version = "2.1.0";
src = fetchFromGitHub {
owner = "dmbaturin";
repo = "ocaml-tsort";
rev = version;
sha256 = "0i67ys5p5i8q9p0nhkq4pjg9jav8dy0fiy975a365j7m6bhrwgc1";
sha256 = "sha256-SCd0R8iGwMeRhhSxMid9lzqj5fm+owCJ2dzwtLpFqB4=";
};
propagatedBuildInputs = [ containers ];
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "cachelib";
version = "0.7.0";
version = "0.8.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "pallets";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-/378xNkBZHoTJ9Qs8RTYi+QosLs7GBgMOkIDYOaSH1Y=";
sha256 = "sha256-MtfBiis0oXF4sxCUI/uneZM/OFzmTy+pj8ddTxamKrs=";
};
checkInputs = [
@@ -6,9 +6,9 @@
, fetchPypi
, setuptools
, setuptools-scm
, toml
, importlib-metadata
, cssselect
, jaraco-test
, lxml
, mock
, pytestCheckHook
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "cssutils";
version = "2.4.1";
version = "2.4.2";
disabled = pythonOlder "3.7";
@@ -25,13 +25,12 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
hash = "sha256-+Gicb66TTLanB3xwZvLGAmwOkN560wqBaz9tWaE41jg=";
hash = "sha256-h3gYv6lmjMU1dz9G5rakbeKENhkSEXQbP3tKqmTZr7s=";
};
nativeBuildInputs = [
setuptools
setuptools-scm
toml
];
propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
@@ -40,6 +39,7 @@ buildPythonPackage rec {
checkInputs = [
cssselect
jaraco-test
lxml
mock
pytestCheckHook
@@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "dash";
version = "2.5.0";
version = "2.5.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "plotly";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-Qh5oOkTxEbxXXDX+g9TDa5DiYBlMpnx0yKsn/XMfMF0=";
hash = "sha256-ptJ/rRAENiwcvnCM80gewUwW5Q77gD0b/NF534LpPfY=";
};
propagatedBuildInputs = [
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "flammkuchen";
version = "0.9.2";
version = "1.0.2";
src = fetchPypi {
inherit pname version;
sha256 = "f249fe5bf85f717d3836e0db6fa9443a8a43101ce07704715b42251c44fc968e";
sha256 = "sha256-KtMGQftoYVNNMtfYeYiaQyMLAySpf9YXLMxj+e/CV5I=";
};
checkInputs = [
@@ -6,13 +6,13 @@
}:
buildPythonPackage rec {
version = "8.0.0";
version = "8.1.2";
pname = "gnureadline";
disabled = isPyPy;
src = fetchPypi {
inherit pname version;
sha256 = "0xllr43dizvybmb68i0ybk1xhaqx5abjwxa9vrg43b9ds0pggvk1";
sha256 = "sha256-QmKmqjVqsi72QvQ6f5TrQqctbwxTLttOjGuTP1cwVtI=";
};
buildInputs = [ pkgs.ncurses ];
@@ -0,0 +1,54 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchPypi
, setuptools
, setuptools-scm
, toml
, jaraco_functools
, jaraco-context
, more-itertools
, jaraco_collections
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "jaraco-test";
version = "5.1.0";
disabled = pythonOlder "3.7";
format = "pyproject";
src = fetchPypi {
pname = "jaraco.test";
inherit version;
sha256 = "04a7503c0c78cd057bd6b5f16ad1e3379b911b619df6694480a564ebc214c0a8";
};
nativeBuildInputs = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [
toml
jaraco_functools
jaraco-context
more-itertools
jaraco_collections
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "jaraco.test" ];
meta = {
description = "Testing support by jaraco";
homepage = "https://github.com/jaraco/jaraco.test";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ dotlambda ];
};
}
@@ -13,7 +13,7 @@
buildPythonApplication rec {
pname = "mkdocs-material";
version = "8.3.4";
version = "8.3.5";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonApplication rec {
owner = "squidfunk";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-UQGszU1ICundexXSHMdDm15FjlnzK1ifuRn2M5fp1sA=";
hash = "sha256-1fRNq2vOWTaUa8OZE1EkLH/2pt9vpUBkWXmro+aqwmA=";
};
propagatedBuildInputs = [
@@ -1,12 +1,12 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k, funcsigs, pytest, numpy }:
buildPythonPackage rec {
version = "1.3.0";
version = "1.3.1";
pname = "mockito";
src = fetchPypi {
inherit pname version;
sha256 = "5d41a5f6ec0b8fc32b6d796480d4849ee5fb0ac75d12f13862f1622684f5f578";
sha256 = "sha256-o8Hg3UnxWbJITBu/IjsbWRHDiJ5smffKUNHAqG21170=";
};
propagatedBuildInputs = lib.optionals (!isPy3k) [ funcsigs ];
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "plaid-python";
version = "9.5.0";
version = "9.6.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-gjYlr2rp2xRMcFKbA4Y/Pb7YYOUR4LTzMtVoG1iMlx0=";
hash = "sha256-LijBSAnRwXoeddWwolamM3QYSTwFvgodmaIbayco8fY=";
};
propagatedBuildInputs = [
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pyclipper";
version = "1.3.0.post2";
version = "1.3.0.post3";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -17,8 +17,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "fonttools";
repo = pname;
rev = version;
hash = "sha256-AFdfzM1zdhmfh3Uu5fFVOMWStbuHxKS3FovZPTeuNFA=";
rev = "refs/tags/${version}";
hash = "sha256-viBnmzbCAH9QaVHwUq43rm11e8o3N/jtGsGpmRZokaw=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "qcelemental";
version = "0.24.0";
version = "0.25.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-XcsR89tu26EG5AcXqmndkESLGWZ8eKmTkjaLziosawE=";
sha256 = "sha256-v1yu6yBEtgVsheku/8YaIaXrsVgMzcFlWAuySPhYgyQ=";
};
propagatedBuildInputs = [
@@ -4,6 +4,7 @@
, fetchFromGitHub
, cmake
, cython_3
, ninja
, rapidfuzz-capi
, scikit-build
, jarowinkler
@@ -32,6 +33,7 @@ buildPythonPackage rec {
nativeBuildInputs = [
cmake
cython_3
ninja
rapidfuzz-capi
scikit-build
];
@@ -0,0 +1,23 @@
{ lib, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "rpi-gpio";
version = "0.7.1";
src = fetchPypi {
pname = "RPi.GPIO";
inherit version;
sha256 = "sha256-zWHEsDw3tiu6SlrP6phidJwzxhjgKV5+kKpHE/s3O3A=";
};
# Tests disable because they do a platform check which requires running on a
# Raspberry Pi
doCheck = false;
meta = with lib; {
homepage = "https://sourceforge.net/p/raspberry-gpio-python";
description = "Python module to control the GPIO on a Raspberry Pi";
license = licenses.mit;
maintainers = with maintainers; [ onny ];
};
}
@@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "sabyenc3";
version = "5.1.7";
version = "5.4.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-pewB7JAQ/4KitGFrHX52Gn02my/bOcQCz79cwh6vElk=";
hash = "sha256-6wXwmL1RCZ72KSqJgMjO3grvuDLWyMsbuU+kJmEkCmM=";
};
# Tests are not included in pypi distribution
@@ -32,14 +32,14 @@ with py.pkgs;
buildPythonApplication rec {
pname = "checkov";
version = "2.0.1210";
version = "2.0.1212";
format = "setuptools";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
hash = "sha256-2NVr8XUddKfsfCHEv9tvEwbLZRVzLTmlVkZ7+anmtA4=";
hash = "sha256-/SrxLqPtMPj9kvig2x9BzhlDsQClWWu+hZ1nyvXCyxA=";
};
nativeBuildInputs = with py.pkgs; [
@@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "appthreat-depscan";
version = "2.1.3";
version = "2.1.5";
src = fetchFromGitHub {
owner = "AppThreat";
repo = "dep-scan";
rev = "refs/tags/v${version}";
hash = "sha256-6ifpPNBcqaNGVQjZQ3G48QuwTRRn4zL3awa06yOeveU=";
hash = "sha256-pe8bEMpK0pHLoTRSE0eEbARbU3Pyqv1PFOYvF6D4Trw=";
};
propagatedBuildInputs = with python3.pkgs; [
+5 -2
View File
@@ -6,13 +6,14 @@
, libjwt
, libyaml
, json_c
, http-parser
# enable internal X11 support via libssh2
, enableX11 ? true
}:
stdenv.mkDerivation rec {
pname = "slurm";
version = "22.05.0.1";
version = "22.05.1.1";
# N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
# because the latter does not keep older releases.
@@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
repo = "slurm";
# The release tags use - instead of .
rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";
sha256 = "0bc8kycrc5a8kqffbd03k22z38f7z8fj725iniq8hz6srhf5nxgs";
sha256 = "034qnqvamb7v8gimybjr579442c37qwdq8i2kip6c0zhcl42bvaf";
};
outputs = [ "out" "dev" ];
@@ -53,10 +54,12 @@ stdenv.mkDerivation rec {
libmysqlclient ncurses gtk2 lz4 rdma-core
lua hwloc numactl readline freeipmi shadow.su
pmix json_c libjwt libyaml dbus libbpf
http-parser
] ++ lib.optionals enableX11 [ xorg.xauth ];
configureFlags = with lib;
[ "--with-freeipmi=${freeipmi}"
"--with-http-parser=${http-parser}"
"--with-hwloc=${hwloc.dev}"
"--with-json=${json_c.dev}"
"--with-jwt=${libjwt}"
+3 -3
View File
@@ -12,16 +12,16 @@
# server, and the FHS userenv and corresponding NixOS module should
# automatically pick up the changes.
stdenv.mkDerivation rec {
version = "1.26.2.5797-5bd057d2b";
version = "1.27.0.5897-3940636f2";
pname = "plexmediaserver";
# Fetch the source
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
sha256 = "1wcscq5n98b37j9rm10kcdv3fjaf82hx4zgk4vfhkbs9lh9349rz";
sha256 = "1ibahbz276diji66m5w059a1h9crva92r83w6av1dfq44v298s77";
} else fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
sha256 = "08nqqp9i346f6i4xypba441by000fc8xsm93q9bzc96kslid3f2d";
sha256 = "119nmmjpca05d6vzhy3xipgca9k51ps8252vcgdsp080dh7nk2kp";
};
outputs = [ "out" "basedb" ];
+3 -17
View File
@@ -10,21 +10,7 @@
}:
let
python = python3.override {
packageOverrides = final: prev: {
sabyenc3 = prev.sabyenc3.overridePythonAttrs (oldAttrs: rec {
version = "4.0.0";
src = oldAttrs.src.override {
inherit version;
hash = "sha256-PwwQ2jChKIqh7jJ6E2hkqPquTDSN4MklghfJ+MkM0n0=";
};
});
};
self = python;
};
pythonEnv = python.withPackages(ps: with ps; [
pythonEnv = python3.withPackages(ps: with ps; [
chardet
cheetah3
cherrypy
@@ -38,14 +24,14 @@ let
]);
path = lib.makeBinPath [ par2cmdline unrar unzip p7zip ];
in stdenv.mkDerivation rec {
version = "3.5.3";
version = "3.6.0";
pname = "sabnzbd";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "sha256-pdYTTahdn9YVFreU5KhMGlUzQxHviN5G4TxWKKRBxOc=";
sha256 = "sha256-X5O3TxNjQ+8kOd3OakKV0+KncxQr+oQn0mXeBXDV/Xs=";
};
nativeBuildInputs = [ makeWrapper ];
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "godns";
version = "2.7.7";
version = "2.7.8";
src = fetchFromGitHub {
owner = "TimothyYe";
repo = "godns";
rev = "v${version}";
sha256 = "sha256-55A1dxVRIngfS43V+iM1RX2U6eQyPsIAHgyxKGO4yrY=";
sha256 = "sha256-8uGw8F4HcpSsZF8X4cYz9ETsLLBH/NbOk2QzbAXFVFo=";
};
vendorSha256 = "sha256-vhByl9oJjFIvOskAgLubZ5RCcitKd2jjxi8D9nU6850=";
vendorSha256 = "sha256-tXH62HyA/pJxt69GWkVrJ4VrA16KfpEtpK/YKiUkvtU=";
# Some tests require internet access, broken in sandbox
doCheck = false;
+4 -4
View File
@@ -2,17 +2,17 @@
buildGoModule rec {
pname = "gitsign";
version = "0.1.0";
version = "0.1.1";
src = fetchFromGitHub {
owner = "sigstore";
repo = pname;
rev = "v${version}";
sha256 = "sha256-tcWq+WZJLyO8lJKxV0QSDH1JKgW+9FaC9FxrSotLQag=";
sha256 = "sha256-0cu5uJVFiqkvfVxCbrruHLa4Zj0EU75cbgrTrwzo7+U=";
};
vendorSha256 = "sha256-34pyHAUU1+K9qNAi7rPZIvaGAen+LrwEqLyrrzUaLbk=";
vendorSha256 = "sha256-JMS/OFL2oxQFWa+wNhxS7fXSYQbCSEV3Sakq4rmsolI=";
ldflags = [ "-s" "-w" ];
ldflags = [ "-s" "-w" "-buildid=" "-X github.com/sigstore/gitsign/pkg/version.gitVersion=${version}" ];
meta = {
homepage = "https://github.com/sigstore/gitsign";
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "yubikey-agent";
version = "0.1.5";
version = "unstable-2022-03-17";
src = fetchFromGitHub {
owner = "FiloSottile";
repo = pname;
rev = "v${version}";
sha256 = "14s61jgcmpqh70jz0krrai8xg0xqhwmillxkij50vbsagpxjssk6";
repo = "yubikey-agent";
rev = "205a7ef2554625c7494038600d963123d6311873";
sha256 = "sha256-wJpN63KY5scmez6yYFsIr3JLEUB+YSl/XvoatIIeRI0=";
};
buildInputs =
@@ -21,7 +21,7 @@ buildGoModule rec {
substituteInPlace main.go --replace 'notify-send' ${libnotify}/bin/notify-send
'';
vendorSha256 = "1v4ccn7ysh8ax1nkf1v9fcgsdnz6zjyh6j6ivyljyfvma1lmcrmk";
vendorSha256 = "sha256-SnjbkDPVjAnCbM2nLqBsuaPZwOmvDTKiUbi/93BlWVQ=";
doCheck = false;
-27
View File
@@ -1,27 +0,0 @@
{ lib, stdenv, fetchFromGitHub, qt4, perl, pkg-config }:
stdenv.mkDerivation rec {
pname = "qshowdiff";
version = "1.2";
src = fetchFromGitHub {
owner = "danfis";
repo = "qshowdiff";
rev = "v${version}";
sha256 = "g3AWQ6/LSF59ztzdgNuLi+8d6fFTPiC9z0yXMdPdB5U=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ qt4 perl ];
configurePhase = ''
mkdir -p $out/{bin,man/man1}
makeFlags="PREFIX=$out CC=$CXX"
'';
meta = {
homepage = "http://qshowdiff.danfis.cz/";
description = "Colourful diff viewer";
license = lib.licenses.gpl3Plus;
};
}
+2
View File
@@ -682,6 +682,7 @@ mapAliases ({
letsencrypt = throw "'letsencrypt' has been renamed to/replaced by 'certbot'"; # Converted to throw 2022-02-22
libGL_driver = throw "'libGL_driver' has been renamed to/replaced by 'mesa.drivers'"; # Converted to throw 2022-02-22
libaudit = throw "'libaudit' has been renamed to/replaced by 'audit'"; # Converted to throw 2022-02-22
libbluedevil = throw "'libbluedevil' (Qt4) is unmaintained and unused since 'kde4.bluedevil's removal in 2017"; # Added 2022-06-14
libcanberra_gtk2 = throw "'libcanberra_gtk2' has been renamed to/replaced by 'libcanberra-gtk2'"; # Converted to throw 2022-02-22
libcanberra_gtk3 = throw "'libcanberra_gtk3' has been renamed to/replaced by 'libcanberra-gtk3'"; # Converted to throw 2022-02-22
libcap_manpages = throw "'libcap_manpages' has been renamed to/replaced by 'libcap.doc'"; # Converted to throw 2022-02-22
@@ -1168,6 +1169,7 @@ mapAliases ({
qflipper = qFlipper; # Added 2022-02-11
qmk_firmware = throw "qmk_firmware has been removed because it was broken"; # Added 2021-04-02
qr-filetransfer = throw ''"qr-filetransfer" has been renamed to "qrcp"''; # Added 2020-12-02
qshowdiff = throw "'qshowdiff' (Qt4) is unmaintained and not been updated since its addition in 2010"; # Added 2022-06-14
qt-3 = throw "qt-3 has been removed from nixpkgs, as it's unmaintained and insecure"; # Added 2021-02-15
qt5ct = libsForQt5.qt5ct; # Added 2021-12-27
qtcurve = libsForQt5.qtcurve; # Added 2020-11-07
+2 -4
View File
@@ -2959,6 +2959,8 @@ with pkgs;
catch2 = callPackage ../development/libraries/catch2 { };
catch2_3 = callPackage ../development/libraries/catch2/3.nix { };
catdoc = callPackage ../tools/text/catdoc { };
catdocx = callPackage ../tools/text/catdocx { };
@@ -9772,8 +9774,6 @@ with pkgs;
qscintilla-qt4 = callPackage ../development/libraries/qscintilla-qt4 { };
qshowdiff = callPackage ../tools/text/qshowdiff { };
qrcp = callPackage ../tools/networking/qrcp { };
qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { };
@@ -18337,8 +18337,6 @@ with pkgs;
libbencodetools = callPackage ../development/libraries/libbencodetools { };
libbluedevil = callPackage ../development/libraries/libbluedevil { };
libbdplus = callPackage ../development/libraries/libbdplus { };
libblockdev = callPackage ../development/libraries/libblockdev { };
+4
View File
@@ -4427,6 +4427,8 @@ in {
jaraco_stream = callPackage ../development/python-modules/jaraco_stream { };
jaraco-test = callPackage ../development/python-modules/jaraco-test { };
jaraco_text = callPackage ../development/python-modules/jaraco_text { };
jarowinkler = callPackage ../development/python-modules/jarowinkler { };
@@ -9338,6 +9340,8 @@ in {
rpi-bad-power = callPackage ../development/python-modules/rpi-bad-power { };
rpi-gpio = callPackage ../development/python-modules/rpi-gpio { };
rply = callPackage ../development/python-modules/rply { };
rpm = toPythonModule (pkgs.rpm.override {