mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 23:13:19 +00:00
Merge pull request #259249 from dali99/update_hydrus2
hydrus: 544 -> 549
This commit is contained in:
commit
37dbff2abd
@ -1,18 +0,0 @@
|
||||
diff --git a/hydrus/core/HydrusConstants.py b/hydrus/core/HydrusConstants.py
|
||||
index 809338ef..9125928f 100644
|
||||
--- a/hydrus/core/HydrusConstants.py
|
||||
+++ b/hydrus/core/HydrusConstants.py
|
||||
@@ -59,12 +59,7 @@ elif PLATFORM_HAIKU:
|
||||
RUNNING_FROM_SOURCE = sys.argv[0].endswith( '.py' ) or sys.argv[0].endswith( '.pyw' )
|
||||
RUNNING_FROM_MACOS_APP = os.path.exists( os.path.join( BASE_DIR, 'running_from_app' ) )
|
||||
|
||||
-if RUNNING_FROM_SOURCE:
|
||||
- NICE_RUNNING_AS_STRING = 'from source'
|
||||
-elif RUNNING_FROM_FROZEN_BUILD:
|
||||
- NICE_RUNNING_AS_STRING = 'from frozen build'
|
||||
-elif RUNNING_FROM_MACOS_APP:
|
||||
- NICE_RUNNING_AS_STRING = 'from App'
|
||||
+NICE_RUNNING_AS_STRING = "from nixpkgs (source)"
|
||||
|
||||
BIN_DIR = os.path.join( BASE_DIR, 'bin' )
|
||||
HELP_DIR = os.path.join( BASE_DIR, 'help' )
|
@ -12,21 +12,16 @@
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "hydrus";
|
||||
version = "544";
|
||||
version = "549";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hydrusnetwork";
|
||||
repo = "hydrus";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-e3VvkdJAQx5heKDJ1Ms6XpXrXWdzv48f8yu0DHfPy1A=";
|
||||
hash = "sha256-y3WFQhPE8H0198Xu3Dn9YAqaX8YvFJcdt90tebTg7qw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Nixpkgs specific, can be removed if upstream makes a more reasonable check
|
||||
./0001-inform-nixpkgs.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapQtAppsHook
|
||||
python3Packages.mkdocs-material
|
||||
@ -75,31 +70,35 @@ python3Packages.buildPythonPackage rec {
|
||||
|
||||
# most tests are failing, presumably because we are not using test.py
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
nosetests $src/hydrus/test \
|
||||
-e TestClientAPI \
|
||||
-e TestClientConstants \
|
||||
-e TestClientDaemons \
|
||||
-e TestClientData \
|
||||
-e TestClientDB \
|
||||
-e TestClientDBDuplicates \
|
||||
-e TestClientDBTags \
|
||||
-e TestClientImageHandling \
|
||||
-e TestClientImportOptions \
|
||||
-e TestClientListBoxes \
|
||||
-e TestClientMigration \
|
||||
-e TestClientNetworking \
|
||||
-e TestClientTags \
|
||||
-e TestClientThreading \
|
||||
-e TestDialogs \
|
||||
-e TestFunctions \
|
||||
-e TestHydrusNetwork \
|
||||
-e TestHydrusNATPunch \
|
||||
-e TestHydrusSerialisable \
|
||||
-e TestHydrusServer \
|
||||
-e TestHydrusSessions \
|
||||
-e TestServer \
|
||||
-e TestClientMetadataMigration \
|
||||
-e TestClientFileStorage \
|
||||
-e TestClientAPI \
|
||||
-e TestClientConstants \
|
||||
-e TestClientDaemons \
|
||||
-e TestClientData \
|
||||
-e TestClientDB \
|
||||
-e TestClientDBDuplicates \
|
||||
-e TestClientDBTags \
|
||||
-e TestClientImageHandling \
|
||||
-e TestClientImportOptions \
|
||||
-e TestClientListBoxes \
|
||||
-e TestClientMigration \
|
||||
-e TestClientNetworking \
|
||||
-e TestClientTags \
|
||||
-e TestClientThreading \
|
||||
-e TestDialogs \
|
||||
-e TestFunctions \
|
||||
-e TestHydrusNetwork \
|
||||
-e TestHydrusNATPunch \
|
||||
-e TestHydrusSerialisable \
|
||||
-e TestHydrusServer \
|
||||
-e TestHydrusSessions \
|
||||
-e TestServer \
|
||||
-e TestClientMetadataMigration \
|
||||
-e TestClientFileStorage \
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
@ -112,7 +111,8 @@ python3Packages.buildPythonPackage rec {
|
||||
chmod -x $out/${python3Packages.python.sitePackages}/static/*.{png,svg,ico}
|
||||
# Build docs
|
||||
mkdocs build -d help
|
||||
mv help $out/doc/
|
||||
mkdir -p $doc/share/doc
|
||||
mv help $doc/share/doc/hydrus
|
||||
|
||||
# install the hydrus binaries
|
||||
mkdir -p $out/bin
|
||||
|
Loading…
Reference in New Issue
Block a user