diff options
| author | Bobby Rong <rjl931189261@126.com> | 2023-09-29 14:25:03 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-29 14:25:03 +0800 |
| commit | f0dae4e8a9504cb315c6e05e20000ae0a8325eb2 (patch) | |
| tree | e2da0cfb75c7c6ab568915e2dc48e6b305363ed1 | |
| parent | a1f529bf88a2175605708f614ba22a98751d059f (diff) | |
| parent | c2b690288001fe8aee96665db8850a9337144657 (diff) | |
| download | nixpkgs-f0dae4e8a9504cb315c6e05e20000ae0a8325eb2.tar nixpkgs-f0dae4e8a9504cb315c6e05e20000ae0a8325eb2.tar.gz nixpkgs-f0dae4e8a9504cb315c6e05e20000ae0a8325eb2.tar.bz2 nixpkgs-f0dae4e8a9504cb315c6e05e20000ae0a8325eb2.tar.lz nixpkgs-f0dae4e8a9504cb315c6e05e20000ae0a8325eb2.tar.xz nixpkgs-f0dae4e8a9504cb315c6e05e20000ae0a8325eb2.tar.zst nixpkgs-f0dae4e8a9504cb315c6e05e20000ae0a8325eb2.zip | |
Merge pull request #257432 from bobby285271/upd/pantheon
Pantheon updates 2023-09-26
| -rw-r--r-- | pkgs/desktops/pantheon/apps/elementary-files/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix | 14 |
2 files changed, 4 insertions, 26 deletions
diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 4716d217c26..12d0740c438 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pkg-config , meson @@ -14,7 +13,6 @@ , libgee , libhandy , granite -, libnotify , pango , elementary-dock , bamf @@ -28,7 +26,7 @@ stdenv.mkDerivation rec { pname = "elementary-files"; - version = "6.5.0"; + version = "6.5.2"; outputs = [ "out" "dev" ]; @@ -36,18 +34,9 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = "files"; rev = version; - sha256 = "sha256-E1e2eXGpycl2VXEUvUir5G3MRLz/4TQMvmOuWgU9JNc="; + sha256 = "sha256-YwXyqZ0exwQ3Qx+VWWyTTmhqCVr6be8tqzS1k3Luo8o="; }; - patches = [ - # meson: Don't run gtk-update-icon-cache - # https://github.com/elementary/files/pull/2294 - (fetchpatch { - url = "https://github.com/elementary/files/commit/758ece9fb29eb4a25f47065710dad4ac547ca2ce.patch"; - hash = "sha256-+OASDsOPH0g5Cyxw4JmVxA70zQHhcpqLMKKYP4VLTO0="; - }) - ]; - nativeBuildInputs = [ desktop-file-utils meson @@ -68,7 +57,6 @@ stdenv.mkDerivation rec { libgee libgit2-glib libhandy - libnotify pango sqlite systemd diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix index d5bb01cecb9..3e89aa38189 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , substituteAll , pkg-config @@ -18,24 +17,15 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-network"; - version = "7.0.1"; + version = "7.0.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-pz2sWN33d20/fMByR+XrNz2lxPdgCA6vxism3E/Fh/I="; + sha256 = "sha256-PqTnopacT1/Ctx8VH6b35tiVI+3ZlrdFcRsDpAWm4a0="; }; - patches = [ - # PopoverWidget: fix flowbox child focus - # https://github.com/elementary/wingpanel-indicator-network/pull/288 - (fetchpatch { - url = "https://github.com/elementary/wingpanel-indicator-network/commit/88db9004249334e1316321e0373a3065900fe6f1.patch"; - sha256 = "sha256-rpAULo4qVPO3yr7cBVeKyT7L43zHVEdYLJD4x0ukBs4="; - }) - ]; - nativeBuildInputs = [ meson ninja |