Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
0f45200a29
@ -29,13 +29,13 @@ let
|
||||
in
|
||||
melpaBuild {
|
||||
pname = "lsp-bridge";
|
||||
version = "0-unstable-2024-09-11";
|
||||
version = "0-unstable-2024-09-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "manateelazycat";
|
||||
repo = "lsp-bridge";
|
||||
rev = "fb64891c2585f9fc0b7f2062cc2b98321aa4e4ca";
|
||||
hash = "sha256-ChpZhFEKvN+1oYHbQKBUMbTjk/U++kCDnImMVtcYVBc=";
|
||||
rev = "f9d540ff451d9a0ee92819b84472820f16be15d5";
|
||||
hash = "sha256-YqUC2Z24ORwIMNZUsAJrAnSaDovccnGMg2OSYY1mYoQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -1,93 +0,0 @@
|
||||
{ mkDerivation, lib, fetchpatch, fetchurl, extra-cmake-modules, kdoctools
|
||||
, boost, qtwebkit, qtx11extras, shared-mime-info
|
||||
, breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets
|
||||
, kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n
|
||||
, kiconthemes, kitemviews, kjobwidgets, kcmutils, kdelibs4support, kio, kross
|
||||
, knotifications, knotifyconfig, kparts, ktextwidgets, kwallet, kwidgetsaddons
|
||||
, kwindowsystem, kxmlgui, sonnet, threadweaver
|
||||
, kcontacts, akonadi, akonadi-calendar, akonadi-contacts
|
||||
, eigen, git, gsl, ilmbase, kproperty, kreport, lcms2, marble, pcre, libgit2, libodfgen
|
||||
, librevenge, libvisio, libwpd, libwpg, libwps, okular, openexr, openjpeg, phonon
|
||||
, poppler, pstoedit, qca-qt5, vc, fontconfig
|
||||
# TODO: package Spnav, m2mml LibEtonyek, Libqgit2
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "calligra";
|
||||
version = "3.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0iqi6z6gkck2afgy200dacgcspq7i7887alcj0pklm08hbmsdy5i";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix fontconfig underlinking: https://github.com/NixOS/nixpkgs/issues/137794
|
||||
# Can be dropped on next release.
|
||||
(fetchpatch {
|
||||
name = "fix-fontconfig-linking.patch";
|
||||
url = "https://github.com/KDE/calligra/commit/62f510702ef9c34ac50f8d8601a4290ab558464c.patch";
|
||||
sha256 = "11dzrp9q05dmvnwp4vk4ihcibqcf4xyr0ijscpi716cyy730flma";
|
||||
excludes = [ "CMakeLists.txt" ];
|
||||
})
|
||||
# Fixes for building calligra with gcc11/c++17
|
||||
(fetchpatch {
|
||||
name = "build_c++17_poppler.patch";
|
||||
url = "https://github.com/archlinux/svntogit-packages/raw/bbbe35f97eb1033798f1cf95d427890168598199/trunk/068cd9ae.patch";
|
||||
sha256 = "sha256-d9/ILwSeW+ov11DF191hzIaUafO/rjQrAeONwqDSKbA=";
|
||||
})
|
||||
# Fixes for building calligra with modern poppler[-qt5]
|
||||
(fetchpatch {
|
||||
name = "calligra-poppler-22.03.patch";
|
||||
url = "https://invent.kde.org/office/calligra/-/commit/236bacbe13739414e919de868283b0caf2df5d8a.patch";
|
||||
sha256 = "sha256-9DmKPCvEFy2Cs3g7350iOCF5Vrx1HL+/8jr+Tb44CyE=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "calligra-poppler-22.04.patch";
|
||||
url = "https://invent.kde.org/office/calligra/-/commit/6b75bec784c9835c78993349845d8c2ef22ec3de.patch";
|
||||
sha256 = "sha256-z9/4he4x0WN2K/ZGrDAAtHF/W5X1PAtpeO6s7fgL/fA=";
|
||||
})
|
||||
];
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace 'CMAKE_CXX_STANDARD 11' 'CMAKE_CXX_STANDARD 17'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
|
||||
buildInputs = [
|
||||
boost qtwebkit qtx11extras shared-mime-info
|
||||
kactivities karchive kcodecs kcompletion kconfig kconfigwidgets kcoreaddons
|
||||
kdbusaddons kdiagram kguiaddons khtml ki18n kiconthemes kitemviews
|
||||
kjobwidgets kcmutils kdelibs4support kio kross knotifications knotifyconfig kparts
|
||||
ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui sonnet threadweaver
|
||||
kcontacts akonadi akonadi-calendar akonadi-contacts
|
||||
eigen git gsl ilmbase kproperty kreport lcms2 marble pcre libgit2 libodfgen librevenge
|
||||
libvisio libwpd libwpg libwps okular openexr openjpeg phonon poppler qca-qt5 vc
|
||||
fontconfig
|
||||
];
|
||||
|
||||
propagatedUserEnvPkgs = [ kproperty ];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
|
||||
|
||||
qtWrapperArgs = [
|
||||
"--prefix PATH : ${lib.getBin pstoedit}/bin"
|
||||
"--prefix XDG_DATA_DIRS : ${breeze-icons}/share"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Suite of productivity applications";
|
||||
longDescription = ''
|
||||
Calligra Suite is a set of applications written to help
|
||||
you to accomplish your work. Calligra includes efficient
|
||||
and capable office components: Words for text processing,
|
||||
Sheets for computations, Plan for planning, and Karbon for
|
||||
vector graphics.
|
||||
'';
|
||||
homepage = "https://www.calligra.org/";
|
||||
maintainers = with maintainers; [ ebzzry zraexy ];
|
||||
platforms = platforms.linux;
|
||||
license = with licenses; [ gpl2 lgpl2 ];
|
||||
};
|
||||
}
|
||||
@ -47,14 +47,14 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gamescope";
|
||||
version = "3.15.9";
|
||||
version = "3.15.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ValveSoftware";
|
||||
repo = "gamescope";
|
||||
rev = "refs/tags/${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-+BRinPyh8t9HboT0uXPEu+sSJz9qCZshlfzDfZDA41Q=";
|
||||
hash = "sha256-O2pxaPDwEr9ko7Zplv65qRUDzIk1Q54Q7Rgs94VkTII=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
let
|
||||
pname = "gate";
|
||||
version = "0.40.0";
|
||||
version = "0.41.0";
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version;
|
||||
@ -14,10 +14,10 @@ buildGoModule {
|
||||
owner = "minekube";
|
||||
repo = "gate";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-zEbkt38/K4LVLVXXqaLU83mX94vI/dbZ+JqOjn2u0/c=";
|
||||
hash = "sha256-tQO1ClfZasRdnazFOMOWeqnXaEda84lQMQKw5640YCI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-W3YBIbxblxO5Rirso+b20h4cwUzfj8rG/Owh1KyJ0mM=";
|
||||
vendorHash = "sha256-Nl6NGz+sEdwcTzbL+OwHuaQzi2lHX/cN2lE6HNi1uJQ=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
||||
@ -5,47 +5,47 @@
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, python3
|
||||
, sassc
|
||||
, vala
|
||||
, wrapGAppsHook3
|
||||
, gtk3
|
||||
, wrapGAppsHook4
|
||||
, gtk4
|
||||
, libgee
|
||||
, pango
|
||||
, pantheon
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pantheon-tweaks";
|
||||
version = "2.0.2";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pantheon-tweaks";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-7a6maEpvmIS+Raawr9ec44nCbuj83EUnd+8RqYgWy24=";
|
||||
hash = "sha256-NrDBr7Wtfxf9UA/sbi9ilgrlxK6QGQAopuz3TV2ITjs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
sassc
|
||||
vala
|
||||
wrapGAppsHook3
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
gtk4
|
||||
libgee
|
||||
pango
|
||||
] ++ (with pantheon; [
|
||||
elementary-files # settings schemas
|
||||
elementary-terminal # settings schemas
|
||||
granite
|
||||
granite7
|
||||
switchboard
|
||||
]);
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson/post_install.py
|
||||
patchShebangs meson/post_install.py
|
||||
|
||||
substituteInPlace src/Settings/ThemeSettings.vala \
|
||||
--replace-fail "/usr/share/" "/run/current-system/sw/share/"
|
||||
'';
|
||||
|
||||
@ -1,23 +1,23 @@
|
||||
{
|
||||
version = "1.15.0";
|
||||
version = "1.17.0";
|
||||
|
||||
x86_64-linux = {
|
||||
url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.15.0/linux/amd64/sysdig-cli-scanner";
|
||||
hash = "sha256-Mwpn8UWyR9gqLXq+buy9GaPUA0i6EOh6ymY4Ezv/vbs=";
|
||||
url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.17.0/linux/amd64/sysdig-cli-scanner";
|
||||
hash = "sha256-ls5iOdSTFFj3j1pc9Qd2PYqS9YP/BPQBvvE6tVdR0HU=";
|
||||
};
|
||||
|
||||
aarch64-linux = {
|
||||
url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.15.0/linux/arm64/sysdig-cli-scanner";
|
||||
hash = "sha256-UeztxyqRtbnF2eRprjMOEO5gAG95sUfrS6ZScvRx/Ag=";
|
||||
url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.17.0/linux/arm64/sysdig-cli-scanner";
|
||||
hash = "sha256-5R3wpYf+ooRLQbypVxKp7QNgSd/DHmEB+SmVo2qAbKA=";
|
||||
};
|
||||
|
||||
x86_64-darwin = {
|
||||
url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.15.0/darwin/amd64/sysdig-cli-scanner";
|
||||
hash = "sha256-FjKfEtxwTPpMgepu3P0VeefSbhzAWUgb+8UFyQSjVPI=";
|
||||
url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.17.0/darwin/amd64/sysdig-cli-scanner";
|
||||
hash = "sha256-E4HAxADxOS6t4XnGCeakMFd+zA/rBudlCysUYRv0ALE=";
|
||||
};
|
||||
|
||||
aarch64-darwin = {
|
||||
url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.15.0/darwin/arm64/sysdig-cli-scanner";
|
||||
hash = "sha256-neI+oSbFqIibupKMe2IR3SMMPtiQ7SQlRaxJld6qh6g=";
|
||||
url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.17.0/darwin/arm64/sysdig-cli-scanner";
|
||||
hash = "sha256-vcwWl0FgnwN4okIWDCHC86I82plJwOQbse/QfYCz8oQ=";
|
||||
};
|
||||
}
|
||||
|
||||
@ -18,11 +18,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-notification-daemon";
|
||||
version = "1.28.0";
|
||||
version = "1.28.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "pDEDSOrYZsvLm0xGP00mXMapahp4KpQRoIsjvWXbsuA=";
|
||||
hash = "sha256-//71U76hW+z/XtQNZOGMI9O2ScRZnMHrHoL3BTOFOzQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pycaption";
|
||||
version = "2.2.12";
|
||||
version = "2.2.14";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "pbs";
|
||||
repo = "pycaption";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-vdSoqNWEubK0np14EiI/hRbrEx0722qg6Ggcpmhz8FM=";
|
||||
hash = "sha256-9COO8cJRxXiWWceh3XtasSMBq7E5Py0p+1b3sWMaMWE=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -1,4 +0,0 @@
|
||||
source 'https://rubygems.org'
|
||||
|
||||
gem 'fpm'
|
||||
gem 'ronn'
|
||||
@ -1,54 +0,0 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
arr-pm (0.0.10)
|
||||
cabin (> 0)
|
||||
backports (3.14.0)
|
||||
cabin (0.9.0)
|
||||
childprocess (0.9.0)
|
||||
ffi (~> 1.0, >= 1.0.11)
|
||||
clamp (1.0.1)
|
||||
dotenv (2.7.2)
|
||||
ffi (1.10.0)
|
||||
fpm (1.11.0)
|
||||
arr-pm (~> 0.0.10)
|
||||
backports (>= 2.6.2)
|
||||
cabin (>= 0.6.0)
|
||||
childprocess (= 0.9.0)
|
||||
clamp (~> 1.0.0)
|
||||
ffi
|
||||
json (>= 1.7.7, < 2.0)
|
||||
pleaserun (~> 0.0.29)
|
||||
ruby-xz (~> 0.2.3)
|
||||
stud
|
||||
hpricot (0.8.6)
|
||||
insist (1.0.0)
|
||||
io-like (0.3.0)
|
||||
json (1.8.6)
|
||||
mustache (0.99.8)
|
||||
pleaserun (0.0.30)
|
||||
cabin (> 0)
|
||||
clamp
|
||||
dotenv
|
||||
insist
|
||||
mustache (= 0.99.8)
|
||||
stud
|
||||
rdiscount (2.2.0.1)
|
||||
ronn (0.7.3)
|
||||
hpricot (>= 0.8.2)
|
||||
mustache (>= 0.7.0)
|
||||
rdiscount (>= 1.5.8)
|
||||
ruby-xz (0.2.3)
|
||||
ffi (~> 1.9)
|
||||
io-like (~> 0.3)
|
||||
stud (0.0.23)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
fpm
|
||||
ronn
|
||||
|
||||
BUNDLED WITH
|
||||
2.1.4
|
||||
@ -1,38 +1,26 @@
|
||||
{ lib, bundlerEnv, ruby, buildGoModule, fetchFromGitHub }:
|
||||
let
|
||||
# needed for manpage generation
|
||||
gems = bundlerEnv {
|
||||
name = "ejson-gems";
|
||||
gemdir = ./.;
|
||||
inherit ruby;
|
||||
};
|
||||
in
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ejson";
|
||||
version = "1.3.3";
|
||||
version = "1.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Shopify";
|
||||
repo = "ejson";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-M2Gk+/l1tNlIAe1/fR1WLEOey+tjCUmMAujc76gmeZA=";
|
||||
sha256 = "sha256-Pv0eoFf/E+PE/C+0wsSQxhVTlymOMAYk5UVQP2udpnA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-9+x7HrbXRoS/7ZADWwhsbynQLr3SyCbcsp9QnSubov0=";
|
||||
vendorHash = "sha256-N2vcj3STkaZO2eRr8VztZTWOBUTI+wOri0HYDJ1KiN8=";
|
||||
|
||||
nativeBuildInputs = [ gems ];
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
# set HOME, otherwise bundler will insert stuff in the manpages
|
||||
postBuild = ''
|
||||
HOME=$PWD make man SHELL=$SHELL
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share
|
||||
cp -r build/man $out/share
|
||||
'';
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Small library to manage encrypted secrets using asymmetric encryption";
|
||||
|
||||
@ -1,188 +0,0 @@
|
||||
{
|
||||
arr-pm = {
|
||||
dependencies = ["cabin"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "07yx1g1nh4zdy38i2id1xyp42fvj4vl6i196jn7szvjfm0jx98hg";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.0.10";
|
||||
};
|
||||
backports = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "17j5pf0b69bkn043wi4xd530ky53jbbnljr4bsjzlm4k8bzlknfn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.14.0";
|
||||
};
|
||||
cabin = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0b3b8j3iqnagjfn1261b9ncaac9g44zrx1kcg81yg4z9i513kici";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.9.0";
|
||||
};
|
||||
childprocess = {
|
||||
dependencies = ["ffi"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.9.0";
|
||||
};
|
||||
clamp = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0jb6l4scp69xifhicb5sffdixqkw8wgkk9k2q57kh2y36x1px9az";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.1";
|
||||
};
|
||||
dotenv = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "13cis6bf06hmz744xrsl163p6gb78xcm8g8q4pcabsy5ywyv6kag";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.7.2";
|
||||
};
|
||||
ffi = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.10.0";
|
||||
};
|
||||
fpm = {
|
||||
dependencies = ["arr-pm" "backports" "cabin" "childprocess" "clamp" "ffi" "json" "pleaserun" "ruby-xz" "stud"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0khzsiqzswxpql6w2ws9dawb27zgv4nmgrjszydmm0xpv6h21jrm";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.11.0";
|
||||
};
|
||||
hpricot = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1jn8x9ch79gqmnzgyz78kppavjh5lqx0y0r6frykga2b86rz9s6z";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.8.6";
|
||||
};
|
||||
insist = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0bw3bdwns14mapbgb8cbjmr0amvwz8y72gyclq04xp43wpp5jrvg";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.0";
|
||||
};
|
||||
io-like = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "04nn0s2wmgxij3k760h3r8m1dgih5dmd9h4v1nn085yi824i5z6k";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.3.0";
|
||||
};
|
||||
json = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.8.6";
|
||||
};
|
||||
mustache = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1g5hplm0k06vwxwqzwn1mq5bd02yp0h3rym4zwzw26aqi7drcsl2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.99.8";
|
||||
};
|
||||
pleaserun = {
|
||||
dependencies = ["cabin" "clamp" "dotenv" "insist" "mustache" "stud"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0hgnrl67zkqaxmfkwbyscawj4wqjm7h8khpbj58s6iw54wp3408p";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.0.30";
|
||||
};
|
||||
rdiscount = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1arvk3k06prxasq1djbj065ixar4zl171340g7wr1ww4gj9makx3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.2.0.1";
|
||||
};
|
||||
ronn = {
|
||||
dependencies = ["hpricot" "mustache" "rdiscount"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "07plsxxfx5bxdk72ii9za6km0ziqlq8jh3bicr4774dalga6zpw2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.7.3";
|
||||
};
|
||||
ruby-xz = {
|
||||
dependencies = ["ffi" "io-like"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "11bgpvvk0098ghvlxr4i713jmi2izychalgikwvdwmpb452r3ndw";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.2.3";
|
||||
};
|
||||
stud = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0qpb57cbpm9rwgsygqxifca0zma87drnlacv49cqs2n5iyi6z8kb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.0.23";
|
||||
};
|
||||
}
|
||||
@ -68,6 +68,7 @@ let
|
||||
selenium-webdriver-at-spi = null; # Used for integration tests that we don't run, stub
|
||||
|
||||
alpaka = self.callPackage ./misc/alpaka { };
|
||||
calligra = self.callPackage ./misc/calligra { };
|
||||
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 { };
|
||||
|
||||
76
pkgs/kde/misc/calligra/default.nix
Normal file
76
pkgs/kde/misc/calligra/default.nix
Normal file
@ -0,0 +1,76 @@
|
||||
{
|
||||
mkKdeDerivation,
|
||||
lib,
|
||||
fetchurl,
|
||||
boost,
|
||||
eigen,
|
||||
imath,
|
||||
libetonyek,
|
||||
libgit2,
|
||||
libodfgen,
|
||||
librevenge,
|
||||
libvisio,
|
||||
libwpd,
|
||||
libwpg,
|
||||
libwps,
|
||||
okular,
|
||||
perl,
|
||||
pkg-config,
|
||||
poppler,
|
||||
qtkeychain,
|
||||
qtsvg,
|
||||
}:
|
||||
|
||||
mkKdeDerivation rec {
|
||||
pname = "calligra";
|
||||
version = "4.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/calligra/calligra-${version}.tar.xz";
|
||||
hash = "sha256-1AH15z9PG9wLNUjqGlCwrBd4we3jCmozWUTtf72I2V8=";
|
||||
};
|
||||
|
||||
extraBuildInputs = [
|
||||
boost
|
||||
eigen
|
||||
imath
|
||||
libetonyek
|
||||
libgit2
|
||||
libodfgen
|
||||
librevenge
|
||||
libvisio
|
||||
libwpd
|
||||
libwpg
|
||||
libwps
|
||||
okular
|
||||
poppler
|
||||
qtkeychain
|
||||
qtsvg
|
||||
];
|
||||
|
||||
extraNativeBuildInputs = [
|
||||
perl
|
||||
pkg-config
|
||||
];
|
||||
|
||||
# Recommended by the upstream packaging instructions. RELEASE_BUILD disables
|
||||
# unmaintained components, like Braindump, from being built, and KDE_NO_DEBUG_OUTPUT
|
||||
# is supposed to improve performance in the finished package.
|
||||
extraCmakeFlags = [
|
||||
(lib.cmakeBool "RELEASE_BUILD" true)
|
||||
(lib.cmakeFeature "CMAKE_CXX_FLAGS" "-DKDE_NO_DEBUG_OUTPUT")
|
||||
];
|
||||
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [
|
||||
ebzzry
|
||||
zraexy
|
||||
sigmasquadron
|
||||
];
|
||||
license = with lib.licenses; [
|
||||
gpl2
|
||||
lgpl2
|
||||
];
|
||||
mainProgram = "calligralauncher";
|
||||
};
|
||||
}
|
||||
@ -215,6 +215,7 @@ mapAliases {
|
||||
|
||||
### C ###
|
||||
|
||||
calligra = kdePackages.calligra; # Added 2024-09-27
|
||||
callPackage_i686 = pkgsi686Linux.callPackage;
|
||||
cadence = throw "cadence has been removed from nixpkgs, as it was archived upstream"; # Added 2023-10-28
|
||||
cask = emacs.pkgs.cask; # Added 2022-11-12
|
||||
|
||||
@ -28668,8 +28668,6 @@ with pkgs;
|
||||
calicoctl
|
||||
confd-calico;
|
||||
|
||||
calligra = libsForQt5.callPackage ../applications/office/calligra { };
|
||||
|
||||
perkeep = callPackage ../applications/misc/perkeep { };
|
||||
|
||||
canto-curses = callPackage ../applications/networking/feedreaders/canto-curses { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user