dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #240631 from bobby285271/upd/pantheon

Browse Source 
Pantheon updates 2023-06-30
This commit is contained in:
Bobby Rong 2023-06-30 17:23:13 +08:00 committed by GitHub
commit 7b3f4c9a33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 10 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/desktops/pantheon/apps/elementary-files/default.nix
View File

@ -28,7 +28,7 @@
stdenv.mkDerivation rec {
pname = "elementary-files";
version = "6.3.1";
version = "6.4.0";
outputs = [ "out" "dev" ];
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = "files";
rev = version;
sha256 = "sha256-JFkyO4r/Fb8bjWn+wVS2rIpFz19/uBVCsLt8091xzVI=";
sha256 = "sha256-mpCB8jRE9QIUiyBWkfYpfm6dsnMDcWvwwg8twbOiZ6I=";
};
nativeBuildInputs = [

4
pkgs/desktops/pantheon/apps/sideload/default.nix
View File

@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "sideload";
version = "6.2.0";
version = "6.2.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "sha256-AIfQDkodxc3zKi9oYBWIkOw1UgW+nXufNXbpM1Jxjtg=";
sha256 = "sha256-BkU2lANn2KNaElL/JZ3TPVZIjh8eM3//ZiO4lFBIMm8=";
};
nativeBuildInputs = [

4
pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
View File

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-onlineaccounts";
version = "6.5.2";
version = "6.5.3";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "sha256-IW6twvEbCzQbuNFnryHxer5rK5zYfbmilcLjHCV9ZsM=";
sha256 = "sha256-qERXF7aymI2xbyqrD6rwUBiFNRnIiVllavSPgW0F8yk=";
};
nativeBuildInputs = [

6
pkgs/desktops/pantheon/default.nix
View File

@ -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
}

55
pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/default.nix
View File

@ -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;
};
}

11
pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/exec-path.patch
View File

@ -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

14
pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
View File

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, pkg-config
, meson
@ -19,24 +18,15 @@
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-bluetooth";
version = "7.0.0";
version = "7.0.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "sha256-t8Sn8NQW7WueinPkJdn8hd0oCJ3uFeRJliggSFHoaZU=";
sha256 = "sha256-VLW3r5X0AWhNRQpajYmCNMIl/UvZCWz14gpxZLlLJdQ=";
};
patches = [
# Prevent a race that skips automatic resource loading
# https://github.com/elementary/wingpanel-indicator-bluetooth/issues/203
(fetchpatch {
url = "https://github.com/elementary/wingpanel-indicator-bluetooth/commit/4f9237c0cb1152a696ccdd2a2fc83fc706f54d62.patch";
sha256 = "sha256-fUnqw0EAWvtpoo2wI++2B5kXNqQPxnsjPbZ7O30lXBI=";
})
];
nativeBuildInputs = [
glib # for glib-compile-schemas
libxml2