Merge master into staging-next

This commit is contained in:
github-actions[bot] 2024-08-26 06:04:26 +00:00 committed by GitHub
commit 7241849967
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
39 changed files with 560 additions and 179 deletions

View File

@ -24,6 +24,7 @@ in {
lomiri-calculator-app
lomiri-camera-app
lomiri-clock-app
lomiri-docviewer-app
lomiri-download-manager
lomiri-filemanager-app
lomiri-gallery-app

View File

@ -55,8 +55,8 @@ in
ffmpeg = {
bin = mkOption {
type = path;
default = "${lib.getBin pkgs.ffmpeg_6-headless}/bin/ffmpeg";
defaultText = literalExpression "\${lib.getBin pkgs.ffmpeg_6-headless}/bin/ffmpeg";
default = lib.getExe pkgs.ffmpeg_7-headless;
defaultText = literalExpression "lib.getExe pkgs.ffmpeg_7-headless";
description = ''
The ffmpeg package to use for transcoding.
'';

View File

@ -545,6 +545,7 @@ in {
lomiri-calculator-app = runTest ./lomiri-calculator-app.nix;
lomiri-camera-app = runTest ./lomiri-camera-app.nix;
lomiri-clock-app = runTest ./lomiri-clock-app.nix;
lomiri-docviewer-app = runTest ./lomiri-docviewer-app.nix;
lomiri-filemanager-app = runTest ./lomiri-filemanager-app.nix;
lomiri-gallery-app = runTest ./lomiri-gallery-app.nix;
lomiri-system-settings = handleTest ./lomiri-system-settings.nix {};

View File

@ -0,0 +1,84 @@
{ lib, ... }:
let
exampleText = "Lorem ipsum dolor sit amet";
in
{
name = "lomiri-docviewer-app-standalone";
meta.maintainers = lib.teams.lomiri.members;
nodes.machine =
{ config, pkgs, ... }:
{
imports = [ ./common/x11.nix ];
services.xserver.enable = true;
environment = {
etc."docviewer-sampletext.txt".text = exampleText;
systemPackages =
with pkgs;
[
libreoffice # txt -> odf to test LibreOfficeKit integration
]
++ (with pkgs.lomiri; [
suru-icon-theme
lomiri-docviewer-app
]);
variables = {
UITK_ICON_THEME = "suru";
};
};
i18n.supportedLocales = [ "all" ];
fonts = {
packages = with pkgs; [
# Intended font & helps with OCR
ubuntu-classic
];
};
};
enableOCR = true;
testScript = ''
machine.wait_for_x()
with subtest("lomiri docviewer launches"):
machine.succeed("lomiri-docviewer-app >&2 &")
machine.wait_for_text("No documents")
machine.screenshot("lomiri-docviewer_open")
machine.succeed("pkill -f lomiri-docviewer-app")
# Setup different document types
machine.succeed("soffice --convert-to odt --outdir /root/ /etc/docviewer-sampletext.txt")
machine.succeed("soffice --convert-to pdf --outdir /root/ /etc/docviewer-sampletext.txt")
with subtest("lomiri docviewer txt works"):
machine.succeed("lomiri-docviewer-app /etc/docviewer-sampletext.txt >&2 &")
machine.wait_for_text("${exampleText}")
machine.screenshot("lomiri-docviewer_txt")
machine.succeed("pkill -f lomiri-docviewer-app")
with subtest("lomiri docviewer odt works"):
machine.succeed("lomiri-docviewer-app /root/docviewer-sampletext.odt >&2 &")
machine.wait_for_text("${exampleText}")
machine.screenshot("lomiri-docviewer_odt")
machine.succeed("pkill -f lomiri-docviewer-app")
with subtest("lomiri docviewer pdf works"):
machine.succeed("lomiri-docviewer-app /root/docviewer-sampletext.pdf >&2 &")
machine.wait_for_text("${exampleText}")
machine.screenshot("lomiri-docviewer_pdf")
machine.succeed("pkill -f lomiri-docviewer-app")
with subtest("lomiri docviewer localisation works"):
machine.succeed("env LANG=de_DE.UTF-8 lomiri-docviewer-app >&2 &")
machine.wait_for_text("Keine Dokumente")
machine.screenshot("lomiri-docviewer_localised")
'';
}

View File

@ -8,13 +8,13 @@
melpaBuild {
pname = "ligo-mode";
version = "1.7.0-unstable-2024-08-14";
version = "1.7.0-unstable-2024-08-22";
src = fetchFromGitLab {
owner = "ligolang";
repo = "ligo";
rev = "547da30202972fd9b5114ce82c4b94ddf6c8e8f7";
hash = "sha256-kGFV3Ci8F+vK1LCQCsdpxeoLHarfa4dItQkJDihE7eI=";
rev = "47128d41a9329356cbad40a982d8144da19a9218";
hash = "sha256-IrxPnbWrhqe3TxELsqa2y4NdcfEJMGUcGCdNuDG+rfs=";
};
files = ''("tools/emacs/ligo-mode.el")'';

View File

@ -1,8 +1,7 @@
{
config,
pkgs,
# zathura_pdf_mupdf fails to load _opj_create_decompress at runtime on Darwin (https://github.com/NixOS/nixpkgs/pull/61295#issue-277982980)
useMupdf ? config.zathura.useMupdf or (!pkgs.stdenv.isDarwin),
useMupdf ? true,
}:
let

View File

@ -1,11 +1,11 @@
{
"packageVersion": "129.0.1-1",
"packageVersion": "129.0.2-1",
"source": {
"rev": "129.0.1-1",
"sha256": "0pvv3v23q31hdjvqi1f3cqfyjrb8dbrrbfwxj2wacak1g0mzbxf4"
"rev": "129.0.2-1",
"sha256": "1zghj91bqy2746x4x6cwn503dkw1fmfv0wgq02wv2cwlp8mmd7j7"
},
"firefox": {
"version": "129.0.1",
"sha512": "27c463e8277994c62bab85cf0e2f0cea16a9b272694b61fa56a6b3bd7c70d6481774288386094836a54df54c1b1144d61be67f4f5eac418c05479d452221c027"
"version": "129.0.2",
"sha512": "f6805a87e5cb4e437583916e3ec1b312dc73eec5fc06ce7a038b13bd7c6827b18cf383c30645d96623ce41675351f3023ec6b9f89d676f1c889994eae79f2c13"
}
}

View File

@ -561,8 +561,9 @@ in stdenv.mkDerivation (finalAttrs: {
];
postInstall = optionalString (variant != "collabora") ''
mkdir -p $out/share/icons
mkdir -p $out/{include,share/icons}
cp -r include/LibreOfficeKit $out/include/
cp -r sysui/desktop/icons/hicolor $out/share/icons
# Rename icons for consistency

View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "morgen";
version = "3.5.1";
version = "3.5.5";
src = fetchurl {
url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb";
hash = "sha256-YvgVCviqAuGlT61ANktztzqRYBtROsVrScGMxY6IeEs=";
hash = "sha256-xT/mV54L2tXiQnUR7K/h61FsHtF16siEExM/I0mSy+8=";
};
nativeBuildInputs = [

View File

@ -11,11 +11,11 @@
stdenvNoCC.mkDerivation rec {
pname = "iterm2";
version = "3.5.2";
version = "3.5.4";
src = fetchzip {
url = "https://iterm2.com/downloads/stable/iTerm2-${lib.replaceStrings ["."] ["_"] version}.zip";
hash = "sha256-WiRRxklI3A/3MtJY63jAkUVe8qa5jfRACzUESfwAmmw=";
hash = "sha256-Sxj8OnaXh+UdAAf2hoHBQ8TuczYykhV37XvalNpwq7U=";
};
dontFixup = true;

View File

@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "application-title-bar";
version = "0.7.0";
version = "0.7.2";
src = fetchFromGitHub {
owner = "antroids";
repo = "application-title-bar";
rev = "v${finalAttrs.version}";
hash = "sha256-4eSlhrh40L/32N7P7Q3/qqj8BlUQuDKqpuKGNwimeDU=";
hash = "sha256-0tSwjyKPVyOR0VJi1qqMFf/yVmWFmyue0xaNp9pYxDo=";
};
propagatedUserEnvPkgs = with kdePackages; [ kconfig ];

View File

@ -39,9 +39,9 @@ stdenv.mkDerivation rec {
hash = "sha256-0huZP1hopHaN5R1Hki6YutpvoASfIHzHMl/Y4czHHMo=";
};
prePatch = ''
substituteInPlace cmake/FindGTK3.cmake --replace GTK3_CFLAGS_OTHER ""
substituteInPlace cmake/FindGTK3.cmake --replace-fail GTK3_CFLAGS_OTHER ""
'' + lib.optionalString (!dbusSupport) ''
substituteInPlace cmake/modules.cmake --replace 'list(APPEND MODULES ctrl_dbus)' ""
substituteInPlace cmake/modules.cmake --replace-fail 'list(APPEND MODULES ctrl_dbus)' ""
'';
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [

View File

@ -13,7 +13,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "i2p";
version = "2.6.0";
version = "2.6.1";
src = fetchzip {
urls = [
@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
"https://files.i2p-projekt.de/"
"https://download.i2p2.no/releases/"
]);
hash = "sha256-9f4L1JRDTT+sBCEI/GIM9q2u1VJuiZi7DI9qgJMftd0=";
hash = "sha256-ntjTXdpgcTReEVxzDEoq9r3NAqS7q4m+rlJXp7is1k0=";
};
strictDeps = true;

View File

@ -3,29 +3,19 @@
python3Packages,
fetchFromGitHub,
procps,
fetchpatch2,
}:
python3Packages.buildPythonApplication rec {
pname = "mackup";
version = "0.8.40";
version = "0.8.41";
pyproject = true;
src = fetchFromGitHub {
owner = "lra";
repo = "mackup";
rev = "refs/tags/${version}";
hash = "sha256-hAIl9nGFRaROlt764IZg4ejw+b1dpnYpiYq4CB9dJqQ=";
rev = "${version}";
hash = "sha256-eWSBl8BTg2FLI21DQcnepBFPF08bfm0V8lYB4mMbAiw=";
};
patches = [
(fetchpatch2 {
name = "remove-six.patch";
url = "https://github.com/lra/mackup/commit/31ae717d40360e2e9d2d46518f57dcdc95b165ca.patch";
hash = "sha256-M2gtY03SOlPefsHREPmeajhnfmIoHbNYjm+W4YZqwKM=";
excludes = [ "CHANGELOG.md" ];
})
];
postPatch = ''
substituteInPlace mackup/utils.py \
--replace-fail '"/usr/bin/pgrep"' '"${lib.getExe' procps "pgrep"}"' \
@ -41,6 +31,9 @@ python3Packages.buildPythonApplication rec {
pytestFlagsArray = [ "tests/*.py" ];
# Disabling tests failing on darwin due to a missing pgrep binary on procps
disabledTests = [ "test_is_process_running" ];
meta = {
description = "A tool to keep your application settings in sync (OS X/Linux)";
changelog = "https://github.com/lra/mackup/releases/tag/${version}";

View File

@ -17,13 +17,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "media-downloader";
version = "4.9.0";
version = "5.0.1";
src = fetchFromGitHub {
owner = "mhogomchungu";
repo = "media-downloader";
rev = finalAttrs.version;
hash = "sha256-ERH/lQv+ykJ0gfJBkwGUeFXenoALr2rf7Vm+ZAn23fg=";
hash = "sha256-yAG9F9helGM8/TjJiqMDUviHK6uEUvHGny2QklwB2JY=";
};
nativeBuildInputs = [

View File

@ -6,10 +6,10 @@
}:
let
pname = "remnote";
version = "1.16.96";
version = "1.16.101";
src = fetchurl {
url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage";
hash = "sha256-shprixFQy5lirCGUKQac6qPuP8oEA/nn/nInnwf8KuA=";
hash = "sha256-gK54K48s+5u2uv9ZxR0PVekZHdtgguCb+qHOVb2awAE=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };
in

View File

@ -0,0 +1,33 @@
{
fetchPypi,
lib,
python3,
}:
python3.pkgs.buildPythonApplication rec {
pname = "seventeenlands";
version = "0.1.42";
src = fetchPypi {
inherit pname version;
hash = "sha256-P/imV4vvyd6wgjqXzgfIAURFtFhLwX1eS8eiPl79oZk=";
};
# No tests
doCheck = false;
pythonImportsCheck = [ "seventeenlands" ];
propagatedBuildInputs = with python3.pkgs; [
python-dateutil
requests
tkinter
];
meta = with lib; {
description = "Client for passing relevant events from MTG Arena logs to the 17Lands REST endpoint, also known as mtga-log-client";
homepage = "https://www.17lands.com/";
license = licenses.gpl3Only;
maintainers = with maintainers; [ sephi ];
mainProgram = "seventeenlands";
};
}

View File

@ -0,0 +1,68 @@
{
lib,
python3Packages,
fetchFromGitLab,
appstream,
blueprint-compiler,
desktop-file-utils,
glib,
gobject-introspection,
gst_all_1,
libadwaita,
meson,
ninja,
pkg-config,
wrapGAppsHook4,
}:
python3Packages.buildPythonApplication rec {
pname = "showtime";
version = "46.3";
pyproject = false;
src = fetchFromGitLab {
group = "GNOME";
owner = "Incubator";
repo = "showtime";
rev = "refs/tags/${version}";
hash = "sha256-0qT62VoodRcrxYNTtZk+KqxzhflxFU/HPtj2u0wRSH0=";
domain = "gitlab.gnome.org";
};
nativeBuildInputs = [
appstream
blueprint-compiler
desktop-file-utils
glib # for `glib-compile-schemas`
gobject-introspection
meson
ninja
pkg-config
wrapGAppsHook4
];
buildInputs = [
gst_all_1.gstreamer
gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-rs
gst_all_1.gst-plugins-ugly
libadwaita
];
dependencies = with python3Packages; [ pygobject3 ];
dontWrapGApps = true;
makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ];
pythonImportsCheck = [ "showtime" ];
meta = {
description = "Watch without distraction";
homepage = "https://apps.gnome.org/Showtime";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ getchoo ];
mainProgram = "showtime";
};
}

View File

@ -0,0 +1,157 @@
{
stdenv,
lib,
fetchFromGitLab,
fetchpatch,
fetchpatch2,
gitUpdater,
nixosTests,
cmake,
content-hub,
gettext,
libreoffice,
libreoffice-unwrapped,
lomiri-ui-toolkit,
pkg-config,
poppler,
qtbase,
qtdeclarative,
qtsystems,
wrapQtAppsHook,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "lomiri-docviewer-app";
version = "3.0.4";
src = fetchFromGitLab {
owner = "ubports";
repo = "development/apps/lomiri-docviewer-app";
rev = "v${finalAttrs.version}";
hash = "sha256-xUBE+eSAfG2yMlE/DI+6JHQx+3HiNwtSTv/P4YOAE7Y=";
};
patches = [
# Remove when version > 3.0.4
(fetchpatch {
name = "0001-lomiri-docviewer-app-Set-gettext-domain.patch";
url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/8dc2c911817c45451ff341e4ae4b841bcc134945.patch";
hash = "sha256-vP6MYl7qhJzkgtnVelMMIbc0ZkHxC1s3abUXJ2zVi4w=";
})
(fetchpatch {
name = "0002-lomiri-docviewer-app-Install-splash-file.patch";
url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/ef20bbdd5e80040bf11273a5fc2964400086fdc9.patch";
hash = "sha256-ylPFn53PJRyyzhN1SxtmNFMFeDsV9UxyQhAqULA5PJM=";
})
# Remove when https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/merge_requests/72 merged & in release
(fetchpatch {
name = "1001-lomiri-docviewer-app-Stop-using-qt5_use_modules.patch";
url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/120c81dd71356f2e06ef5c44d114b665236a7382.patch";
hash = "sha256-4VCw90qYnQ/o67ndp9o8h+wUl2IUpmVGb9xyY55AMIQ=";
})
(fetchpatch {
name = "1002-lomiri-docviewer-app-Move-Qt-find_package-to-top-level.patch";
url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/43ee96a3a33b7a8f04e95f434982bcc60ba4b257.patch";
hash = "sha256-3LggdNo4Yak4SVAD/4/mMCl8PjZy1dIx9i5hKHM5fJU=";
})
# Remove when https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/merge_requests/73 merged & in release
(fetchpatch {
name = "1011-lomiri-docviewer-app-Call-i18n-bindtextdomain.patch";
url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/67599a841917304f76ffa1167a217718542a8b46.patch";
hash = "sha256-nbi3qX14kWtFcXrxAD41IeybDIRTNfUdRgSP1vDI/Hs=";
})
# Remove when https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/merge_requests/74 merged & in release
(fetchpatch {
name = "1021-lomiri-docviewer-app-Use-GNUInstallDirs-more-better.patch";
url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/40a860a118077c05692002db694be77ea62dc5b3.patch";
hash = "sha256-/zhpIdqZ7WsU4tx4/AZs5w8kEopjH2boiHdHaJk5RXk=";
})
# Remove when https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/merge_requests/75 merged & in release
(fetchpatch {
name = "1031-lomiri-docviewer-app-Use-BUILD_TESTING.patch";
url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/6f1eb739a3e0bf0ba847f94f8ea8411e0a385c2d.patch";
hash = "sha256-yVuYG+1JGo/I4TVRZ3UQeO/TJ8GiFO5BJ9Bs7glK7hg=";
})
# Remove when https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/merge_requests/76 merged & in release
# fetchpatch2 because there's a file rename
(fetchpatch2 {
name = "1041-lomiri-docviewer-app-Configurable-LibreOffice-path.patch";
url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/6e1aee99b31b88a90b07f3c5fcf6340c54ce9aaa.patch";
hash = "sha256-KdHyKXM0hMMIFkuDn5JZJOEuitWAXT2QQOuR+1AolP0=";
})
# Remove when https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/merge_requests/77 merged & in release
(fetchpatch {
name = "1051-lomiri-docviewer-app-Install-content-hub-lomiri-url-dispatcher-files.patch";
url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/98f5ab9d51ba05e8c3ed1991c0b67d3922b5ba90.patch";
hash = "sha256-JA26ga1CNOdbis87lSzqbUbs94Oc1vlxraXZxx3dsu8=";
})
];
postPatch = ''
substituteInPlace cmake/modules/Click.cmake \
--replace-fail 'qmake -query QT_INSTALL_QML' "echo $out/${qtbase.qtQmlPrefix}"
# We don't want absolute paths in desktop files
substituteInPlace data/CMakeLists.txt \
--replace-fail 'ICON "''${DATA_DIR}/''${ICON_FILE}"' 'ICON lomiri-docviewer-app' \
--replace-fail 'SPLASH "''${DATA_DIR}/''${SPLASH_FILE}"' 'SPLASH "lomiri-app-launch/splash/lomiri-docviewer-app.svg"'
'';
strictDeps = true;
nativeBuildInputs = [
cmake
gettext
pkg-config
wrapQtAppsHook
];
buildInputs = [
libreoffice-unwrapped # LibreOfficeKit
poppler
qtbase
qtdeclarative
# QML
content-hub
lomiri-ui-toolkit
qtsystems
];
cmakeFlags = [
(lib.cmakeBool "INSTALL_TESTS" false)
(lib.cmakeBool "CLICK_MODE" false)
(lib.cmakeFeature "LIBREOFFICE_PREFIX" "${libreoffice-unwrapped}")
];
# Only autopilot tests we can't run
doCheck = false;
postInstall = ''
mkdir -p $out/share/{icons/hicolor/scalable/apps,lomiri-app-launch/splash}
ln -s $out/share/{lomiri-docviewer-app/docviewer-app.svg,icons/hicolor/scalable/apps/lomiri-docviewer-app.svg}
ln -s $out/share/{lomiri-docviewer-app/docviewer-app-splash.svg,lomiri-app-launch/splash/lomiri-docviewer-app.svg}
'';
passthru = {
tests.vm = nixosTests.lomiri-docviewer-app;
updateScript = gitUpdater { rev-prefix = "v"; };
};
meta = {
description = "Document Viewer application for Ubuntu Touch devices";
homepage = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app";
changelog = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/blob/v${finalAttrs.version}/ChangeLog";
license = lib.licenses.gpl3Only;
maintainers = lib.teams.lomiri.members;
mainProgram = "lomiri-docviewer-app";
platforms = lib.platforms.linux;
};
})

View File

@ -17,6 +17,7 @@ let
lomiri-calculator-app = callPackage ./applications/lomiri-calculator-app { };
lomiri-camera-app = callPackage ./applications/lomiri-camera-app { };
lomiri-clock-app = callPackage ./applications/lomiri-clock-app { };
lomiri-docviewer-app = callPackage ./applications/lomiri-docviewer-app { };
lomiri-filemanager-app = callPackage ./applications/lomiri-filemanager-app { };
lomiri-gallery-app = callPackage ./applications/lomiri-gallery-app { };
lomiri-system-settings-unwrapped = callPackage ./applications/lomiri-system-settings { };

View File

@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-reason";
version = "3.11.0";
version = "3.12.0";
src = fetchurl {
url = "https://github.com/reasonml/reason/releases/download/${version}/reason-${version}.tbz";
hash = "sha256-pYg38Up58EfI65nVUYrrFu5kNTV0KGz9WyhMmKGiclA=";
hash = "sha256-Y9lQr/viA3AaPUwHaidQtWIRuucBfNj1naUI77CaGv4=";
};
strictDeps = true;

View File

@ -61,6 +61,13 @@ stdenv.mkDerivation rec {
})
];
env = lib.optionalAttrs stdenv.cc.isClang {
NIX_CFLAGS_COMPILE = toString [
"-Wno-error=implicit-function-declaration"
"-Wno-error=incompatible-function-pointer-types"
];
};
enableParallelBuilding = true;
meta = with lib; {

View File

@ -50,6 +50,10 @@ let
version = "8.06.13";
sha256 = "sha256-Vpf13g3DEWlUI5aypiowGp2fkQPK0cOGv2XiRUY/Ip4=";
};
"5.2" = mkNewParam {
version = "8.06.14";
sha256 = "sha256-eVSQetk+i3KObjHfsvnD615cIsq3aZ7IxycX42cuPIU=";
};
};
param = params . ${lib.versions.majorMinor ocaml.version}
or (throw "labltk is not available for OCaml ${ocaml.version}");

View File

@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "emborg";
version = "1.39";
version = "1.40";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "KenKundert";
repo = "emborg";
rev = "refs/tags/v${version}";
hash = "sha256-DK98VAYSwN+UKuwwbd2O+gF2PDQPosbXo9D2Zrwe/yU=";
hash = "sha256-1cgTKYt2/HiPxsar/nIr4kk2dRMYCJZQilhr+zs1AEg=";
};
nativeBuildInputs = [ flit-core ];

View File

@ -2,29 +2,44 @@
lib,
pkg-config,
exiv2,
gettext,
python3Packages,
fetchFromGitHub,
gitUpdater,
}:
python3Packages.buildPythonPackage rec {
pname = "exiv2";
version = "0.16.3";
version = "0.17.0";
pyproject = true;
src = fetchFromGitHub {
owner = "jim-easterbrook";
repo = "python-exiv2";
rev = "refs/tags/${version}";
hash = "sha256-DX0pg80fOSkWqrIvcye0btZGglnizzM9ZEuVEpnEJKQ=";
hash = "sha256-nPSspQPq0y2Vg2S+iwQ1E+TdaOJ9aJN3eeXRrcDzdsM=";
};
# FAIL: test_localisation (test_types.TestTypesModule.test_localisation)
# FAIL: test_TimeValue (test_value.TestValueModule.test_TimeValue)
postPatch = ''
substituteInPlace tests/test_value.py \
--replace-fail "def test_TimeValue(self):" "@unittest.skip('skipping')
def test_TimeValue(self):"
substituteInPlace tests/test_types.py \
--replace-fail "def test_localisation(self):" "@unittest.skip('skipping')
def test_localisation(self):"
'';
build-system = with python3Packages; [
setuptools
toml
];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ exiv2 ];
buildInputs = [
exiv2
gettext
];
pythonImportsCheck = [ "exiv2" ];
nativeCheckInputs = with python3Packages; [ unittestCheckHook ];

View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "yalesmartalarmclient";
version = "0.4.0";
version = "0.4.2";
pyproject = true;
disabled = pythonOlder "3.11";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "domwillcode";
repo = "yale-smart-alarm-client";
rev = "refs/tags/v${version}";
hash = "sha256-L9y8J0NIN1LWhzcpKY1Z4BPbCHUuLQz+3Bbq+qJJeak=";
hash = "sha256-/0Vydy7udmiaxtgxhSrwafTR37zHwsEll3VUF+hx25c=";
};
build-system = [ poetry-core ];

