Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
@@ -11,6 +11,9 @@ on:
|
||||
systems:
|
||||
required: true
|
||||
type: string
|
||||
defaultVersion:
|
||||
required: true
|
||||
type: string
|
||||
testVersions:
|
||||
required: false
|
||||
default: false
|
||||
@@ -105,7 +108,7 @@ jobs:
|
||||
- name: Evaluate the ${{ matrix.system }} output paths at the merge commit
|
||||
env:
|
||||
MATRIX_SYSTEM: ${{ matrix.system }}
|
||||
MATRIX_VERSION: ${{ matrix.version || 'nixVersions.latest' }}
|
||||
MATRIX_VERSION: ${{ matrix.version || inputs.defaultVersion }}
|
||||
run: |
|
||||
nix-build nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A eval.singleSystem \
|
||||
--argstr evalSystem "$MATRIX_SYSTEM" \
|
||||
@@ -115,36 +118,18 @@ jobs:
|
||||
# If it uses too much memory, slightly decrease chunkSize.
|
||||
# Note: Keep the same further down in sync!
|
||||
|
||||
# Running the attrpath generation step separately from the outpath step afterwards.
|
||||
# The idea is that, *if* Eval on the target branch has not finished, yet, we will
|
||||
# generate the attrpaths in the meantime - and the separate command command afterwards
|
||||
# will check cachix again for whether Eval has finished. If no Eval result from the
|
||||
# target branch can be found the second time, we proceed to run it in here. Attrpaths
|
||||
# generation takes roughly 30 seconds, so for every normal use-case this should be more
|
||||
# than enough of a head start for Eval on the target branch to finish.
|
||||
# This edge-case, that Eval on the target branch is delayed is unlikely to happen anyway:
|
||||
# For a commit to become the target commit of a PR, it must *already* be on the branch.
|
||||
# Normally, CI should always start running on that push event *before* it starts running
|
||||
# on the PR.
|
||||
- name: Evaluate the ${{ matrix.system }} attribute paths at the target commit
|
||||
if: inputs.targetSha
|
||||
env:
|
||||
MATRIX_SYSTEM: ${{ matrix.system }}
|
||||
run: |
|
||||
nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/trusted-pinned -A eval.attrpathsSuperset \
|
||||
--argstr evalSystem "$MATRIX_SYSTEM" \
|
||||
--argstr nixPath "nixVersions.latest"
|
||||
|
||||
- name: Evaluate the ${{ matrix.system }} output paths at the target commit
|
||||
if: inputs.targetSha
|
||||
env:
|
||||
MATRIX_SYSTEM: ${{ matrix.system }}
|
||||
# This should be very quick, because it pulls the eval results from Cachix.
|
||||
# This must match the default version set in the Merge Queue.
|
||||
VERSION: lixPackageSets.latest.lix
|
||||
# This is very quick, because it pulls the eval results from Cachix.
|
||||
run: |
|
||||
nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/trusted-pinned -A eval.singleSystem \
|
||||
--argstr evalSystem "$MATRIX_SYSTEM" \
|
||||
--arg chunkSize 8000 \
|
||||
--argstr nixPath "nixVersions.latest" \
|
||||
--argstr nixPath "$VERSION" \
|
||||
--out-link target
|
||||
|
||||
- name: Compare outpaths against the target branch
|
||||
|
||||
@@ -17,6 +17,21 @@ on:
|
||||
permissions: {}
|
||||
|
||||
jobs:
|
||||
prepare:
|
||||
runs-on: ubuntu-24.04-arm
|
||||
outputs:
|
||||
systems: ${{ steps.systems.outputs.systems }}
|
||||
steps:
|
||||
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
|
||||
with:
|
||||
sparse-checkout: |
|
||||
ci/supportedSystems.json
|
||||
|
||||
- name: Load supported systems
|
||||
id: systems
|
||||
run: |
|
||||
echo "systems=$(jq -c <ci/supportedSystems.json)" >> "$GITHUB_OUTPUT"
|
||||
|
||||
lint:
|
||||
name: Lint
|
||||
uses: ./.github/workflows/lint.yml
|
||||
@@ -26,6 +41,23 @@ jobs:
|
||||
mergedSha: ${{ inputs.mergedSha || github.event.merge_group.head_sha }}
|
||||
targetSha: ${{ inputs.targetSha || github.event.merge_group.base_sha }}
|
||||
|
||||
eval:
|
||||
name: Eval
|
||||
needs: [prepare]
|
||||
uses: ./.github/workflows/eval.yml
|
||||
# The eval workflow requests these permissions so we must explicitly allow them,
|
||||
# even though they are unused when working with the merge queue.
|
||||
permissions:
|
||||
# compare
|
||||
statuses: write
|
||||
secrets:
|
||||
CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
|
||||
with:
|
||||
mergedSha: ${{ inputs.mergedSha || github.event.merge_group.head_sha }}
|
||||
systems: ${{ needs.prepare.outputs.systems }}
|
||||
# This must match the version in Eval's target step.
|
||||
defaultVersion: lixPackageSets.latest.lix
|
||||
|
||||
# This job's only purpose is to create the target for the "Required Status Checks" branch ruleset.
|
||||
# It "needs" all the jobs that should block the Merge Queue.
|
||||
unlock:
|
||||
@@ -33,6 +65,7 @@ jobs:
|
||||
# Modify this list to add or remove jobs from required status checks.
|
||||
needs:
|
||||
- lint
|
||||
- eval
|
||||
runs-on: ubuntu-24.04-arm
|
||||
permissions:
|
||||
statuses: write
|
||||
|
||||
@@ -86,6 +86,7 @@ jobs:
|
||||
mergedSha: ${{ needs.prepare.outputs.mergedSha }}
|
||||
targetSha: ${{ needs.prepare.outputs.targetSha }}
|
||||
systems: ${{ needs.prepare.outputs.systems }}
|
||||
defaultVersion: nixVersions.latest
|
||||
testVersions: ${{ contains(fromJSON(needs.prepare.outputs.touched), 'pinned') && !contains(fromJSON(needs.prepare.outputs.headBranch).type, 'development') }}
|
||||
|
||||
labels:
|
||||
|
||||
@@ -1,50 +0,0 @@
|
||||
name: Push
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
- staging
|
||||
- release-*
|
||||
- staging-*
|
||||
- haskell-updates
|
||||
workflow_call:
|
||||
inputs:
|
||||
mergedSha:
|
||||
required: true
|
||||
type: string
|
||||
secrets:
|
||||
CACHIX_AUTH_TOKEN:
|
||||
required: true
|
||||
|
||||
permissions: {}
|
||||
|
||||
jobs:
|
||||
prepare:
|
||||
runs-on: ubuntu-24.04-arm
|
||||
outputs:
|
||||
systems: ${{ steps.systems.outputs.systems }}
|
||||
steps:
|
||||
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
|
||||
with:
|
||||
sparse-checkout: |
|
||||
ci/supportedSystems.json
|
||||
|
||||
- name: Load supported systems
|
||||
id: systems
|
||||
run: |
|
||||
echo "systems=$(jq -c <ci/supportedSystems.json)" >> "$GITHUB_OUTPUT"
|
||||
|
||||
eval:
|
||||
name: Eval
|
||||
needs: [prepare]
|
||||
uses: ./.github/workflows/eval.yml
|
||||
# Those are not actually used on push, but will throw an error if not set.
|
||||
permissions:
|
||||
# compare
|
||||
statuses: write
|
||||
secrets:
|
||||
CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
|
||||
with:
|
||||
mergedSha: ${{ inputs.mergedSha || github.sha }}
|
||||
systems: ${{ needs.prepare.outputs.systems }}
|
||||
@@ -48,6 +48,7 @@ jobs:
|
||||
})).map(file => file.filename)
|
||||
|
||||
if (files.some(file => [
|
||||
'.github/workflows/eval.yml',
|
||||
'.github/workflows/lint.yml',
|
||||
'.github/workflows/merge-group.yml',
|
||||
'.github/workflows/test.yml',
|
||||
@@ -65,12 +66,6 @@ jobs:
|
||||
'.github/workflows/test.yml',
|
||||
].includes(file))) core.setOutput('pr', true)
|
||||
|
||||
if (files.some(file => [
|
||||
'.github/workflows/eval.yml',
|
||||
'.github/workflows/push.yml',
|
||||
'.github/workflows/test.yml',
|
||||
].includes(file))) core.setOutput('push', true)
|
||||
|
||||
merge-group:
|
||||
if: needs.prepare.outputs.merge-group
|
||||
name: Merge Group
|
||||
@@ -98,16 +93,3 @@ jobs:
|
||||
secrets:
|
||||
CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
|
||||
NIXPKGS_CI_APP_PRIVATE_KEY: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
|
||||
|
||||
push:
|
||||
if: needs.prepare.outputs.push
|
||||
name: Push
|
||||
needs: [prepare]
|
||||
uses: ./.github/workflows/push.yml
|
||||
# Those are not actually used on the push or pull_request events, but will throw an error if not set.
|
||||
permissions:
|
||||
statuses: write
|
||||
secrets:
|
||||
CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
|
||||
with:
|
||||
mergedSha: ${{ needs.prepare.outputs.mergedSha }}
|
||||
|
||||
@@ -1054,6 +1054,7 @@
|
||||
./services/monitoring/zabbix-agent.nix
|
||||
./services/monitoring/zabbix-proxy.nix
|
||||
./services/monitoring/zabbix-server.nix
|
||||
./services/network-filesystems/a2boot.nix
|
||||
./services/network-filesystems/cachefilesd.nix
|
||||
./services/network-filesystems/ceph.nix
|
||||
./services/network-filesystems/davfs2.nix
|
||||
|
||||
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "claude-code";
|
||||
publisher = "anthropic";
|
||||
version = "2.0.14";
|
||||
hash = "sha256-+3GkCBfAAIaORU+qKGv6OmN2w9aXt3QKMgWtyLMJUS0=";
|
||||
version = "2.0.15";
|
||||
hash = "sha256-TKN0IR/0pzbcusO1J9n7sodqbrmzw4u4EEXkmFKb3co=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -3676,6 +3676,8 @@ let
|
||||
|
||||
oops418.nix-env-picker = callPackage ./oops418.nix-env-picker { };
|
||||
|
||||
oracle.oracle-java = callPackage ./oracle.oracle-java { };
|
||||
|
||||
ph-hawkins.arc-plus = callPackage ./ph-hawkins.arc-plus { };
|
||||
|
||||
phind.phind = buildVscodeMarketplaceExtension {
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
{
|
||||
lib,
|
||||
vscode-utils,
|
||||
}:
|
||||
|
||||
vscode-utils.buildVscodeMarketplaceExtension rec {
|
||||
mktplcRef = {
|
||||
name = "oracle-java";
|
||||
publisher = "oracle";
|
||||
version = "24.1.2";
|
||||
hash = "sha256-sw+FJbpdkHABKgnRsA5tS6FYEjBD0/iVRCHHzf49Xx4=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/oracle/javavscode/releases/tag/v${mktplcRef.version}";
|
||||
description = "Java Platform Extension for Visual Studio Code";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=oracle.oracle-java";
|
||||
homepage = "https://github.com/oracle/javavscode/";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.kiyotoko ];
|
||||
};
|
||||
}
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
@@ -32,6 +33,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-+xjwvxFrv++XF6Uhm/ZwkseuToz3LtqCfTD18GiwNyw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/AlbrechtL/welle.io/pull/853
|
||||
(fetchpatch {
|
||||
name = "cmake3_16.patch";
|
||||
url = "https://github.com/AlbrechtL/welle.io/commit/c7581c251b5fe2408b45365e0f2c5efc7f01fd19.patch";
|
||||
hash = "sha256-e282lwCstwsRFGCtFT39CBn1jTvkA9bxa5t6Nk8mc98=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "all-the-package-names";
|
||||
version = "2.0.2228";
|
||||
version = "2.0.2235";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nice-registry";
|
||||
repo = "all-the-package-names";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Qq5dHI6Z33MbGvOKSzONeYgb/u0kgH3PFPV9zhfjkyY=";
|
||||
hash = "sha256-I2E1V296tljsvtpfU5xlUkKNEeEZb4qtM1WDLXQZHbg=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-NxyOqp3chgionveBfCVN5VnMF7cLZhmV15Ff5n91lQQ=";
|
||||
npmDepsHash = "sha256-p1IBNK6dRBnEUEZ4bIMoGcVSPoecnKWgRtuUJTYW7q8=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "atmos";
|
||||
version = "1.189.0";
|
||||
version = "1.194.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudposse";
|
||||
repo = "atmos";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-udreQcDKZYnOLxeEUQfC+OsLg1VdwXP9R7hDKD6YEkw=";
|
||||
hash = "sha256-xWKdKhuSGwVnRuIaphZ+/5MAoo8tbbbN/WB5OvZYD+w=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-RnmYUEgVQyZXvPPIXxS8cCkpKkQTGxQzawfDN4zVLHw=";
|
||||
vendorHash = "sha256-wFYR53mDaoiidE/IkSf6eDat3yTHPqxswd0iPBP2GUE=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -1,28 +1,38 @@
|
||||
{
|
||||
lib,
|
||||
python3,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
extras ? [ "all" ],
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "browsr";
|
||||
version = "1.21.0";
|
||||
version = "1.22.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juftin";
|
||||
repo = "browsr";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-76OzJOunZRVSGalQiyX+TSukD8rRIFHxA713NqOn3PY=";
|
||||
hash = "sha256-eISOADs++ZF62qkWbhFZu6JkEVtTytg3q5nbwS2m+8g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
patches = [
|
||||
# https://github.com/juftin/browsr/pull/55
|
||||
(fetchpatch {
|
||||
name = "textual-6-compat.patch";
|
||||
url = "https://github.com/juftin/browsr/commit/ab958ac982e14e836a0e44080a53c920ad50b256.patch";
|
||||
hash = "sha256-vAJ+M6Eg7N2NV7Cb2DWPYqLJIeq/DY1COECEQOnkpXE=";
|
||||
})
|
||||
];
|
||||
|
||||
build-system = with python3Packages; [
|
||||
hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs =
|
||||
with python3.pkgs;
|
||||
dependencies =
|
||||
with python3Packages;
|
||||
[
|
||||
art
|
||||
click
|
||||
@@ -38,7 +48,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
]
|
||||
++ lib.attrVals extras optional-dependencies;
|
||||
|
||||
optional-dependencies = with python3.pkgs; {
|
||||
optional-dependencies = with python3Packages; {
|
||||
all = [
|
||||
pyarrow
|
||||
textual-universal-directorytree.optional-dependencies.remote
|
||||
@@ -51,13 +61,15 @@ python3.pkgs.buildPythonApplication rec {
|
||||
];
|
||||
};
|
||||
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
pytest-cov-stub
|
||||
pytest-textual-snapshot
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"art"
|
||||
"click"
|
||||
"pandas"
|
||||
"pymupdf"
|
||||
"pyperclip"
|
||||
@@ -71,18 +83,12 @@ python3.pkgs.buildPythonApplication rec {
|
||||
"browsr"
|
||||
];
|
||||
|
||||
pytestFlags = [
|
||||
"--snapshot-update"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Tests require internet access
|
||||
"test_github_screenshot"
|
||||
"test_github_screenshot_license"
|
||||
"test_textual_app_context_path_github"
|
||||
"test_mkdocs_screenshot"
|
||||
# Different output
|
||||
"test_textual_app_context_path"
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "@anthropic-ai/claude-code",
|
||||
"version": "2.0.14",
|
||||
"version": "2.0.15",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "@anthropic-ai/claude-code",
|
||||
"version": "2.0.14",
|
||||
"version": "2.0.15",
|
||||
"license": "SEE LICENSE IN README.md",
|
||||
"bin": {
|
||||
"claude": "cli.js"
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
}:
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "claude-code";
|
||||
version = "2.0.14";
|
||||
version = "2.0.15";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-U/wd00eva/qbSS4LpW1L7nmPW4dT9naffeMkHQ5xr5o=";
|
||||
hash = "sha256-wMRW3rp/AimeqC6XcO+ouI39ZdcFMKF4wmA4EnCTQ3g=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-ugI5JSCxEneQmIMF2rzOWihMw9RuZjNco4YRNmaQ69A=";
|
||||
npmDepsHash = "sha256-g03tfNJjx/KIUu14/mqranKR4G8mo9ig74iRgCdiJuE=";
|
||||
|
||||
postPatch = ''
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
|
||||
@@ -24,6 +24,12 @@ stdenv.mkDerivation rec {
|
||||
readline
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt --replace-fail \
|
||||
'cmake_minimum_required(VERSION 2.6)' \
|
||||
'cmake_minimum_required(VERSION 3.5)'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://ctodo.apakoh.dk/";
|
||||
description = "Simple ncurses-based task list manager";
|
||||
|
||||
@@ -2,10 +2,12 @@
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitLab,
|
||||
fetchpatch2,
|
||||
gitUpdater,
|
||||
testers,
|
||||
boost186,
|
||||
cmake,
|
||||
ctestCheckHook,
|
||||
dbus,
|
||||
doxygen,
|
||||
graphviz,
|
||||
@@ -35,6 +37,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"examples"
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Provide more information when there's an issue in AsyncExecutionLoadTest.RepeatedlyInvokingAnAsyncFunctionWorks
|
||||
# Remove when version > 5.0.5
|
||||
(fetchpatch2 {
|
||||
name = "0001-dbus-cpp-tests-async_execution_load_test-Print-received-error-on-DBus-method-failure.name";
|
||||
url = "https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/commit/8390ce83153c2ae29f21afd2bf5e79e88c59e6d9.diff";
|
||||
hash = "sha256-js2nXT7eG9dcX+yoFMNRVlamQxsbJclmKTX6/5RxxM4=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace doc/CMakeLists.txt \
|
||||
--replace-fail 'DESTINATION share/''${CMAKE_PROJECT_NAME}/doc' 'DESTINATION ''${CMAKE_INSTALL_DOCDIR}'
|
||||
@@ -71,6 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
ctestCheckHook
|
||||
dbus
|
||||
];
|
||||
|
||||
@@ -87,6 +100,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# DBus, parallelism messes with communication
|
||||
enableParallelChecking = false;
|
||||
|
||||
disabledTests = [
|
||||
# Possible memory corruption in Executor.TimeoutsAreHandledCorrectly
|
||||
# https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/issues/10
|
||||
"executor_test"
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
moveToOutput libexec/examples $examples
|
||||
'';
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
direwolf,
|
||||
nix-update-script,
|
||||
hamlibSupport ? true,
|
||||
gpsdSupport ? true,
|
||||
extraScripts ? false,
|
||||
}:
|
||||
|
||||
(direwolf.override {
|
||||
inherit hamlibSupport gpsdSupport extraScripts;
|
||||
}).overrideAttrs
|
||||
(oldAttrs: {
|
||||
version = "1.7-unstable-2025-04-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wb2osz";
|
||||
repo = "direwolf";
|
||||
rev = "486b3cf1f685502af7dc87b0f9c9cead6800d47b";
|
||||
hash = "sha256-VFBkOWHGZP7GjekHL3GY3BGkVXQbtyD1YPmu0xaQ1ME=";
|
||||
};
|
||||
|
||||
postPatch =
|
||||
builtins.replaceStrings
|
||||
[
|
||||
"decode_aprs.c"
|
||||
"tocalls.txt"
|
||||
"--replace-fail /etc/udev/rules.d/"
|
||||
]
|
||||
[
|
||||
"deviceid.c"
|
||||
"tocalls.yaml"
|
||||
"--replace-fail /usr/lib/udev/rules.d/ $out/lib/udev/rules.d/ --replace-fail /etc/udev/rules.d/"
|
||||
]
|
||||
oldAttrs.postPatch;
|
||||
|
||||
dontVersionCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch=dev" ]; };
|
||||
})
|
||||
+26
-18
@@ -7,7 +7,8 @@
|
||||
alsa-lib,
|
||||
gpsd,
|
||||
gpsdSupport ? false,
|
||||
hamlib,
|
||||
hamlib_4,
|
||||
hamlib ? hamlib_4,
|
||||
hamlibSupport ? true,
|
||||
perl,
|
||||
portaudio,
|
||||
@@ -15,17 +16,19 @@
|
||||
espeak,
|
||||
udev,
|
||||
udevCheckHook,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
extraScripts ? false,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "direwolf";
|
||||
version = "1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wb2osz";
|
||||
repo = "direwolf";
|
||||
rev = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Vbxc6a6CK+wrBfs15dtjfRa1LJDKKyHMrg8tqsF7EX4=";
|
||||
};
|
||||
|
||||
@@ -57,6 +60,7 @@ stdenv.mkDerivation rec {
|
||||
perl
|
||||
espeak
|
||||
];
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
preConfigure = lib.optionals (!extraScripts) ''
|
||||
echo "" > scripts/CMakeLists.txt
|
||||
@@ -64,35 +68,39 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace conf/CMakeLists.txt \
|
||||
--replace /etc/udev/rules.d/ $out/lib/udev/rules.d/
|
||||
--replace-fail /etc/udev/rules.d/ $out/lib/udev/rules.d/
|
||||
substituteInPlace src/symbols.c \
|
||||
--replace /usr/share/direwolf/symbols-new.txt $out/share/direwolf/symbols-new.txt \
|
||||
--replace /opt/local/share/direwolf/symbols-new.txt $out/share/direwolf/symbols-new.txt
|
||||
--replace-fail /usr/share/direwolf/symbols-new.txt $out/share/direwolf/symbols-new.txt \
|
||||
--replace-fail /opt/local/share/direwolf/symbols-new.txt $out/share/direwolf/symbols-new.txt
|
||||
substituteInPlace src/decode_aprs.c \
|
||||
--replace /usr/share/direwolf/tocalls.txt $out/share/direwolf/tocalls.txt \
|
||||
--replace /opt/local/share/direwolf/tocalls.txt $out/share/direwolf/tocalls.txt
|
||||
--replace-fail /usr/share/direwolf/tocalls.txt $out/share/direwolf/tocalls.txt \
|
||||
--replace-fail /opt/local/share/direwolf/tocalls.txt $out/share/direwolf/tocalls.txt
|
||||
substituteInPlace cmake/cpack/direwolf.desktop.in \
|
||||
--replace 'Terminal=false' 'Terminal=true' \
|
||||
--replace 'Exec=@APPLICATION_DESKTOP_EXEC@' 'Exec=direwolf'
|
||||
substituteInPlace src/dwgpsd.c \
|
||||
--replace 'GPSD_API_MAJOR_VERSION > 11' 'GPSD_API_MAJOR_VERSION > 14'
|
||||
--replace-fail 'Terminal=false' 'Terminal=true' \
|
||||
--replace-fail 'Exec=@APPLICATION_DESKTOP_EXEC@' 'Exec=direwolf'
|
||||
''
|
||||
+ lib.optionalString extraScripts ''
|
||||
patchShebangs scripts/dwespeak.sh
|
||||
substituteInPlace scripts/dwespeak.sh \
|
||||
--replace espeak ${espeak}/bin/espeak
|
||||
--replace-fail espeak ${espeak}/bin/espeak
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
versionCheckProgramArg = [ "-u" ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Soundcard Packet TNC, APRS Digipeater, IGate, APRStt gateway";
|
||||
homepage = "https://github.com/wb2osz/direwolf/";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [
|
||||
mainProgram = "direwolf";
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [
|
||||
lasandell
|
||||
sarcasticadmin
|
||||
pandapip1
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -12,11 +12,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
name = "eigenwallet";
|
||||
version = "3.1.1";
|
||||
version = "3.1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/eigenwallet/core/releases/download/${finalAttrs.version}/eigenwallet_${finalAttrs.version}_amd64.deb";
|
||||
hash = "sha256-QkfJ8ixt2HzWmRNltoZhis/EJ546DQgthWqVyqGpvvA=";
|
||||
hash = "sha256-HQqkoyzKqy4eaCfEwwkRUjgex834kkt2OR3Ib16bE0Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "esp-generate";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "esp-rs";
|
||||
repo = "esp-generate";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-rvgmmG0LhRb+eRdqmlCf514lzV0QGWPaJ8pnlTnxfvo=";
|
||||
hash = "sha256-4yvJgYMaASCHHz86Fh73yd2vSo/0cIjVkwZMh55ZWKc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ai8FUKHK/iHeUEgklZEDAMKoorXVDxGSZVrB7LahVV8=";
|
||||
cargoHash = "sha256-OS2ZAXdOh+oL/ImIuEuo+gBsK9wk4X1vgoJbnHTJ2f4=";
|
||||
|
||||
meta = {
|
||||
description = "Template generation tool to create no_std applications targeting Espressif's chips";
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "firefly-iii-data-importer";
|
||||
version = "1.8.2";
|
||||
version = "1.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firefly-iii";
|
||||
repo = "data-importer";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Bi1LwKC2LFs1AzrZflaKFk6/DiPiSQn5pHHrh9QkqVw=";
|
||||
hash = "sha256-xo1CgsPdqSw7VFlPx5aidB7h7fwot95XYlPxyW7S8yw=";
|
||||
};
|
||||
|
||||
buildInputs = [ php84 ];
|
||||
@@ -38,12 +38,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
composerStrictValidation = true;
|
||||
strictDeps = true;
|
||||
|
||||
vendorHash = "sha256-qSH1aA1FdN+LmtQcJdY0JWmpkF3txHojMfev+mFMBfk=";
|
||||
vendorHash = "sha256-6sTCXSMAgMQH7tQjl3UvPgqRShdEUV1Xi4R/M/j2Xxc=";
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit (finalAttrs) src;
|
||||
name = "${finalAttrs.pname}-npm-deps";
|
||||
hash = "sha256-n7puQeAAmyDNkAHQK3xlQvm43W1IIyKu47fVR1a2YrA=";
|
||||
hash = "sha256-gYCjxZP7pytYYgJEvW78SmzX9jZAjkAMlRv9doc+JqE=";
|
||||
};
|
||||
|
||||
composerRepository = php84.mkComposerRepository {
|
||||
|
||||
@@ -24,6 +24,24 @@ stdenv.mkDerivation rec {
|
||||
url = "https://github.com/dvidelabs/flatcc/commit/5885e50f88248bc7ed398880c887ab23db89f05a.patch";
|
||||
hash = "sha256-z2HSxNXerDFKtMGu6/vnzGRlqfz476bFMjg4DVfbObQ";
|
||||
})
|
||||
# Bump cmake to 2.8.12, required fox 3.16 patch
|
||||
(fetchpatch {
|
||||
name = "bump-cmake-version.patch";
|
||||
url = "https://github.com/dvidelabs/flatcc/commit/5f07eda43caabd81a2bfa2857af0e3f26dc6d4ee.patch?full_index=1";
|
||||
hash = "sha256-eRlkQw+YGRgCUjrlYB3I8w+/cPuJhgEfNUW/+TZhHlI=";
|
||||
})
|
||||
# Bump min. CMake to 3.16 and fix custom build rules
|
||||
(fetchpatch {
|
||||
name = "fix-cmake-version.patch";
|
||||
url = "https://github.com/dvidelabs/flatcc/commit/385c27b23236dff7ad4fa35c59fd4f9143dcaae6.patch?full_index=1";
|
||||
hash = "sha256-ORDby2LRRQdFrNc1owHKxo0TfMIxISj5SuD5oqvDFFo=";
|
||||
excludes = [
|
||||
"README.md"
|
||||
"CHANGELOG.md"
|
||||
"test/doublevec_test/CMakeLists.txt"
|
||||
"test/monster_test_cpp/CMakeLists.txt"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -16,16 +16,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "forecast";
|
||||
version = "0-unstable-2025-10-07";
|
||||
version = "0-unstable-2025-10-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cosmic-utils";
|
||||
repo = "forecast";
|
||||
rev = "e384cacb53dc58656f56659409060fc16f6a2351";
|
||||
hash = "sha256-BkL4B4RXcntDUjDy5UPUaxSglzcM3h3kKq5LsCtCukw=";
|
||||
rev = "f4dca2317007bc3316b22456e36a76d50500ccc8";
|
||||
hash = "sha256-zbL4a5haggMJEN7vbe+v026Qo4BFZvtoH8QaZPmpcBw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-aiKxgUnW711c2vhXDKVt0USTUZD6CyWB3tT6UzjqNSg=";
|
||||
cargoHash = "sha256-di7zjwI0/6NB2cAih3d7iqwSb+o/607jbgJN1MtbZX8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
libcosmicAppHook
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
util-linux,
|
||||
xdg-utils,
|
||||
zsh,
|
||||
fish,
|
||||
unstableGitUpdater,
|
||||
}:
|
||||
|
||||
@@ -29,6 +30,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
doInstallCheck = true;
|
||||
|
||||
postPatch = ''
|
||||
sed -i \
|
||||
@@ -50,17 +52,30 @@ stdenv.mkDerivation rec {
|
||||
-e "s,__fzf_git=.*BASH_SOURCE.*,__fzf_git=$out/share/${pname}/fzf-git.sh," \
|
||||
-e "/__fzf_git=.*readlink.*/d" \
|
||||
fzf-git.sh
|
||||
|
||||
sed -i \
|
||||
-e "s,\bbash\b,${bash}/bin/bash," \
|
||||
-e "s,\''$fzf_git_sh_path\b,$out/share/${pname}," \
|
||||
fzf-git.fish
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -D fzf-git.sh $out/share/${pname}/fzf-git.sh
|
||||
install -D fzf-git.fish $out/share/${pname}/fzf-git.fish
|
||||
'';
|
||||
|
||||
# Smoke test
|
||||
installCheckPhase = ''
|
||||
export HOME=$(mktemp -d)
|
||||
${bash}/bin/bash -c "source $out/share/${pname}/fzf-git.sh"
|
||||
${fish}/bin/fish -c "source $out/share/${pname}/fzf-git.fish"
|
||||
'';
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/junegunn/fzf-git.sh";
|
||||
description = "Bash and zsh key bindings for Git objects, powered by fzf";
|
||||
description = "Bash, zsh and fish key bindings for Git objects, powered by fzf";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ deejayem ];
|
||||
platforms = platforms.all;
|
||||
|
||||
@@ -5,26 +5,47 @@
|
||||
gmp,
|
||||
mpfr,
|
||||
boost,
|
||||
version ? "1.6.0",
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gappa";
|
||||
inherit version;
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gappa.gitlabpages.inria.fr/releases/gappa-${version}.tar.gz";
|
||||
hash = "sha256-aNht0Ttv+gzS9eLzu4PQitRK/zQN9QQ4YOEjQ2d9xIM=";
|
||||
url = "https://gappa.gitlabpages.inria.fr/releases/gappa-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-1ux5ImKR8edXyvL21w3jY2o4/fATEjO2SMzS8B0o8Ok=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
buildInputs = [
|
||||
gmp
|
||||
mpfr
|
||||
boost.dev
|
||||
];
|
||||
|
||||
buildPhase = "./remake";
|
||||
installPhase = "./remake install";
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
./remake
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
./remake install
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://gappa.gitlabpages.inria.fr/";
|
||||
@@ -37,4 +58,4 @@ stdenv.mkDerivation {
|
||||
maintainers = with lib.maintainers; [ vbgl ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gcsfuse";
|
||||
version = "3.3.0";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googlecloudplatform";
|
||||
repo = "gcsfuse";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-uHLfK6z2Ck38kxGtz91yyWV9YUW/Bft7S/MOUEHMf3o=";
|
||||
hash = "sha256-PdYHsHIlq77QnsjD1z3KliW3JHLZ0M26I4Z7v0SuvlU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-M4hI9ciDe49siQhFVRFTXNfQBMt9aBulu9+HvCQeVHA=";
|
||||
vendorHash = "sha256-w5EOHPOJLfINILrP3ipZwYUAcAJIlGw1HlVAUAzW3x4=";
|
||||
|
||||
subPackages = [
|
||||
"."
|
||||
|
||||
@@ -42,6 +42,7 @@ stdenv.mkDerivation rec {
|
||||
ffmpeg
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DCMAKE_POLICY_VERSION_MINIMUM=3.20" ];
|
||||
meta = with lib; {
|
||||
description = "Live GLSL coding renderer";
|
||||
homepage = "https://patriciogonzalezvivo.com/2015/glslViewer/";
|
||||
|
||||
@@ -13,16 +13,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "hyprshell";
|
||||
version = "4.7.1";
|
||||
version = "4.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "H3rmt";
|
||||
repo = "hyprshell";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SRw1X2oC7V/h2Tqo/wTXcu6d1kKVMPrW2HGsNGE4nCA=";
|
||||
hash = "sha256-6WC7vcPdtKR4iw5VHF88i/NQ+EBfvGxex8AvJONnG5w=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ULuztkKukOyfQkiGZY7HtWn5nSs2PWX8B86FQP/z7RU=";
|
||||
cargoHash = "sha256-g23W5cgGxWNyJ4uew2x12vgF5Bvaid1+phV2fxyHbas=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook4
|
||||
|
||||
@@ -33,13 +33,13 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kew";
|
||||
version = "3.5.2";
|
||||
version = "3.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ravachol";
|
||||
repo = "kew";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-vcH3TdZqEtkP7iN+KhlarGAORdHk16DgNI1mXlrizow=";
|
||||
hash = "sha256-7bO9IvSTJJKiNYQzcTSI2Ugjhw1ibbyE5/fe6EDYqvI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "nelm";
|
||||
version = "1.13.0";
|
||||
version = "1.13.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "nelm";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-uDCumcUNIMcvqYrV6iDMs4PSxuLodGzR/JyllwT6xn0=";
|
||||
hash = "sha256-g/JnFD1TPVKllY1yrODJ9P0bJe2357B11XAn9tQPLE8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-XzDIufMdDIaDfXrDutUak5/0nUo11RkD63c+Fpk76Xw=";
|
||||
vendorHash = "sha256-yd9qSQi7ktbI9b5eaTc98TjhxDsBVvh9qrf3+F2Twu4=";
|
||||
|
||||
subPackages = [ "cmd/nelm" ];
|
||||
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "nom";
|
||||
version = "2.16.2";
|
||||
version = "2.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "guyfedwards";
|
||||
repo = "nom";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-4CpvhcMP71dC1nDpvM9P6ZIeE2d2J90MNMWFYXTVaY4=";
|
||||
hash = "sha256-xIe7CgGzNNYzhkazjrejvZGfuLL4RqFCfXOUtFEgLCA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-d5KTDZKfuzv84oMgmsjJoXGO5XYLVKxOB5XehqgRvYw=";
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "pfetch";
|
||||
version = "1.9.3";
|
||||
version = "1.9.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Un1q32";
|
||||
repo = "pfetch";
|
||||
tag = version;
|
||||
hash = "sha256-2rBuqqS4jzefueVploU5bs2ZytDvYv5jeSK5jOyz86Y=";
|
||||
hash = "sha256-lEtRPM/uSt3vb/zhAx8Jiz3F2BhvOr17DHXaCPQlddA=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
brotli,
|
||||
tailwindcss_3,
|
||||
esbuild,
|
||||
buildPackages,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -158,8 +159,10 @@ beamPackages.mixRelease rec {
|
||||
cp --no-preserve=mode -r ${assets} assets
|
||||
cp -r ${tracker} tracker
|
||||
|
||||
# Fix cross-compilation with buildPackages
|
||||
# since tailwindcss_3 is not available for RiscV
|
||||
cat >> config/config.exs <<EOF
|
||||
config :tailwind, path: "${lib.getExe tailwindcss_3}"
|
||||
config :tailwind, path: "${lib.getExe buildPackages.tailwindcss_3}"
|
||||
config :esbuild, path: "${lib.getExe esbuild}"
|
||||
EOF
|
||||
'';
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
From 3a4a988f6c69abece44fe2c77eab5f0a9ae7bbd2 Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Frijters <sfrijters@gmail.com>
|
||||
Date: Mon, 13 Oct 2025 10:53:14 +0200
|
||||
Subject: [PATCH] Update minimum CMake version
|
||||
|
||||
And fix compatibility with https://cmake.org/cmake/help/v4.1/policy/CMP0065.html
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
src/CMakeLists.txt | 1 +
|
||||
2 files changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 10192bf..1bb3e0c 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 3.0)
|
||||
+cmake_minimum_required(VERSION 3.10)
|
||||
project(PNMixer)
|
||||
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index eb04c2b..8630a21 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -56,6 +56,7 @@ target_link_libraries(pnmixer "${PNMixer_DEPS_LDFLAGS}")
|
||||
target_link_libraries(pnmixer m)
|
||||
target_compile_options(pnmixer PUBLIC "${PNMixer_DEPS_CFLAGS}")
|
||||
target_compile_definitions(pnmixer PUBLIC -DHAVE_CONFIG_H)
|
||||
+set_property(TARGET pnmixer PROPERTY ENABLE_EXPORTS 1)
|
||||
|
||||
install(TARGETS pnmixer DESTINATION "${CMAKE_INSTALL_BINDIR}")
|
||||
|
||||
@@ -13,17 +13,22 @@
|
||||
pcre,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pnmixer";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nicklan";
|
||||
repo = "pnmixer";
|
||||
rev = "v${version}";
|
||||
sha256 = "0416pa933ddf4b7ph9zxhk5jppkk7ppcq1aqph6xsrfnka4yb148";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-iITliZrWZd0NvFgFzO49c94ry4T9J3jPIq61MZK6JhA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/nicklan/pnmixer/pull/197
|
||||
./fix-cmake-version.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
@@ -39,15 +44,15 @@ stdenv.mkDerivation rec {
|
||||
pcre
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://github.com/nicklan/pnmixer";
|
||||
description = "ALSA volume mixer for the system tray";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [
|
||||
license = lib.licenses.gpl3;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
campadrenalin
|
||||
romildo
|
||||
];
|
||||
mainProgram = "pnmixer";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
fetchpatch2,
|
||||
testers,
|
||||
gitUpdater,
|
||||
cmake,
|
||||
@@ -30,6 +31,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"dev"
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Fix compat with CMake 4
|
||||
# Remove when version > 3.0.2
|
||||
(fetchpatch2 {
|
||||
name = "0001-process-cpp-Bump-cmake_minimum_required-to-version-3.10.patch";
|
||||
url = "https://gitlab.com/ubports/development/core/lib-cpp/process-cpp/-/commit/c374b62cb79d668505c1c8dc55edddc938a573ba.diff";
|
||||
hash = "sha256-2H6f+EAR7p4mb0ReNl8LaosPVF/CNRm+PiYV7tkOQ/w=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace data/process-cpp.pc.in \
|
||||
--replace-fail 'libdir=''${exec_prefix}' 'libdir=''${prefix}' \
|
||||
|
||||
@@ -14,25 +14,15 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "properties-cpp";
|
||||
version = "0.0.3";
|
||||
version = "0.0.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "ubports";
|
||||
repo = "development/core/lib-cpp/properties-cpp";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-C/BDEuKNMQHOjATO5aWBptjIlgfv6ykzjFAsHb6uP3Q=";
|
||||
hash = "sha256-rxv2SPTXubaIBlDZixBZ88wqM7pxY03dVhRVImcDZtA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# GTest needs C++17
|
||||
# Remove when https://gitlab.com/ubports/development/core/lib-cpp/properties-cpp/-/merge_requests/3 merged & in release
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail 'std=c++14' 'std=c++17'
|
||||
''
|
||||
+ lib.optionalString (!finalAttrs.finalPackage.doCheck) ''
|
||||
sed -i "/add_subdirectory(tests)/d" CMakeLists.txt
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "scooter";
|
||||
version = "0.8.1";
|
||||
version = "0.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thomasschafer";
|
||||
repo = "scooter";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-i3FSuIEUzKyb6tIzYYOlBwlPtTrdlBsVLNsplzqNhkc=";
|
||||
hash = "sha256-Fgq1FJIvgnbBGkFrFCzjIPjyTyCxxknRGtzBGUuZfIY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-jaNkjr5uMAf4uShIj2iA5CK/7x/s41BETteshmlZkzA=";
|
||||
cargoHash = "sha256-kPJvwZhpE8k4Kv+Jai/Fp+b/YI8F7cR8acM1sc2fkf4=";
|
||||
|
||||
# Ensure that only the `scooter` package is built (excluding `xtask`)
|
||||
cargoBuildFlags = [
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sentry-native";
|
||||
version = "0.11.2";
|
||||
version = "0.11.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getsentry";
|
||||
repo = "sentry-native";
|
||||
tag = version;
|
||||
hash = "sha256-t1wv6/HFOo6UVkrurIg/GbqZTfZBrfrdIEKyqg86M/4=";
|
||||
hash = "sha256-I+vWQWxFpvLnfW7S3YufjM0CD8YgaLy/FL6xGndiXwE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "shader-slang";
|
||||
version = "2025.18.2";
|
||||
version = "2025.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shader-slang";
|
||||
repo = "slang";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-9upf/4Ix4ReV4OlkPMzLMJo4DlAXydQLSEp+GM+tN2g=";
|
||||
hash = "sha256-WG+yW76iFrrYFldCp85LcbwQ8cz61NkAvdlvIfaPgac=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -35,20 +35,20 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "siyuan";
|
||||
version = "3.3.4";
|
||||
version = "3.3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "siyuan-note";
|
||||
repo = "siyuan";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-jC7zYP5sMJCoT7lLyHPHxiikw3Nsz/LYkR664xSPuR4=";
|
||||
hash = "sha256-6CKY5rIPI+8uKh1vjw9nBI01J8o7U4vlxEPJS7xaAVg=";
|
||||
};
|
||||
|
||||
kernel = buildGoModule {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}-kernel";
|
||||
inherit (finalAttrs) src;
|
||||
sourceRoot = "${finalAttrs.src.name}/kernel";
|
||||
vendorHash = "sha256-ZcL9DuwiGjzRHBhzHpoAHeAmR6Mm9HymkjJCoA4+MRw=";
|
||||
vendorHash = "sha256-kDWOkAY6GiSp/oLkyLya2VYWmLz4fPxZPRKGlb2B8M4=";
|
||||
|
||||
patches = [
|
||||
(replaceVars ./set-pandoc-path.patch {
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "spire";
|
||||
version = "1.13.0";
|
||||
version = "1.13.1";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -18,10 +18,10 @@ buildGoModule (finalAttrs: {
|
||||
owner = "spiffe";
|
||||
repo = "spire";
|
||||
tag = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-hUvzC3gaNpp5yvIOoWG72WcC8yy5yLgf5RRzP+hPXrA=";
|
||||
sha256 = "sha256-1i2zT2oTJXMmISzUc4ixlZQjtjCcqUEi6RzgF9Zwm9s=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-qhYuE/rlaGJyOxt4e0a1QzAySF0wWOFoNdLAe2nKQbw=";
|
||||
vendorHash = "sha256-tho3Qm9uHiiSNFmBZGZFgxhAKD4HKWsIUmiqkWlToQk=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -65,13 +65,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "syslog-ng";
|
||||
version = "4.10.1";
|
||||
version = "4.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "syslog-ng";
|
||||
repo = "syslog-ng";
|
||||
tag = "syslog-ng-${finalAttrs.version}";
|
||||
hash = "sha256-Iha0HExkB0oM8IxzgMjnqwY4AlrK8ifL6DU3MxgGdXQ=";
|
||||
hash = "sha256-hUaDeJBW3jgXRD9uy4yzQsMm0QpprNeQZL8jjP2NOGs=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
cmake,
|
||||
zlib,
|
||||
openssl,
|
||||
@@ -11,20 +12,29 @@
|
||||
git,
|
||||
gbenchmark,
|
||||
nghttp2,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tarantool";
|
||||
version = "2.10.4";
|
||||
version = "3.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tarantool";
|
||||
repo = "tarantool";
|
||||
tag = version;
|
||||
hash = "sha256-yCRU5IxC6gNS+O2KYtKWjFk35EHkBnnzWy5UnyuB9f4=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-NU+0R07Qrnew7+HeeJu6QnGfktEXFRxSZFwl48vjGZE=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
cat <<'EOF' > third_party/luajit/test/cmake/GetLinuxDistro.cmake
|
||||
macro(GetLinuxDistro output)
|
||||
set(''${output} linux)
|
||||
endmacro()
|
||||
EOF
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
nghttp2
|
||||
git
|
||||
@@ -37,20 +47,33 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeCheckInputs = [ gbenchmark ];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
cmake
|
||||
];
|
||||
|
||||
preAutoreconf = ''
|
||||
pushd third_party/libunwind
|
||||
'';
|
||||
|
||||
postAutoreconf = ''
|
||||
popd
|
||||
'';
|
||||
|
||||
cmakeBuildType = "RelWithDebInfo";
|
||||
|
||||
cmakeFlags = [
|
||||
"-DENABLE_DIST=ON"
|
||||
"-DTARANTOOL_VERSION=${version}.builtByNix" # expects the commit hash as well
|
||||
"-DTARANTOOL_VERSION=${finalAttrs.version}.builtByNix" # expects the commit hash as well
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; };
|
||||
|
||||
meta = {
|
||||
description = "In-memory computing platform consisting of a database and an application server";
|
||||
homepage = "https://www.tarantool.io/";
|
||||
license = licenses.bsd2;
|
||||
license = lib.licenses.bsd2;
|
||||
mainProgram = "tarantool";
|
||||
maintainers = with maintainers; [ dit7ya ];
|
||||
maintainers = with lib.maintainers; [ dit7ya ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -71,13 +71,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
|
||||
stdenvNoCC.mkDerivation
|
||||
{
|
||||
inherit pname;
|
||||
version = "0-unstable-2025-09-09";
|
||||
version = "0-unstable-2025-10-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Fausto-Korpsvart";
|
||||
repo = "Tokyonight-GTK-Theme";
|
||||
rev = "93295bf8688724ea8c529c4fe3fa3fda1ebda2c6";
|
||||
hash = "sha256-Cf6kBU4GVdZvuKtYrRFsn3QZjRTLiJ+Aod4uA9t7qj4=";
|
||||
rev = "9d67b24f1d326816a645ba47933f9986a1ff8a23";
|
||||
hash = "sha256-KsVa5tAi8mPmfSxtO34swNErRgAprBV6xr1+2rkCXCI=";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
|
||||
|
||||
@@ -16,19 +16,15 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "trackballs";
|
||||
version = "1.3.4";
|
||||
version = "1.3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trackballs";
|
||||
repo = "trackballs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-JKSiNe5mu8rRztUhduGFY6IsSMx6VyBqKcGO5EssI+8=";
|
||||
hash = "sha256-Zy4o/khWAdy27P6WIU7gouNTYXLgN5ursSoSDDboXAk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/glHelp.h --replace-fail _TTF_Font TTF_Font
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [
|
||||
zlib
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "vacuum-go";
|
||||
version = "0.18.5";
|
||||
version = "0.18.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "daveshanley";
|
||||
repo = "vacuum";
|
||||
# using refs/tags because simple version gives: 'the given path has multiple possibilities' error
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-vsdSRsfGXjWlYxl3a6cGWJ7IadLP7KIM3lFkUlboTj4=";
|
||||
hash = "sha256-9qRdikwZcTEZEQON2/n3dy9FA34Bu8YTfNfssOcUwgg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+GkxN20mZD/ZBTCjmjiDcEAJix2Ssn9HsNrUtQkrI18=";
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "weaviate";
|
||||
version = "1.32.8";
|
||||
version = "1.33.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaviate";
|
||||
repo = "weaviate";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RJnvPqOyK8IMIu0C5NZFW7fyuVxbiEYbBUyp6gBwYB4=";
|
||||
hash = "sha256-vFjP/GesZg2G57zyF3LLDla9W+4gQyeAI3vAvSw+wls=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-5Xv1YvNEti1fzlu6Ev65dQfXyyFusvsnlRQUSCRjc4s=";
|
||||
vendorHash = "sha256-sMpYk2uXXt8oJ7HC3n9Gqa1cOvspxt0oof3E1fbRgco=";
|
||||
|
||||
subPackages = [ "cmd/weaviate-server" ];
|
||||
|
||||
|
||||
@@ -28,6 +28,10 @@ stdenv.mkDerivation {
|
||||
./0001-clang19-gcc15-compat.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt --replace-fail 'cmake_minimum_required(VERSION 3.2.0)' 'cmake_minimum_required(VERSION 3.10.0)'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [
|
||||
xercesc
|
||||
|
||||
@@ -37,6 +37,15 @@ let
|
||||
rev = "3179d35694a28267a0b6273fc9b5bdce3b6b1235";
|
||||
hash = "sha256-XvqqDXaFclWK/XpIxOqAXQ9gcc/dTljl841CN0KrlyA=";
|
||||
};
|
||||
|
||||
# CMake 4 compat
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail 'cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)' 'cmake_minimum_required(VERSION 3.10 FATAL_ERROR)'
|
||||
|
||||
substituteInPlace td/generate/tl-parser/CMakeLists.txt \
|
||||
--replace-fail 'cmake_minimum_required(VERSION 3.0 FATAL_ERROR)' 'cmake_minimum_required(VERSION 3.10 FATAL_ERROR)'
|
||||
'';
|
||||
}
|
||||
);
|
||||
in
|
||||
@@ -59,6 +68,19 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-zxxFvoj6jluGPCA9GQsxuYYweaSOVrkD01hZwCtq52U=";
|
||||
})
|
||||
|
||||
# Fix CMake 4 compatibility
|
||||
# Remove when version > 1.21
|
||||
(fetchpatch {
|
||||
name = "0002-teleports-CMakeLists.txt-Support-building-with-CMake-4.patch";
|
||||
url = "https://gitlab.com/ubports/development/apps/teleports/-/commit/ffb4e745889a473a208a86a29b7e439129930b01.patch";
|
||||
hash = "sha256-EdcCHH/0Zq8wcF6UPyvy16wntDeSqTV9LWQat91LNRo=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "0003-teleports-libs-qtdlib-CMakeLists.txt-Support-building-with-CMake-4.patch";
|
||||
url = "https://gitlab.com/ubports/development/apps/teleports/-/commit/fe7f0cb304ddaefae9f97917d3edc89de5f21b1f.patch";
|
||||
hash = "sha256-yIc/l6iHb5qWI0QZOx8Hhd0lgEYyPozL+AjrmF2L89k=";
|
||||
})
|
||||
|
||||
# Remove when https://gitlab.com/ubports/development/apps/teleports/-/merge_requests/586 merged & in release
|
||||
./1001-app-CMakeLists.txt-Drop-explicit-dependency-on-rlottie.patch
|
||||
];
|
||||
@@ -101,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
quazip
|
||||
quickflux
|
||||
rlottie
|
||||
tdlib-1811
|
||||
finalAttrs.passthru.tdlib
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
@@ -115,6 +137,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tdlib = tdlib-1811;
|
||||
|
||||
updateScript = gitUpdater { rev-prefix = "v"; };
|
||||
tests.vm = nixosTests.teleports;
|
||||
};
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
From 3dea0cc91b579de5e2c9db811f2e9e34079d3733 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
|
||||
Date: Mon, 1 Sep 2025 13:22:26 +0200
|
||||
Subject: [PATCH] {CMakeLists.txt,cmake/GtkDocScanGObjWrapper.cmake}: Bump
|
||||
cmake_minimum_required() to version 3.10.
|
||||
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
cmake/GtkDocScanGObjWrapper.cmake | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 5fbff8a..e7b863e 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 3.0)
|
||||
+cmake_minimum_required(VERSION 3.10)
|
||||
project(geonames VERSION 0.3.1 LANGUAGES C)
|
||||
|
||||
include(GNUInstallDirs)
|
||||
diff --git a/cmake/GtkDocScanGObjWrapper.cmake b/cmake/GtkDocScanGObjWrapper.cmake
|
||||
index b187ebb..b026ed0 100644
|
||||
--- a/cmake/GtkDocScanGObjWrapper.cmake
|
||||
+++ b/cmake/GtkDocScanGObjWrapper.cmake
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
# This is needed for find_package(PkgConfig) to work correctly --
|
||||
# CMAKE_MINIMUM_REQUIRED_VERSION needs to be defined.
|
||||
-cmake_minimum_required(VERSION 3.2)
|
||||
+cmake_minimum_required(VERSION 3.10)
|
||||
|
||||
if(NOT APPLE)
|
||||
# We use pkg-config to find glib et al
|
||||
--
|
||||
GitLab
|
||||
|
||||
@@ -42,6 +42,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"devdoc"
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Fix compat with CMake 4
|
||||
# Remove when https://gitlab.com/ubports/development/core/geonames/-/merge_requests/4 merged & in release
|
||||
./1001-geonames-cmake4-compat.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs src/generate-locales.sh tests/setup-test-env.sh
|
||||
'';
|
||||
|
||||
@@ -35,6 +35,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
url = "https://gitlab.com/ubports/development/core/gmenuharness/-/commit/70e9ed85792a6ac1950faaf26391ce91e69486ab.patch";
|
||||
hash = "sha256-jeue0qrl2JZCt/Yfj4jT210wsF/E+MlbtNT/yFTcw5I=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "0002-gmenuharness-CMakeLists.txt-Bump-cmake_minimum_required-to-version-3.10.patch";
|
||||
url = "https://gitlab.com/ubports/development/core/gmenuharness/-/commit/42d04e0d484b3715e7b9935e3ef3e2fa6c33b409.patch";
|
||||
hash = "sha256-Gyk8TxIfEWsqL9CGymmnVA/Xj4/+J1PRNmWikNEcRJ8=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lomiri-api";
|
||||
version = "0.2.2";
|
||||
version = "0.2.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "ubports";
|
||||
repo = "development/core/lomiri-api";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-+ttmtvt18NMKYfGntEXgBOSJ3lW9Bf55327XYIzxMh8=";
|
||||
hash = "sha256-ypz15XX0ESkOWI6G+a9/36bRg5gBG0X4Y/EvB/m7qm8=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
@@ -40,13 +40,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
patchShebangs $(find test -name '*.py')
|
||||
|
||||
substituteInPlace data/liblomiri-api.pc.in \
|
||||
--replace "\''${prefix}/@CMAKE_INSTALL_LIBDIR@" '@CMAKE_INSTALL_FULL_LIBDIR@'
|
||||
--replace-fail "\''${prefix}/@CMAKE_INSTALL_LIBDIR@" '@CMAKE_INSTALL_FULL_LIBDIR@'
|
||||
|
||||
# Variable is queried via pkg-config by reverse dependencies
|
||||
# TODO This is likely not supposed to be the regular Qt QML import prefix
|
||||
# but otherwise i.e. lomiri-notifications cannot be found in lomiri
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace 'SHELL_PLUGINDIR ''${CMAKE_INSTALL_LIBDIR}/lomiri/qml' 'SHELL_PLUGINDIR ${qtbase.qtQmlPrefix}'
|
||||
--replace-fail 'SHELL_PLUGINDIR ''${CMAKE_INSTALL_LIBDIR}/lomiri/qml' 'SHELL_PLUGINDIR ${qtbase.qtQmlPrefix}'
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitLab,
|
||||
fetchpatch,
|
||||
testers,
|
||||
cmake,
|
||||
cmake-extras,
|
||||
@@ -37,13 +36,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# Not regular qtmir, experimental support for Mir 2.x
|
||||
# Currently following https://gitlab.com/ubports/development/core/qtmir/-/tree/personal/sunweaver/debian-upstream
|
||||
pname = "qtmir-debian-upstream";
|
||||
version = "0.8.0-unstable-2024-03-06";
|
||||
version = "0.8.0-unstable-2025-05-20";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "ubports";
|
||||
repo = "development/core/qtmir";
|
||||
rev = "de639c3a482ac6c59b9be02abb839a8c96158041";
|
||||
hash = "sha256-AKSzkGl6bAoR4I2lolNRUp67VS/PiZnrPpCYtTlKWKc=";
|
||||
rev = "b35762f5198873560138a810b387ae9401615c02";
|
||||
hash = "sha256-v5mdu3XLK4F5O56GDItyeCFsFMey4JaNWwXRlgjKFMA=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
@@ -51,37 +50,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"dev"
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Mir 2.15 compatibility patch
|
||||
# Remove when https://gitlab.com/ubports/development/core/qtmir/-/merge_requests/70 merged into branch
|
||||
(fetchpatch {
|
||||
name = "0001-qtmir-Update-for-Mir-2.15-removals.patch";
|
||||
url = "https://gitlab.com/ubports/development/core/qtmir/-/commit/ead5cacd4d69094ab956627f4dd94ecaff1fd69e.patch";
|
||||
hash = "sha256-hUUUnYwhNH3gm76J21M8gA5okaRd/Go03ZFJ4qn0JUo=";
|
||||
})
|
||||
|
||||
# Remove when https://gitlab.com/ubports/development/core/qtmir/-/merge_requests/72 merged in branch
|
||||
(fetchpatch {
|
||||
name = "0002-qtmir-Add-more-better-GNUInstallDirs-variables-usage.patch";
|
||||
url = "https://gitlab.com/ubports/development/core/qtmir/-/commit/87e2cd31052ce15e9625c1327807a320ee5d12af.patch";
|
||||
hash = "sha256-MTE9tHw+xJhraEO1up7dLg0UIcmfHXgWOeuyYrVu2wc=";
|
||||
})
|
||||
|
||||
# Remove when https://gitlab.com/ubports/development/core/qtmir/-/merge_requests/73 merged in branch
|
||||
(fetchpatch {
|
||||
name = "0003-qtmir-CMakeLists-Only-require-test-dependencies-when-building-tests.patch";
|
||||
url = "https://gitlab.com/ubports/development/core/qtmir/-/commit/b7144e67bcbb4cfbd2283d5d05146fb22b7d8cd4.patch";
|
||||
hash = "sha256-Afbj40MopztchDnk6fphTYk86YrQkiK8L1e/oXiL1Mw=";
|
||||
})
|
||||
|
||||
# Remove when https://gitlab.com/ubports/development/core/qtmir/-/merge_requests/74 merged in branch
|
||||
(fetchpatch {
|
||||
name = "0004-qtmir-CMakeLists-Drop-call-of-Qt-internal-macro.patch";
|
||||
url = "https://gitlab.com/ubports/development/core/qtmir/-/commit/8f9c599a4dbc4cf35e289157fd0c82df55b9f8d9.patch";
|
||||
hash = "sha256-SMAErXnlMtVleWRPgO4xuUI7gAAy6W18LxtgXgetRA4=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# 10s timeout for Mir startup is too tight for VM tests on weaker hardwre (aarch64)
|
||||
substituteInPlace src/platforms/mirserver/qmirserver_p.cpp \
|
||||
|
||||
@@ -56,6 +56,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# Fix compatibility with glog 0.7.x
|
||||
# Remove when https://gitlab.com/ubports/development/core/trust-store/-/merge_requests/18 merged & in release
|
||||
./1001-treewide-Switch-to-glog-CMake-module.patch
|
||||
|
||||
# Fix compatibility with CMake 4 and beyond (for now)
|
||||
# Remove when version > 2.0.2
|
||||
(fetchpatch {
|
||||
name = "1002-trust-store-CMakeLists.txt-Bump-minimum-version-to-3.10.patch";
|
||||
url = "https://gitlab.com/ubports/development/core/trust-store/-/commit/64bc51f45e1407f16d389120508c2bcddf9e0d5b.patch";
|
||||
hash = "sha256-+ZkTQd6wphd29dTmEIBI7nADFjPQD5012/FVFOtdGbI=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitLab,
|
||||
fetchpatch,
|
||||
gitUpdater,
|
||||
cmake,
|
||||
lomiri-api,
|
||||
lomiri-indicator-network,
|
||||
@@ -13,24 +13,15 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lomiri-push-qml";
|
||||
version = "0-unstable-2022-09-15";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "ubports";
|
||||
repo = "development/core/lomiri-push-qml";
|
||||
rev = "6f87ee5cf92e2af0e0ce672835e71704e236b8c0";
|
||||
hash = "sha256-ezLcQRJ7Sq/TVbeGJL3Vq2lzBe7StRRCrWXZs2CCUX8=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-1HJkcAe5ixqmEACy4mSk5dSCPf4FsY3tzH6v09SSH+M=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Remove when https://gitlab.com/ubports/development/core/lomiri-push-qml/-/merge_requests/6 merged
|
||||
(fetchpatch {
|
||||
name = "0001-lomiri-push-qml-Stop-using-qt5_use_modules.patch";
|
||||
url = "https://gitlab.com/ubports/development/core/lomiri-push-qml/-/commit/a4268c98b9f50fdd52da69c173d377f78ea93104.patch";
|
||||
hash = "sha256-OijTB5+I9/wabT7dX+DkvoEROKzAUIKhBZkkhqq5Oig=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Queries QMake for QML install location, returns QtBase build path
|
||||
substituteInPlace src/*/PushNotifications/CMakeLists.txt \
|
||||
@@ -64,6 +55,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix}
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Lomiri Push Notifications QML plugin";
|
||||
homepage = "https://gitlab.com/ubports/development/core/lomiri-push-qml";
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lomiri-settings-components";
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "ubports";
|
||||
repo = "development/core/lomiri-settings-components";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-H7G3dzzitdyahB/MwgtfRBpo+qMOhmQSzN4EGYculks=";
|
||||
hash = "sha256-WKLdTiTVfgX9IAVPsRGx7GWBbYMI9iICXevzrfuHPGc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
-25
@@ -1,25 +0,0 @@
|
||||
From e8893fcae7e732c9e15ccd6d54a62b5b3862e445 Mon Sep 17 00:00:00 2001
|
||||
From: OPNA2608 <opna2608@protonmail.com>
|
||||
Date: Thu, 16 Jan 2025 17:12:36 +0100
|
||||
Subject: [PATCH 1/5] doc/liblomiri-thumbnailer-qt: Honour CMAKE_INSTALL_DOCDIR
|
||||
|
||||
---
|
||||
doc/liblomiri-thumbnailer-qt/CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/doc/liblomiri-thumbnailer-qt/CMakeLists.txt b/doc/liblomiri-thumbnailer-qt/CMakeLists.txt
|
||||
index 91e12a0..3e96f80 100644
|
||||
--- a/doc/liblomiri-thumbnailer-qt/CMakeLists.txt
|
||||
+++ b/doc/liblomiri-thumbnailer-qt/CMakeLists.txt
|
||||
@@ -28,7 +28,7 @@ add_doxygen(
|
||||
)
|
||||
|
||||
install(DIRECTORY ${PROJECT_BINARY_DIR}/doc/liblomiri-thumbnailer-qt/html
|
||||
- DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/doc/liblomiri-thumbnailer-qt)
|
||||
+ DESTINATION ${CMAKE_INSTALL_DOCDIR})
|
||||
|
||||
add_subdirectory(examples)
|
||||
|
||||
--
|
||||
2.47.0
|
||||
|
||||
@@ -1,97 +0,0 @@
|
||||
From 37687a195052186432923276bc2c2358b3622ab1 Mon Sep 17 00:00:00 2001
|
||||
From: OPNA2608 <opna2608@protonmail.com>
|
||||
Date: Thu, 16 Jan 2025 17:12:44 +0100
|
||||
Subject: [PATCH 2/5] Re-enable documentation
|
||||
|
||||
---
|
||||
CMakeLists.txt | 6 +++++-
|
||||
debian/liblomiri-thumbnailer-qt-doc.install | 1 +
|
||||
...lomiri-thumbnailer-qt-doc.install.disabled | 1 -
|
||||
doc/liblomiri-thumbnailer-qt/CMakeLists.txt | 21 ++++++++-----------
|
||||
4 files changed, 15 insertions(+), 14 deletions(-)
|
||||
create mode 100644 debian/liblomiri-thumbnailer-qt-doc.install
|
||||
delete mode 100644 debian/liblomiri-thumbnailer-qt-doc.install.disabled
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 464ac70..cade10f 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -184,7 +184,11 @@ if (${BUILD_TESTING})
|
||||
endif()
|
||||
add_subdirectory(include)
|
||||
add_subdirectory(man)
|
||||
-#add_subdirectory(doc)
|
||||
+
|
||||
+option(ENABLE_DOC "Build documentation" ON)
|
||||
+if(ENABLE_DOC)
|
||||
+ add_subdirectory(doc)
|
||||
+endif()
|
||||
|
||||
#enable_coverage_report(
|
||||
# TARGETS
|
||||
diff --git a/debian/liblomiri-thumbnailer-qt-doc.install b/debian/liblomiri-thumbnailer-qt-doc.install
|
||||
new file mode 100644
|
||||
index 0000000..ff56aee
|
||||
--- /dev/null
|
||||
+++ b/debian/liblomiri-thumbnailer-qt-doc.install
|
||||
@@ -0,0 +1 @@
|
||||
+usr/share/doc/lomiri-thumbnailer/*
|
||||
diff --git a/debian/liblomiri-thumbnailer-qt-doc.install.disabled b/debian/liblomiri-thumbnailer-qt-doc.install.disabled
|
||||
deleted file mode 100644
|
||||
index db055cf..0000000
|
||||
--- a/debian/liblomiri-thumbnailer-qt-doc.install.disabled
|
||||
+++ /dev/null
|
||||
@@ -1 +0,0 @@
|
||||
-usr/share/doc/liblomiri-thumbnailer-qt/*
|
||||
diff --git a/doc/liblomiri-thumbnailer-qt/CMakeLists.txt b/doc/liblomiri-thumbnailer-qt/CMakeLists.txt
|
||||
index 3e96f80..fe98e4c 100644
|
||||
--- a/doc/liblomiri-thumbnailer-qt/CMakeLists.txt
|
||||
+++ b/doc/liblomiri-thumbnailer-qt/CMakeLists.txt
|
||||
@@ -1,35 +1,32 @@
|
||||
-include(UseDoxygen OPTIONAL)
|
||||
+find_package(DoxygenBuilder REQUIRED)
|
||||
|
||||
file(GLOB libthumbnailer_headers "${PROJECT_SOURCE_DIR}/include/lomiri/thumbnailer/qt/*.h")
|
||||
|
||||
add_doxygen(
|
||||
liblomiri-thumbnailer-qt-doc
|
||||
+ PROJECT_NAME
|
||||
+ "Thumbnailer Qt API"
|
||||
INPUT
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/tutorial.dox
|
||||
${libthumbnailer_headers}
|
||||
- OUTPUT_DIRECTORY
|
||||
- ${CMAKE_BINARY_DIR}/doc/liblomiri-thumbnailer-qt
|
||||
+ EXAMPLE_PATH
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
STRIP_FROM_PATH
|
||||
"${CMAKE_SOURCE_DIR}/src"
|
||||
STRIP_FROM_INC_PATH
|
||||
"${CMAKE_SOURCE_DIR}/include"
|
||||
+ DOXYFILE_IN
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in
|
||||
EXCLUDE_PATTERNS
|
||||
*/internal/*
|
||||
EXCLUDE_SYMBOLS
|
||||
*::internal*
|
||||
*::Priv
|
||||
- EXAMPLE_PATH
|
||||
- ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
- DOXYFILE_IN
|
||||
- ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in
|
||||
- PROJECT_NAME
|
||||
- "Thumbnailer Qt API"
|
||||
+ INSTALL
|
||||
+ ${CMAKE_INSTALL_DOCDIR}
|
||||
ALL
|
||||
)
|
||||
|
||||
-install(DIRECTORY ${PROJECT_BINARY_DIR}/doc/liblomiri-thumbnailer-qt/html
|
||||
- DESTINATION ${CMAKE_INSTALL_DOCDIR})
|
||||
-
|
||||
add_subdirectory(examples)
|
||||
|
||||
list(APPEND UNIT_TEST_TARGETS qt_example_test)
|
||||
--
|
||||
2.47.0
|
||||
|
||||
-25
@@ -1,25 +0,0 @@
|
||||
From 010d19f85f4f8d73f96f054e5d293951fae1f9de Mon Sep 17 00:00:00 2001
|
||||
From: OPNA2608 <opna2608@protonmail.com>
|
||||
Date: Thu, 16 Jan 2025 17:12:45 +0100
|
||||
Subject: [PATCH 3/5] doc/liblomiri-thumbnailer-qt/examples: Drop
|
||||
qt5_use_modules usage
|
||||
|
||||
Leftover from a0d81863f3f48717507cfa181030a8ffb0c4e881
|
||||
---
|
||||
doc/liblomiri-thumbnailer-qt/examples/CMakeLists.txt | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/doc/liblomiri-thumbnailer-qt/examples/CMakeLists.txt b/doc/liblomiri-thumbnailer-qt/examples/CMakeLists.txt
|
||||
index db8139f..825a821 100644
|
||||
--- a/doc/liblomiri-thumbnailer-qt/examples/CMakeLists.txt
|
||||
+++ b/doc/liblomiri-thumbnailer-qt/examples/CMakeLists.txt
|
||||
@@ -1,6 +1,5 @@
|
||||
include_directories(${CMAKE_BINARY_DIR}/tests ${CMAKE_SOURCE_DIR}/tests)
|
||||
add_executable(qt_example_test qt_example_test.cpp)
|
||||
-qt5_use_modules(qt_example_test Core Gui Network Test)
|
||||
target_link_libraries(qt_example_test
|
||||
gtest
|
||||
Qt5::Core
|
||||
--
|
||||
2.47.0
|
||||
|
||||
-131
@@ -1,131 +0,0 @@
|
||||
From ffec02835aa44e93c96c48b7a33be3f51a3571a1 Mon Sep 17 00:00:00 2001
|
||||
From: OPNA2608 <opna2608@protonmail.com>
|
||||
Date: Thu, 16 Jan 2025 17:12:46 +0100
|
||||
Subject: [PATCH 4/5] Re-enable coverge reporting
|
||||
|
||||
---
|
||||
CMakeLists.txt | 51 +++++++++++++--------
|
||||
doc/CMakeLists.txt | 6 ++-
|
||||
doc/liblomiri-thumbnailer-qt/CMakeLists.txt | 8 ++--
|
||||
tests/CMakeLists.txt | 2 -
|
||||
4 files changed, 40 insertions(+), 27 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index cade10f..cbfd9c0 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -134,7 +134,14 @@ endif()
|
||||
|
||||
include(CTest)
|
||||
|
||||
-#include(EnableCoverageReport)
|
||||
+if (cmake_build_type_lower MATCHES coverage)
|
||||
+ find_package(CoverageReport REQUIRED)
|
||||
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftest-coverage -fprofile-arcs" )
|
||||
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ftest-coverage -fprofile-arcs" )
|
||||
+ set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -coverage" )
|
||||
+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -coverage" )
|
||||
+endif()
|
||||
+
|
||||
|
||||
include(cmake/UseGSettings.cmake)
|
||||
|
||||
@@ -169,6 +176,8 @@ include_directories(${TAGLIB_DEPS_INCLUDE_DIRS})
|
||||
include_directories(include)
|
||||
include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
|
||||
|
||||
+set(UNIT_TEST_TARGETS "")
|
||||
+
|
||||
add_subdirectory(src)
|
||||
add_subdirectory(data)
|
||||
add_subdirectory(plugins/Lomiri/Thumbnailer.0.1)
|
||||
@@ -190,22 +199,24 @@ if(ENABLE_DOC)
|
||||
add_subdirectory(doc)
|
||||
endif()
|
||||
|
||||
-#enable_coverage_report(
|
||||
-# TARGETS
|
||||
-# recovery_test # Need to turn on coverage for this, to get the helper template instrumented.
|
||||
-# testutils
|
||||
-# test-seq
|
||||
-# thumbnailer-admin
|
||||
-# thumbnailer-qml
|
||||
-# thumbnailer-qml-static
|
||||
-# lomiri-thumbnailer-qt
|
||||
-# thumbnailer-service
|
||||
-# thumbnailer-static
|
||||
-# vs-thumb
|
||||
-# vs-thumb-static
|
||||
-# FILTER
|
||||
-# ${CMAKE_SOURCE_DIR}/tests/*
|
||||
-# ${CMAKE_BINARY_DIR}/*
|
||||
-# TESTS
|
||||
-# ${UNIT_TEST_TARGETS}
|
||||
-#)
|
||||
+if (cmake_build_type_lower MATCHES coverage)
|
||||
+ enable_coverage_report(
|
||||
+ TARGETS
|
||||
+ recovery_test # Need to turn on coverage for this, to get the helper template instrumented.
|
||||
+ testutils
|
||||
+ test-seq
|
||||
+ lomiri-thumbnailer-admin
|
||||
+ LomiriThumbnailer-qml
|
||||
+ thumbnailer-qml-static
|
||||
+ lomiri-thumbnailer-qt
|
||||
+ thumbnailer-service
|
||||
+ thumbnailer-static
|
||||
+ vs-thumb
|
||||
+ vs-thumb-static
|
||||
+ FILTER
|
||||
+ ${CMAKE_SOURCE_DIR}/tests/*
|
||||
+ ${CMAKE_BINARY_DIR}/*
|
||||
+ TESTS
|
||||
+ ${UNIT_TEST_TARGETS}
|
||||
+ )
|
||||
+endif()
|
||||
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
|
||||
index 11f4449..249f5e0 100644
|
||||
--- a/doc/CMakeLists.txt
|
||||
+++ b/doc/CMakeLists.txt
|
||||
@@ -1,4 +1,6 @@
|
||||
add_subdirectory(liblomiri-thumbnailer-qt)
|
||||
|
||||
-list(APPEND UNIT_TEST_TARGETS qt_example_test)
|
||||
-set(UNIT_TEST_TARGETS ${UNIT_TEST_TARGETS} PARENT_SCOPE)
|
||||
+if(BUILD_TESTING)
|
||||
+ list(APPEND UNIT_TEST_TARGETS qt_example_test)
|
||||
+ set(UNIT_TEST_TARGETS ${UNIT_TEST_TARGETS} PARENT_SCOPE)
|
||||
+endif()
|
||||
diff --git a/doc/liblomiri-thumbnailer-qt/CMakeLists.txt b/doc/liblomiri-thumbnailer-qt/CMakeLists.txt
|
||||
index fe98e4c..078be07 100644
|
||||
--- a/doc/liblomiri-thumbnailer-qt/CMakeLists.txt
|
||||
+++ b/doc/liblomiri-thumbnailer-qt/CMakeLists.txt
|
||||
@@ -27,7 +27,9 @@ add_doxygen(
|
||||
ALL
|
||||
)
|
||||
|
||||
-add_subdirectory(examples)
|
||||
+if(BUILD_TESTING)
|
||||
+ add_subdirectory(examples)
|
||||
|
||||
-list(APPEND UNIT_TEST_TARGETS qt_example_test)
|
||||
-set(UNIT_TEST_TARGETS ${UNIT_TEST_TARGETS} PARENT_SCOPE)
|
||||
+ list(APPEND UNIT_TEST_TARGETS qt_example_test)
|
||||
+ set(UNIT_TEST_TARGETS ${UNIT_TEST_TARGETS} PARENT_SCOPE)
|
||||
+endif()
|
||||
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
|
||||
index 03a4900..97cb3a1 100644
|
||||
--- a/tests/CMakeLists.txt
|
||||
+++ b/tests/CMakeLists.txt
|
||||
@@ -42,8 +42,6 @@ set(slow_test_dirs
|
||||
stress
|
||||
)
|
||||
|
||||
-set(UNIT_TEST_TARGETS "")
|
||||
-
|
||||
foreach(dir ${unit_test_dirs})
|
||||
add_subdirectory(${dir})
|
||||
list(APPEND UNIT_TEST_TARGETS "${dir}_test")
|
||||
--
|
||||
2.47.0
|
||||
|
||||
-38
@@ -1,38 +0,0 @@
|
||||
From d9152f5e1f77a6c3bbc759eec58811410de7b85a Mon Sep 17 00:00:00 2001
|
||||
From: OPNA2608 <opna2608@protonmail.com>
|
||||
Date: Thu, 16 Jan 2025 17:12:49 +0100
|
||||
Subject: [PATCH 5/5] Make GTest available to example test
|
||||
|
||||
---
|
||||
CMakeLists.txt | 2 ++
|
||||
tests/CMakeLists.txt | 1 -
|
||||
2 files changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index cbfd9c0..0663b44 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -189,6 +189,8 @@ if (${BUILD_TESTING})
|
||||
find_package(Qt5QuickTest REQUIRED)
|
||||
find_package(Qt5Network REQUIRED)
|
||||
|
||||
+ find_package(GMock REQUIRED)
|
||||
+
|
||||
add_subdirectory(tests)
|
||||
endif()
|
||||
add_subdirectory(include)
|
||||
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
|
||||
index 97cb3a1..92eae14 100644
|
||||
--- a/tests/CMakeLists.txt
|
||||
+++ b/tests/CMakeLists.txt
|
||||
@@ -3,7 +3,6 @@
|
||||
|
||||
set(old_cxx_flags ${CMAKE_CXX_FLAGS})
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wno-old-style-cast -Wno-missing-field-initializers")
|
||||
-find_package(GMock)
|
||||
set(CMAKE_CXX_FLAGS ${old_cxx_flags})
|
||||
|
||||
set(TESTDATADIR ${CMAKE_CURRENT_SOURCE_DIR}/media)
|
||||
--
|
||||
2.47.0
|
||||
|
||||
@@ -33,13 +33,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lomiri-thumbnailer";
|
||||
version = "3.0.4";
|
||||
version = "3.0.5";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "ubports";
|
||||
repo = "development/core/lomiri-thumbnailer";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-pf/bzpooCcoIGb5JtSnowePcobcfVSzHyBaEkb51IOg=";
|
||||
hash = "sha256-TfBGcHg9y9G2Rxs/OpZ8CcQrhK05gijZjVxOYSTkJJ8=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
@@ -49,21 +49,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Fix compat with taglib 2.x
|
||||
# Remove when version > 3.0.4
|
||||
(fetchpatch {
|
||||
name = "0001-lomiri-thumbnailer-Fix-taglib-2.x-compat.patch";
|
||||
url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/b7f1055e36cd6e33314bb9f6648f93e977a33267.patch";
|
||||
hash = "sha256-9RHtxqsgdMkgIyswaeL5yS6+o/YvzT+HgRD8KL/RfNM=";
|
||||
})
|
||||
|
||||
# Remove when https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/merge_requests/23 merged & in release
|
||||
./1001-doc-liblomiri-thumbnailer-qt-Honour-CMAKE_INSTALL_DO.patch
|
||||
./1002-Re-enable-documentation.patch
|
||||
./1003-doc-liblomiri-thumbnailer-qt-examples-Drop-qt5_use_m.patch
|
||||
./1004-Re-enable-coverge-reporting.patch
|
||||
./1005-Make-GTest-available-to-example-test.patch
|
||||
|
||||
# In aarch64 lomiri-gallery-app VM tests, default 10s timeout for thumbnail extractor is often too tight
|
||||
# Raise to 20s to work around this (too much more will run into D-Bus' call timeout)
|
||||
./2001-Raise-default-extraction-timeout.patch
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
lib,
|
||||
fetchFromGitLab,
|
||||
fetchpatch,
|
||||
gitUpdater,
|
||||
testers,
|
||||
cmake,
|
||||
cmake-extras,
|
||||
@@ -17,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libqtdbustest";
|
||||
version = "0.3.2";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "ubports";
|
||||
repo = "development/core/libqtdbustest";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-yqqyKxsbqiVTrkas79YoPMi28dKFNntiE7+dx1v+Qh4=";
|
||||
hash = "sha256-49YIkaQ2ceJxaPLkzOg+L3bwiPzoB36xU7skRh4vYQg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -90,11 +91,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
passthru = {
|
||||
tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
updateScript = gitUpdater { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for testing DBus interactions using Qt";
|
||||
homepage = "https://launchpad.net/libqtdbustest";
|
||||
homepage = "https://gitlab.com/ubports/development/core/libqtdbustest";
|
||||
license = licenses.lgpl3Only;
|
||||
platforms = platforms.unix;
|
||||
teams = [ teams.lomiri ];
|
||||
|
||||
@@ -70,18 +70,3 @@ diff '--color=auto' -ur '--color=never' a/tests/libqtdbustest/TestQProcessDBusSe
|
||||
+ "python3",
|
||||
QStringList() << "-m" << "dbusmock" << "not.test.name"
|
||||
<< "/test/object" << "test.Interface");
|
||||
|
||||
diff '--color=auto' -ur '--color=never' a/tests/libqtdbustest/TestSuicidalProcess.cpp b/tests/libqtdbustest/TestSuicidalProcess.cpp
|
||||
--- a/tests/libqtdbustest/TestSuicidalProcess.cpp 2023-01-20 21:36:16.948292559 +0100
|
||||
+++ b/tests/libqtdbustest/TestSuicidalProcess.cpp 2023-01-20 21:55:07.219951081 +0100
|
||||
@@ -51,9 +51,7 @@
|
||||
pgrep.waitForFinished();
|
||||
pgrep.waitForReadyRead();
|
||||
|
||||
- EXPECT_TRUE(QString::fromUtf8(pgrep.readAll().trimmed())
|
||||
- .toStdString()
|
||||
- .find("sleep 5") != std::string::npos);
|
||||
+ EXPECT_TRUE(pgrep.readAll().contains("sleep 5"));
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
@@ -29,6 +29,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail 'quickflux STATIC' 'quickflux' \
|
||||
--replace-fail 'DESTINATION include' 'DESTINATION ''${CMAKE_INSTALL_INCLUDEDIR}'
|
||||
|
||||
# Fix CMake 4 compat
|
||||
# https://github.com/benlau/quickflux/pull/37
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail 'cmake_minimum_required(VERSION 3.0.0)' 'cmake_minimum_required(VERSION 3.10)'
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.4.20";
|
||||
version = "0.4.21";
|
||||
in
|
||||
buildPecl {
|
||||
inherit version;
|
||||
@@ -16,7 +16,7 @@ buildPecl {
|
||||
owner = "NoiseByNorthwest";
|
||||
repo = "php-spx";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2MOl9waWY3zK5NzQ19TJKK8kE7xC4K+e9AwV+wyAHZc=";
|
||||
hash = "sha256-3rVnKUZZXLxoKCW717pCiPOVWDudQpoN8lC1jQzpwuw=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "pylint-odoo";
|
||||
version = "9.3.18";
|
||||
version = "9.3.21";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OCA";
|
||||
repo = "pylint-odoo";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-8nrAwjfz28INoLD4xuQ/R5lYodZjw/PqBdZAF+wBXN0=";
|
||||
hash = "sha256-qNZHk8bl1mxaLzS55oV29iKGDfIKumQgME1V9PIx4vQ=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
babel,
|
||||
click,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
sphinx,
|
||||
pytestCheckHook,
|
||||
mock,
|
||||
@@ -23,7 +24,10 @@ buildPythonPackage rec {
|
||||
hash = "sha256-5Ro+UG9pwwp656fYyCsna6P4s9Gb86Tu3Qm2WUI7tsE=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
babel
|
||||
|
||||
@@ -3,36 +3,26 @@
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
fetchpatch,
|
||||
mock,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
let
|
||||
pname = "supervisor";
|
||||
version = "4.2.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
version = "4.3.0";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-NHYbrhojxYGSKBpRFfsH+/IsmwEzwIFmvv/HD+0+vBI=";
|
||||
hash = "sha256-SivxSa30KZfhu0S3DEO2EydeyYUsPtrMqGqRZrJ+lF4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# adapted from 49b74cafb6e72e0e620e321711c1b81a0823be12
|
||||
./fix-python313-unittest.patch
|
||||
# Fix SubprocessTests.test_getProcessStateDescription on python 3.13
|
||||
(fetchpatch {
|
||||
url = "https://github.com/Supervisor/supervisor/commit/27efcd59b454e4f3a81e5e1b02ab0d8d0ff2f45f.patch";
|
||||
hash = "sha256-9KNcdRJwnZJA00dDy/mAS7RJuBei60YzVhWkeQgmJ8c=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ setuptools ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
# wants to write to /tmp/foo which is likely already owned by another
|
||||
# nixbld user on hydra
|
||||
@@ -45,11 +35,11 @@ buildPythonPackage rec {
|
||||
|
||||
pythonImportsCheck = [ "supervisor" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "System for controlling process state under UNIX";
|
||||
homepage = "https://supervisord.org/";
|
||||
changelog = "https://github.com/Supervisor/supervisor/blob/${version}/CHANGES.rst";
|
||||
license = licenses.free; # http://www.repoze.org/LICENSE.txt
|
||||
maintainers = with maintainers; [ zimbatm ];
|
||||
license = lib.licenses.free; # http://www.repoze.org/LICENSE.txt
|
||||
maintainers = with lib.maintainers; [ zimbatm ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,337 +0,0 @@
|
||||
From e18f91d4ddbc30920c828e782ce40fbe844fcab9 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Naberezny <mike@naberezny.com>
|
||||
Date: Sun, 25 Dec 2022 10:58:24 -0800
|
||||
Subject: [PATCH] Remove unused test_suite() that now causes unittest and
|
||||
pytest warnings
|
||||
|
||||
supervisor/tests/test_confecho.py::test_suite
|
||||
/home/runner/work/supervisor/supervisor/supervisor/tests/test_confecho.py:18: DeprecationWarning: unittest.findTestCases() is deprecated and will be removed in Python 3.13. Please use unittest.TestLoader.loadTestsFromModule() instead.
|
||||
return unittest.findTestCases(sys.modules[__name__])
|
||||
|
||||
supervisor/tests/test_confecho.py::test_suite
|
||||
/home/runner/work/supervisor/supervisor/.tox/py311/lib/python3.11/site-packages/_pytest/python.py:199: PytestReturnNotNoneWarning: Expected None, but supervisor/tests/test_confecho.py::test_suite returned <unittest.suite.TestSuite tests=[<unittest.suite.TestSuite tests=[<supervisor.tests.test_confecho.TopLevelFunctionTests testMethod=test_main_writes_data_out_that_looks_like_a_config_file>]>]>, which will be an error in a future version of pytest. Did you mean to use `assert` instead of `return`?
|
||||
---
|
||||
supervisor/tests/test_childutils.py | 7 -------
|
||||
supervisor/tests/test_confecho.py | 7 -------
|
||||
supervisor/tests/test_dispatchers.py | 6 ------
|
||||
supervisor/tests/test_end_to_end.py | 6 ------
|
||||
supervisor/tests/test_events.py | 7 -------
|
||||
supervisor/tests/test_http.py | 6 ------
|
||||
supervisor/tests/test_loggers.py | 6 ------
|
||||
supervisor/tests/test_options.py | 7 -------
|
||||
supervisor/tests/test_poller.py | 7 -------
|
||||
supervisor/tests/test_rpcinterfaces.py | 8 --------
|
||||
supervisor/tests/test_socket_manager.py | 20 --------------------
|
||||
supervisor/tests/test_states.py | 7 -------
|
||||
supervisor/tests/test_supervisorctl.py | 7 -------
|
||||
supervisor/tests/test_supervisord.py | 7 -------
|
||||
supervisor/tests/test_templating.py | 9 ---------
|
||||
supervisor/tests/test_web.py | 6 ------
|
||||
supervisor/tests/test_xmlrpc.py | 1 -
|
||||
17 files changed, 124 deletions(-)
|
||||
|
||||
diff --git a/supervisor/tests/test_childutils.py b/supervisor/tests/test_childutils.py
|
||||
index f2b39d8..94193fc 100644
|
||||
--- a/supervisor/tests/test_childutils.py
|
||||
+++ b/supervisor/tests/test_childutils.py
|
||||
@@ -132,10 +132,3 @@ class TestEventListenerProtocol(unittest.TestCase):
|
||||
listener.send(msg, stdout)
|
||||
expected = '%s%s\n%s' % (begin, len(msg), msg)
|
||||
self.assertEqual(stdout.getvalue(), expected)
|
||||
-
|
||||
-
|
||||
-def test_suite():
|
||||
- return unittest.findTestCases(sys.modules[__name__])
|
||||
-
|
||||
-if __name__ == '__main__':
|
||||
- unittest.main(defaultTest='test_suite')
|
||||
diff --git a/supervisor/tests/test_confecho.py b/supervisor/tests/test_confecho.py
|
||||
index 6ae5108..f35f845 100644
|
||||
--- a/supervisor/tests/test_confecho.py
|
||||
+++ b/supervisor/tests/test_confecho.py
|
||||
@@ -12,10 +12,3 @@ class TopLevelFunctionTests(unittest.TestCase):
|
||||
|
||||
output = sio.getvalue()
|
||||
self.assertTrue("[supervisord]" in output)
|
||||
-
|
||||
-
|
||||
-def test_suite():
|
||||
- return unittest.findTestCases(sys.modules[__name__])
|
||||
-
|
||||
-if __name__ == '__main__':
|
||||
- unittest.main(defaultTest='test_suite')
|
||||
diff --git a/supervisor/tests/test_dispatchers.py b/supervisor/tests/test_dispatchers.py
|
||||
index 87692e2..ee6e44a 100644
|
||||
--- a/supervisor/tests/test_dispatchers.py
|
||||
+++ b/supervisor/tests/test_dispatchers.py
|
||||
@@ -1227,9 +1227,3 @@ class stripEscapeTests(unittest.TestCase):
|
||||
def test_noansi(self):
|
||||
noansi = b'Hello world... this is longer than a token!'
|
||||
self.assertEqual(self._callFUT(noansi), noansi)
|
||||
-
|
||||
-def test_suite():
|
||||
- return unittest.findTestCases(sys.modules[__name__])
|
||||
-
|
||||
-if __name__ == '__main__':
|
||||
- unittest.main(defaultTest='test_suite')
|
||||
diff --git a/supervisor/tests/test_end_to_end.py b/supervisor/tests/test_end_to_end.py
|
||||
index dd5c977..763da48 100644
|
||||
--- a/supervisor/tests/test_end_to_end.py
|
||||
+++ b/supervisor/tests/test_end_to_end.py
|
||||
@@ -419,9 +419,3 @@ class EndToEndTests(BaseTestCase):
|
||||
finally:
|
||||
transport.close()
|
||||
self.assertEqual(ident, "from_command_line")
|
||||
-
|
||||
-def test_suite():
|
||||
- return unittest.findTestCases(sys.modules[__name__])
|
||||
-
|
||||
-if __name__ == '__main__':
|
||||
- unittest.main(defaultTest='test_suite')
|
||||
diff --git a/supervisor/tests/test_events.py b/supervisor/tests/test_events.py
|
||||
index bd33a0c..a432da8 100644
|
||||
--- a/supervisor/tests/test_events.py
|
||||
+++ b/supervisor/tests/test_events.py
|
||||
@@ -508,10 +508,3 @@ class TestUtilityFunctions(unittest.TestCase):
|
||||
self.assertTrue(events.EventTypes.FOO is FooEvent)
|
||||
finally:
|
||||
del events.EventTypes.FOO
|
||||
-
|
||||
-def test_suite():
|
||||
- return unittest.findTestCases(sys.modules[__name__])
|
||||
-
|
||||
-if __name__ == '__main__':
|
||||
- unittest.main(defaultTest='test_suite')
|
||||
-
|
||||
diff --git a/supervisor/tests/test_http.py b/supervisor/tests/test_http.py
|
||||
index 1198597..f4c4496 100644
|
||||
--- a/supervisor/tests/test_http.py
|
||||
+++ b/supervisor/tests/test_http.py
|
||||
@@ -684,9 +684,3 @@ class DummyProducer:
|
||||
return self.data.pop(0)
|
||||
else:
|
||||
return b''
|
||||
-
|
||||
-def test_suite():
|
||||
- return unittest.findTestCases(sys.modules[__name__])
|
||||
-
|
||||
-if __name__ == '__main__':
|
||||
- unittest.main(defaultTest='test_suite')
|
||||
diff --git a/supervisor/tests/test_loggers.py b/supervisor/tests/test_loggers.py
|
||||
index 0742c17..a9ae297 100644
|
||||
--- a/supervisor/tests/test_loggers.py
|
||||
+++ b/supervisor/tests/test_loggers.py
|
||||
@@ -599,9 +599,3 @@ class DummyHandler:
|
||||
self.records.append(record)
|
||||
def close(self):
|
||||
self.closed = True
|
||||
-
|
||||
-def test_suite():
|
||||
- return unittest.findTestCases(sys.modules[__name__])
|
||||
-
|
||||
-if __name__ == '__main__':
|
||||
- unittest.main(defaultTest='test_suite')
|
||||
diff --git a/supervisor/tests/test_options.py b/supervisor/tests/test_options.py
|
||||
index f43537a..18e7399 100644
|
||||
--- a/supervisor/tests/test_options.py
|
||||
+++ b/supervisor/tests/test_options.py
|
||||
@@ -3804,10 +3804,3 @@ class UtilFunctionsTests(unittest.TestCase):
|
||||
self.assertEqual(s('process'), ('process', 'process'))
|
||||
self.assertEqual(s('group:'), ('group', None))
|
||||
self.assertEqual(s('group:*'), ('group', None))
|
||||
-
|
||||
-def test_suite():
|
||||
- return unittest.findTestCases(sys.modules[__name__])
|
||||
-
|
||||
-if __name__ == '__main__':
|
||||
- unittest.main(defaultTest='test_suite')
|
||||
-
|
||||
diff --git a/supervisor/tests/test_poller.py b/supervisor/tests/test_poller.py
|
||||
index 1b12a8e..fb5bf81 100644
|
||||
--- a/supervisor/tests/test_poller.py
|
||||
+++ b/supervisor/tests/test_poller.py
|
||||
@@ -437,10 +437,3 @@ class FakeKEvent(object):
|
||||
def __init__(self, ident, filter):
|
||||
self.ident = ident
|
||||
self.filter = filter
|
||||
-
|
||||
-
|
||||
-def test_suite():
|
||||
- return unittest.findTestCases(sys.modules[__name__])
|
||||
-
|
||||
-if __name__ == '__main__':
|
||||
- unittest.main(defaultTest='test_suite')
|
||||
diff --git a/supervisor/tests/test_rpcinterfaces.py b/supervisor/tests/test_rpcinterfaces.py
|
||||
index 0827adf..ec88a90 100644
|
||||
--- a/supervisor/tests/test_rpcinterfaces.py
|
||||
+++ b/supervisor/tests/test_rpcinterfaces.py
|
||||
@@ -2392,14 +2392,6 @@ class Test_make_main_rpcinterface(unittest.TestCase):
|
||||
)
|
||||
|
||||
|
||||
-
|
||||
class DummyRPCInterface:
|
||||
def hello(self):
|
||||
return 'Hello!'
|
||||
-
|
||||
-def test_suite():
|
||||
- return unittest.findTestCases(sys.modules[__name__])
|
||||
-
|
||||
-if __name__ == '__main__':
|
||||
- unittest.main(defaultTest='test_suite')
|
||||
-
|
||||
diff --git a/supervisor/tests/test_socket_manager.py b/supervisor/tests/test_socket_manager.py
|
||||
index 626d786..8eaafaa 100644
|
||||
--- a/supervisor/tests/test_socket_manager.py
|
||||
+++ b/supervisor/tests/test_socket_manager.py
|
||||
@@ -51,7 +51,6 @@ class ProxyTest(unittest.TestCase):
|
||||
proxy = self._makeOne(Subject(), on_delete=self.setOnDeleteCalled)
|
||||
self.assertEqual(5, proxy.getValue())
|
||||
proxy = None
|
||||
- gc_collect()
|
||||
self.assertTrue(self.on_deleteCalled)
|
||||
|
||||
class ReferenceCounterTest(unittest.TestCase):
|
||||
@@ -94,9 +93,6 @@ class ReferenceCounterTest(unittest.TestCase):
|
||||
|
||||
class SocketManagerTest(unittest.TestCase):
|
||||
|
||||
- def tearDown(self):
|
||||
- gc_collect()
|
||||
-
|
||||
def _getTargetClass(self):
|
||||
from supervisor.socket_manager import SocketManager
|
||||
return SocketManager
|
||||
@@ -160,12 +156,10 @@ class SocketManagerTest(unittest.TestCase):
|
||||
self.assertTrue(sock_manager.is_prepared())
|
||||
self.assertFalse(sock_manager.socket.close_called)
|
||||
sock = None
|
||||
- gc_collect()
|
||||
# Socket not actually closed yet b/c ref ct is 1
|
||||
self.assertTrue(sock_manager.is_prepared())
|
||||
self.assertFalse(sock_manager.socket.close_called)
|
||||
sock2 = None
|
||||
- gc_collect()
|
||||
# Socket closed
|
||||
self.assertFalse(sock_manager.is_prepared())
|
||||
self.assertTrue(sock_manager.socket.close_called)
|
||||
@@ -178,7 +172,6 @@ class SocketManagerTest(unittest.TestCase):
|
||||
self.assertNotEqual(sock_id, sock3_id)
|
||||
# Drop ref ct to zero
|
||||
del sock3
|
||||
- gc_collect()
|
||||
# Now assert that socket is closed
|
||||
self.assertFalse(sock_manager.is_prepared())
|
||||
self.assertTrue(sock_manager.socket.close_called)
|
||||
@@ -193,7 +186,6 @@ class SocketManagerTest(unittest.TestCase):
|
||||
self.assertEqual('Creating socket %s' % repr(conf), logger.data[0])
|
||||
# socket close
|
||||
del sock
|
||||
- gc_collect()
|
||||
self.assertEqual(len(logger.data), 2)
|
||||
self.assertEqual('Closing socket %s' % repr(conf), logger.data[1])
|
||||
|
||||
@@ -242,15 +234,3 @@ class SocketManagerTest(unittest.TestCase):
|
||||
self.fail()
|
||||
except Exception as e:
|
||||
self.assertEqual(e.args[0], 'Socket has not been prepared')
|
||||
-
|
||||
-def gc_collect():
|
||||
- if __pypy__ is not None:
|
||||
- gc.collect()
|
||||
- gc.collect()
|
||||
- gc.collect()
|
||||
-
|
||||
-def test_suite():
|
||||
- return unittest.findTestCases(sys.modules[__name__])
|
||||
-
|
||||
-if __name__ == '__main__':
|
||||
- unittest.main(defaultTest='test_suite')
|
||||
diff --git a/supervisor/tests/test_states.py b/supervisor/tests/test_states.py
|
||||
index ba8e58f..41fed7b 100644
|
||||
--- a/supervisor/tests/test_states.py
|
||||
+++ b/supervisor/tests/test_states.py
|
||||
@@ -50,10 +50,3 @@ class TopLevelEventListenerStateTests(unittest.TestCase):
|
||||
def test_getEventListenerStateDescription_returns_None_when_not_found(self):
|
||||
self.assertEqual(states.getEventListenerStateDescription(3.14159),
|
||||
None)
|
||||
-
|
||||
-
|
||||
-def test_suite():
|
||||
- return unittest.findTestCases(sys.modules[__name__])
|
||||
-
|
||||
-if __name__ == '__main__':
|
||||
- unittest.main(defaultTest='test_suite')
|
||||
diff --git a/supervisor/tests/test_supervisorctl.py b/supervisor/tests/test_supervisorctl.py
|
||||
index 3c0e097..af2149b 100644
|
||||
--- a/supervisor/tests/test_supervisorctl.py
|
||||
+++ b/supervisor/tests/test_supervisorctl.py
|
||||
@@ -2067,10 +2067,3 @@ class DummyPlugin:
|
||||
|
||||
def do_help(self, arg):
|
||||
self.helped = True
|
||||
-
|
||||
-def test_suite():
|
||||
- return unittest.findTestCases(sys.modules[__name__])
|
||||
-
|
||||
-if __name__ == '__main__':
|
||||
- unittest.main(defaultTest='test_suite')
|
||||
-
|
||||
diff --git a/supervisor/tests/test_supervisord.py b/supervisor/tests/test_supervisord.py
|
||||
index 3d7b4ff..4099bba 100644
|
||||
--- a/supervisor/tests/test_supervisord.py
|
||||
+++ b/supervisor/tests/test_supervisord.py
|
||||
@@ -834,10 +834,3 @@ class SupervisordTests(unittest.TestCase):
|
||||
self.assertEqual(supervisord.ticks[3600], 3600)
|
||||
self.assertEqual(len(L), 6)
|
||||
self.assertEqual(L[-1].__class__, events.Tick3600Event)
|
||||
-
|
||||
-def test_suite():
|
||||
- return unittest.findTestCases(sys.modules[__name__])
|
||||
-
|
||||
-if __name__ == '__main__':
|
||||
- unittest.main(defaultTest='test_suite')
|
||||
-
|
||||
diff --git a/supervisor/tests/test_templating.py b/supervisor/tests/test_templating.py
|
||||
index 29311a7..8970c4f 100644
|
||||
--- a/supervisor/tests/test_templating.py
|
||||
+++ b/supervisor/tests/test_templating.py
|
||||
@@ -1785,12 +1785,3 @@ def normalize_xml(s):
|
||||
s = re.sub(r"(?s)\s+<", "<", s)
|
||||
s = re.sub(r"(?s)>\s+", ">", s)
|
||||
return s
|
||||
-
|
||||
-def test_suite():
|
||||
- return unittest.findTestCases(sys.modules[__name__])
|
||||
-
|
||||
-def main():
|
||||
- unittest.main(defaultTest='test_suite')
|
||||
-
|
||||
-if __name__ == '__main__':
|
||||
- main()
|
||||
diff --git a/supervisor/tests/test_web.py b/supervisor/tests/test_web.py
|
||||
index 8bae3ed..f31972d 100644
|
||||
--- a/supervisor/tests/test_web.py
|
||||
+++ b/supervisor/tests/test_web.py
|
||||
@@ -177,9 +177,3 @@ class StatusViewTests(unittest.TestCase):
|
||||
|
||||
class DummyContext:
|
||||
pass
|
||||
-
|
||||
-def test_suite():
|
||||
- return unittest.findTestCases(sys.modules[__name__])
|
||||
-
|
||||
-if __name__ == '__main__':
|
||||
- unittest.main(defaultTest='test_suite')
|
||||
diff --git a/supervisor/tests/test_xmlrpc.py b/supervisor/tests/test_xmlrpc.py
|
||||
index 3d49ce0..8cee058 100644
|
||||
--- a/supervisor/tests/test_xmlrpc.py
|
||||
+++ b/supervisor/tests/test_xmlrpc.py
|
||||
@@ -917,4 +917,3 @@ class DummyConnection:
|
||||
|
||||
def close(self):
|
||||
self.closed = True
|
||||
-
|
||||
--
|
||||
2.49.0
|
||||
|
||||
@@ -16,9 +16,9 @@ let
|
||||
variants = {
|
||||
# ./update-zen.py zen
|
||||
zen = {
|
||||
version = "6.17.1"; # zen
|
||||
version = "6.17.2"; # zen
|
||||
suffix = "zen1"; # zen
|
||||
sha256 = "0610gcmzmvc70nw7n225avf1spahzffc6ajq18ibidra1k5q2msj"; # zen
|
||||
sha256 = "0xb0x8726znk7v39incvdsmqh0plfzyjj4sg0dmbjqlgi2kh560r"; # zen
|
||||
isLqx = false;
|
||||
};
|
||||
# ./update-zen.py lqx
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "amitfin";
|
||||
domain = "oref_alert";
|
||||
version = "3.2.4";
|
||||
version = "4.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "amitfin";
|
||||
repo = "oref_alert";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-+kZOwepyfehETfRDeA4w0eTaGSvkXNzG5rL2wdAKOy8=";
|
||||
hash = "sha256-WMWt2QjwWDIfNbD6/YGc91GASmjNhzfLREMHvc2eOdE=";
|
||||
};
|
||||
|
||||
dependencies = [
|
||||
|
||||
@@ -10960,10 +10960,6 @@ with pkgs;
|
||||
|
||||
dfasma = libsForQt5.callPackage ../applications/audio/dfasma { };
|
||||
|
||||
direwolf = callPackage ../applications/radio/direwolf {
|
||||
hamlib = hamlib_4;
|
||||
};
|
||||
|
||||
djv = callPackage ../by-name/dj/djv/package.nix { openexr = openexr_2; };
|
||||
|
||||
djview4 = djview;
|
||||
|
||||
Reference in New Issue
Block a user