diff options
| author | Daniel Olsen <daniel.olsen99@gmail.com> | 2023-09-29 05:17:32 +0200 |
|---|---|---|
| committer | Daniel Olsen <daniel.olsen99@gmail.com> | 2023-10-28 23:46:19 +0200 |
| commit | da07e52ffa908dcfc77535b49bf2c08eed2af2cd (patch) | |
| tree | 25fb88e09632745a1ef3ccfcee38686967187ad2 /pkgs/applications/graphics/hydrus | |
| parent | b59bd02274e166da7098c58182979f4d0416b127 (diff) | |
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
Diffstat (limited to 'pkgs/applications/graphics/hydrus')
| -rw-r--r-- | pkgs/applications/graphics/hydrus/0001-inform-nixpkgs.patch | 18 | ||||
| -rw-r--r-- | pkgs/applications/graphics/hydrus/default.nix | 9 |
2 files changed, 2 insertions, 25 deletions
diff --git a/pkgs/applications/graphics/hydrus/0001-inform-nixpkgs.patch b/pkgs/applications/graphics/hydrus/0001-inform-nixpkgs.patch deleted file mode 100644 index e7200814eb059..0000000000000 --- a/pkgs/applications/graphics/hydrus/0001-inform-nixpkgs.patch +++ /dev/null @@ -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' ) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 968f60ba80965..188564cd69ce2 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -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 |