diff options
3 files changed, 2 insertions, 70 deletions
diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index 9ba16c2eb765d..d7bd9c926edea 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -109,10 +109,6 @@ lib.makeScope pkgs.newScope (self: with self; { gala = callPackage ./desktop/gala { }; - gnome-bluetooth-contract = callPackage ./desktop/gnome-bluetooth-contract { - inherit (gnome) gnome-bluetooth_1_0; - }; - wingpanel = callPackage ./desktop/wingpanel { }; wingpanel-with-indicators = callPackage ./desktop/wingpanel/wrapper.nix { @@ -248,6 +244,8 @@ lib.makeScope pkgs.newScope (self: with self; { file-roller = pkgs.gnome.file-roller; # added 2022-03-12 + gnome-bluetooth-contract = throw "pantheon.gnome-bluetooth-contract has been removed, abandoned by upstream."; # added 2022-06-30 + notes-up = throw "The ‘pantheon.notes-up’ alias was removed on 2022-02-02, please use ‘pkgs.notes-up’ directly."; # added 2021-12-18 } diff --git a/pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/default.nix b/pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/default.nix deleted file mode 100644 index 6df583c2ce6ab..0000000000000 --- a/pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, unstableGitUpdater -, substituteAll -, gnome-bluetooth_1_0 -}: - -stdenv.mkDerivation rec { - pname = "gnome-bluetooth-contract"; - version = "unstable-2021-02-22"; - - src = fetchFromGitHub { - owner = "elementary"; - repo = pname; - rev = "8dcd4d03dc7a7d487980fd8bc95af985dc4fff5c"; - sha256 = "sha256-9eX6j/cvN/CoqrHrh9mZEsUJ8viDWIGxIva1xFwIK7c="; - }; - - patches = [ - (substituteAll { - src = ./exec-path.patch; - # sendto device selection is removed in gnome-bluetooth 42 - # https://github.com/elementary/gnome-bluetooth-contract/issues/1 - gnome_bluetooth = gnome-bluetooth_1_0; - }) - ]; - - dontConfigure = true; - - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/contractor - cp *.contract $out/share/contractor/ - - runHook postInstall - ''; - - passthru = { - updateScript = unstableGitUpdater { - url = "https://github.com/elementary/gnome-bluetooth-contract.git"; - }; - }; - - meta = with lib; { - description = "Contractor extension for GNOME Bluetooth"; - homepage = "https://github.com/elementary/gnome-bluetooth-contract"; - license = licenses.gpl3Plus; - maintainers = teams.pantheon.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/exec-path.patch b/pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/exec-path.patch deleted file mode 100644 index c0bd9e579f46a..0000000000000 --- a/pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/exec-path.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/io.elementary.contracter.gnome-bluetooth.contract b/io.elementary.contracter.gnome-bluetooth.contract -index 3eb2334..ce0e5f5 100644 ---- a/io.elementary.contracter.gnome-bluetooth.contract -+++ b/io.elementary.contracter.gnome-bluetooth.contract -@@ -3,5 +3,5 @@ Name=Send Files via Bluetooth - Icon=bluetooth - Description=Send files to device... - MimeType=!inode; --Exec=bluetooth-sendto %F -+Exec=@gnome_bluetooth@/bin/bluetooth-sendto %F - Gettext-Domain=gnome-bluetooth2 |