From 28a115edc418b3e725dc96199dc384ad52ab9ab3 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 1 Dec 2021 22:39:43 +0800
Subject: [PATCH] pantheon.extra-elementary-contracts: drop
---
.../x11/desktop-managers/pantheon.nix | 1 -
pkgs/desktops/pantheon/default.nix | 6 +--
.../extra-elementary-contracts/default.nix | 44 -------------------
.../exec-path.patch | 34 --------------
4 files changed, 2 insertions(+), 83 deletions(-)
delete mode 100644 pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix
delete mode 100644 pkgs/desktops/pantheon/desktop/extra-elementary-contracts/exec-path.patch
diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix
index e252a244eb83..3296b7220485 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -298,7 +298,6 @@ in
(mkIf serviceCfg.contractor.enable {
environment.systemPackages = with pkgs.pantheon; [
contractor
- extra-elementary-contracts
file-roller-contract
gnome-bluetooth-contract
];
diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix
index 4ac5f9bcf1db..3300dd2ec8c4 100644
--- a/pkgs/desktops/pantheon/default.nix
+++ b/pkgs/desktops/pantheon/default.nix
@@ -93,10 +93,6 @@ lib.makeScope pkgs.newScope (self: with self; {
elementary-shortcut-overlay = callPackage ./desktop/elementary-shortcut-overlay { };
- extra-elementary-contracts = callPackage ./desktop/extra-elementary-contracts {
- inherit (gnome) file-roller gnome-bluetooth;
- };
-
file-roller-contract = callPackage ./desktop/file-roller-contract {
inherit (gnome) file-roller;
};
@@ -225,4 +221,6 @@ lib.makeScope pkgs.newScope (self: with self; {
elementary-screenshot-tool = elementary-screenshot; # added 2021-07-21
+ extra-elementary-contracts = throw "extra-elementary-contracts has been removed as all contracts have been upstreamed."; # added 2021-12-01
+
})
diff --git a/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix b/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix
deleted file mode 100644
index c579997f5e83..000000000000
--- a/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ lib
-, stdenv
-, substituteAll
-, fetchFromGitHub
-, file-roller
-, gnome-bluetooth
-}:
-
-stdenv.mkDerivation rec {
- pname = "extra-elementary-contracts";
- version = "2018-08-21";
-
- src = fetchFromGitHub {
- owner = "worldofpeace";
- repo = pname;
- rev = "a05dfb00695854163805b666185e3e9f31b6eb83";
- sha256 = "0fkaf2w4xg0n9faj74rgzy7gvd3yz112l058b157a3pr39vpci7g";
- };
-
- patches = [
- (substituteAll {
- src = ./exec-path.patch;
- file_roller = file-roller;
- gnome_bluetooth = gnome-bluetooth;
- })
- ];
-
- dontBuild = true;
- dontConfigure = true;
-
- installPhase = ''
- mkdir -p $out/share/contractor
-
- cp *.contract $out/share/contractor/
- '';
-
- meta = with lib; {
- description = "Extra contractor files for elementary";
- homepage = "https://github.com/worldofpeace/extra-elementary-contracts";
- license = licenses.gpl2;
- maintainers = with maintainers; [ worldofpeace ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/exec-path.patch b/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/exec-path.patch
deleted file mode 100644
index 3b97e306119d..000000000000
--- a/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/exec-path.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/file-roller-compress.contract b/file-roller-compress.contract
-index 8de5396..de7e939 100644
---- a/file-roller-compress.contract
-+++ b/file-roller-compress.contract
-@@ -3,6 +3,6 @@ Name=Compress
- Icon=add-files-to-archive
- Description=Create a compressed archive with the selected objects
- MimeType=!archive;inode/blockdevice;inode/chardevice;inode/fifo;inode/socket;
--Exec=file-roller --add %U
-+Exec=@file_roller@/bin/file-roller --add %U
- Gettext-Domain=file-roller
-
-diff --git a/file-roller-extract-here.contract b/file-roller-extract-here.contract
-index 184a6f2..345f4e7 100644
---- a/file-roller-extract-here.contract
-+++ b/file-roller-extract-here.contract
-@@ -3,5 +3,5 @@ Name=Extract Here
- Icon=extract-archive
- Description=Extract the contents of the archives in the archive folder and quit the program
- MimeType=application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-ar;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-deb;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lhz;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;application/zip;
--Exec=file-roller --extract-here %U
-+Exec=@file_roller@/bin/file-roller --extract-here %U
- Gettext-Domain=file-roller
-diff --git a/gnome-bluetooth.contract b/gnome-bluetooth.contract
-index 745dbbe..8cc0102 100644
---- a/gnome-bluetooth.contract
-+++ b/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