mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-09 05:33:25 +00:00
hydrus: 544 -> 549
Diff: https://github.com/hydrusnetwork/hydrus/compare/refs/tags/v544...v549 Drops the running from source patch, since upstream is doing a better check
This commit is contained in:
parent
b59bd02274
commit
da07e52ffa
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user