Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -13,7 +13,7 @@ let
|
||||
"x86_64-darwin" "i686-darwin" "aarch64-darwin" "armv7a-darwin"
|
||||
|
||||
# FreeBSD
|
||||
"i686-freebsd" "x86_64-freebsd"
|
||||
"i686-freebsd" "x86_64-freebsd" "aarch64-freebsd"
|
||||
|
||||
# Genode
|
||||
"aarch64-genode" "i686-genode" "x86_64-genode"
|
||||
|
||||
@@ -335,6 +335,11 @@ rec {
|
||||
|
||||
# BSDs
|
||||
|
||||
aarch64-freebsd = {
|
||||
config = "aarch64-unknown-freebsd";
|
||||
useLLVM = true;
|
||||
};
|
||||
|
||||
x86_64-freebsd = {
|
||||
config = "x86_64-unknown-freebsd";
|
||||
useLLVM = true;
|
||||
|
||||
@@ -52,7 +52,7 @@ lib.runTests (
|
||||
|
||||
testcygwin = mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ];
|
||||
testdarwin = mseteq darwin [ "x86_64-darwin" "i686-darwin" "aarch64-darwin" "armv7a-darwin" ];
|
||||
testfreebsd = mseteq freebsd [ "i686-freebsd" "x86_64-freebsd" ];
|
||||
testfreebsd = mseteq freebsd [ "aarch64-freebsd" "i686-freebsd" "x86_64-freebsd" ];
|
||||
testgenode = mseteq genode [ "aarch64-genode" "i686-genode" "x86_64-genode" ];
|
||||
testredox = mseteq redox [ "x86_64-redox" ];
|
||||
testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */);
|
||||
|
||||
@@ -6927,6 +6927,12 @@
|
||||
githubId = 30512529;
|
||||
name = "Evils";
|
||||
};
|
||||
evris99 = {
|
||||
name = "Evrymachos Koukoumakas";
|
||||
github = "evris99";
|
||||
githubId = 32963606;
|
||||
email = "cptevris@gmail.com";
|
||||
};
|
||||
ewok = {
|
||||
email = "ewok@ewok.ru";
|
||||
github = "ewok-old";
|
||||
|
||||
@@ -749,12 +749,6 @@
|
||||
- The `atlassian-crowd` package and its `services.crowd` NixOS module
|
||||
- The `atlassian-jira` package and its `services.jira` NixOS module
|
||||
|
||||
- `nerdfonts` has been separated into individual font packages under the namespace `nerd-fonts`. The directories for font
|
||||
files have changed from `$out/share/fonts/{opentype,truetype}/NerdFonts` to
|
||||
`$out/share/fonts/{opentype,truetype}/NerdFonts/<fontDirName>`, where `<fontDirName>` can be found in the
|
||||
[official website](https://www.nerdfonts.com/font-downloads) as the titles in preview images, with the "Nerd Font"
|
||||
suffix and any whitespaces trimmed.
|
||||
|
||||
- `python3Packages.nose` has been removed, as it has been deprecated and unmaintained for almost a decade and does not work on Python 3.12.
|
||||
Please switch to `pytest` or another test runner/framework.
|
||||
|
||||
|
||||
@@ -41,6 +41,12 @@
|
||||
for more information.
|
||||
- `vscode-utils.buildVscodeExtension` now requires pname as an argument
|
||||
|
||||
- `nerdfonts` has been separated into individual font packages under the namespace `nerd-fonts`. The directories for font
|
||||
files have changed from `$out/share/fonts/{opentype,truetype}/NerdFonts` to
|
||||
`$out/share/fonts/{opentype,truetype}/NerdFonts/<fontDirName>`, where `<fontDirName>` can be found in the
|
||||
[official website](https://www.nerdfonts.com/font-downloads) as the titles in preview images, with the "Nerd Font"
|
||||
suffix and any whitespaces trimmed.
|
||||
|
||||
- the notmuch vim plugin now lives in a separate output of the `notmuch`
|
||||
package. Installing `notmuch` will not bring the notmuch vim package anymore,
|
||||
add `vimPlugins.notmuch-vim` to your (Neo)vim configuration if you want the
|
||||
|
||||
@@ -1,4 +1,9 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
@@ -8,7 +13,10 @@ let
|
||||
in
|
||||
{
|
||||
|
||||
meta.maintainers = with maintainers; [ Br1ght0ne happysalada ];
|
||||
meta.maintainers = with maintainers; [
|
||||
Br1ght0ne
|
||||
happysalada
|
||||
];
|
||||
meta.doc = ./meilisearch.md;
|
||||
|
||||
###### interface
|
||||
@@ -37,7 +45,10 @@ in
|
||||
environment = mkOption {
|
||||
description = "Defines the running environment of MeiliSearch.";
|
||||
default = "development";
|
||||
type = types.enum [ "development" "production" ];
|
||||
type = types.enum [
|
||||
"development"
|
||||
"production"
|
||||
];
|
||||
};
|
||||
|
||||
# TODO change this to LoadCredentials once possible
|
||||
@@ -105,6 +116,10 @@ in
|
||||
###### implementation
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
# used to restore dumps
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
systemd.services.meilisearch = {
|
||||
description = "MeiliSearch daemon";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-pylance";
|
||||
publisher = "MS-python";
|
||||
version = "2024.10.1";
|
||||
hash = "sha256-rSgPTF7RtrR2lgp++uKfT9tYx4AKqW3qjBvPUZpw52s=";
|
||||
version = "2024.11.3";
|
||||
hash = "sha256-EVZSIALg6e1BdJNriGznJ3zxMKwU0QEbPiNPMmxeLbU=";
|
||||
};
|
||||
|
||||
buildInputs = [ pyright ];
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -9,10 +9,10 @@
|
||||
|
||||
buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "128.4.0esr";
|
||||
version = "128.5.0esr";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "e720b1f993926d73f5a5727648f753176ac2fd093fb0b71393946bbc5919ce5fc7b88b82960bd1aa427b5663c7f659828dc6702485fc0c1e7a6961571c67faa3";
|
||||
sha512 = "ff20f18f92c5e9cd1d9eaf7c38cec61bcab2dca8dd2817519b712bc1f760b5c6e290212acf3289152764e5130e01626950b7ecd9327b2c587b24a246591afd67";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -9,10 +9,10 @@
|
||||
|
||||
buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "132.0.2";
|
||||
version = "133.0";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "9ea95d9fb1a941ac5a5b50da67e224f3ccf8c401f26cb61bb74ad7f4e1e8706d469c4b6325714f2cb9cdf50c32710377d6bca18dd65b55db2c39ef2b27a57fae";
|
||||
sha512 = "b16f9898bee4121914caef48d4f7f44bf9d69aee168586b02bf1b4f4197844fd10179e1b63b273f52929fb348030df36328f24993cd666969da4ddc82562a90c";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"acme": {
|
||||
"hash": "sha256-RboEWeTUgEZShZ9NrR9yuUzbGPq9wauTyoFiHXZS2oI=",
|
||||
"hash": "sha256-pBe+X0ZjSV/4GaN+EyS3/Bim0wPlrwgKJlRSTzcNn3E=",
|
||||
"homepage": "https://registry.terraform.io/providers/vancluever/acme",
|
||||
"owner": "vancluever",
|
||||
"repo": "terraform-provider-acme",
|
||||
"rev": "v2.26.0",
|
||||
"rev": "v2.28.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-pJlt35kPV3CYOE4RiIjHLT9YEwSreQHgzRuY3ba9oBk="
|
||||
"vendorHash": "sha256-o4imbzlkhj5dd8gH8k/saXSmcBTl9u10p/yJjgUrj5Q="
|
||||
},
|
||||
"age": {
|
||||
"hash": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=",
|
||||
@@ -117,13 +117,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"aws": {
|
||||
"hash": "sha256-iTRq2y4Qf4y4t8lLFgtpW2BqDjYXCmF8vwOU0z4NCy4=",
|
||||
"hash": "sha256-gPbNqPyWt+gFhPZth12HxEjzq7yvkEh54sMxPD9F9Io=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/aws",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-aws",
|
||||
"rev": "v5.72.0",
|
||||
"rev": "v5.78.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-6nHAXNPadMqoegsXsqjZWQvQdhCg6f9GABGnKof6+u4="
|
||||
"vendorHash": "sha256-5pQnUfO359BWYmmrBJdEe8VsbeRNehMPOHJmnPAEoQU="
|
||||
},
|
||||
"azuread": {
|
||||
"hash": "sha256-m4ZzZFlcMBAfGN7tHjeYACMwxaG6rpUO4MPVMqjD7Hk=",
|
||||
@@ -498,13 +498,13 @@
|
||||
"vendorHash": "sha256-P718i0CkboK15CRJ7GNmS7oMYQ8oy+mKOoYrBt3sSZg="
|
||||
},
|
||||
"google": {
|
||||
"hash": "sha256-u6p937GYGWFZZD0s1BnnESny7fHMHZ+Fctp67ElUYUU=",
|
||||
"hash": "sha256-07Yq81I2XMwbFcsjlWgr/zvln594Yt1S/RCnGPxTe6Q=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-google",
|
||||
"rev": "v6.7.0",
|
||||
"rev": "v6.12.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-iJSo5zrJWRpm7kPHxEBBovsn1ICQCNe1fjsp4CdJgBU="
|
||||
"vendorHash": "sha256-hwWHtrPmzJJT7OUcjiqt7a6Nf1GLvoEcepqIAHv5bsI="
|
||||
},
|
||||
"google-beta": {
|
||||
"hash": "sha256-vYMyLjb2OQAVPmc9wSxTCWG1lLUOH/cxayCJPZIF2Bo=",
|
||||
|
||||
@@ -34,12 +34,12 @@
|
||||
, which
|
||||
, icu
|
||||
, boost
|
||||
, jdk17
|
||||
, jdk21
|
||||
, ant
|
||||
, cups
|
||||
, xorg
|
||||
, fontforge
|
||||
, jre17_minimal
|
||||
, jre21_minimal
|
||||
, openssl
|
||||
, gperf
|
||||
, cppunit
|
||||
@@ -177,7 +177,7 @@ let
|
||||
];
|
||||
};
|
||||
|
||||
jre' = jre17_minimal.override {
|
||||
jre' = jre21_minimal.override {
|
||||
modules = [ "java.base" "java.desktop" "java.logging" "java.sql" ];
|
||||
};
|
||||
|
||||
@@ -298,7 +298,7 @@ in stdenv.mkDerivation (finalAttrs: {
|
||||
bison
|
||||
fontforge
|
||||
gdb
|
||||
jdk17
|
||||
jdk21
|
||||
libtool
|
||||
pkg-config
|
||||
];
|
||||
|
||||
@@ -101,7 +101,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# The store path to "which" is baked into src/library/base/R/unix/system.unix.R,
|
||||
# but Nix cannot detect it as a run-time dependency because the installed file
|
||||
# is compiled and compressed, which hides the store path.
|
||||
postFixup = "echo ${which} > $out/nix-support/undetected-runtime-dependencies";
|
||||
postFixup = ''
|
||||
echo ${which} > $out/nix-support/undetected-runtime-dependencies
|
||||
${lib.optionalString stdenv.hostPlatform.isLinux ''find $out -name "*.so" -exec patchelf {} --add-rpath $out/lib/R/lib \;''}
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
preCheck = "export HOME=$TMPDIR; export TZ=CET; bin/Rscript -e 'sessionInfo()'";
|
||||
|
||||
@@ -14,19 +14,27 @@
|
||||
webkitgtk_6_0,
|
||||
gcr_4,
|
||||
gdk-pixbuf,
|
||||
autoPatchelfHook,
|
||||
appstream,
|
||||
libxml2,
|
||||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "devtoolbox";
|
||||
version = "1.2";
|
||||
version = "1.2.1";
|
||||
pyproject = false; # uses meson
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aleiepure";
|
||||
repo = "devtoolbox";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tSH7H2Y/+8EpuM4+Fa0iL/pSJSVtFDXlO2w/xwpzps0=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-yeOX2ASQWpo3TN9ou25voOVD3pSK4SE0CDXHkrwu+E4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/views/reverse_cron.py \
|
||||
--replace-fail '"\D"' 'r"\D"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
@@ -35,6 +43,9 @@ python3Packages.buildPythonApplication rec {
|
||||
blueprint-compiler
|
||||
wrapGAppsHook4
|
||||
desktop-file-utils
|
||||
autoPatchelfHook
|
||||
appstream
|
||||
libxml2
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -76,6 +87,8 @@ python3Packages.buildPythonApplication rec {
|
||||
# Contains an unusable devtoolbox-run-script
|
||||
postInstall = ''
|
||||
rm -r $out/devtoolbox
|
||||
ln -s $out/share/locale/zh_Hant $out/share/locale/zh_TW
|
||||
ln -s $out/share/locale/zh_Hans $out/share/locale/zh_CN
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
# Python environment that needs to be able to run the following:
|
||||
# https://github.com/fwupd/fwupd/blob/f8b5ed554ce3d5e7a016e6e97f0a03e48e510ddb/plugins/uefi-capsule/meson.build#L73
|
||||
|
||||
{
|
||||
lib,
|
||||
glib,
|
||||
pango,
|
||||
python3,
|
||||
harfbuzz,
|
||||
}:
|
||||
|
||||
let
|
||||
giTypelibPath = lib.makeSearchPathOutput "out" "lib/girepository-1.0" [
|
||||
harfbuzz
|
||||
pango
|
||||
glib
|
||||
];
|
||||
in
|
||||
(python3.withPackages (p: [
|
||||
p.jinja2
|
||||
p.pygobject3
|
||||
p.setuptools
|
||||
])).override
|
||||
{
|
||||
makeWrapperArgs = [ "--set GI_TYPELIB_PATH ${giTypelibPath}" ];
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
# Updating? Keep $out/etc synchronized with passthru keys
|
||||
|
||||
{
|
||||
pkgsBuildBuild,
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
@@ -22,6 +23,7 @@
|
||||
elfutils,
|
||||
valgrind,
|
||||
meson,
|
||||
mesonEmulatorHook,
|
||||
libuuid,
|
||||
ninja,
|
||||
gnutls,
|
||||
@@ -57,14 +59,6 @@
|
||||
}:
|
||||
|
||||
let
|
||||
python = python3.withPackages (
|
||||
p: with p; [
|
||||
jinja2
|
||||
pygobject3
|
||||
setuptools
|
||||
]
|
||||
);
|
||||
|
||||
isx86 = stdenv.hostPlatform.isx86;
|
||||
|
||||
# Dell isn't supported on Aarch64
|
||||
@@ -165,30 +159,39 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
./efi-app-path.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
# required for firmware zipping
|
||||
ensureNewerSourcesForZipFilesHook
|
||||
meson
|
||||
ninja
|
||||
gi-docgen
|
||||
pkg-config
|
||||
gobject-introspection
|
||||
gettext
|
||||
shared-mime-info
|
||||
valgrind
|
||||
gnutls
|
||||
protobufc # for protoc
|
||||
python
|
||||
wrapGAppsNoGuiHook
|
||||
vala
|
||||
strictDeps = true;
|
||||
|
||||
depsBuildBuild = [
|
||||
pkg-config # for finding build-time dependencies
|
||||
(pkgsBuildBuild.callPackage ./build-time-python.nix { })
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
json-glib
|
||||
];
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
ensureNewerSourcesForZipFilesHook # required for firmware zipping
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
gettext
|
||||
shared-mime-info
|
||||
valgrind
|
||||
protobufc # for protoc
|
||||
wrapGAppsNoGuiHook
|
||||
vala
|
||||
gobject-introspection
|
||||
gi-docgen
|
||||
]
|
||||
++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
|
||||
mesonEmulatorHook
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
gnutls
|
||||
polkit
|
||||
libxmlb
|
||||
gusb
|
||||
|
||||
@@ -4,15 +4,15 @@
|
||||
# runtime dependencies
|
||||
imagemagick, libtiff, djvulibre, poppler_utils, ghostscript, unpaper, pdftk,
|
||||
# test dependencies
|
||||
xvfb-run, liberation_ttf, file, tesseract }:
|
||||
xvfb-run, liberation_ttf, file, tesseract3 }:
|
||||
|
||||
perlPackages.buildPerlPackage rec {
|
||||
pname = "gscan2pdf";
|
||||
version = "2.13.3";
|
||||
version = "2.13.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gscan2pdf/gscan2pdf-${version}.tar.xz";
|
||||
hash = "sha256-QAs6fsQDe9+nKM/OAVZUHB034K72jHsKoA2LY2JQa8Y=";
|
||||
hash = "sha256-4HcTkVJBscBb8AxeN6orMQFVR0w4hFfkGhxQOzP3mWk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -99,7 +99,7 @@ perlPackages.buildPerlPackage rec {
|
||||
|
||||
xvfb-run
|
||||
file
|
||||
tesseract # tests are expecting tesseract 3.x precisely
|
||||
tesseract3 # tests are expecting tesseract 3.x precisely
|
||||
] ++ (with perlPackages; [
|
||||
TestPod
|
||||
]);
|
||||
|
||||
@@ -1,22 +1,31 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, runCommand
|
||||
, fetchzip
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, jbig2dec
|
||||
, libjpeg_turbo
|
||||
, libpng
|
||||
, makeWrapper
|
||||
, pkg-config
|
||||
, zlib
|
||||
, enableGSL ? true, gsl
|
||||
, enableGhostScript ? true, ghostscript
|
||||
, enableMuPDF ? true, mupdf
|
||||
, enableDJVU ? true, djvulibre
|
||||
, enableGOCR ? false, gocr # Disabled by default due to crashes
|
||||
, enableTesseract ? true, leptonica, tesseract
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
runCommand,
|
||||
fetchzip,
|
||||
fetchurl,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
jbig2dec,
|
||||
libjpeg_turbo,
|
||||
libpng,
|
||||
makeWrapper,
|
||||
pkg-config,
|
||||
zlib,
|
||||
enableGSL ? true,
|
||||
gsl,
|
||||
enableGhostScript ? true,
|
||||
ghostscript,
|
||||
enableMuPDF ? true,
|
||||
mupdf,
|
||||
enableDJVU ? true,
|
||||
djvulibre,
|
||||
enableGOCR ? false,
|
||||
gocr, # Disabled by default due to crashes
|
||||
enableTesseract ? true,
|
||||
leptonica,
|
||||
tesseract5,
|
||||
opencl-headers,
|
||||
}:
|
||||
|
||||
# k2pdfopt is a pain to package. It requires modified versions of mupdf,
|
||||
@@ -45,20 +54,26 @@
|
||||
|
||||
let
|
||||
# Create a patch against src based on changes applied in patchCommands
|
||||
mkPatch = { name, src, patchCommands }: runCommand "${name}-k2pdfopt.patch" { inherit src; } ''
|
||||
source $stdenv/setup
|
||||
unpackPhase
|
||||
mkPatch =
|
||||
{
|
||||
name,
|
||||
src,
|
||||
patchCommands,
|
||||
}:
|
||||
runCommand "${name}-k2pdfopt.patch" { inherit src; } ''
|
||||
source $stdenv/setup
|
||||
unpackPhase
|
||||
|
||||
orig=$sourceRoot
|
||||
new=$sourceRoot-modded
|
||||
cp -r $orig/. $new/
|
||||
orig=$sourceRoot
|
||||
new=$sourceRoot-modded
|
||||
cp -r $orig/. $new/
|
||||
|
||||
pushd $new >/dev/null
|
||||
${patchCommands}
|
||||
popd >/dev/null
|
||||
pushd $new >/dev/null
|
||||
${patchCommands}
|
||||
popd >/dev/null
|
||||
|
||||
diff -Naur $orig $new > $out || true
|
||||
'';
|
||||
diff -Naur $orig $new > $out || true
|
||||
'';
|
||||
|
||||
pname = "k2pdfopt";
|
||||
version = "2.55";
|
||||
@@ -66,7 +81,8 @@ let
|
||||
url = "http://www.willus.com/${pname}/src/${pname}_v${version}_src.zip";
|
||||
hash = "sha256-orQNDXQkkcCtlA8wndss6SiJk4+ImiFCG8XRLEg963k=";
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname version;
|
||||
src = k2pdfopt_src;
|
||||
|
||||
@@ -79,88 +95,124 @@ in stdenv.mkDerivation rec {
|
||||
--replace "<djvu.h>" "<libdjvu/ddjvuapi.h>"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config makeWrapper ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
let
|
||||
# We use specific versions of these sources below to match the versions
|
||||
# used in the k2pdfopt source. Note that this does _not_ need to match the
|
||||
# version used elsewhere in nixpkgs, since it is only used to create the
|
||||
# patch that can then be applied to the version in nixpkgs.
|
||||
mupdf_patch = mkPatch {
|
||||
name = "mupdf";
|
||||
src = fetchurl {
|
||||
url = "https://mupdf.com/downloads/archive/mupdf-1.23.7-source.tar.gz";
|
||||
hash = "sha256-NaVJM/QA6JZnoImkJfHGXNadRiOU/tnAZ558Uu+6pWg=";
|
||||
};
|
||||
patchCommands = ''
|
||||
cp ${k2pdfopt_src}/mupdf_mod/{filter-basic,font,stext-device,string}.c ./source/fitz/
|
||||
cp ${k2pdfopt_src}/mupdf_mod/pdf-* ./source/pdf/
|
||||
'';
|
||||
};
|
||||
mupdf_modded = mupdf.overrideAttrs ({ patches ? [], ... }: {
|
||||
patches = patches ++ [ mupdf_patch ];
|
||||
# This function is missing in font.c, see font-win32.c
|
||||
postPatch = ''
|
||||
echo "void pdf_install_load_system_font_funcs(fz_context *ctx) {}" >> source/fitz/font.c
|
||||
'';
|
||||
});
|
||||
|
||||
leptonica_patch = mkPatch {
|
||||
name = "leptonica";
|
||||
src = fetchurl {
|
||||
url = "http://www.leptonica.org/source/leptonica-1.83.0.tar.gz";
|
||||
hash = "sha256-IGWR3VjPhO84CDba0TO1jJ0a+SSR9amCXDRqFiBEvP4=";
|
||||
};
|
||||
patchCommands = "cp -r ${k2pdfopt_src}/leptonica_mod/. ./src/";
|
||||
};
|
||||
leptonica_modded = leptonica.overrideAttrs ({ patches ? [], ... }: {
|
||||
patches = patches ++ [ leptonica_patch ];
|
||||
});
|
||||
|
||||
tesseract_patch = mkPatch {
|
||||
name = "tesseract";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tesseract-ocr";
|
||||
repo = "tesseract";
|
||||
rev = "5.3.3";
|
||||
hash = "sha256-/aGzwm2+0y8fheOnRi/OJXZy3o0xjY1cCq+B3GTzfos=";
|
||||
};
|
||||
patchCommands = ''
|
||||
cp ${k2pdfopt_src}/tesseract_mod/tesseract.* include/tesseract/
|
||||
cp ${k2pdfopt_src}/tesseract_mod/tesseract/baseapi.h include/tesseract/
|
||||
cp ${k2pdfopt_src}/tesseract_mod/{baseapi,config_auto,tesscapi,tesseract}.* src/api/
|
||||
cp ${k2pdfopt_src}/tesseract_mod/tesseract/baseapi.h src/api/
|
||||
cp ${k2pdfopt_src}/tesseract_mod/{tesscapi,tessedit,tesseract}.* src/ccmain/
|
||||
cp ${k2pdfopt_src}/tesseract_mod/tesseract/baseapi.h src/ccmain/
|
||||
cp ${k2pdfopt_src}/tesseract_mod/dotproduct{avx,fma,sse}.* src/arch/
|
||||
cp ${k2pdfopt_src}/tesseract_mod/{intsimdmatrixsse,simddetect}.* src/arch/
|
||||
cp ${k2pdfopt_src}/tesseract_mod/{errcode,genericvector,mainblk,params,serialis,tessdatamanager,tess_version,tprintf,unicharset}.* src/ccutil/
|
||||
cp ${k2pdfopt_src}/tesseract_mod/{input,lstmrecognizer}.* src/lstm/
|
||||
cp ${k2pdfopt_src}/tesseract_mod/openclwrapper.* src/opencl/
|
||||
'';
|
||||
};
|
||||
tesseract_modded = tesseract.override {
|
||||
tesseractBase = tesseract.tesseractBase.overrideAttrs ({ patches ? [], ... }: {
|
||||
patches = patches ++ [ tesseract_patch ];
|
||||
# Additional compilation fixes
|
||||
postPatch = ''
|
||||
echo libtesseract_la_SOURCES += src/api/tesscapi.cpp >> Makefile.am
|
||||
substituteInPlace src/api/tesseract.h \
|
||||
--replace "#include <leptonica.h>" "//#include <leptonica.h>"
|
||||
substituteInPlace include/tesseract/tesseract.h \
|
||||
--replace "#include <leptonica.h>" "//#include <leptonica.h>"
|
||||
let
|
||||
# We use specific versions of these sources below to match the versions
|
||||
# used in the k2pdfopt source. Note that this does _not_ need to match the
|
||||
# version used elsewhere in nixpkgs, since it is only used to create the
|
||||
# patch that can then be applied to the version in nixpkgs.
|
||||
mupdf_patch = mkPatch {
|
||||
name = "mupdf";
|
||||
src = fetchurl {
|
||||
url = "https://mupdf.com/downloads/archive/mupdf-1.23.7-source.tar.gz";
|
||||
hash = "sha256-NaVJM/QA6JZnoImkJfHGXNadRiOU/tnAZ558Uu+6pWg=";
|
||||
};
|
||||
patchCommands = ''
|
||||
cp ${k2pdfopt_src}/mupdf_mod/{filter-basic,font,stext-device,string}.c ./source/fitz/
|
||||
cp ${k2pdfopt_src}/mupdf_mod/pdf-* ./source/pdf/
|
||||
'';
|
||||
});
|
||||
};
|
||||
in
|
||||
[ jbig2dec libjpeg_turbo libpng zlib ] ++
|
||||
lib.optional enableGSL gsl ++
|
||||
lib.optional enableGhostScript ghostscript ++
|
||||
lib.optional enableMuPDF mupdf_modded ++
|
||||
lib.optional enableDJVU djvulibre ++
|
||||
lib.optional enableGOCR gocr ++
|
||||
lib.optionals enableTesseract [ leptonica_modded tesseract_modded ];
|
||||
};
|
||||
mupdf_modded = mupdf.overrideAttrs (
|
||||
{
|
||||
patches ? [ ],
|
||||
...
|
||||
}:
|
||||
{
|
||||
patches = patches ++ [ mupdf_patch ];
|
||||
# This function is missing in font.c, see font-win32.c
|
||||
postPatch = ''
|
||||
echo "void pdf_install_load_system_font_funcs(fz_context *ctx) {}" >> source/fitz/font.c
|
||||
'';
|
||||
}
|
||||
);
|
||||
|
||||
leptonica_patch = mkPatch {
|
||||
name = "leptonica";
|
||||
src = fetchurl {
|
||||
url = "http://www.leptonica.org/source/leptonica-1.83.0.tar.gz";
|
||||
hash = "sha256-IGWR3VjPhO84CDba0TO1jJ0a+SSR9amCXDRqFiBEvP4=";
|
||||
};
|
||||
patchCommands = "cp -r ${k2pdfopt_src}/leptonica_mod/. ./src/";
|
||||
};
|
||||
leptonica_modded = leptonica.overrideAttrs (
|
||||
{
|
||||
patches ? [ ],
|
||||
...
|
||||
}:
|
||||
{
|
||||
patches = patches ++ [ leptonica_patch ];
|
||||
}
|
||||
);
|
||||
|
||||
tesseract_patch = mkPatch {
|
||||
name = "tesseract";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tesseract-ocr";
|
||||
repo = "tesseract";
|
||||
rev = "5.3.3";
|
||||
hash = "sha256-/aGzwm2+0y8fheOnRi/OJXZy3o0xjY1cCq+B3GTzfos=";
|
||||
};
|
||||
patchCommands = ''
|
||||
cp ${k2pdfopt_src}/tesseract_mod/tesseract.* include/tesseract/
|
||||
cp ${k2pdfopt_src}/tesseract_mod/tesseract/baseapi.h include/tesseract/
|
||||
cp ${k2pdfopt_src}/tesseract_mod/{baseapi,config_auto,tesscapi,tesseract}.* src/api/
|
||||
cp ${k2pdfopt_src}/tesseract_mod/tesseract/baseapi.h src/api/
|
||||
cp ${k2pdfopt_src}/tesseract_mod/{tesscapi,tessedit,tesseract}.* src/ccmain/
|
||||
cp ${k2pdfopt_src}/tesseract_mod/tesseract/baseapi.h src/ccmain/
|
||||
cp ${k2pdfopt_src}/tesseract_mod/dotproduct{avx,fma,sse}.* src/arch/
|
||||
cp ${k2pdfopt_src}/tesseract_mod/{intsimdmatrixsse,simddetect}.* src/arch/
|
||||
cp ${k2pdfopt_src}/tesseract_mod/{errcode,genericvector,mainblk,params,serialis,tessdatamanager,tess_version,tprintf,unicharset}.* src/ccutil/
|
||||
cp ${k2pdfopt_src}/tesseract_mod/{input,lstmrecognizer}.* src/lstm/
|
||||
cp ${k2pdfopt_src}/tesseract_mod/openclwrapper.* src/opencl/
|
||||
'';
|
||||
};
|
||||
tesseract_modded = tesseract5.override {
|
||||
tesseractBase = tesseract5.tesseractBase.overrideAttrs (
|
||||
{
|
||||
patches ? [ ],
|
||||
buildInputs ? [ ],
|
||||
...
|
||||
}:
|
||||
{
|
||||
pname = "tesseract-k2pdfopt";
|
||||
version = tesseract_patch.src.rev;
|
||||
src = tesseract_patch.src;
|
||||
# opencl-headers were removed from tesseract in Version 5.4
|
||||
buildInputs = buildInputs ++ [ opencl-headers ];
|
||||
patches = patches ++ [ tesseract_patch ];
|
||||
# Additional compilation fixes
|
||||
postPatch = ''
|
||||
echo libtesseract_la_SOURCES += src/api/tesscapi.cpp >> Makefile.am
|
||||
substituteInPlace src/api/tesseract.h \
|
||||
--replace "#include <leptonica.h>" "//#include <leptonica.h>"
|
||||
substituteInPlace include/tesseract/tesseract.h \
|
||||
--replace "#include <leptonica.h>" "//#include <leptonica.h>"
|
||||
'';
|
||||
}
|
||||
);
|
||||
};
|
||||
in
|
||||
[
|
||||
jbig2dec
|
||||
libjpeg_turbo
|
||||
libpng
|
||||
zlib
|
||||
]
|
||||
++ lib.optional enableGSL gsl
|
||||
++ lib.optional enableGhostScript ghostscript
|
||||
++ lib.optional enableMuPDF mupdf_modded
|
||||
++ lib.optional enableDJVU djvulibre
|
||||
++ lib.optional enableGOCR gocr
|
||||
++ lib.optionals enableTesseract [
|
||||
leptonica_modded
|
||||
tesseract_modded
|
||||
];
|
||||
|
||||
dontUseCmakeBuildDir = true;
|
||||
|
||||
@@ -173,7 +225,7 @@ in stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
preFixup = lib.optionalString enableTesseract ''
|
||||
wrapProgram $out/bin/k2pdfopt --set-default TESSDATA_PREFIX ${tesseract}/share/tessdata
|
||||
wrapProgram $out/bin/k2pdfopt --set-default TESSDATA_PREFIX ${tesseract5}/share/tessdata
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
@@ -182,7 +234,9 @@ in stdenv.mkDerivation rec {
|
||||
changelog = "https://www.willus.com/k2pdfopt/k2pdfopt_version.txt";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ bosu danielfullmer ];
|
||||
maintainers = with maintainers; [
|
||||
bosu
|
||||
danielfullmer
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
python3Packages,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "timew-sync-client";
|
||||
version = "1.0.1-unstable-2024-08-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "timewarrior-synchronize";
|
||||
repo = "timew-sync-client";
|
||||
rev = "de3442bd29b071f54cd1e10af99f3378a83b4794";
|
||||
hash = "sha256-AKRAMEUTIPvR+kaEZZYjd4II2KzYZTwRgGzFMGD5aio=";
|
||||
};
|
||||
|
||||
pyproject = true;
|
||||
|
||||
build-system = [
|
||||
python3Packages.setuptools
|
||||
];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
requests
|
||||
jwcrypto
|
||||
pyjwt
|
||||
colorama
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Client component of timewarrior synchronization application";
|
||||
mainProgram = "timew-sync-client";
|
||||
homepage = "https://github.com/timewarrior-synchronize/timew-sync-client";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
evris99
|
||||
errnoh
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -35,13 +35,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lxqt-panel";
|
||||
version = "2.1.1";
|
||||
version = "2.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxqt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-IlT7qXWMKFkmHNjXJYivawd4HnOBzILtIE6XaM/ZvkM=";
|
||||
hash = "sha256-090zBmRUFac9Tt10l20Vxvn234Br5YPpdLR6+KreEFM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -83,12 +83,13 @@ in stdenv.mkDerivation rec {
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Clozure Common Lisp";
|
||||
homepage = "https://ccl.clozure.com/";
|
||||
maintainers = lib.teams.lisp.members;
|
||||
platforms = attrNames options;
|
||||
# assembler failures during build, x86_64-darwin broken since 2020-10-14
|
||||
broken = (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64);
|
||||
description = "Clozure Common Lisp";
|
||||
homepage = "https://ccl.clozure.com/";
|
||||
license = licenses.asl20;
|
||||
mainProgram = "ccl";
|
||||
maintainers = lib.teams.lisp.members;
|
||||
platforms = attrNames options;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -48,14 +48,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.cons.org/cmucl/";
|
||||
description = "CMU implementation of Common Lisp";
|
||||
homepage = "http://www.cons.org/cmucl/";
|
||||
license = licenses.publicDomain;
|
||||
longDescription = ''
|
||||
CMUCL is a free implementation of the Common Lisp programming language
|
||||
which runs on most major Unix platforms. It mainly conforms to the
|
||||
ANSI Common Lisp standard.
|
||||
'';
|
||||
license = licenses.publicDomain;
|
||||
mainProgram = "lisp";
|
||||
maintainers = lib.teams.lisp.members;
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
};
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, gawk, fetchpatch, undmg, cpio, xar, darwin, libiconv }:
|
||||
{ lib, stdenv, fetchurl, gawk, fetchpatch, undmg, cpio, xar, libiconv }:
|
||||
|
||||
let startFPC = import ./binary.nix { inherit stdenv fetchurl undmg cpio xar lib; }; in
|
||||
|
||||
@@ -11,11 +11,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "85ef993043bb83f999e2212f1bca766eb71f6f973d362e2290475dbaaf50161f";
|
||||
};
|
||||
|
||||
buildInputs = [ startFPC gawk ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
libiconv
|
||||
darwin.apple_sdk.frameworks.CoreFoundation
|
||||
];
|
||||
buildInputs = [ startFPC gawk ];
|
||||
|
||||
glibc = stdenv.cc.libc.out;
|
||||
|
||||
@@ -46,8 +42,9 @@ stdenv.mkDerivation rec {
|
||||
--replace "-no_uuid" ""
|
||||
'';
|
||||
|
||||
NIX_LDFLAGS = lib.optionalString
|
||||
stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; "-F${CoreFoundation}/Library/Frameworks");
|
||||
preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
NIX_LDFLAGS="-syslibroot $SDKROOT -L${lib.getLib libiconv}/lib"
|
||||
'';
|
||||
|
||||
makeFlags = [ "NOGDB=1" "FPC=${startFPC}/bin/fpc" ];
|
||||
|
||||
|
||||
@@ -61,7 +61,8 @@ stdenv.mkDerivation rec {
|
||||
description = "ANSI Common Lisp Implementation";
|
||||
homepage = "https://common-lisp.net/project/mkcl/";
|
||||
license = licenses.lgpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "mkcl";
|
||||
maintainers = lib.teams.lisp.members;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -126,7 +126,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = [
|
||||
finalAttrs.setupHook
|
||||
] ++ lib.optionals (!stdenv.hostPlatform.isFreeBSD) [
|
||||
libsysprof-capture
|
||||
] ++ [
|
||||
pcre2
|
||||
] ++ lib.optionals (!stdenv.hostPlatform.isWindows) [
|
||||
bash gnum4 # install glib-gettextize and m4 macros for other apps to use
|
||||
@@ -185,6 +187,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
] ++ lib.optionals stdenv.hostPlatform.isFreeBSD [
|
||||
"-Db_lundef=false"
|
||||
"-Dxattr=false"
|
||||
"-Dsysprof=disabled" # sysprof-capture does not build on FreeBSD
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
python-dateutil,
|
||||
requests,
|
||||
azure-identity,
|
||||
msal,
|
||||
ijson,
|
||||
azure-core,
|
||||
asgiref,
|
||||
aiohttp,
|
||||
pandas,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-kusto-data";
|
||||
version = "4.6.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-tfOnb6rFjTzg4af26gK5gk1185mejAiaDvetE/r4L0Q=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
python-dateutil
|
||||
requests
|
||||
azure-identity
|
||||
msal
|
||||
ijson
|
||||
azure-core
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
pandas = [ pandas ];
|
||||
aio = [
|
||||
aiohttp
|
||||
asgiref
|
||||
];
|
||||
};
|
||||
|
||||
# Tests require secret connection strings
|
||||
# and a network connection.
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "azure.kusto.data" ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/Azure/azure-kusto-python/releases/tag/v${version}";
|
||||
description = "Kusto Data Client";
|
||||
homepage = "https://github.com/Azure/azure-kusto-python";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ pyrox0 ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,53 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
azure-kusto-data,
|
||||
azure-storage-blob,
|
||||
azure-storage-queue,
|
||||
tenacity,
|
||||
pandas,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-kusto-ingest";
|
||||
version = "4.6.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Azure";
|
||||
repo = "azure-kusto-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-rm8G3/WAUlK1/80uk3uiTqDA5hUIr+VVZEmPe0mYBjI=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/azure-kusto-ingest";
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
azure-kusto-data
|
||||
azure-storage-blob
|
||||
azure-storage-queue
|
||||
tenacity
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
pandas = [ pandas ];
|
||||
};
|
||||
|
||||
# Tests require secret connection strings
|
||||
# and a network connection.
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "azure.kusto.ingest" ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/Azure/azure-kusto-python/releases/tag/v${version}";
|
||||
description = "Kusto Ingest Client";
|
||||
homepage = "https://github.com/Azure/azure-kusto-python";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ pyrox0 ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
{
|
||||
lib,
|
||||
aiohttp,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pytest-asyncio,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pypalazzetti";
|
||||
version = "0.1.14";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dotvav";
|
||||
repo = "py-palazzetti-api";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-TDD3/UghNtsSAWV0k1I4MOjTFZB+sBqGgpKwy1p9Gx4=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ aiohttp ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pypalazzetti" ];
|
||||
|
||||
meta = {
|
||||
description = "Library to access and control a Palazzetti stove through a Connection Box";
|
||||
homepage = "https://github.com/dotvav/py-palazzetti-api";
|
||||
changelog = "https://github.com/dotvav/py-palazzetti-api/blob/${src.rev}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@@ -1,4 +1,5 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
mkDerivation,
|
||||
buildPackages,
|
||||
@@ -14,6 +15,8 @@ mkDerivation {
|
||||
"contrib/libc-vis"
|
||||
"etc/mtree/BSD.include.dist"
|
||||
"sys"
|
||||
# Used for aarch64-freebsd
|
||||
"lib/msun/arm"
|
||||
];
|
||||
|
||||
extraNativeBuildInputs = [
|
||||
|
||||
@@ -106,6 +106,9 @@ mkDerivation {
|
||||
"include/paths.h"
|
||||
|
||||
"lib/libdl"
|
||||
|
||||
# Used for aarch64-freebsd
|
||||
"contrib/arm-optimized-routines"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -352,7 +352,10 @@
|
||||
paho-mqtt_1
|
||||
];
|
||||
"azure_data_explorer" = ps: with ps; [
|
||||
]; # missing inputs: azure-kusto-data azure-kusto-ingest
|
||||
azure-kusto-data
|
||||
azure-kusto-ingest
|
||||
]
|
||||
++ azure-kusto-data.optional-dependencies.aio;
|
||||
"azure_devops" = ps: with ps; [
|
||||
aioazuredevops
|
||||
];
|
||||
@@ -3225,7 +3228,8 @@
|
||||
p1monitor
|
||||
];
|
||||
"palazzetti" = ps: with ps; [
|
||||
]; # missing inputs: pypalazzetti
|
||||
pypalazzetti
|
||||
];
|
||||
"panasonic_bluray" = ps: with ps; [
|
||||
panacotta
|
||||
];
|
||||
@@ -5125,6 +5129,7 @@
|
||||
"awair"
|
||||
"aws"
|
||||
"axis"
|
||||
"azure_data_explorer"
|
||||
"azure_devops"
|
||||
"azure_event_hub"
|
||||
"backup"
|
||||
@@ -5615,6 +5620,7 @@
|
||||
"ovo_energy"
|
||||
"owntracks"
|
||||
"p1_monitor"
|
||||
"palazzetti"
|
||||
"panasonic_viera"
|
||||
"panel_custom"
|
||||
"peco"
|
||||
|
||||
@@ -129,7 +129,7 @@ stdenv.mkDerivation {
|
||||
] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [
|
||||
# fix build vts module on gcc11
|
||||
"-Wno-error=stringop-overread"
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
] ++ lib.optionals stdenv.cc.isClang [
|
||||
"-Wno-error=deprecated-declarations"
|
||||
"-Wno-error=gnu-folding-constant"
|
||||
"-Wno-error=unused-but-set-variable"
|
||||
|
||||
@@ -36,6 +36,7 @@
|
||||
, nixosTests
|
||||
, libiconv
|
||||
, testers
|
||||
, pkgsCross
|
||||
|
||||
, enableLDAP ? false, openldap
|
||||
, enablePrinting ? false, cups
|
||||
@@ -78,6 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
./patch-source3__libads__kerberos_keytab.c.patch
|
||||
./4.x-no-persistent-install-dynconfig.patch
|
||||
./4.x-fix-makeflags-parsing.patch
|
||||
./build-find-pre-built-heimdal-build-tools-in-case-of-.patch
|
||||
(fetchpatch {
|
||||
# workaround for https://github.com/NixOS/nixpkgs/issues/303436
|
||||
name = "samba-reproducible-builds.patch";
|
||||
@@ -160,6 +162,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"--sysconfdir=/etc"
|
||||
"--localstatedir=/var"
|
||||
"--disable-rpath"
|
||||
# otherwise third_party/waf/waflib/Tools/python.py would
|
||||
# get the wrong pythondir from build platform python
|
||||
"--pythondir=${placeholder "out"}/${python.sitePackages}"
|
||||
(lib.enableFeature enablePrinting "cups")
|
||||
] ++ optional (!enableDomainController)
|
||||
"--without-ad-dc"
|
||||
@@ -245,6 +250,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
passthru.tests = {
|
||||
samba = nixosTests.samba;
|
||||
cross = pkgsCross.aarch64-multiplatform.samba;
|
||||
pkg-config = testers.hasPkgConfigModules {
|
||||
package = finalAttrs.finalPackage;
|
||||
};
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
From 48f7e6d66e2850088b8922024641173776222242 Mon Sep 17 00:00:00 2001
|
||||
From: Nick Cao <nickcao@nichi.co>
|
||||
Date: Thu, 21 Nov 2024 15:30:00 -0500
|
||||
Subject: [PATCH] build: find pre-built heimdal build tools in case of embedded
|
||||
heimdal
|
||||
|
||||
This patch fixes the case of finding asn1_compile and compile_et for
|
||||
building embedded heimdal, by setting
|
||||
--bundled-libraries='!asn1_compile,!compile_et' as configure flags.
|
||||
|
||||
The Heimdal build tools compile_et and asn1_compile are needed *only*
|
||||
if we use the embedded heimdal (otherwise we don't build heimdal and
|
||||
use headers that have been generated by those tools elsewhere).
|
||||
|
||||
For cross-compilation with embedded heimdal, it is vital to use host build
|
||||
tools, and so asn1_compile and compile_et must be supplied and not
|
||||
built. One way of doing this would be to set the COMPILE_ET and
|
||||
ASN1_COMPILE env vars to the location of supplied binaries. Another way,
|
||||
which is more commonly used, is to exclude asn1_compile and compile_et
|
||||
from bundled packages via the switch
|
||||
-bundled-libraries='!asn1_compile,!compile_et'. When this is done,
|
||||
the build script searches the path for those tools and sets the
|
||||
ASN1_COMPILE and COMPILE_ET vars accordingly. (this is admittedly
|
||||
kind of a round-about way of doing things but this has become the
|
||||
de-facto standard amongst embedded distro builders).
|
||||
|
||||
In commit 8061983d4882f3ba3f12da71443b035d7b672eec, this process of
|
||||
finding the binaris has been moved to be carried out only in the
|
||||
system heimdal case. As explained above, we only need these tools,
|
||||
and hence the check, in bundled mode.
|
||||
|
||||
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14164
|
||||
|
||||
Signed-off-by: Uri Simchoni <uri@samba.org>
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
[Bachp: rebased for version 4.15.0]
|
||||
[Mats: rebased for version 4.18.5]
|
||||
---
|
||||
wscript_configure_embedded_heimdal | 11 +++++++++++
|
||||
1 file changed, 11 insertions(+)
|
||||
|
||||
diff --git a/wscript_configure_embedded_heimdal b/wscript_configure_embedded_heimdal
|
||||
index 45f47721de..6c5a4bcf01 100644
|
||||
--- a/wscript_configure_embedded_heimdal
|
||||
+++ b/wscript_configure_embedded_heimdal
|
||||
@@ -13,3 +13,14 @@ conf.RECURSE('third_party/heimdal_build')
|
||||
# when this will be available also in
|
||||
# system libraries...
|
||||
conf.define('HAVE_CLIENT_GSS_C_CHANNEL_BOUND_FLAG', 1)
|
||||
+
|
||||
+def check_system_heimdal_binary(name):
|
||||
+ if conf.LIB_MAY_BE_BUNDLED(name):
|
||||
+ return False
|
||||
+ if not conf.find_program(name, var=name.upper()):
|
||||
+ return False
|
||||
+ conf.define('USING_SYSTEM_%s' % name.upper(), 1)
|
||||
+ return True
|
||||
+
|
||||
+check_system_heimdal_binary("compile_et")
|
||||
+check_system_heimdal_binary("asn1_compile")
|
||||
--
|
||||
2.47.0
|
||||
|
||||
@@ -6597,6 +6597,9 @@ with pkgs;
|
||||
jre17_minimal = callPackage ../development/compilers/openjdk/jre.nix {
|
||||
jdk = jdk17;
|
||||
};
|
||||
jre21_minimal = callPackage ../development/compilers/openjdk/jre.nix {
|
||||
jdk = jdk21;
|
||||
};
|
||||
jre_minimal = callPackage ../development/compilers/openjdk/jre.nix { };
|
||||
|
||||
openjdk = jdk;
|
||||
|
||||
@@ -1173,6 +1173,10 @@ self: super: with self; {
|
||||
|
||||
azure-keyvault-secrets = callPackage ../development/python-modules/azure-keyvault-secrets { };
|
||||
|
||||
azure-kusto-data = callPackage ../development/python-modules/azure-kusto-data { };
|
||||
|
||||
azure-kusto-ingest = callPackage ../development/python-modules/azure-kusto-ingest { };
|
||||
|
||||
azure-loganalytics = callPackage ../development/python-modules/azure-loganalytics { };
|
||||
|
||||
azure-mgmt-advisor = callPackage ../development/python-modules/azure-mgmt-advisor { };
|
||||
@@ -12100,6 +12104,8 @@ self: super: with self; {
|
||||
inherit python;
|
||||
});
|
||||
|
||||
pypalazzetti = callPackage ../development/python-modules/pypalazzetti { };
|
||||
|
||||
pypandoc = callPackage ../development/python-modules/pypandoc { };
|
||||
|
||||
pyparser = callPackage ../development/python-modules/pyparser { };
|
||||
|
||||
Reference in New Issue
Block a user