gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2024-09-20 12:05:56 +00:00
committed by GitHub
parent 8e51715333 7556e2a306
commit 33e2cbc61f
448 changed files with 12630 additions and 1459 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
+6
View File
@@ -16908,6 +16908,12 @@
githubId = 406946;
name = "Valentin Lorentz";
};
projectinitiative = {
name = "ProjectInitiative";
github = "ProjectInitiative";
githubId = 6314611;
keys = [ { fingerprint = "EEC7 53FC EAAA FD9E 4DC0 9BB5 CAEB 4185 C226 D76B"; } ];
};
prominentretail = {
email = "me@jakepark.me";
github = "ProminentRetail";
maintainers/scripts/kde/generate-sources.py
+2 -2
View File
@@ -16,7 +16,7 @@ import utils
LEAF_TEMPLATE = jinja2.Template('''
{mkKdeDerivation}:
{ mkKdeDerivation }:
mkKdeDerivation {
pname = "{{ pname }}";
}
@@ -25,7 +25,7 @@ mkKdeDerivation {
ROOT_TEMPLATE = jinja2.Template('''
{callPackage}: {
{%- for p in packages %}
{{ p }} = callPackage ./{{ p }} {};
{{ p }} = callPackage ./{{ p }} { };
{%- endfor %}
}
'''.strip());
nixos/modules/installer/tools/get-version-suffix
-23
View File
@@ -1,23 +0,0 @@
getVersion() {
local dir="$1"
rev=
gitDir="$dir/.git"
if [ -e "$gitDir" ]; then
if [ -z "$(type -P git)" ]; then
echo "warning: Git not found; cannot figure out revision of $dir" >&2
return
fi
cd "$dir"
rev=$(git --git-dir="$gitDir" rev-parse --short HEAD)
if git --git-dir="$gitDir" describe --always --dirty | grep -q dirty; then
rev+=M
fi
fi
}
if nixpkgs=$(nix-instantiate --find-file nixpkgs "$@"); then
getVersion $nixpkgs
if [ -n "$rev" ]; then
echo ".git.$rev"
fi
fi
nixos/modules/installer/tools/tools.nix
+3 -29
View File
@@ -17,26 +17,9 @@ let
'';
});
nixos-build-vms = makeProg {
name = "nixos-build-vms";
src = ./nixos-build-vms/nixos-build-vms.sh;
inherit (pkgs) runtimeShell;
manPage = ./manpages/nixos-build-vms.8;
};
nixos-install = makeProg {
name = "nixos-install";
src = ./nixos-install.sh;
inherit (pkgs) runtimeShell;
nix = config.nix.package.out;
path = makeBinPath [
pkgs.jq
nixos-enter
pkgs.util-linuxMinimal
];
manPage = ./manpages/nixos-install.8;
};
inherit (pkgs) nixos-build-vms;
nixos-install = pkgs.nixos-install.override { nix = config.nix.package; };
nixos-rebuild = pkgs.nixos-rebuild.override { nix = config.nix.package.out; };
nixos-generate-config = makeProg {
@@ -69,16 +52,7 @@ let
manPage = ./manpages/nixos-version.8;
};
nixos-enter = makeProg {
name = "nixos-enter";
src = ./nixos-enter.sh;
inherit (pkgs) runtimeShell;
path = makeBinPath [
pkgs.util-linuxMinimal
];
manPage = ./manpages/nixos-enter.8;
};
inherit (pkgs) nixos-enter;
in
{
nixos/modules/misc/nixpkgs.nix
+4 -1
View File
@@ -386,7 +386,10 @@ in
`nixpkgs.config` options should be passed when creating the instance instead.
Current value:
${lib.generators.toPretty { multiline = true; } opt.config}
${lib.generators.toPretty { multiline = true; } cfg.config}
Defined in:
${lib.concatMapStringsSep "\n" (file: " - ${file}") opt.config.files}
'';
}
];
nixos/modules/misc/nixpkgs/test.nix
+19
View File
@@ -16,6 +16,11 @@ let
nixpkgs.hostPlatform = "aarch64-linux";
nixpkgs.buildPlatform = "aarch64-linux";
};
externalPkgsWithConfig = {
_file = "ext-pkgs-config.nix";
nixpkgs.pkgs = pkgs;
nixpkgs.config.allowUnfree = true;
};
ambiguous = {
_file = "ambiguous.nix";
nixpkgs.hostPlatform = "aarch64-linux";
@@ -108,6 +113,20 @@ lib.recurseIntoAttrs {
For a future proof system configuration, we recommend to remove
the legacy definitions.
''];
assert builtins.trace (lib.head (getErrors externalPkgsWithConfig))
getErrors externalPkgsWithConfig ==
[''
Your system configures nixpkgs with an externally created instance.
`nixpkgs.config` options should be passed when creating the instance instead.
Current value:
{
allowUnfree = true;
}
Defined in:
- ext-pkgs-config.nix
''];
assert getErrors {
nixpkgs.localSystem = pkgs.stdenv.hostPlatform;
nixpkgs.hostPlatform = pkgs.stdenv.hostPlatform;
nixos/modules/services/web-apps/wordpress.nix
+6 -3
View File
@@ -75,13 +75,16 @@ let
mkPhpValue = v: let
isHasAttr = s: isAttrs v && hasAttr s v;
# "you're escaped" -> "'you\'re escaped'"
# https://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.single
toPhpString = s: "'${escape [ "'" "\\" ] s}'";
in
if isString v then escapeShellArg v
if isString v then toPhpString v
# NOTE: If any value contains a , (comma) this will not get escaped
else if isList v && any lib.strings.isCoercibleToString v then escapeShellArg (concatMapStringsSep "," toString v)
else if isList v && any lib.strings.isCoercibleToString v then toPhpString (concatMapStringsSep "," toString v)
else if isInt v then toString v
else if isBool v then boolToString v
else if isHasAttr "_file" then "trim(file_get_contents(${lib.escapeShellArg v._file}))"
else if isHasAttr "_file" then "trim(file_get_contents(${toPhpString v._file}))"
else if isHasAttr "_raw" then v._raw
else abort "The Wordpress config value ${lib.generators.toPretty {} v} can not be encoded."
;
nixos/tests/terminal-emulators.nix
+3
View File
@@ -62,6 +62,9 @@ let tests = {
konsole.pkg = p: p.plasma5Packages.konsole;
lomiri-terminal-app.pkg = p: p.lomiri.lomiri-terminal-app;
# after recent Mesa change, borked software rendering config under x86_64 icewm?
# BGR colour display on x86_64, RGB on aarch64
lomiri-terminal-app.colourTest = false;
lxterminal.pkg = p: p.lxterminal;
nixos/tests/wordpress.nix
+2 -2
View File
@@ -11,7 +11,7 @@ rec {
};
nodes = lib.foldl (a: version: let
package = pkgs."wordpress${version}";
package = pkgs."wordpress_${version}";
in a // {
"wp${version}_httpd" = _: {
services.httpd.adminAddr = "webmaster@site.local";
@@ -67,7 +67,7 @@ rec {
networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ];
};
}) {} [
"6_3" "6_4"
"6_5" "6_6"
];
testScript = ''
pkgs/applications/editors/elvis/default.nix
-49
View File
@@ -1,49 +0,0 @@
{ fetchurl, fetchpatch, lib, stdenv, ncurses }:
stdenv.mkDerivation rec {
pname = "elvis";
version = "2.2_0";
src = fetchurl {
url = "http://www.the-little-red-haired-girl.org/pub/elvis/elvis-${version}.tar.gz";
sha256 = "182fj9qzyq6cjq1r849gpam6nq9smwv9f9xwaq84961p56r6d14s";
};
buildInputs = [ ncurses ];
patches = [
(fetchpatch {
url = "https://github.com/mbert/elvis/commit/076cf4ad5cc993be0c6195ec0d5d57e5ad8ac1eb.patch";
sha256 = "0yzkc1mxjwg09mfmrk20ksa0vfnb2x83ndybwvawq4xjm1qkcahc";
})
];
postPatch = ''
substituteInPlace configure \
--replace '-lcurses' '-lncurses'
'';
preConfigure = ''
mkdir -p $out/share/man/man1
'';
installPhase = ''
mkdir -p $out/bin $out/share/elvis $out/share/elvis/doc
cp elvis ref elvtags elvfmt $out/bin
cp -R data/* $out/share/elvis
cp doc/* $out/share/elvis/doc
mkdir -p $out/share/man/man1
for a in doc/*.man; do
cp $a $out/share/man/man1/`basename $a .man`.1
done
'';
configureFlags = [ "--ioctl=termios" ];
meta = {
homepage = "http://elvis.the-little-red-haired-girl.org/";
description = "Vi clone for Unix and other operating systems";
license = lib.licenses.free;
};
}
pkgs/applications/misc/tuba/default.nix
+2 -2
View File
@@ -35,13 +35,13 @@
stdenv.mkDerivation rec {
pname = "tuba";
version = "0.8.3";
version = "0.8.4";
src = fetchFromGitHub {
owner = "GeopJr";
repo = "Tuba";
rev = "v${version}";
hash = "sha256-K0TXWFCSVjwogSXiTRX2eE92w5OzOGVeU4hFkDTJl+M=";
hash = "sha256-PRzLTlq8XfI5dYZhJ8YBtYi4H3883S2olp9jrn1Q5CQ=";
};
nativeBuildInputs = [
pkgs/applications/science/math/cemu-ti/default.nix
+13 -13
View File
@@ -1,39 +1,39 @@
{ stdenv
, lib
, fetchFromGitHub
, qmake
, cmake
, pkg-config
, wrapQtAppsHook
, qt6
, libarchive
, libpng
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "CEmu";
version = "unstable-2022-06-29";
version = "2.0";
src = fetchFromGitHub {
owner = "CE-Programming";
repo = "CEmu";
rev = "880d391ba9f8b7b2ec36ab9b45a34e9ecbf744e9";
hash = "sha256-aFwGZJceh1jEP8cEajY5wYlSaFuNhYvSoZ/E1QDfJEI=";
rev = "v${finalAttrs.version}";
hash = "sha256-fohsIJrvPDMmYHoPbmYQlKLMnj/B3XEBaerZYuqxvd8=";
fetchSubmodules = true;
};
sourceRoot = "${finalAttrs.src.name}/gui/qt/";
nativeBuildInputs = [
qmake
wrapQtAppsHook
cmake
qt6.wrapQtAppsHook
pkg-config
];
buildInputs = [
qt6.qtbase
libarchive
libpng
];
qmakeFlags = [
"gui/qt"
];
meta = with lib; {
description = "Third-party TI-84 Plus CE / TI-83 Premium CE emulator, focused on developer features";
mainProgram = "CEmu";
@@ -43,4 +43,4 @@ stdenv.mkDerivation rec {
platforms = [ "x86_64-linux" "x86_64-darwin" ];
broken = stdenv.isDarwin;
};
}
})
pkgs/applications/version-management/git-gone/default.nix
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "git-gone";
version = "1.1.0";
version = "1.1.1";
src = fetchFromGitHub {
owner = "swsnr";
repo = "git-gone";
rev = "v${version}";
hash = "sha256-Mc9/P4VBmLOC05xqdx/yopbhvdpQS3uejc4YA7BIgug=";
hash = "sha256-j88ZnJ0V8h/fthOWwV6B0ZbzUz7THykqrI2QpOkDT4I=";
};
cargoHash = "sha256-NyyficEDJReMLAw2VAK2fOXNIwHilnUqQRACGck+0Vo=";
cargoHash = "sha256-H41wpG5LhjJ7BtFrol0JbjTpssOPUgumgapOiZJi2lc=";
nativeBuildInputs = [ installShellFiles ];
pkgs/by-name/el/elvis/package.nix
+75
View File
@@ -0,0 +1,75 @@
{
lib,
fetchurl,
fetchpatch,
installShellFiles,
ncurses,
stdenv,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "elvis";
version = "2.2_0";
src = fetchurl {
urls = [
"http://www.the-little-red-haired-girl.org/pub/elvis/elvis-${finalAttrs.version}.tar.gz"
"http://www.the-little-red-haired-girl.org/pub/elvis/old/elvis-${finalAttrs.version}.tar.gz"
];
hash = "sha256-moRmsik3mEQQVrwnlzavOmFrqrovEZQDlsxg/3GSTqA=";
};
patches = [
(fetchpatch {
name = "0000-resolve-stdio-getline-naming-conflict.patch";
url = "https://github.com/mbert/elvis/commit/076cf4ad5cc993be0c6195ec0d5d57e5ad8ac1eb.patch";
hash = "sha256-DCo2caiyE8zV5ss3O1AXy7oNlJ5AzFxdTeBx2Wtg83s=";
})
];
outputs = [
"out"
"man"
];
nativeBuildInputs = [ installShellFiles ];
buildInputs = [ ncurses ];
configureFlags = [ "--ioctl=termios" ];
strictDeps = false;
postPatch = ''
substituteInPlace configure \
--replace-fail '-lcurses' '-lncurses'
'';
installPhase = ''
runHook preInstall
installBin elvis ref elvtags elvfmt
pushd doc
for page in *.man; do
installManPage $page
rm $page
done
popd
mkdir -p $out/share/doc/elvis-${finalAttrs.version}/ $out/share/elvis/
cp -R data/* $out/share/elvis/
cp doc/* $out/share/doc/elvis-${finalAttrs.version}/
runHook postInstall
'';
meta = {
homepage = "http://elvis.the-little-red-haired-girl.org/";
description = "Vi clone for Unix and other operating systems";
license = lib.licenses.free;
mainProgram = "elvis";
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.unix;
};
})
pkgs/applications/office/homebank/default.nix → pkgs/by-name/ho/homebank/package.nix
+6 -5
View File
@@ -1,16 +1,17 @@
{ fetchurl, lib, stdenv, gtk, pkg-config, libofx, intltool, wrapGAppsHook3
{ fetchurl, lib, stdenv, gtk3, pkg-config, libofx, intltool, wrapGAppsHook3
, libsoup_3, adwaita-icon-theme }:
stdenv.mkDerivation rec {
pname = "homebank";
version = "5.8.2";
version = "5.8.3";
src = fetchurl {
url = "https://www.gethomebank.org/public/sources/homebank-${version}.tar.gz";
hash = "sha256-1CpForKKHXp6le8vVlObm22VTh2LqQlI9Qk4bwlzfLA=";
url =
"https://www.gethomebank.org/public/sources/homebank-${version}.tar.gz";
hash = "sha256-5Ag9UjAdxT5R6cYV6VT7ktaVHqd0kzQoLCpfS5q5xMI=";
};
nativeBuildInputs = [ pkg-config wrapGAppsHook3 intltool ];
buildInputs = [ gtk libofx libsoup_3 adwaita-icon-theme];
buildInputs = [ gtk3 libofx libsoup_3 adwaita-icon-theme ];
meta = with lib; {
description = "Free, easy, personal accounting for everyone";
pkgs/by-name/ma/matrix-zulip-bridge/package.nix
+57
View File
@@ -0,0 +1,57 @@
{
lib,
fetchFromGitHub,
python3Packages,
}:
python3Packages.buildPythonApplication rec {
pname = "MatrixZulipBridge";
version = "0.4.1";
pyproject = true;
disabled = python3Packages.pythonOlder "3.10";
src = fetchFromGitHub {
owner = "GearKite";
repo = "MatrixZulipBridge";
rev = "v${version}";
hash = "sha256-5bDqZb8xx5SjThZUSmOcctwo6B15cjkIwA26QNfED2A=";
};
build-system = with python3Packages; [
poetry-core
];
dependencies = with python3Packages; [
zulip
beautifulsoup4
bidict
coloredlogs
emoji
markdownify
mautrix
python-dotenv
ruamel-yaml
zulip-emoji-mapping
];
pythonRelaxDeps = [
"bidict"
"markdownify"
"ruamel-yaml"
"zulip-emoji-mapping"
];
pythonImportsCheck = [
"matrixzulipbridge"
];
meta = {
description = "Matrix puppeting appservice bridge for Zulip";
homepage = "https://github.com/GearKite/MatrixZulipBridge";
changelog = "https://github.com/GearKite/MatrixZulipBridge/releases/tag/v${version}";
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ robertrichter ];
mainProgram = "matrix-zulip-bridge";
};
}
pkgs/by-name/ma/mautrix-meta/package.nix
+4 -4
View File
@@ -14,21 +14,21 @@
buildGoModule rec {
pname = "mautrix-meta";
version = "0.3.2";
version = "0.4.0";
subPackages = [ "." ];
subPackages = [ "cmd/mautrix-meta" ];
src = fetchFromGitHub {
owner = "mautrix";
repo = "meta";
rev = "v${version}";
hash = "sha256-whBqhdB2FSFfrbtGtq8v3pjXW7QMt+I0baHTXVGPWVg=";
hash = "sha256-KJuLBJy/g4ShcylkqIG4OuUalwboUSErSif3p7x4Zo4=";
};
buildInputs = lib.optional (!withGoolm) olm;
tags = lib.optional withGoolm "goolm";
vendorHash = "sha256-rP9wvF6yYW0TdQ+vQV6ZcVMxnCtqz8xRcd9v+4pYYio=";
vendorHash = "sha256-ErY40xIDhhOHQI/jYa8DcnfjOI998neIMgb/IQNP/JQ=";
passthru = {
tests = {
nixos/modules/installer/tools/nixos-build-vms/build-vms.nix → pkgs/by-name/ni/nixos-build-vms/build-vms.nix
+3 -2
View File
@@ -1,5 +1,6 @@
{ system ? builtins.currentSystem
, config ? {}
, nixpkgs
, networkExpr
}:
@@ -9,9 +10,9 @@ let
imports = [ module ];
}) (import networkExpr);
pkgs = import ../../../../.. { inherit system config; };
pkgs = import nixpkgs { inherit system config; };
testing = import ../../../../lib/testing-python.nix {
testing = import "${pkgs.path}/nixos/lib/testing-python.nix" {
inherit system pkgs;
};
nixos/modules/installer/tools/manpages/nixos-build-vms.8 → pkgs/by-name/ni/nixos-build-vms/nixos-build-vms.8
View File
nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh → pkgs/by-name/ni/nixos-build-vms/nixos-build-vms.sh
+3 -2
View File
@@ -49,5 +49,6 @@ then
fi
# Build a network of VMs
nix-build '<nixpkgs/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix>' \
--argstr networkExpr "$networkExpr" "${nixBuildArgs[@]}"
nix-build @buildVms@ \
--argstr networkExpr "$networkExpr" "${nixBuildArgs[@]}" \
--arg nixpkgs "<nixpkgs>"
pkgs/by-name/ni/nixos-build-vms/package.nix
+22
View File
@@ -0,0 +1,22 @@
{
substituteAll,
runtimeShell,
installShellFiles,
}:
substituteAll {
name = "nixos-build-vms";
src = ./nixos-build-vms.sh;
inherit runtimeShell;
buildVms = ./build-vms.nix;
dir = "bin";
isExecutable = true;
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
installManPage ${./nixos-build-vms.8}
'';
meta.mainProgram = "nixos-build-vms";
}
nixos/modules/installer/tools/manpages/nixos-enter.8 → pkgs/by-name/ni/nixos-enter/nixos-enter.8
View File
nixos/modules/installer/tools/nixos-enter.sh → pkgs/by-name/ni/nixos-enter/nixos-enter.sh
View File
pkgs/by-name/ni/nixos-enter/package.nix
+28
View File
@@ -0,0 +1,28 @@
{
lib,
substituteAll,
runtimeShell,
installShellFiles,
util-linuxMinimal,
}:
substituteAll {
name = "nixos-enter";
src = ./nixos-enter.sh;
inherit runtimeShell;
path = lib.makeBinPath [
util-linuxMinimal
];
dir = "bin";
isExecutable = true;
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
installManPage ${./nixos-enter.8}
'';
meta.mainProgram = "nixos-enter";
}
nixos/modules/installer/tools/manpages/nixos-install.8 → pkgs/by-name/ni/nixos-install/nixos-install.8
View File
nixos/modules/installer/tools/nixos-install.sh → pkgs/by-name/ni/nixos-install/nixos-install.sh
View File
pkgs/by-name/ni/nixos-install/package.nix
+33
View File
@@ -0,0 +1,33 @@
{
lib,
substituteAll,
runtimeShell,
installShellFiles,
nix,
jq,
nixos-enter,
util-linuxMinimal,
}:
substituteAll {
name = "nixos-install";
src = ./nixos-install.sh;
inherit runtimeShell nix;
path = lib.makeBinPath [
jq
nixos-enter
util-linuxMinimal
];
dir = "bin";
isExecutable = true;
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
installManPage ${./nixos-install.8}
'';
meta.mainProgram = "nixos-install";
}
pkgs/by-name/oi/oidc-agent/package.nix
+25 -16
View File
@@ -1,15 +1,16 @@
{ lib
, stdenv
, fetchFromGitHub
, curl
, webkitgtk
, libmicrohttpd
, libsecret
, qrencode
, libsodium
, pkg-config
, help2man
, nix-update-script
{
lib,
stdenv,
fetchFromGitHub,
curl,
webkitgtk,
libmicrohttpd,
libsecret,
qrencode,
libsodium,
pkg-config,
help2man,
nix-update-script,
}:
stdenv.mkDerivation rec {
@@ -39,14 +40,23 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
makeFlags = [ "PREFIX=$(out)" "BIN_PATH=$(out)" "LIB_PATH=$(out)/lib" ];
makeFlags = [
"PREFIX=$(out)"
"BIN_PATH=$(out)"
"PROMPT_BIN_PATH=$(out)"
"LIB_PATH=$(out)/lib"
];
installTargets = [ "install_bin" "install_lib" "install_conf" ];
installTargets = [
"install_bin"
"install_lib"
"install_conf"
];
postFixup = ''
# Override with patched binary to be used by help2man
cp -r $out/bin/* bin
make install_man PREFIX=$out
make install_man PREFIX=$out MAN_PATH=$out/share/man PROMPT_MAN_PATH=$out/share/man
'';
passthru.updateScript = nix-update-script { };
@@ -58,4 +68,3 @@ stdenv.mkDerivation rec {
license = licenses.mit;
};
}
pkgs/by-name/rc/rcu/package.nix
+2 -2
View File
@@ -14,14 +14,14 @@
python3Packages.buildPythonApplication rec {
pname = "rcu";
version = "2024.001p";
version = "2024.001q";
format = "other";
src = let
src-tarball = requireFile {
name = "rcu-d${version}-source.tar.gz";
hash = "sha256-FtdPcv2JA/fJeD2jG/kadPhhDSbfH2QLjjvLdUZJpZQ=";
hash = "sha256-Ywk28gJBMSSQL6jEcHE8h253KOsXIGwVOag6PBWs8kg=";
url = "http://www.davisr.me/projects/rcu/";
};
in runCommand "${src-tarball.name}-unpacked" {} ''
pkgs/by-name/ru/ruff/Cargo.lock
Generated
+101 -3
View File
@@ -161,6 +161,21 @@ version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
[[package]]
name = "assert_fs"
version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7efdb1fdb47602827a342857666feb372712cbc64b414172bd6b167a02927674"
dependencies = [
"anstyle",
"doc-comment",
"globwalk",
"predicates",
"predicates-core",
"predicates-tree",
"tempfile",
]
[[package]]
name = "autocfg"
version = "1.2.0"
@@ -240,6 +255,9 @@ name = "camino"
version = "1.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3"
dependencies = [
"serde",
]
[[package]]
name = "cast"
@@ -722,6 +740,12 @@ version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
[[package]]
name = "difflib"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
[[package]]
name = "digest"
version = "0.10.7"
@@ -773,6 +797,12 @@ dependencies = [
"windows-sys 0.48.0",
]
[[package]]
name = "doc-comment"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
[[package]]
name = "drop_bomb"
version = "0.1.5"
@@ -968,6 +998,17 @@ dependencies = [
"regex-syntax 0.8.3",
]
[[package]]
name = "globwalk"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757"
dependencies = [
"bitflags 2.6.0",
"ignore",
"walkdir",
]
[[package]]
name = "half"
version = "2.4.1"
@@ -1864,6 +1905,33 @@ version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
[[package]]
name = "predicates"
version = "3.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97"
dependencies = [
"anstyle",
"difflib",
"predicates-core",
]
[[package]]
name = "predicates-core"
version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931"
[[package]]
name = "predicates-tree"
version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13"
dependencies = [
"predicates-core",
"termtree",
]
[[package]]
name = "pretty_assertions"
version = "1.4.0"
@@ -2187,10 +2255,11 @@ dependencies = [
[[package]]
name = "ruff"
version = "0.6.5"
version = "0.6.6"
dependencies = [
"anyhow",
"argfile",
"assert_fs",
"bincode",
"bitflags 2.6.0",
"cachedir",
@@ -2200,7 +2269,9 @@ dependencies = [
"clearscreen",
"colored",
"filetime",
"globwalk",
"ignore",
"indoc",
"insta",
"insta-cmd",
"is-macro",
@@ -2212,7 +2283,9 @@ dependencies = [
"rayon",
"regex",
"ruff_cache",
"ruff_db",
"ruff_diagnostics",
"ruff_graph",
"ruff_linter",
"ruff_macros",
"ruff_notebook",
@@ -2295,6 +2368,7 @@ dependencies = [
"ruff_text_size",
"rustc-hash 2.0.0",
"salsa",
"serde",
"tempfile",
"thiserror",
"tracing",
@@ -2370,6 +2444,23 @@ dependencies = [
"unicode-width",
]
[[package]]
name = "ruff_graph"
version = "0.1.0"
dependencies = [
"anyhow",
"clap",
"red_knot_python_semantic",
"ruff_cache",
"ruff_db",
"ruff_linter",
"ruff_macros",
"ruff_python_ast",
"salsa",
"schemars",
"serde",
]
[[package]]
name = "ruff_index"
version = "0.0.0"
@@ -2380,7 +2471,7 @@ dependencies = [
[[package]]
name = "ruff_linter"
version = "0.6.5"
version = "0.6.6"
dependencies = [
"aho-corasick",
"annotate-snippets 0.9.2",
@@ -2700,7 +2791,7 @@ dependencies = [
[[package]]
name = "ruff_wasm"
version = "0.6.5"
version = "0.6.6"
dependencies = [
"console_error_panic_hook",
"console_log",
@@ -2743,6 +2834,7 @@ dependencies = [
"regex",
"ruff_cache",
"ruff_formatter",
"ruff_graph",
"ruff_linter",
"ruff_macros",
"ruff_python_ast",
@@ -3197,6 +3289,12 @@ dependencies = [
"phf_codegen",
]
[[package]]
name = "termtree"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
[[package]]
name = "test-case"
version = "3.3.1"
pkgs/by-name/ru/ruff/package.nix
+2 -9
View File
@@ -14,13 +14,13 @@
rustPlatform.buildRustPackage rec {
pname = "ruff";
version = "0.6.5";
version = "0.6.6";
src = fetchFromGitHub {
owner = "astral-sh";
repo = "ruff";
rev = "refs/tags/${version}";
hash = "sha256-1V95S0FWHzCxztgip+rbCjji4O71D+QdcSZ/hbABeKg=";
hash = "sha256-8EKOBlF6bgjgB5t3KP4AcWU7YkLaiFoAj+wuJWEOAic=";
};
cargoLock = {
@@ -31,13 +31,6 @@ rustPlatform.buildRustPackage rec {
};
};
# Revert the change made in https://github.com/astral-sh/ruff/pull/13299
# It was causing linking issues: https://github.com/NixOS/nixpkgs/pull/341674#issuecomment-2351172084
postPatch = ''
substituteInPlace crates/ruff_benchmark/Cargo.toml \
--replace-fail '"unprefixed_malloc_on_supported_platforms"' ' '
'';
nativeBuildInputs = [ installShellFiles ];
buildInputs = [
pkgs/by-name/ru/rush-parallel/package.nix
+33
View File
@@ -0,0 +1,33 @@
{
lib,
buildGoModule,
fetchFromGitHub,
}:
buildGoModule rec {
pname = "rush-parallel";
version = "0.5.6";
src = fetchFromGitHub {
owner = "shenwei356";
repo = "rush";
rev = "v${version}";
hash = "sha256-u3KGjZ5C8jDuAKE/dy4zR+EEFb35aJtj2YkwIb+kad4=";
};
vendorHash = "sha256-zCloMhjHNkPZHYX1e1nx072IYbWHFWam4Af0l0s8a6M=";
ldflags = [
"-s"
"-w"
];
meta = {
description = "A cross-platform command-line tool for executing jobs in parallel";
homepage = "https://github.com/shenwei356/rush";
changelog = "https://github.com/shenwei356/rush/blob/${src.rev}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ kranzes ];
mainProgram = "rush-parallel";
};
}
pkgs/by-name/se/servo/Cargo.lock
Generated
+8766
View File
File diff suppressed because it is too large Load Diff
pkgs/by-name/se/servo/package.nix
+155
View File
@@ -0,0 +1,155 @@
{
lib,
stdenv,
rustPlatform,
fetchFromGitHub,
# build deps
cargo-deny,
cmake,
dbus,
gcc,
git,
gnumake,
libxkbcommon,
llvm,
llvmPackages,
m4,
makeWrapper,
perl,
pkg-config,
python3,
taplo,
vulkan-loader,
which,
yasm,
zlib,
# runtime deps
darwin,
fontconfig,
freetype,
gst_all_1,
libGL,
libunwind,
udev,
wayland,
xorg,
}:
let
customPython = python3.withPackages (
ps: with ps; [
dbus
packaging
pip
six
virtualenv
]
);
runtimePaths = lib.makeLibraryPath [
xorg.libXcursor
xorg.libXrandr
xorg.libXi
libxkbcommon
vulkan-loader
wayland
libGL
];
in
rustPlatform.buildRustPackage {
pname = "servo";
version = "0-unstable-2024-09-09";
src = fetchFromGitHub {
owner = "servo";
repo = "servo";
rev = "938fd8c12fc2489303e12538d3e3585bd771141f";
hash = "sha256-CrpEBFYd8Qd0rxSnT81IvtxxEuYG0jWGJeHISvxalyY=";
};
# need to use a `Cargo.lock` as there are git dependencies
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"derive_common-0.0.1" = "sha256-z0I2fQQlbUqaFU1EX45eYDy5IbZJ4SIget7WHzq4St0=";
"fontsan-0.5.2" = "sha256-4id66xxQ8iu0+OvJKH77WYPUE0eoVa9oUHmr6lRFPa8=";
"gilrs-0.10.6" = "sha256-RIfowFShWTPqgVWliK8Fc4cJw0YKITLvmexmTC0SwQk=";
"mozjs-0.14.1" = "sha256-RMM28Rd0r58VLfNEJzjWw3Ze6oKEi5lC1Edv03tJbfY=";
"peek-poke-0.3.0" = "sha256-WCZYX68vZrPhaAZwpx9/lUp3bVsLMwtmlJSW8wNb2ks=";
"servo-media-0.1.0" = "sha256-+J/6ZJPM9eus6YHJA6ENJD63CBiJTtKZdfORq9n6Nf8=";
"signpost-0.1.0" = "sha256-xRVXwW3Gynace9Yk5r1q7xA60yy6xhC5wLAyMJ6rPRs=";
"webxr-0.0.1" = "sha256-HZ8oWm5BaBLBXo4dS2CbWjpExry7dzeB2ddRLh7+98w=";
"naga-22.0.0" = "sha256-Xi2lWZCv4V2mUbQmwV1aw3pcvIIcyltKvv/C+LVqqDI=";
"raqote-0.8.5" = "sha256-WLsz5q08VNmYBxUhQ0hOn0K0RVFnnjaWF/MuQGkO/Rg=";
};
};
# Remap absolute path between modules to include SEMVER
# set `HOME` to a temp dir for write access
# Fix invalid option errors during linking (https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328)
preConfigure = ''
sed -i -e 's/\/style\//\/style-0.0.1\//g' ../cargo-vendor-dir/servo_atoms-0.0.1/build.rs
export HOME=$TMPDIR
unset AS
'';
nativeBuildInputs = [
cargo-deny
cmake
customPython
dbus
gcc
git
gnumake
llvm
llvmPackages.libstdcxxClang
m4
makeWrapper
perl
pkg-config
python3
taplo
which
yasm
zlib
];
buildInputs = [
fontconfig
freetype
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-ugly
libunwind
udev
wayland
libGL
xorg.libX11
xorg.libxcb
] ++ (lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]);
# copy resources into `$out` to be used during runtime
# link runtime libraries
postFixup = ''
mkdir -p $out/resources
cp -r ./resources $out/
wrapProgram $out/bin/servo \
--prefix LD_LIBRARY_PATH : ${runtimePaths}
'';
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
meta = {
description = "The embeddable, independent, memory-safe, modular, parallel web rendering engine";
homepage = "https://servo.org";
license = lib.licenses.mpl20;
maintainers = with lib.maintainers; [ supinie ];
mainProgram = "servo";
platforms = lib.platforms.linux ++ lib.platforms.darwin;
};
}
pkgs/development/compilers/gleam/default.nix
+3 -3
View File
@@ -12,13 +12,13 @@
rustPlatform.buildRustPackage rec {
pname = "gleam";
version = "1.4.1";
version = "1.5.0";
src = fetchFromGitHub {
owner = "gleam-lang";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-z9xDMQXzVUeHne7KG4QsutQAiU01mgnV7ccdkjl+EkU=";
hash = "sha256-buMnbBg+/vHXzbBuMPuV8AfdUmYA9J6WTXP7Oqrdo34=";
};
nativeBuildInputs = [ git pkg-config ];
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ] ++
lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
cargoHash = "sha256-XKHcA4DSVsWZfUHT6BkRjK0Mzz90E+ohYrtwZKPMtTY=";
cargoHash = "sha256-0Vtf9UXLPW5HuqNIAGNyqIXCMTITdG7PuFdw4H4v6a4=";
passthru.updateScript = nix-update-script { };
pkgs/development/coq-modules/autosubst/default.nix
+5 -3
View File
@@ -3,15 +3,17 @@
mkCoqDerivation {
pname = "autosubst";
release."1.7".rev = "v1.7";
releaseRev = v: "v${v}";
release."1.7".sha256 = "sha256-qoyteQ5W2Noxf12uACOVeHhPLvgmTzrvEo6Ts+FKTGI=";
release."1.8".rev = "v1.8";
release."1.8".sha256 = "sha256-n0lD8D+tjqkDDjFiE4CggxczOPS5TkEnxpB3zEwWZ2I=";
release."1.9".sha256 = "sha256-XiLZjMc+1iwRGOstfLm/WQRF6FTdX6oJr5urn3wmLlA=";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.10" "8.13"; out = "1.7"; }
{ case = range "8.14" "8.20"; out = "1.9"; }
{ case = range "8.14" "8.18"; out = "1.8"; }
{ case = range "8.10" "8.13"; out = "1.7"; }
] null;
propagatedBuildInputs = [ mathcomp-ssreflect ];
pkgs/development/ocaml-modules/brr/default.nix
+2 -2
View File
@@ -6,10 +6,10 @@
stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-brr";
version = "0.0.6";
version = "0.0.7";
src = fetchurl {
url = "https://erratique.ch/software/brr/releases/brr-${version}.tbz";
hash = "sha256-paYZlzujXsG1S+s/4/kAPBlDuV1Ljorw7okAu4qaAV0=";
hash = "sha256-rcWuW6avI/RJZNAlxKOsPSEtDQZ1hb51oKpSk3iG7oY=";
};
buildInputs = [ ocaml findlib ocamlbuild topkg ];
propagatedBuildInputs = [ js_of_ocaml-compiler js_of_ocaml-toplevel ];
pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix
+9 -5
View File
@@ -6,21 +6,25 @@
fetchPypi,
isodate,
pythonOlder,
setuptools,
}:
buildPythonPackage rec {
pname = "azure-mgmt-cosmosdb";
version = "9.5.1";
format = "setuptools";
version = "9.6.0";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchPypi {
inherit pname version;
hash = "sha256-TlXTlz8RzwLPeoBVruhmFSM9fL47siegfBdrrIvH7wI=";
pname = "azure_mgmt_cosmosdb";
inherit version;
hash = "sha256-Znx9io9UKw55cuYydK9TatmFGH4kpswuPI7vNVYIgfw=";
};
propagatedBuildInputs = [
build-system = [ setuptools ];
dependencies = [
isodate
azure-common
azure-mgmt-core
pkgs/development/python-modules/ring-doorbell/default.nix
+6 -4
View File
@@ -8,8 +8,8 @@
fetchPypi,
firebase-messaging,
freezegun,
hatchling,
oauthlib,
poetry-core,
pytest-asyncio,
pytest-freezer,
pytest-mock,
@@ -18,11 +18,12 @@
pythonOlder,
pytz,
typing-extensions,
websockets,
}:
buildPythonPackage rec {
pname = "ring-doorbell";
version = "0.9.3";
version = "0.9.5";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -30,12 +31,12 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "ring_doorbell";
inherit version;
hash = "sha256-jzhboyDq3PXkwKKrAehX1F1UEUo9qofb+Z4/W5vwjiU=";
hash = "sha256-NnKcUr0SExXRDkNCIGU3LtwU1LIMAZzurn2Aoua1lzA=";
};
pythonRelaxDeps = [ "requests-oauthlib" ];
build-system = [ poetry-core ];
build-system = [ hatchling ];
dependencies = [
aiofiles
@@ -44,6 +45,7 @@ buildPythonPackage rec {
oauthlib
pytz
typing-extensions
websockets
];
optional-dependencies = {
pkgs/development/python-modules/zulip-emoji-mapping/default.nix
+34
View File
@@ -0,0 +1,34 @@
{
lib,
fetchFromGitHub,
python3Packages,
}:
python3Packages.buildPythonPackage rec {
pname = "zulip-emoji-mapping";
version = "1.0.1";
pyproject = true;
src = fetchFromGitHub {
owner = "GearKite";
repo = "zulip-emoji-mapping";
rev = "v${version}";
hash = "sha256-logm5uAnLAcFqI7mUxKEO9ZmHqRkd6CFiCW4B5tqZzg=";
};
build-system = with python3Packages; [
setuptools
];
pythonImportsCheck = [
"zulip_emoji_mapping"
];
meta = {
description = "Get emojis by Zulip names";
homepage = "https://github.com/GearKite/zulip-emoji-mapping";
changelog = "https://github.com/GearKite/zulip-emoji-mapping/releases";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ robertrichter ];
};
}
pkgs/development/tools/b4/default.nix
+2 -2
View File
@@ -2,12 +2,12 @@
python3Packages.buildPythonApplication rec {
pname = "b4";
version = "0.14.1";
version = "0.14.2";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-ZJ1TxkvOZWQWQrtQvAIN0G9cLXRH89GcrTuIbaIKgDE=";
hash = "sha256-T4NbblrjDv9gBLslwV/Y9Pbs0RBVluhtsYcf730YET0=";
};
# tests make dns requests and fails
pkgs/kde/default.nix
+75 -64
View File
@@ -11,78 +11,89 @@
wayland-protocols,
wayland,
zxing-cpp,
}: let
allPackages = self: let
frameworks = import ./frameworks {inherit (self) callPackage;};
gear = import ./gear {inherit (self) callPackage;};
plasma = import ./plasma {inherit (self) callPackage;};
}:
let
allPackages =
self:
let
frameworks = import ./frameworks { inherit (self) callPackage; };
gear = import ./gear { inherit (self) callPackage; };
plasma = import ./plasma { inherit (self) callPackage; };
sets = ["gear" "frameworks" "plasma"];
sets = [
"gear"
"frameworks"
"plasma"
];
loadUrls = set: lib.importJSON (./generated/sources + "/${set}.json");
allUrls = lib.attrsets.mergeAttrsList (map loadUrls sets);
loadUrls = set: lib.importJSON (./generated/sources + "/${set}.json");
allUrls = lib.attrsets.mergeAttrsList (map loadUrls sets);
sources = lib.mapAttrs (_: v:
(fetchurl {
inherit (v) url hash;
})
// {inherit (v) version;})
allUrls;
in (
qt6Packages
// frameworks
// gear
// plasma
// {
inherit sources;
sources = lib.mapAttrs (
_: v:
(fetchurl {
inherit (v) url hash;
})
// {
inherit (v) version;
}
) allUrls;
in
(
qt6Packages
// frameworks
// gear
// plasma
// {
inherit sources;
mkKdeDerivation = self.callPackage (import ./lib/mk-kde-derivation.nix self) {};
mkKdeDerivation = self.callPackage (import ./lib/mk-kde-derivation.nix self) { };
# THIRD PARTY
inherit
cmark
gpgme
taglib
wayland
wayland-protocols
zxing-cpp
;
# THIRD PARTY
inherit
cmark
gpgme
taglib
wayland
wayland-protocols
zxing-cpp
;
# Alias to match metadata
kquickimageeditor = self.kquickimageedit;
# Alias to match metadata
kquickimageeditor = self.kquickimageedit;
# Alias because it's just data
plasma-wayland-protocols = libsForQt5.plasma-wayland-protocols;
# Alias because it's just data
plasma-wayland-protocols = libsForQt5.plasma-wayland-protocols;
selenium-webdriver-at-spi = null; # Used for integration tests that we don't run, stub
selenium-webdriver-at-spi = null; # Used for integration tests that we don't run, stub
alpaka = self.callPackage ./misc/alpaka {};
kdiagram = self.callPackage ./misc/kdiagram {};
kdevelop-pg-qt = self.callPackage ./misc/kdevelop-pg-qt {};
kdsoap-ws-discovery-client = self.callPackage ./misc/kdsoap-ws-discovery-client {};
kirigami-addons = self.callPackage ./misc/kirigami-addons {};
kio-extras-kf5 = self.callPackage ./misc/kio-extras-kf5 {};
kio-fuse = self.callPackage ./misc/kio-fuse {};
klevernotes = self.callPackage ./misc/klevernotes {};
ktextaddons = self.callPackage ./misc/ktextaddons {};
kunifiedpush = self.callPackage ./misc/kunifiedpush {};
kup = self.callPackage ./misc/kup {};
marknote = self.callPackage ./misc/marknote {};
mpvqt = self.callPackage ./misc/mpvqt {};
oxygen-icons = self.callPackage ./misc/oxygen-icons {};
phonon = self.callPackage ./misc/phonon {};
phonon-vlc = self.callPackage ./misc/phonon-vlc {};
polkit-qt-1 = self.callPackage ./misc/polkit-qt-1 {};
pulseaudio-qt = self.callPackage ./misc/pulseaudio-qt {};
alpaka = self.callPackage ./misc/alpaka { };
kdiagram = self.callPackage ./misc/kdiagram { };
kdevelop-pg-qt = self.callPackage ./misc/kdevelop-pg-qt { };
kdsoap-ws-discovery-client = self.callPackage ./misc/kdsoap-ws-discovery-client { };
kirigami-addons = self.callPackage ./misc/kirigami-addons { };
kio-extras-kf5 = self.callPackage ./misc/kio-extras-kf5 { };
kio-fuse = self.callPackage ./misc/kio-fuse { };
klevernotes = self.callPackage ./misc/klevernotes { };
ktextaddons = self.callPackage ./misc/ktextaddons { };
kunifiedpush = self.callPackage ./misc/kunifiedpush { };
kup = self.callPackage ./misc/kup { };
marknote = self.callPackage ./misc/marknote { };
mpvqt = self.callPackage ./misc/mpvqt { };
oxygen-icons = self.callPackage ./misc/oxygen-icons { };
phonon = self.callPackage ./misc/phonon { };
phonon-vlc = self.callPackage ./misc/phonon-vlc { };
polkit-qt-1 = self.callPackage ./misc/polkit-qt-1 { };
pulseaudio-qt = self.callPackage ./misc/pulseaudio-qt { };
applet-window-buttons6 = self.callPackage ./third-party/applet-window-buttons6 {};
karousel = self.callPackage ./third-party/karousel {};
krohnkite = self.callPackage ./third-party/krohnkite {};
kzones = self.callPackage ./third-party/kzones {};
}
);
applet-window-buttons6 = self.callPackage ./third-party/applet-window-buttons6 { };
karousel = self.callPackage ./third-party/karousel { };
krohnkite = self.callPackage ./third-party/krohnkite { };
kzones = self.callPackage ./third-party/kzones { };
}
);
in
makeScopeWithSplicing' {
otherSplices = generateSplicesForMkScope "kdePackages";
f = allPackages;
}
makeScopeWithSplicing' {
otherSplices = generateSplicesForMkScope "kdePackages";
f = allPackages;
}
pkgs/kde/frameworks/attica/default.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{mkKdeDerivation}:
{ mkKdeDerivation }:
mkKdeDerivation {
pname = "attica";
}
pkgs/kde/frameworks/baloo/default.nix
+4 -1
View File
@@ -11,5 +11,8 @@ mkKdeDerivation {
substituteInPlace src/file/kde-baloo.service.in --replace-fail @KDE_INSTALL_FULL_BINDIR@/kde-systemd-start-condition /run/current-system/sw/bin/kde-systemd-start-condition
'';
extraBuildInputs = [qtdeclarative lmdb];
extraBuildInputs = [
qtdeclarative
lmdb
];
}
pkgs/kde/frameworks/bluez-qt/default.nix
+1 -1
View File
@@ -5,5 +5,5 @@
mkKdeDerivation {
pname = "bluez-qt";
extraBuildInputs = [qtdeclarative];
extraBuildInputs = [ qtdeclarative ];
}
pkgs/kde/frameworks/breeze-icons/default.nix
+1 -1
View File
@@ -7,7 +7,7 @@ mkKdeDerivation {
pname = "breeze-icons";
extraNativeBuildInputs = [
(python3.withPackages (ps: [ps.lxml]))
(python3.withPackages (ps: [ ps.lxml ]))
libxml2
];
pkgs/kde/frameworks/default.nix
+74 -73
View File
@@ -1,74 +1,75 @@
{callPackage}: {
attica = callPackage ./attica {};
baloo = callPackage ./baloo {};
bluez-qt = callPackage ./bluez-qt {};
breeze-icons = callPackage ./breeze-icons {};
extra-cmake-modules = callPackage ./extra-cmake-modules {};
frameworkintegration = callPackage ./frameworkintegration {};
kapidox = callPackage ./kapidox {};
karchive = callPackage ./karchive {};
kauth = callPackage ./kauth {};
kbookmarks = callPackage ./kbookmarks {};
kcalendarcore = callPackage ./kcalendarcore {};
kcmutils = callPackage ./kcmutils {};
kcodecs = callPackage ./kcodecs {};
kcolorscheme = callPackage ./kcolorscheme {};
kcompletion = callPackage ./kcompletion {};
kconfig = callPackage ./kconfig {};
kconfigwidgets = callPackage ./kconfigwidgets {};
kcontacts = callPackage ./kcontacts {};
kcoreaddons = callPackage ./kcoreaddons {};
kcrash = callPackage ./kcrash {};
kdav = callPackage ./kdav {};
kdbusaddons = callPackage ./kdbusaddons {};
kdeclarative = callPackage ./kdeclarative {};
kded = callPackage ./kded {};
kdesu = callPackage ./kdesu {};
kdnssd = callPackage ./kdnssd {};
kdoctools = callPackage ./kdoctools {};
kfilemetadata = callPackage ./kfilemetadata {};
kglobalaccel = callPackage ./kglobalaccel {};
kguiaddons = callPackage ./kguiaddons {};
kholidays = callPackage ./kholidays {};
ki18n = callPackage ./ki18n {};
kiconthemes = callPackage ./kiconthemes {};
kidletime = callPackage ./kidletime {};
kimageformats = callPackage ./kimageformats {};
kio = callPackage ./kio {};
kirigami = callPackage ./kirigami {};
kitemmodels = callPackage ./kitemmodels {};
kitemviews = callPackage ./kitemviews {};
kjobwidgets = callPackage ./kjobwidgets {};
knewstuff = callPackage ./knewstuff {};
knotifications = callPackage ./knotifications {};
knotifyconfig = callPackage ./knotifyconfig {};
kpackage = callPackage ./kpackage {};
kparts = callPackage ./kparts {};
kpeople = callPackage ./kpeople {};
kplotting = callPackage ./kplotting {};
kpty = callPackage ./kpty {};
kquickcharts = callPackage ./kquickcharts {};
krunner = callPackage ./krunner {};
kservice = callPackage ./kservice {};
kstatusnotifieritem = callPackage ./kstatusnotifieritem {};
ksvg = callPackage ./ksvg {};
ktexteditor = callPackage ./ktexteditor {};
ktexttemplate = callPackage ./ktexttemplate {};
ktextwidgets = callPackage ./ktextwidgets {};
kunitconversion = callPackage ./kunitconversion {};
kuserfeedback = callPackage ./kuserfeedback {};
kwallet = callPackage ./kwallet {};
kwidgetsaddons = callPackage ./kwidgetsaddons {};
kwindowsystem = callPackage ./kwindowsystem {};
kxmlgui = callPackage ./kxmlgui {};
modemmanager-qt = callPackage ./modemmanager-qt {};
networkmanager-qt = callPackage ./networkmanager-qt {};
prison = callPackage ./prison {};
purpose = callPackage ./purpose {};
qqc2-desktop-style = callPackage ./qqc2-desktop-style {};
solid = callPackage ./solid {};
sonnet = callPackage ./sonnet {};
syndication = callPackage ./syndication {};
syntax-highlighting = callPackage ./syntax-highlighting {};
threadweaver = callPackage ./threadweaver {};
{ callPackage }:
{
attica = callPackage ./attica { };
baloo = callPackage ./baloo { };
bluez-qt = callPackage ./bluez-qt { };
breeze-icons = callPackage ./breeze-icons { };
extra-cmake-modules = callPackage ./extra-cmake-modules { };
frameworkintegration = callPackage ./frameworkintegration { };
kapidox = callPackage ./kapidox { };
karchive = callPackage ./karchive { };
kauth = callPackage ./kauth { };
kbookmarks = callPackage ./kbookmarks { };
kcalendarcore = callPackage ./kcalendarcore { };
kcmutils = callPackage ./kcmutils { };
kcodecs = callPackage ./kcodecs { };
kcolorscheme = callPackage ./kcolorscheme { };
kcompletion = callPackage ./kcompletion { };
kconfig = callPackage ./kconfig { };
kconfigwidgets = callPackage ./kconfigwidgets { };
kcontacts = callPackage ./kcontacts { };
kcoreaddons = callPackage ./kcoreaddons { };
kcrash = callPackage ./kcrash { };
kdav = callPackage ./kdav { };
kdbusaddons = callPackage ./kdbusaddons { };
kdeclarative = callPackage ./kdeclarative { };
kded = callPackage ./kded { };
kdesu = callPackage ./kdesu { };
kdnssd = callPackage ./kdnssd { };
kdoctools = callPackage ./kdoctools { };
kfilemetadata = callPackage ./kfilemetadata { };
kglobalaccel = callPackage ./kglobalaccel { };
kguiaddons = callPackage ./kguiaddons { };
kholidays = callPackage ./kholidays { };
ki18n = callPackage ./ki18n { };
kiconthemes = callPackage ./kiconthemes { };
kidletime = callPackage ./kidletime { };
kimageformats = callPackage ./kimageformats { };
kio = callPackage ./kio { };
kirigami = callPackage ./kirigami { };
kitemmodels = callPackage ./kitemmodels { };
kitemviews = callPackage ./kitemviews { };
kjobwidgets = callPackage ./kjobwidgets { };
knewstuff = callPackage ./knewstuff { };
knotifications = callPackage ./knotifications { };
knotifyconfig = callPackage ./knotifyconfig { };
kpackage = callPackage ./kpackage { };
kparts = callPackage ./kparts { };
kpeople = callPackage ./kpeople { };
kplotting = callPackage ./kplotting { };
kpty = callPackage ./kpty { };
kquickcharts = callPackage ./kquickcharts { };
krunner = callPackage ./krunner { };
kservice = callPackage ./kservice { };
kstatusnotifieritem = callPackage ./kstatusnotifieritem { };
ksvg = callPackage ./ksvg { };
ktexteditor = callPackage ./ktexteditor { };
ktexttemplate = callPackage ./ktexttemplate { };
ktextwidgets = callPackage ./ktextwidgets { };
kunitconversion = callPackage ./kunitconversion { };
kuserfeedback = callPackage ./kuserfeedback { };
kwallet = callPackage ./kwallet { };
kwidgetsaddons = callPackage ./kwidgetsaddons { };
kwindowsystem = callPackage ./kwindowsystem { };
kxmlgui = callPackage ./kxmlgui { };
modemmanager-qt = callPackage ./modemmanager-qt { };
networkmanager-qt = callPackage ./networkmanager-qt { };
prison = callPackage ./prison { };
purpose = callPackage ./purpose { };
qqc2-desktop-style = callPackage ./qqc2-desktop-style { };
solid = callPackage ./solid { };
sonnet = callPackage ./sonnet { };
syndication = callPackage ./syndication { };
syntax-highlighting = callPackage ./syntax-highlighting { };
threadweaver = callPackage ./threadweaver { };
}
pkgs/kde/frameworks/extra-cmake-modules/default.nix
+3 -2
View File
@@ -1,5 +1,6 @@
{ mkKdeDerivation
, python3
{
mkKdeDerivation,
python3,
}:
mkKdeDerivation {
pname = "extra-cmake-modules";
pkgs/kde/frameworks/frameworkintegration/default.nix
+2 -2
View File
@@ -6,6 +6,6 @@
mkKdeDerivation {
pname = "frameworkintegration";
extraNativeBuildInputs = [pkg-config];
extraBuildInputs = [packagekit-qt];
extraNativeBuildInputs = [ pkg-config ];
extraBuildInputs = [ packagekit-qt ];
}
pkgs/kde/frameworks/kapidox/default.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{mkKdeDerivation}:
{ mkKdeDerivation }:
mkKdeDerivation {
pname = "kapidox";
}
pkgs/kde/frameworks/karchive/default.nix
+5 -2
View File
@@ -7,6 +7,9 @@
mkKdeDerivation {
pname = "karchive";
extraNativeBuildInputs = [qttools pkg-config];
extraBuildInputs = [xz];
extraNativeBuildInputs = [
qttools
pkg-config
];
extraBuildInputs = [ xz ];
}
pkgs/kde/frameworks/kauth/default.nix
+2 -2
View File
@@ -7,7 +7,7 @@ mkKdeDerivation {
# Late resolve paths so things end up in their own prefix
# FIXME(later): discuss with upstream
patches = [./fix-paths.patch];
patches = [ ./fix-paths.patch ];
extraNativeBuildInputs = [qttools];
extraNativeBuildInputs = [ qttools ];
}
pkgs/kde/frameworks/kbookmarks/default.nix
+1 -1
View File
@@ -5,5 +5,5 @@
mkKdeDerivation {
pname = "kbookmarks";
extraNativeBuildInputs = [qttools];
extraNativeBuildInputs = [ qttools ];
}
pkgs/kde/frameworks/kcalendarcore/default.nix
+4 -1
View File
@@ -6,5 +6,8 @@
mkKdeDerivation {
pname = "kcalendarcore";
extraBuildInputs = [qtdeclarative libical];
extraBuildInputs = [
qtdeclarative
libical
];
}
pkgs/kde/frameworks/kcmutils/default.nix
+1 -1
View File
@@ -5,6 +5,6 @@
mkKdeDerivation {
pname = "kcmutils";
extraPropagatedBuildInputs = [qtdeclarative];
extraPropagatedBuildInputs = [ qtdeclarative ];
meta.mainProgram = "kcmshell6";
}
pkgs/kde/frameworks/kcodecs/default.nix
+4 -1
View File
@@ -6,5 +6,8 @@
mkKdeDerivation {
pname = "kcodecs";
extraNativeBuildInputs = [qttools gperf];
extraNativeBuildInputs = [
qttools
gperf
];
}
pkgs/kde/frameworks/kcolorscheme/default.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{mkKdeDerivation}:
{ mkKdeDerivation }:
mkKdeDerivation {
pname = "kcolorscheme";
}
pkgs/kde/frameworks/kcompletion/default.nix
+1 -1
View File
@@ -5,5 +5,5 @@
mkKdeDerivation {
pname = "kcompletion";
extraNativeBuildInputs = [qttools];
extraNativeBuildInputs = [ qttools ];
}
pkgs/kde/frameworks/kconfig/default.nix
+2 -2
View File
@@ -6,6 +6,6 @@
mkKdeDerivation {
pname = "kconfig";
extraNativeBuildInputs = [qttools];
extraPropagatedBuildInputs = [qtdeclarative];
extraNativeBuildInputs = [ qttools ];
extraPropagatedBuildInputs = [ qtdeclarative ];
}
pkgs/kde/frameworks/kconfigwidgets/default.nix
+1 -1
View File
@@ -5,5 +5,5 @@
mkKdeDerivation {
pname = "kconfigwidgets";
extraBuildInputs = [qttools];
extraBuildInputs = [ qttools ];
}
pkgs/kde/frameworks/kcontacts/default.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{mkKdeDerivation}:
{ mkKdeDerivation }:
mkKdeDerivation {
pname = "kcontacts";
}
pkgs/kde/frameworks/kcoreaddons/default.nix
+5 -2
View File
@@ -7,6 +7,9 @@
mkKdeDerivation {
pname = "kcoreaddons";
extraNativeBuildInputs = [qttools shared-mime-info];
extraBuildInputs = [qtdeclarative];
extraNativeBuildInputs = [
qttools
shared-mime-info
];
extraBuildInputs = [ qtdeclarative ];
}
pkgs/kde/frameworks/kcrash/default.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{mkKdeDerivation}:
{ mkKdeDerivation }:
mkKdeDerivation {
pname = "kcrash";
}
pkgs/kde/frameworks/kdav/default.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{mkKdeDerivation}:
{ mkKdeDerivation }:
mkKdeDerivation {
pname = "kdav";
}
pkgs/kde/frameworks/kdbusaddons/default.nix
+1 -1
View File
@@ -5,6 +5,6 @@
mkKdeDerivation {
pname = "kdbusaddons";
extraNativeBuildInputs = [qttools];
extraNativeBuildInputs = [ qttools ];
meta.mainProgram = "kquitapp6";
}
pkgs/kde/frameworks/kdeclarative/default.nix
+2 -2
View File
@@ -6,6 +6,6 @@
mkKdeDerivation {
pname = "kdeclarative";
extraNativeBuildInputs = [spirv-tools];
extraBuildInputs = [qtdeclarative];
extraNativeBuildInputs = [ spirv-tools ];
extraBuildInputs = [ qtdeclarative ];
}
pkgs/kde/frameworks/kded/default.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{mkKdeDerivation}:
{ mkKdeDerivation }:
mkKdeDerivation {
pname = "kded";
meta.mainProgram = "kded6";
pkgs/kde/frameworks/kdesu/default.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{mkKdeDerivation}:
{ mkKdeDerivation }:
mkKdeDerivation {
pname = "kdesu";
# Look for NixOS SUID wrapper first
patches = [./kdesu-search-for-wrapped-daemon-first.patch];
patches = [ ./kdesu-search-for-wrapped-daemon-first.patch ];
}
pkgs/kde/frameworks/kdnssd/default.nix
+2 -2
View File
@@ -6,6 +6,6 @@
mkKdeDerivation {
pname = "kdnssd";
extraNativeBuildInputs = [qttools];
extraBuildInputs = [avahi];
extraNativeBuildInputs = [ qttools ];
extraBuildInputs = [ avahi ];
}
pkgs/kde/frameworks/kdoctools/default.nix
+13 -3
View File
@@ -10,7 +10,17 @@ mkKdeDerivation {
pname = "kdoctools";
# Perl could be used both at build time and at runtime.
extraNativeBuildInputs = [perl perlPackages.URI libxml2];
extraBuildInputs = [docbook_xml_dtd_45 docbook-xsl-nons];
extraPropagatedBuildInputs = [perl perlPackages.URI];
extraNativeBuildInputs = [
perl
perlPackages.URI
libxml2
];
extraBuildInputs = [
docbook_xml_dtd_45
docbook-xsl-nons
];
extraPropagatedBuildInputs = [
perl
perlPackages.URI
];
}
pkgs/kde/frameworks/kfilemetadata/default.nix
+11 -3
View File
@@ -14,8 +14,16 @@ mkKdeDerivation {
# Fix installing cmake files into wrong directory
# FIXME(later): upstream
patches = [./cmake-install-paths.patch];
patches = [ ./cmake-install-paths.patch ];
extraNativeBuildInputs = [pkg-config];
extraBuildInputs = [attr ebook_tools exiv2 ffmpeg kconfig kdegraphics-mobipocket libappimage];
extraNativeBuildInputs = [ pkg-config ];
extraBuildInputs = [
attr
ebook_tools
exiv2
ffmpeg
kconfig
kdegraphics-mobipocket
libappimage
];
}
pkgs/kde/frameworks/kglobalaccel/default.nix
+1 -1
View File
@@ -5,5 +5,5 @@
mkKdeDerivation {
pname = "kglobalaccel";
extraNativeBuildInputs = [qttools];
extraNativeBuildInputs = [ qttools ];
}
pkgs/kde/frameworks/kguiaddons/default.nix
+2 -2
View File
@@ -6,7 +6,7 @@
mkKdeDerivation {
pname = "kguiaddons";
extraNativeBuildInputs = [pkg-config];
extraBuildInputs = [qtwayland];
extraNativeBuildInputs = [ pkg-config ];
extraBuildInputs = [ qtwayland ];
meta.mainProgram = "kde-geo-uri-handler";
}
pkgs/kde/frameworks/kholidays/default.nix
+2 -2
View File
@@ -6,6 +6,6 @@
mkKdeDerivation {
pname = "kholidays";
extraNativeBuildInputs = [qttools];
extraBuildInputs = [qtdeclarative];
extraNativeBuildInputs = [ qttools ];
extraBuildInputs = [ qtdeclarative ];
}
pkgs/kde/frameworks/ki18n/default.nix
+3 -3
View File
@@ -7,7 +7,7 @@
mkKdeDerivation {
pname = "ki18n";
extraNativeBuildInputs = [python3];
propagatedNativeBuildInputs = [gettext];
extraBuildInputs = [qtdeclarative];
extraNativeBuildInputs = [ python3 ];
propagatedNativeBuildInputs = [ gettext ];
extraBuildInputs = [ qtdeclarative ];
}
pkgs/kde/frameworks/kidletime/default.nix
+5 -2
View File
@@ -7,6 +7,9 @@
mkKdeDerivation {
pname = "kidletime";
extraNativeBuildInputs = [pkg-config];
extraBuildInputs = [qtwayland xorg.libXScrnSaver];
extraNativeBuildInputs = [ pkg-config ];
extraBuildInputs = [
qtwayland
xorg.libXScrnSaver
];
}
pkgs/kde/frameworks/kimageformats/default.nix
+9 -3
View File
@@ -10,7 +10,13 @@
mkKdeDerivation {
pname = "kimageformats";
extraCmakeFlags = ["-DKIMAGEFORMATS_HEIF=1"];
extraNativeBuildInputs = [pkg-config];
extraBuildInputs = [libheif libjxl libavif libraw openexr_3];
extraCmakeFlags = [ "-DKIMAGEFORMATS_HEIF=1" ];
extraNativeBuildInputs = [ pkg-config ];
extraBuildInputs = [
libheif
libjxl
libavif
libraw
openexr_3
];
}
pkgs/kde/frameworks/kio/default.nix
+6 -1
View File
@@ -13,5 +13,10 @@ mkKdeDerivation {
./0001-Remove-impure-smbd-search-path.patch
];
extraBuildInputs = [qt5compat qttools acl attr];
extraBuildInputs = [
qt5compat
qttools
acl
attr
];
}
pkgs/kde/frameworks/kirigami/default.nix
+15 -6
View File
@@ -17,18 +17,27 @@ let
unwrapped = mkKdeDerivation {
pname = "kirigami";
extraNativeBuildInputs = [qtsvg qttools];
extraBuildInputs = [qtdeclarative];
extraPropagatedBuildInputs = [qt5compat];
extraNativeBuildInputs = [
qtsvg
qttools
];
extraBuildInputs = [ qtdeclarative ];
extraPropagatedBuildInputs = [ qt5compat ];
};
in stdenv.mkDerivation {
in
stdenv.mkDerivation {
pname = "kirigami-wrapped";
inherit (unwrapped) version;
propagatedBuildInputs = [ unwrapped qqc2-desktop-style ];
propagatedBuildInputs = [
unwrapped
qqc2-desktop-style
];
dontUnpack = true;
dontWrapQtApps = true;
passthru = { inherit unwrapped; };
passthru = {
inherit unwrapped;
};
}
pkgs/kde/frameworks/kitemmodels/default.nix
+1 -1
View File
@@ -5,5 +5,5 @@
mkKdeDerivation {
pname = "kitemmodels";
extraBuildInputs = [qtdeclarative];
extraBuildInputs = [ qtdeclarative ];
}
pkgs/kde/frameworks/kitemviews/default.nix
+1 -1
View File
@@ -5,5 +5,5 @@
mkKdeDerivation {
pname = "kitemviews";
extraNativeBuildInputs = [qttools];
extraNativeBuildInputs = [ qttools ];
}
pkgs/kde/frameworks/kjobwidgets/default.nix
+1 -1
View File
@@ -5,5 +5,5 @@
mkKdeDerivation {
pname = "kjobwidgets";
extraNativeBuildInputs = [qttools];
extraNativeBuildInputs = [ qttools ];
}
pkgs/kde/frameworks/knewstuff/default.nix
+6 -3
View File
@@ -9,9 +9,12 @@ mkKdeDerivation {
# Late resolve knsrcdir so other things install to their own prefix
# FIXME(later): upstream
patches = [./delay-resolving-knsrcdir.patch];
patches = [ ./delay-resolving-knsrcdir.patch ];
extraBuildInputs = [qtdeclarative qttools];
extraPropagatedBuildInputs = [kcmutils];
extraBuildInputs = [
qtdeclarative
qttools
];
extraPropagatedBuildInputs = [ kcmutils ];
meta.mainProgram = "knewstuff-dialog6";
}
pkgs/kde/frameworks/knotifications/default.nix
+5 -2
View File
@@ -7,6 +7,9 @@
mkKdeDerivation {
pname = "knotifications";
extraNativeBuildInputs = [qttools];
extraBuildInputs = [qtdeclarative libcanberra];
extraNativeBuildInputs = [ qttools ];
extraBuildInputs = [
qtdeclarative
libcanberra
];
}
pkgs/kde/frameworks/knotifyconfig/default.nix
+1 -1
View File
@@ -5,5 +5,5 @@
mkKdeDerivation {
pname = "knotifyconfig";
extraBuildInputs = [libcanberra];
extraBuildInputs = [ libcanberra ];
}
pkgs/kde/frameworks/kpackage/default.nix
+2 -2
View File
@@ -1,9 +1,9 @@
{mkKdeDerivation}:
{ mkKdeDerivation }:
mkKdeDerivation {
pname = "kpackage";
# Follow symlinks when resolving packages
# FIXME(later): upstream
patches = [./follow-symlinks.patch];
patches = [ ./follow-symlinks.patch ];
meta.mainProgram = "kpackagetool6";
}
pkgs/kde/frameworks/kparts/default.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{mkKdeDerivation}:
{ mkKdeDerivation }:
mkKdeDerivation {
pname = "kparts";
}
pkgs/kde/frameworks/kpeople/default.nix
+1 -1
View File
@@ -5,5 +5,5 @@
mkKdeDerivation {
pname = "kpeople";
extraBuildInputs = [qtdeclarative];
extraBuildInputs = [ qtdeclarative ];
}
pkgs/kde/frameworks/kplotting/default.nix
+1 -1
View File
@@ -5,5 +5,5 @@
mkKdeDerivation {
pname = "kplotting";
extraBuildInputs = [qttools];
extraBuildInputs = [ qttools ];
}
pkgs/kde/frameworks/kpty/default.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{mkKdeDerivation}:
{ mkKdeDerivation }:
mkKdeDerivation {
pname = "kpty";
}
pkgs/kde/frameworks/kquickcharts/default.nix
+1 -1
View File
@@ -5,5 +5,5 @@
mkKdeDerivation {
pname = "kquickcharts";
extraBuildInputs = [qtdeclarative];
extraBuildInputs = [ qtdeclarative ];
}
pkgs/kde/frameworks/krunner/default.nix
+1 -1
View File
@@ -5,5 +5,5 @@
mkKdeDerivation {
pname = "krunner";
extraBuildInputs = [plasma-activities];
extraBuildInputs = [ plasma-activities ];
}
pkgs/kde/frameworks/kservice/default.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{mkKdeDerivation}:
{ mkKdeDerivation }:
mkKdeDerivation {
pname = "kservice";
pkgs/kde/frameworks/kstatusnotifieritem/default.nix
+1 -1
View File
@@ -5,5 +5,5 @@
mkKdeDerivation {
pname = "kstatusnotifieritem";
extraNativeBuildInputs = [qttools];
extraNativeBuildInputs = [ qttools ];
}
pkgs/kde/frameworks/ksvg/default.nix
+4 -1
View File
@@ -6,5 +6,8 @@
mkKdeDerivation {
pname = "ksvg";
extraBuildInputs = [qtdeclarative qtsvg];
extraBuildInputs = [
qtdeclarative
qtsvg
];
}
pkgs/kde/frameworks/ktexteditor/default.nix
+5 -1
View File
@@ -7,5 +7,9 @@
mkKdeDerivation {
pname = "ktexteditor";
extraBuildInputs = [qtdeclarative qtspeech editorconfig-core-c];
extraBuildInputs = [
qtdeclarative
qtspeech
editorconfig-core-c
];
}
pkgs/kde/frameworks/ktexttemplate/default.nix
+1 -1
View File
@@ -5,5 +5,5 @@
mkKdeDerivation {
pname = "ktexttemplate";
extraBuildInputs = [qtdeclarative];
extraBuildInputs = [ qtdeclarative ];
}
pkgs/kde/frameworks/kunitconversion/default.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{mkKdeDerivation}:
{ mkKdeDerivation }:
mkKdeDerivation {
pname = "kunitconversion";
}
pkgs/kde/frameworks/kuserfeedback/default.nix
+8 -2
View File
@@ -7,6 +7,12 @@ mkKdeDerivation {
pname = "kuserfeedback";
# Disable server-side stuff we don't care about
extraCmakeFlags = ["-DENABLE_CONSOLE=0" "-DENABLE_CLI=0"];
extraNativeBuildInputs = [qttools qtsvg];
extraCmakeFlags = [
"-DENABLE_CONSOLE=0"
"-DENABLE_CLI=0"
];
extraNativeBuildInputs = [
qttools
qtsvg
];
}
pkgs/kde/frameworks/kwallet/default.nix
+5 -1
View File
@@ -7,5 +7,9 @@
mkKdeDerivation {
pname = "kwallet";
extraBuildInputs = [libgcrypt kcrash kdoctools];
extraBuildInputs = [
libgcrypt
kcrash
kdoctools
];
}

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