From 5959e9a15defc54541707d1a01189b10a0ba4d86 Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 11 Apr 2023 18:18:19 +0800 Subject: [PATCH] deepin: use file name as fetchpatch's name --- pkgs/desktops/deepin/apps/deepin-draw/default.nix | 2 +- pkgs/desktops/deepin/apps/deepin-editor/default.nix | 2 +- pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix | 4 ++-- pkgs/desktops/deepin/apps/deepin-terminal/default.nix | 2 +- pkgs/desktops/deepin/core/dde-calendar/default.nix | 2 +- pkgs/desktops/deepin/core/dde-control-center/default.nix | 1 - pkgs/desktops/deepin/go-package/go-lib/default.nix | 2 +- pkgs/desktops/deepin/library/image-editor/default.nix | 4 ++-- pkgs/desktops/deepin/library/util-dfm/default.nix | 2 +- pkgs/desktops/deepin/tools/dde-device-formatter/default.nix | 2 +- 10 files changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/deepin/apps/deepin-draw/default.nix b/pkgs/desktops/deepin/apps/deepin-draw/default.nix index b8c89e0999b9..7bbe4e0a4027 100644 --- a/pkgs/desktops/deepin/apps/deepin-draw/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-draw/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - name = "chore: use GNUInstallDirs in CmakeLists"; + name = "chore-use-GNUInstallDirs-in-CmakeLists.patch"; url = "https://github.com/linuxdeepin/deepin-draw/commit/dac714fe603e1b77fc39952bfe6949852ee6c2d5.patch"; sha256 = "sha256-zajxmKkZJT1lcyvPv/PRPMxcstF69PB1tC50gYKDlWA="; }) diff --git a/pkgs/desktops/deepin/apps/deepin-editor/default.nix b/pkgs/desktops/deepin/apps/deepin-editor/default.nix index 1f26134e9a1c..b83ee544ab63 100644 --- a/pkgs/desktops/deepin/apps/deepin-editor/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-editor/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - name = "chore: use GNUInstallDirs in CmakeLists"; + name = "chore-use-GNUInstallDirs-in-CmakeLists.patch"; url = "https://github.com/linuxdeepin/deepin-editor/commit/7f4314f386a3c8f5cdea3618591b8eb027d034c3.patch"; sha256 = "sha256-/aSBa2nILc/YrFchUyhBHHs2c7Mv6N1juwD5Sdc39Uo="; }) diff --git a/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix index a19776b25536..e512dd277545 100644 --- a/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix @@ -32,12 +32,12 @@ stdenv.mkDerivation rec { patches = [ ./0001-fix-install-path-for-nix.patch (fetchpatch { - name = "chore: use GNUInstallDirs in CmakeLists"; + name = "chore-use-GNUInstallDirs-in-CmakeLists.patch"; url = "https://github.com/linuxdeepin/deepin-image-viewer/commit/4a046e6207fea306e592fddc33c1285cf719a63d.patch"; sha256 = "sha256-aIgYmq6WDfCE+ZcD0GshxM+QmBWZGjh9MzZcTMrhBJ0="; }) (fetchpatch { - name = "fix build with libraw 0.21"; + name = "fix-build-with-libraw-0_21.patch"; url = "https://raw.githubusercontent.com/archlinux/svntogit-community/2ff11979704dd7156a7e7c3bae9b30f08894063d/trunk/libraw-0.21.patch"; sha256 = "sha256-I/w4uiANT8Z8ud/F9WCd3iRHOfplu3fpqnu8ZIs4C+w="; }) diff --git a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix b/pkgs/desktops/deepin/apps/deepin-terminal/default.nix index a50069b74320..fb8c2d1c1ad1 100644 --- a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-terminal/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - name = "chore: use GNUInstallDirs in CmakeLists"; + name = "chore-use-GNUInstallDirs-in-CmakeLists.patch"; url = "https://github.com/linuxdeepin/deepin-terminal/commit/b18a2ca8411f09f5573aa2a8403a484b693ec975.patch"; sha256 = "sha256-Qy8Jg+7BfZr8tQEsCAzhMEwf6rU96gkgup5f9bMMELY="; }) diff --git a/pkgs/desktops/deepin/core/dde-calendar/default.nix b/pkgs/desktops/deepin/core/dde-calendar/default.nix index eeed587c3747..07265bcc671a 100644 --- a/pkgs/desktops/deepin/core/dde-calendar/default.nix +++ b/pkgs/desktops/deepin/core/dde-calendar/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - name = "chore: use GNUInstallDirs in CmakeLists"; + name = "chore-use-GNUInstallDirs-in-CmakeLists.patch"; url = "https://github.com/linuxdeepin/dde-calendar/commit/b9d9555d90a36318eeee62ece49250b4bf8acd10.patch"; sha256 = "sha256-pvgxZPczs/lkwNjysNuVu+1AY69VZlxOn7hR9A02/3M="; }) diff --git a/pkgs/desktops/deepin/core/dde-control-center/default.nix b/pkgs/desktops/deepin/core/dde-control-center/default.nix index ffa77afa6cde..a8625084ba12 100644 --- a/pkgs/desktops/deepin/core/dde-control-center/default.nix +++ b/pkgs/desktops/deepin/core/dde-control-center/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , dtkwidget , qt5integration , qt5platform-plugins diff --git a/pkgs/desktops/deepin/go-package/go-lib/default.nix b/pkgs/desktops/deepin/go-package/go-lib/default.nix index 3a6a8f03dfb5..706ff58ebfbe 100644 --- a/pkgs/desktops/deepin/go-package/go-lib/default.nix +++ b/pkgs/desktops/deepin/go-package/go-lib/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - name = "fix_IsDir_for_symlink"; + name = "fix_IsDir_for_symlink.patch"; url = "https://github.com/linuxdeepin/go-lib/commit/79239904679dc70a11e1ac8e65670afcfdd7c122.patch"; sha256 = "sha256-RsN9hK26i/W6P/+e1l1spCLdlgIEWTehhIW6POBOvW4="; }) diff --git a/pkgs/desktops/deepin/library/image-editor/default.nix b/pkgs/desktops/deepin/library/image-editor/default.nix index ec5f3568fbd6..6133d38aff22 100644 --- a/pkgs/desktops/deepin/library/image-editor/default.nix +++ b/pkgs/desktops/deepin/library/image-editor/default.nix @@ -27,12 +27,12 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - name = "feat_check_PREFIX_value_before_set"; + name = "feat_check_PREFIX_value_before_set.patch"; url = "https://github.com/linuxdeepin/image-editor/commit/dae86e848cf53ba0ece879d81e8d5335d61a7473.patch"; sha256 = "sha256-lxmR+nIrMWVyhl1jpA17x2yqJ40h5vnpqKKcjd8j9RY="; }) (fetchpatch { - name = "feat_use_FULL_install_path"; + name = "feat_use_FULL_install_path.patch"; url = "https://github.com/linuxdeepin/image-editor/commit/855ae53a0444ac628aa0fe893932df6263b82e2e.patch"; sha256 = "sha256-3Dynlwl/l/b6k6hOHjTdoDQ/VGBDfyRz9b8QY8FEsCc="; }) diff --git a/pkgs/desktops/deepin/library/util-dfm/default.nix b/pkgs/desktops/deepin/library/util-dfm/default.nix index 5d45977246c3..ad1458256c95 100644 --- a/pkgs/desktops/deepin/library/util-dfm/default.nix +++ b/pkgs/desktops/deepin/library/util-dfm/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - name = "fix: use pkgconfig to check mount"; + name = "fix-use-pkgconfig-to-check-mount.patch"; url = "https://github.com/linuxdeepin/util-dfm/commit/fb8425a8c13f16e86db38ff84f43347fdc8ea468.diff"; sha256 = "sha256-PGSRfnQ1MGmq0V3NBCoMk4p/T2x19VA04u9C+WcBKow="; }) diff --git a/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix b/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix index 87a2fe1b66c7..66137f4d50f2 100644 --- a/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix +++ b/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - name = "chore: don't use hardcode path"; + name = "chore-do-not-use-hardcode-path.patch"; url = "https://github.com/linuxdeepin/dde-device-formatter/commit/b836a498b8e783e0dff3820302957f15ee8416eb.patch"; sha256 = "sha256-i/VqJ6EmCyhE6weHKUB66bW6b51gLyssIAzb5li4aJM="; })