Merge staging-next into staging
This commit is contained in:
commit
c06d00f1ad
|
@ -0,0 +1,112 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
|
||||
bluez,
|
||||
libnotify,
|
||||
libXdmcp,
|
||||
libXtst,
|
||||
opencv,
|
||||
qtbase,
|
||||
qtmultimedia,
|
||||
qtscript,
|
||||
qttools,
|
||||
qtx11extras,
|
||||
qtxmlpatterns,
|
||||
|
||||
# Running with TTS support causes the program to freeze for a few seconds every time at startup,
|
||||
# so it is disabled by default
|
||||
textToSpeechSupport ? false,
|
||||
qtspeech,
|
||||
}:
|
||||
|
||||
let
|
||||
# For some reason qtscript wants to use the same version of qtbase as itself
|
||||
# This override makes it think that they are the same version
|
||||
qtscript' = qtscript.overrideAttrs (oldAttrs: {
|
||||
inherit (qtbase) version;
|
||||
postPatch = ''
|
||||
substituteInPlace .qmake.conf \
|
||||
--replace-fail ${oldAttrs.version} ${qtbase.version}
|
||||
'';
|
||||
});
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "actiona";
|
||||
version = "3.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Jmgr";
|
||||
repo = "actiona";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-4RKCNEniBBx0kDwdHVZOqXYeGCsH8g6SfVc8JdDV0hI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches =
|
||||
[
|
||||
# Sets the proper search location for the `.so` files and the translations
|
||||
./fix-paths.patch
|
||||
]
|
||||
++ lib.optionals (!textToSpeechSupport) [
|
||||
# Removes TTS support
|
||||
./disable-tts.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace gui/src/mainwindow.cpp executer/src/executer.cpp tools/src/languages.cpp \
|
||||
--subst-var out
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
bluez
|
||||
libnotify
|
||||
libXdmcp
|
||||
libXtst
|
||||
opencv
|
||||
qtbase
|
||||
qtmultimedia
|
||||
qtscript'
|
||||
qttools
|
||||
qtx11extras
|
||||
qtxmlpatterns
|
||||
] ++ lib.optionals textToSpeechSupport [ qtspeech ];
|
||||
|
||||
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
|
||||
cmakeFlags = [ (lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true) ];
|
||||
|
||||
# udev is used by the system-actionpack
|
||||
env.NIX_LDFLAGS = "-ludev";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 {execution,actiontools,tools}/*.so -t $out/lib
|
||||
install -Dm755 actions/actionpack*.so -t $out/lib/actions
|
||||
install -Dm755 actiona actexec -t $out/bin
|
||||
install -Dm644 translations/*.qm -t $out/share/actiona/translations
|
||||
install -Dm644 $src/actiona.desktop -t $out/share/applications
|
||||
install -Dm644 $src/gui/icons/actiona.png -t $out/share/icons/hicolor/48x48/apps
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A cross-platform automation tool";
|
||||
homepage = "https://github.com/Jmgr/actiona";
|
||||
license = lib.licenses.gpl3Only;
|
||||
mainProgram = "actiona";
|
||||
maintainers = with lib.maintainers; [ tomasajt ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
|
@ -0,0 +1,54 @@
|
|||
diff --git a/actions/system/CMakeLists.txt b/actions/system/CMakeLists.txt
|
||||
index ca861145..3e3d3d3b 100644
|
||||
--- a/actions/system/CMakeLists.txt
|
||||
+++ b/actions/system/CMakeLists.txt
|
||||
@@ -66,8 +66,6 @@ set(HEADERS
|
||||
${HEADERS_PREFIX}/actions/playsoundinstance.hpp
|
||||
${HEADERS_PREFIX}/actions/systemdefinition.hpp
|
||||
${HEADERS_PREFIX}/actions/systeminstance.hpp
|
||||
- ${HEADERS_PREFIX}/actions/texttospeechdefinition.hpp
|
||||
- ${HEADERS_PREFIX}/actions/texttospeechinstance.hpp
|
||||
${HEADERS_PREFIX}/code/mediaplaylist.hpp
|
||||
${HEADERS_PREFIX}/code/notify.hpp
|
||||
${HEADERS_PREFIX}/code/process.hpp
|
||||
@@ -131,7 +129,6 @@ find_package(Qt5 ${ACT_MINIMUM_QT_VERSION} COMPONENTS
|
||||
DBus
|
||||
Multimedia
|
||||
MultimediaWidgets
|
||||
- TextToSpeech
|
||||
REQUIRED)
|
||||
|
||||
target_include_directories(${PROJECT}
|
||||
@@ -153,7 +150,6 @@ target_link_libraries(${PROJECT}
|
||||
Qt5::DBus
|
||||
Qt5::Multimedia
|
||||
Qt5::MultimediaWidgets
|
||||
- Qt5::TextToSpeech
|
||||
${LIBNOTIFY_LIBRARIES}
|
||||
${BLUEZ_LIBRARIES}
|
||||
${UDEV_LIBRARIES}
|
||||
diff --git a/actions/system/src/actionpacksystem.hpp b/actions/system/src/actionpacksystem.hpp
|
||||
index c5768415..27a899d6 100644
|
||||
--- a/actions/system/src/actionpacksystem.hpp
|
||||
+++ b/actions/system/src/actionpacksystem.hpp
|
||||
@@ -31,10 +31,6 @@
|
||||
#include "actions/playsounddefinition.hpp"
|
||||
#include "actions/findimagedefinition.hpp"
|
||||
|
||||
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
|
||||
-#include "actions/texttospeechdefinition.hpp"
|
||||
-#endif
|
||||
-
|
||||
#include "code/system.hpp"
|
||||
#include "code/mediaplaylist.hpp"
|
||||
#include "code/notify.hpp"
|
||||
@@ -67,9 +63,6 @@ public:
|
||||
addActionDefinition(new Actions::DetachedCommandDefinition(this));
|
||||
addActionDefinition(new Actions::PlaySoundDefinition(this));
|
||||
addActionDefinition(new Actions::FindImageDefinition(this));
|
||||
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
|
||||
- addActionDefinition(new Actions::TextToSpeechDefinition(this));
|
||||
-#endif
|
||||
}
|
||||
|
||||
QString id() const override { return QStringLiteral("system"); }
|
|
@ -0,0 +1,39 @@
|
|||
diff --git a/executer/src/executer.cpp b/executer/src/executer.cpp
|
||||
index da848dad..5bd7e986 100644
|
||||
--- a/executer/src/executer.cpp
|
||||
+++ b/executer/src/executer.cpp
|
||||
@@ -45,7 +45,7 @@ bool Executer::start(QIODevice *device, const QString &filename)
|
||||
QSettings settings;
|
||||
QString locale = settings.value(QStringLiteral("gui/locale"), QLocale::system().name()).toString();
|
||||
|
||||
- mActionFactory->loadActionPacks(QApplication::applicationDirPath() + QStringLiteral("/actions"), locale);
|
||||
+ mActionFactory->loadActionPacks(QStringLiteral("@out@/lib/actions"), locale);
|
||||
#ifndef Q_OS_WIN
|
||||
if(mActionFactory->actionPackCount() == 0)
|
||||
mActionFactory->loadActionPacks(QStringLiteral("actiona/actions/"), locale);
|
||||
diff --git a/gui/src/mainwindow.cpp b/gui/src/mainwindow.cpp
|
||||
index 6052648e..3c802d93 100644
|
||||
--- a/gui/src/mainwindow.cpp
|
||||
+++ b/gui/src/mainwindow.cpp
|
||||
@@ -322,7 +322,7 @@ void MainWindow::postInit()
|
||||
if(mSplashScreen)
|
||||
mSplashScreen->showMessage(tr("Loading actions..."));
|
||||
|
||||
- mActionFactory->loadActionPacks(QApplication::applicationDirPath() + QStringLiteral("/actions"), mUsedLocale);
|
||||
+ mActionFactory->loadActionPacks(QStringLiteral("@out@/lib/actions"), mUsedLocale);
|
||||
#ifndef Q_OS_WIN
|
||||
if(mActionFactory->actionPackCount() == 0)
|
||||
mActionFactory->loadActionPacks(QStringLiteral("actiona/actions/"), mUsedLocale);
|
||||
diff --git a/tools/src/languages.cpp b/tools/src/languages.cpp
|
||||
index 4926936e..18e9aabb 100644
|
||||
--- a/tools/src/languages.cpp
|
||||
+++ b/tools/src/languages.cpp
|
||||
@@ -79,7 +79,7 @@ namespace Tools
|
||||
void Languages::installTranslator(const QString &componentName, const QString &locale)
|
||||
{
|
||||
auto translator = new QTranslator(QCoreApplication::instance());
|
||||
- if(!translator->load(QStringLiteral("%1/translations/%2_%3").arg(QCoreApplication::applicationDirPath()).arg(componentName).arg(locale)))
|
||||
+ if(!translator->load(QStringLiteral("@out@/share/actiona/translations/%1_%2").arg(componentName).arg(locale)))
|
||||
{
|
||||
auto path = QStringLiteral("%1/translations/%2_%3").arg(QDir::currentPath()).arg(componentName).arg(locale);
|
||||
if(!translator->load(path))
|
|
@ -6,16 +6,16 @@
|
|||
}:
|
||||
buildGoModule rec {
|
||||
pname = "athens";
|
||||
version = "0.13.1";
|
||||
version = "0.13.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gomods";
|
||||
repo = "athens";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tyheAQ+j1mkkkJr0yTyzWwoEFMcTfkJN+qFbb6Zcs+s=";
|
||||
hash = "sha256-UKzR2eGIcAaQNXPx0P/V/1rO32JSr2fGl0U8mPzKjIM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-8+PdkanodNZW/xeFf+tDm3Ej7DRSpBBtiT/CqjnWthw=";
|
||||
vendorHash = "sha256-NycAQsv/EZYVQz8FmVFcKoFpW7+MxguOxK4ry63A7N4=";
|
||||
|
||||
CGO_ENABLED = "0";
|
||||
ldflags = [ "-s" "-w" "-X github.com/gomods/athens/pkg/build.version=${version}" ];
|
||||
|
|
|
@ -25,13 +25,13 @@
|
|||
|
||||
buildDotnetModule rec {
|
||||
pname = "ryujinx";
|
||||
version = "1.1.1242"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
|
||||
version = "1.1.1248"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ryujinx";
|
||||
repo = "Ryujinx";
|
||||
rev = "c94a73ec60f3f75b36179cbc93d046701ed96253";
|
||||
sha256 = "0wksc3c63insll1jl0w6pa7vfgvkc50dzkwip676q3j8749fpzql";
|
||||
rev = "7124d679fd4345f2ed517e77ab40d90e6bef9650";
|
||||
sha256 = "11lp9j885j1ybl9arj51233396r9qdsy53ahwhwsmjgz71n1d2i5";
|
||||
};
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_8_0;
|
||||
|
|
|
@ -0,0 +1,34 @@
|
|||
diff --git a/build.gradle b/build.gradle
|
||||
index c206e2f..b1fda33 100644
|
||||
--- a/build.gradle
|
||||
+++ b/build.gradle
|
||||
@@ -69,19 +69,7 @@ launch4j {
|
||||
messagesInstanceAlreadyExists="Stirling-PDF is already running."
|
||||
}
|
||||
|
||||
-spotless {
|
||||
- java {
|
||||
- target project.fileTree('src/main/java')
|
||||
|
||||
- googleJavaFormat('1.19.1').aosp().reorderImports(false)
|
||||
-
|
||||
- importOrder('java', 'javax', 'org', 'com', 'net', 'io')
|
||||
- toggleOffOn()
|
||||
- trimTrailingWhitespace()
|
||||
- indentWithSpaces()
|
||||
- endWithNewline()
|
||||
- }
|
||||
-}
|
||||
|
||||
dependencies {
|
||||
//security updates
|
||||
@@ -163,9 +151,6 @@ dependencies {
|
||||
annotationProcessor 'org.projectlombok:lombok:1.18.28'
|
||||
}
|
||||
|
||||
-tasks.withType(JavaCompile) {
|
||||
- dependsOn 'spotlessApply'
|
||||
-}
|
||||
compileJava {
|
||||
options.compilerArgs << '-parameters'
|
||||
}
|
|
@ -0,0 +1,16 @@
|
|||
diff --git a/build.gradle b/build.gradle
|
||||
index 7025b2b..d063da3 100644
|
||||
--- a/build.gradle
|
||||
+++ b/build.gradle
|
||||
@@ -20,6 +20,11 @@ repositories {
|
||||
}
|
||||
|
||||
|
||||
+tasks.withType(AbstractArchiveTask) {
|
||||
+ preserveFileTimestamps = false
|
||||
+ reproducibleFileOrder = true
|
||||
+}
|
||||
+
|
||||
|
||||
licenseReport {
|
||||
renderers = [new JsonReportRenderer()]
|
|
@ -0,0 +1,118 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
substituteAll,
|
||||
gradle_7,
|
||||
perl,
|
||||
makeWrapper,
|
||||
jre,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "stirling-pdf";
|
||||
version = "0.22.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Stirling-Tools";
|
||||
repo = "Stirling-PDF";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-8zXTapFAXw4+KLLirxBeEBmqNw6ILFHtbsaBSP3Ehyg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# disable spotless because it tries to fetch files not in the FOD
|
||||
# and also because it slows down the build process
|
||||
./disable-spotless.patch
|
||||
# remove timestamp from the header of a generated .properties file
|
||||
./remove-props-file-timestamp.patch
|
||||
# use gradle's built-in method of zeroing out timestamps,
|
||||
# because stripJavaArchivesHook can't patch signed JAR files
|
||||
./fix-jar-timestamp.patch
|
||||
# set the FOD as the only repository gradle can resolve from
|
||||
(substituteAll {
|
||||
src = ./use-fod-maven-repo.patch;
|
||||
inherit (finalAttrs) deps;
|
||||
})
|
||||
];
|
||||
|
||||
# fake build to pre-download deps into fixed-output derivation
|
||||
deps = stdenv.mkDerivation {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}-deps";
|
||||
inherit (finalAttrs) src;
|
||||
|
||||
patches = [ ./disable-spotless.patch ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gradle_7
|
||||
perl
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
export GRADLE_USER_HOME=$(mktemp -d)
|
||||
gradle --no-daemon --console=plain build
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
# perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar)
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \
|
||||
| perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
|
||||
| sh
|
||||
|
||||
# Mimic existence of okio-3.6.0.jar, originally known as okio-jvm-3.6.0 (and renamed).
|
||||
# Gradle doesn't detect such renames and only fetches the latter.
|
||||
# Whenever this package gets updated, please check if this hack is obsolete.
|
||||
ln -s $out/com/squareup/okio/okio-jvm/3.6.0/okio-jvm-3.6.0.jar $out/com/squareup/okio/okio/3.6.0/okio-3.6.0.jar
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "sha256-zUzKSa7zuIoXE77Hk/Xr5iMF4CEumV9horW2BTFRdtE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
gradle_7
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
export GRADLE_USER_HOME=$(mktemp -d)
|
||||
gradle --offline --no-daemon --console=plain build
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm644 build/libs/Stirling-PDF-*.jar $out/share/stirling-pdf/Stirling-PDF.jar
|
||||
makeWrapper ${jre}/bin/java $out/bin/Stirling-PDF \
|
||||
--add-flags "-jar $out/share/stirling-pdf/Stirling-PDF.jar"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/Stirling-Tools/Stirling-PDF/releases/tag/${finalAttrs.src.rev}";
|
||||
description = "A locally hosted web application that allows you to perform various operations on PDF files";
|
||||
homepage = "https://github.com/Stirling-Tools/Stirling-PDF";
|
||||
license = lib.licenses.gpl3Only;
|
||||
mainProgram = "Stirling-PDF";
|
||||
maintainers = with lib.maintainers; [ tomasajt ];
|
||||
platforms = jre.meta.platforms;
|
||||
sourceProvenance = with lib.sourceTypes; [
|
||||
fromSource
|
||||
binaryBytecode # deps
|
||||
];
|
||||
};
|
||||
})
|
|
@ -0,0 +1,12 @@
|
|||
diff --git a/build.gradle b/build.gradle
|
||||
index e12cbd3..094a219 100644
|
||||
--- a/build.gradle
|
||||
+++ b/build.gradle
|
||||
@@ -173,6 +173,7 @@ task writeVersion {
|
||||
def props = new Properties()
|
||||
props.setProperty('version', version)
|
||||
props.store(propsFile.newWriter(), null)
|
||||
+ propsFile.text = propsFile.readLines().tail().join('\n')
|
||||
}
|
||||
|
||||
swaggerhubUpload {
|
|
@ -0,0 +1,25 @@
|
|||
diff --git a/build.gradle b/build.gradle
|
||||
index c206e2f..cdaddf7 100644
|
||||
--- a/build.gradle
|
||||
+++ b/build.gradle
|
||||
@@ -16,7 +16,7 @@ version = '0.22.3'
|
||||
sourceCompatibility = '17'
|
||||
|
||||
repositories {
|
||||
- mavenCentral()
|
||||
+ maven { url '@deps@' }
|
||||
}
|
||||
|
||||
|
||||
diff --git a/settings.gradle b/settings.gradle
|
||||
index f813993..2c87f3c 100644
|
||||
--- a/settings.gradle
|
||||
+++ b/settings.gradle
|
||||
@@ -1 +1,7 @@
|
||||
+pluginManagement {
|
||||
+ repositories {
|
||||
+ maven { url '@deps@' }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
rootProject.name = 'Stirling-PDF'
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "awkward-cpp";
|
||||
version = "30";
|
||||
version = "32";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-W+lMpzUdjkIcuUeKm3EBb6dnNiH6Ei1HfQsHu2iqfUw=";
|
||||
hash = "sha256-rYxa+GIG+w9DSxZ0nMXMppoVqI4WykPpHlbFzKd0IfA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "awkward";
|
||||
version = "2.6.2";
|
||||
version = "2.6.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -33,7 +33,7 @@ buildPythonPackage rec {
|
|||
owner = "scikit-hep";
|
||||
repo = "awkward";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-5wUTEB0iVffyCi671y4EsTum+7K1GDeAHlhdLpRgKnQ=";
|
||||
hash = "sha256-zII5TZ0bzVEo5hTrLr45N7oL3lYhkCyNfZif+0vkEo4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "cssutils";
|
||||
version = "2.10.1";
|
||||
version = "2.10.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "jaraco";
|
||||
repo = "cssutils";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-FK+EHdfsuCnWmnfUH18gyMq6CBXICBbhJj3XrscLLOA=";
|
||||
hash = "sha256-1sAn6pFwWsnYS1eHQmyDNGTo6kdhL1vJBwUptADvHyo=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
, pytest-mock
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, pyyaml
|
||||
, requests
|
||||
, setuptools
|
||||
|
@ -39,7 +40,12 @@ buildPythonPackage rec {
|
|||
hash = "sha256-x6f5hhTdOPDVFiBvRhfrXq1wd5keYiuUshXnT0IkjX0=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"aiohttp"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
setuptools
|
||||
];
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "testcontainers";
|
||||
version = "4.3.0";
|
||||
version = "4.3.1";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
pyproject = true;
|
||||
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "testcontainers";
|
||||
repo = "testcontainers-python";
|
||||
rev = "refs/tags/testcontainers-v${version}";
|
||||
hash = "sha256-eCoGMfd4gNuPY1rRRK5LH2BI236ZiZ0igTZDALuHevk=";
|
||||
hash = "sha256-pS5YEcHDHpTIWLD4vMPWL4r86DOI+47jN7cTwhDeXHE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -9,7 +9,10 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-QWcnrh8QgOpuMJDOo23QdoJvw2kVHjarc2VXupIZb58=";
|
||||
};
|
||||
|
||||
patches = [ ./no-self-references.patch ];
|
||||
patches = [
|
||||
./no-self-references.patch
|
||||
./fix-hardcoded-mapdir.patch
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"NIXOS=1" "INSTALL=install" "BINDIR=$(out)/sbin"
|
||||
|
@ -46,7 +49,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Programs for managing RAID arrays under Linux";
|
||||
homepage = "http://neil.brown.name/blog/mdadm";
|
||||
homepage = "https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git";
|
||||
license = licenses.gpl2;
|
||||
mainProgram = "mdadm";
|
||||
maintainers = with maintainers; [ ekleog ];
|
||||
|
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/udev.c b/udev.c
|
||||
index bc4722b0..aa2a1a24 100644
|
||||
--- a/udev.c
|
||||
+++ b/udev.c
|
||||
@@ -167,7 +167,7 @@ enum udev_status udev_block(char *devnm)
|
||||
int fd;
|
||||
char *path = xcalloc(1, BUFSIZ);
|
||||
|
||||
- snprintf(path, BUFSIZ, "/run/mdadm/creating-%s", devnm);
|
||||
+ snprintf(path, BUFSIZ, "%s/creating-%s", MAP_DIR, devnm);
|
||||
|
||||
fd = open(path, O_CREAT | O_RDWR, 0600);
|
||||
if (!is_fd_valid(fd)) {
|
|
@ -32,20 +32,20 @@ let
|
|||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "matrix-synapse";
|
||||
version = "1.103.0";
|
||||
version = "1.104.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "element-hq";
|
||||
repo = "synapse";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-NwHX4pOM2PUf2MldaPTOzP9gOcTmILxM1Sx2HPkLBcw=";
|
||||
hash = "sha256-/P7EBtXSYygUrqKQ4niI8J5zkBPZDgHCW/j2rFxRlsY=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-AyV0JPPJkJ4jdaw0FUXPqGF3Qkce1+RK70FkXAw+bLA=";
|
||||
hash = "sha256-0lCbIlEM4wIG7W5BXWIZWkS6c/BkEG13xtcnPm3LjgY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -18011,6 +18011,8 @@ with pkgs;
|
|||
|
||||
abuild = callPackage ../development/tools/abuild { };
|
||||
|
||||
actiona = libsForQt5.callPackage ../applications/misc/actiona { };
|
||||
|
||||
actionlint = callPackage ../development/tools/analysis/actionlint { };
|
||||
|
||||
adreaper = callPackage ../tools/security/adreaper { };
|
||||
|
|
Loading…
Reference in New Issue