View File

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "clickhouse-backup";
version = "2.5.27";
version = "2.5.29";
src = fetchFromGitHub {
owner = "Altinity";
repo = "clickhouse-backup";
rev = "v${version}";
hash = "sha256-IU0M+Dq6jiEXz79fZiRkFqSF/R2piZyBOxsTGF1Ug2E=";
hash = "sha256-Ouep7jd3t+5cryINIYV9KvY2j1caW3TxvPitThRU3kE=";
};
vendorHash = "sha256-IEqxC4EzkEZnZru6U9O7U9kf375YKqBeyeJPqzaWbuM=";

View File

@ -46,6 +46,13 @@ buildGoModule rec {
ln -s $out/bin/task $out/bin/go-task
installShellCompletion completion/{bash,fish,zsh}/*
substituteInPlace $out/share/bash-completion/completions/task.bash \
--replace-warn 'complete -F _task task' 'complete -F _task task go-task'
substituteInPlace $out/share/fish/vendor_completions.d/task.fish \
--replace-warn 'complete -c $GO_TASK_PROGNAME' 'complete -c $GO_TASK_PROGNAME -c go-task'
substituteInPlace $out/share/zsh/site-functions/_task \
--replace-warn '#compdef task' '#compdef task go-task'
'';
passthru.tests = {

View File

@ -1,32 +1,67 @@
{lib, stdenv, fetchurl, motif, ncurses, libX11, libXt}:
{
lib,
stdenv,
fetchurl,
imagemagick,
desktopToDarwinBundle,
motif,
ncurses,
libX11,
libXt,
gdb,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "ddd";
version = "3.3.12";
src = fetchurl {
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
sha256 = "0p5nx387857w3v2jbgvps2p6mlm0chajcdw5sfrddcglsxkwvmis";
};
buildInputs = [motif ncurses libX11 libXt];
configureFlags = [ "--with-x" ];
version = "3.4.0";
patches = [
# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=504868
./gcc44.patch
src = fetchurl {
url = "mirror://gnu/ddd/ddd-${finalAttrs.version}.tar.gz";
hash = "sha256-XUy8iguwRYVDhm1nkwjFOj7wZuQC/loZGOGWmKPTWA8=";
};
postPatch = ''
substituteInPlace ddd/Ddd.in \
--replace-fail 'debuggerCommand:' 'debuggerCommand: ${gdb}/bin/gdb'
'';
nativeBuildInputs = [ imagemagick ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ];
buildInputs = [
motif
ncurses
libX11
libXt
];
env.NIX_CFLAGS_COMPILE = "-fpermissive";
# ioctl is not found without this flag. fixed in next release
# Upstream issue ref: https://savannah.gnu.org/bugs/index.php?64188
env = lib.optionalAttrs stdenv.isDarwin { NIX_CFLAGS_COMPILE = "-DHAVE_SYS_IOCTL_H"; };
configureFlags = [
"--enable-builtin-manual"
"--enable-builtin-app-defaults"
];
# From MacPorts: make will build the executable "ddd" and the X resource
# file "Ddd" in the same directory, as HFS+ is case-insensitive by default
# this will loosely FAIL
makeFlags = [ "EXEEXT=exe" ];
enableParallelBuilding = true;
postInstall = ''
install -D icons/ddd.xpm $out/share/pixmaps/ddd.xpm
mv $out/bin/dddexe $out/bin/ddd
convert icons/ddd.xbm ddd.png
install -D ddd.png $out/share/icons/hicolor/48x48/apps/ddd.png
'';
meta = {
homepage = "https://www.gnu.org/software/ddd";
changelog = "https://www.gnu.org/software/ddd/news.html";
description = "Graphical front-end for command-line debuggers";
homepage = "https://www.gnu.org/software/ddd";
license = lib.licenses.gpl3Only;
mainProgram = "ddd";
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ emilytrau ];
platforms = lib.platforms.unix;
};
}
})

View File

@ -1,11 +0,0 @@
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=504868
--- a/ddd/strclass.C~ 2008-11-07 17:57:13.000000000 +0000
+++ b/ddd/strclass.C 2008-11-07 17:57:27.000000000 +0000
@@ -39,6 +39,7 @@
#include <ctype.h>
#include <limits.h>
#include <new>
+#include <cstdio>
#include <stdlib.h>
void string::error(const char* msg) const

View File

@ -1,44 +0,0 @@
{ fetchFromGitHub, buildGoModule, lib, installShellFiles, libgit2, pkg-config }:
buildGoModule rec {
pname = "turbogit";
version = "3.1.1";
src = fetchFromGitHub {
owner = "b4nst";
repo = pname;
rev = "v${version}";
sha256 = "sha256-BHgVJlitRUX/9zYPoK5XfRpzzTZRbLhQVZJcx8KVshk=";
};
vendorHash = "sha256-280OcGXZQJD4G6z0b2WnWAS+v7XVptyf2WnlPjG99/0=";
subPackages = [ "." ];
buildInputs = [ libgit2 ];
nativeBuildInputs = [ installShellFiles pkg-config ];
postInstall = ''
# Move turbogit binary to tug
ln -s $out/bin/turbogit $out/bin/tug
# Generate completion files
mkdir -p share/completions
$out/bin/tug completion bash > share/completions/tug.bash
$out/bin/tug completion fish > share/completions/tug.fish
$out/bin/tug completion zsh > share/completions/tug.zsh
installShellCompletion share/completions/tug.{bash,fish,zsh}
'';
meta = with lib; {
description = "Keep your git workflow clean without headache";
longDescription = ''
turbogit (tug) is a cli tool built to help you deal with your day-to-day git work.
turbogit enforces convention (e.g. The Conventional Commits) but tries to keep things simple and invisible for you.
turbogit is your friend.
'';
homepage = "https://b4nst.github.io/turbogit";
license = licenses.mit;
platforms = platforms.linux ++ platforms.darwin;
maintainers = [ maintainers.yusdacra ];
};
}

View File

@ -10,8 +10,8 @@ let
};
variants = if stdenv.isLinux then
{
version = "5.0.27";
sha256 = "sha256-++Qv3H6iVN8p0Jq3vx44DZCNh90vY5fAWKgP402bLlw=";
version = "5.0.28";
sha256 = "sha256-r4JltJL4w0TX6dT45W3tYptShnEGxnlF7tYe5mCuc78=";
patches = [ ./fix-build-with-boost-1.79-5_0-linux.patch ];
}
else lib.optionalAttrs stdenv.isDarwin

View File

@ -10,8 +10,8 @@ let
in
buildMongoDB {
inherit avxSupport;
version = "6.0.16";
sha256 = "sha256-DdMWacJTx6sxgIKG2M8DkboSBr0fD2w91M+ZYt75hQI=";
version = "6.0.17";
sha256 = "sha256-rGGAu2B0gAAE/n0NSdVm7Me2YeChZhDGWehvzcBJTi8=";
patches = [
# Patches a bug that it couldn't build MongoDB 6.0 on gcc 13 because a include in ctype.h was missing
./fix-gcc-13-ctype-6_0.patch

View File

@ -1,9 +1,9 @@
{ wasm-bindgen-cli, ... }@args:
import ../generic.nix (args // {
version = "16.0.4";
hash = "sha256-svDqcYm6PbmPyHhN00VKn/sGRkfb7ah2N7BtEVdZ9hg=";
vendorHash = "sha256-H4Rwel/UAvxY8/4CfSbneJYjt9HHgsuNbYXUM6MtqXM=";
yarnHash = "sha256-OHNnN66MevDiH4Zr6Uq3Om65XBzf4O3AIrPvhlvhkbE=";
version = "16.1.4";
hash = "sha256-WgMQzS7nwIwPojcf9HTLajLd0WV+RYEbyp/aWr9XFWc=";
vendorHash = "sha256-8WN4hVueA2o2bHhhxLGPYxPX+1qky8QHGTRqhEGNh9s=";
pnpmHash = "sha256-phDrOSFQsgA+I4PDK9LJasUBXBO8EkVtQIMx9M4v8u0=";
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {

View File

@ -12,6 +12,7 @@
, nodejs
, openssl
, pkg-config
, pnpm_9
, rustc
, Security
, stdenv
@ -30,8 +31,10 @@
, extPatches ? []
, cargoHash ? null
, cargoLock ? null
, yarnHash
, yarnHash ? null
, pnpmHash ? null
}:
assert yarnHash != null || pnpmHash != null;
let
# This repo has a private submodule "e" which fetchgit cannot handle without failing.
src = fetchFromGitHub {
@ -40,6 +43,7 @@ let
rev = "v${version}";
inherit hash;
};
pname = "teleport";
inherit version;
rdpClient = rustPlatform.buildRustPackage rec {
@ -76,33 +80,45 @@ let
cargoDeps = rustPlatform.importCargoLock cargoLock;
nativeBuildInputs = [ nodejs yarn fixup-yarn-lock ] ++
lib.optional (lib.versionAtLeast version "15") [
binaryen
cargo
rustc
rustc.llvmPackages.lld
rustPlatform.cargoSetupHook
wasm-bindgen-cli
wasm-pack
];
pnpmDeps = if pnpmHash != null then pnpm_9.fetchDeps {
inherit src pname version;
hash = pnpmHash;
} else null;
nativeBuildInputs = [ nodejs ] ++ lib.optional (lib.versionAtLeast version "15") [
binaryen
cargo
nodejs
rustc
rustc.llvmPackages.lld
rustPlatform.cargoSetupHook
wasm-bindgen-cli
wasm-pack
] ++ (if lib.versionAtLeast version "16" then [ pnpm_9.configHook ] else [ yarn fixup-yarn-lock ]);
configurePhase = ''
runHook preConfigure
export HOME=$(mktemp -d)
runHook postConfigure
'';
buildPhase = ''
yarn config --offline set yarn-offline-mirror ${yarnOfflineCache}
fixup-yarn-lock yarn.lock
${lib.optionalString (lib.versionOlder version "16") ''
yarn config --offline set yarn-offline-mirror ${yarnOfflineCache}
fixup-yarn-lock yarn.lock
yarn install --offline \
--frozen-lockfile \
--ignore-engines --ignore-scripts
patchShebangs .
yarn install --offline \
--frozen-lockfile \
--ignore-engines --ignore-scripts
patchShebangs .
''}
PATH=$PATH:$PWD/node_modules/.bin
${if lib.versionAtLeast version "15"
then ''
PATH=$PATH:$PWD/node_modules/.bin
pushd web/packages/teleport
# https://github.com/gravitational/teleport/blob/6b91fe5bbb9e87db4c63d19f94ed4f7d0f9eba43/web/packages/teleport/README.md?plain=1#L18-L20
RUST_MIN_STACK=16777216 wasm-pack build ./src/ironrdp --target web --mode no-install
@ -119,9 +135,7 @@ let
};
in
buildGoModule rec {
pname = "teleport";
inherit src version;
inherit pname src version;
inherit vendorHash;
proxyVendor = true;
@ -136,12 +150,17 @@ buildGoModule rec {
patches = extPatches ++ [
./0001-fix-add-nix-path-to-exec-env.patch
./rdpclient.patch
./tsh.patch
(if lib.versionAtLeast version "16" then ./tsh_16.patch else ./tsh.patch)
];
# Reduce closure size for client machines
outputs = [ "out" "client" ];
prePatch = ''
# TODO: remove after https://github.com/NixOS/nixpkgs/pull/332852 merges
sed -i 's/go 1.22.6/go 1.22.5/' go.mod
'';
preBuild = ''
cp -r ${webassets} webassets
'' + lib.optionalString withRdpClient ''

View File

@ -0,0 +1,17 @@
diff --git a/tool/tsh/common/tsh.go b/tool/tsh/common/tsh.go
index 5de21c69d0..3995c19e3c 100644
--- a/tool/tsh/common/tsh.go
+++ b/tool/tsh/common/tsh.go
@@ -1084,10 +1084,11 @@ func Run(ctx context.Context, args []string, opts ...CliOption) error {
var err error
- cf.executablePath, err = os.Executable()
+ tempBinaryPath, err := os.Executable()
if err != nil {
return trace.Wrap(err)
}
+ cf.executablePath = filepath.Dir(tempBinaryPath) + "/tsh"
// configs
setEnvFlags(&cf)

View File

@ -1,19 +1,28 @@
{ lib, buildGoModule, fetchFromGitHub }:
{
lib,
buildGoModule,
fetchFromGitHub,
}:
buildGoModule rec {
pname = "dnsproxy";
version = "0.72.1";
version = "0.72.3";
src = fetchFromGitHub {
owner = "AdguardTeam";
repo = "dnsproxy";
rev = "v${version}";
hash = "sha256-oV3Jh1IoQit3aDNpyoeomy1pLya2A77dHzhPSXOK8g8=";
hash = "sha256-UJ97/oMkP01eojNfiim0ttszigyOReHEHEcMh/JvU7M=";
};
vendorHash = "sha256-vGIw0Hj0l8SI6zYnTknzc7Lb5volW37yE/KnWZHydQE=";
vendorHash = "sha256-zVmoIC7LZfElEgvSq7CkOi1wOCA8ot+8JfW5wTCKwc8=";
ldflags = [ "-s" "-w" "-X" "github.com/AdguardTeam/dnsproxy/internal/version.version=${version}" ];
ldflags = [
"-s"
"-w"
"-X"
"github.com/AdguardTeam/dnsproxy/internal/version.version=${version}"
];
# Development tool dependencies; not part of the main project
excludedPackages = [ "internal/tools" ];
@ -24,7 +33,10 @@ buildGoModule rec {
description = "Simple DNS proxy with DoH, DoT, and DNSCrypt support";
homepage = "https://github.com/AdguardTeam/dnsproxy";
license = licenses.asl20;
maintainers = with maintainers; [ contrun diogotcorreia ];
maintainers = with maintainers; [
contrun
diogotcorreia
];
mainProgram = "dnsproxy";
};
}

View File

@ -1510,6 +1510,7 @@ mapAliases ({
trustedGrub = throw "trustedGrub has been removed, because it is not maintained upstream anymore"; # Added 2023-05-10
trustedGrub-for-HP = throw "trustedGrub-for-HP has been removed, because it is not maintained upstream anymore"; # Added 2023-05-10
tumpa = throw "tumpa has been removed, as it is broken"; # Added 2024-07-15
turbogit = throw "turbogit has been removed as it is unmaintained upstream and depends on an insecure version of libgit2"; # Added 2024-08-25
tvbrowser-bin = tvbrowser; # Added 2023-03-02
typst-fmt = typstfmt; # Added 2023-07-15
typst-preview = throw "The features of 'typst-preview' have been consolidated to 'tinymist', an all-in-one language server for typst"; # Added 2024-07-07

View File

@ -19131,25 +19131,6 @@ with pkgs;
ttyd = callPackage ../servers/ttyd { };
turbogit = callPackage ../development/tools/turbogit {
libgit2 = libgit2.overrideAttrs rec {
version = "1.3.0";
src = pkgs.fetchFromGitHub {
owner = "libgit2";
repo = "libgit2";
rev = "v${version}";
hash = "sha256-7atNkOBzX+nU1gtFQEaE+EF1L+eex+Ajhq2ocoJY920=";
};
patches = [];
# tests fail on old version
doCheck = false;
meta = libgit2.meta // {
maintainers = [ ];
knownVulnerabilities = [ "CVE-2024-24575" "CVE-2024-24577" "CVE-2022-29187" "CVE 2022-24765" ];
};
};
};
tweak = callPackage ../applications/editors/tweak { };
typical = callPackage ../development/tools/misc/typical { };