Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #69052 from worldofpeace/elementary-updates-maybe-5.1
Pantheon 5.1
- Loading branch information
Showing
38 changed files
with
459 additions
and
222 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| { stdenv | ||
| , appstream | ||
| , appstream-glib | ||
| , dbus | ||
| , desktop-file-utils | ||
| , elementary-gtk-theme | ||
| , elementary-icon-theme | ||
| , fetchFromGitHub | ||
| , fetchpatch | ||
| , flatpak | ||
| , gettext | ||
| , glib | ||
| , granite | ||
| , gtk3 | ||
| , json-glib | ||
| , libgee | ||
| , libsoup | ||
| , libxml2 | ||
| , meson | ||
| , ninja | ||
| , packagekit | ||
| , pantheon | ||
| , pkgconfig | ||
| , python3 | ||
| , vala | ||
| , wrapGAppsHook | ||
| }: | ||
|
|
||
| stdenv.mkDerivation rec { | ||
| pname = "appcenter"; | ||
| version = "3.2.0"; | ||
|
|
||
| src = fetchFromGitHub { | ||
| owner = "elementary"; | ||
| repo = pname; | ||
| rev = version; | ||
| sha256 = "0xsxm0qgmnljd4s8m6xajzsjp9skpsa8wwlwqmc5yx34diad7zag"; | ||
| }; | ||
|
|
||
| passthru = { | ||
| updateScript = pantheon.updateScript { | ||
| repoName = pname; | ||
| }; | ||
| }; | ||
|
|
||
| nativeBuildInputs = [ | ||
| appstream-glib | ||
| dbus # for pkgconfig | ||
| desktop-file-utils | ||
| gettext | ||
| meson | ||
| ninja | ||
| pkgconfig | ||
| python3 | ||
| vala | ||
| wrapGAppsHook | ||
| ]; | ||
|
|
||
| buildInputs = [ | ||
| appstream | ||
| elementary-icon-theme | ||
| elementary-gtk-theme | ||
| flatpak | ||
| glib | ||
| granite | ||
| gtk3 | ||
| json-glib | ||
| libgee | ||
| libsoup | ||
| libxml2 | ||
| packagekit | ||
| ]; | ||
|
|
||
| mesonFlags = [ | ||
| "-Dhomepage=false" | ||
| "-Dpayments=false" | ||
| "-Dcurated=false" | ||
| ]; | ||
|
|
||
| postPatch = '' | ||
| chmod +x meson/post_install.py | ||
| patchShebangs meson/post_install.py | ||
| ''; | ||
|
|
||
| meta = with stdenv.lib; { | ||
| homepage = https://github.com/elementary/appcenter; | ||
| description = "An open, pay-what-you-want app store for indie developers, designed for elementary OS"; | ||
| license = licenses.gpl3Plus; | ||
| platforms = platforms.linux; | ||
| maintainers = pantheon.maintainers; | ||
| }; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70 changes: 70 additions & 0 deletions
70
pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| { stdenv | ||
| , fetchFromGitHub | ||
| , pantheon | ||
| , pkgconfig | ||
| , meson | ||
| , ninja | ||
| , vala | ||
| , python3 | ||
| , gtk3 | ||
| , glib | ||
| , granite | ||
| , libgee | ||
| , elementary-icon-theme | ||
| , elementary-gtk-theme | ||
| , gettext | ||
| , wrapGAppsHook | ||
| }: | ||
|
|
||
| stdenv.mkDerivation rec { | ||
| pname = "elementary-feedback"; | ||
| version = "1.0"; | ||
|
|
||
| repoName = "feedback"; | ||
|
|
||
| src = fetchFromGitHub { | ||
| owner = "elementary"; | ||
| repo = repoName; | ||
| rev = version; | ||
| sha256 = "0rc4ifs4hd4cj0v028bzc45v64pwx21xylwrhb20jpw61ainfi8s"; | ||
| }; | ||
|
|
||
| passthru = { | ||
| updateScript = pantheon.updateScript { | ||
| inherit repoName; | ||
| attrPath = pname; | ||
| }; | ||
| }; | ||
|
|
||
| nativeBuildInputs = [ | ||
| gettext | ||
| meson | ||
| ninja | ||
| pkgconfig | ||
| python3 | ||
| vala | ||
| wrapGAppsHook | ||
| ]; | ||
|
|
||
| buildInputs = [ | ||
| elementary-icon-theme | ||
| granite | ||
| gtk3 | ||
| elementary-gtk-theme | ||
| libgee | ||
| glib | ||
| ]; | ||
|
|
||
| postPatch = '' | ||
| chmod +x meson/post_install.py | ||
| patchShebangs meson/post_install.py | ||
| ''; | ||
|
|
||
| meta = with stdenv.lib; { | ||
| description = "GitHub Issue Reporter designed for elementary OS"; | ||
| homepage = https://github.com/elementary/feedback; | ||
| license = licenses.gpl3Plus; | ||
| platforms = platforms.linux; | ||
| maintainers = pantheon.maintainers; | ||
| }; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| { stdenv | ||
| , desktop-file-utils | ||
| , elementary-gtk-theme | ||
| , elementary-icon-theme | ||
| , fetchFromGitHub | ||
| , flatpak | ||
| , gettext | ||
| , glib | ||
| , granite | ||
| , gtk3 | ||
| , libgee | ||
| , meson | ||
| , ninja | ||
| , pantheon | ||
| , pkgconfig | ||
| , python3 | ||
| , vala | ||
| , libxml2 | ||
| , wrapGAppsHook | ||
| }: | ||
|
|
||
| stdenv.mkDerivation rec { | ||
| pname = "sideload"; | ||
| version = "1.0.0"; | ||
|
|
||
| src = fetchFromGitHub { | ||
| owner = "elementary"; | ||
| repo = pname; | ||
| rev = version; | ||
| sha256 = "1qi4wm773bf1szi5a77g9lxjn305v1m85j4nb6il9q4qlh9b1cs5"; | ||
| }; | ||
|
|
||
| passthru = { | ||
| updateScript = pantheon.updateScript { | ||
| repoName = pname; | ||
| }; | ||
| }; | ||
|
|
||
| nativeBuildInputs = [ | ||
| desktop-file-utils | ||
| gettext | ||
| meson | ||
| ninja | ||
| pkgconfig | ||
| python3 | ||
| vala | ||
| wrapGAppsHook | ||
| ]; | ||
|
|
||
| buildInputs = [ | ||
| elementary-gtk-theme | ||
| elementary-icon-theme | ||
| flatpak | ||
| glib | ||
| granite | ||
| gtk3 | ||
| libgee | ||
| libxml2 | ||
| ]; | ||
|
|
||
| postPatch = '' | ||
| chmod +x meson/post_install.py | ||
| patchShebangs meson/post_install.py | ||
| ''; | ||
|
|
||
| meta = with stdenv.lib; { | ||
| homepage = https://github.com/elementary/sideload; | ||
| description = "Flatpak installer, designed for elementary OS"; | ||
| license = licenses.gpl3Plus; | ||
| platforms = platforms.linux; | ||
| maintainers = pantheon.maintainers; | ||
| }; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
26
pkgs/desktops/pantheon/apps/switchboard-plugs/about/fix-paths.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| diff --git a/src/Plug.vala b/src/Plug.vala | ||
| index c32efcbe..0cdaeaca 100644 | ||
| --- a/src/Plug.vala | ||
| +++ b/src/Plug.vala | ||
| @@ -178,7 +178,7 @@ public class About.Plug : Switchboard.Plug { | ||
|
|
||
| var bug_button = new Gtk.Button.with_label (_("Report a Problem")); | ||
| bug_button.clicked.connect (() => { | ||
| - var appinfo = new GLib.DesktopAppInfo ("io.elementary.feedback.desktop"); | ||
| + var appinfo = new GLib.DesktopAppInfo ("@elementary_feedback@/bin/io.elementary.feedback.desktop"); | ||
| if (appinfo != null) { | ||
| try { | ||
| appinfo.launch (null, null); | ||
| diff --git a/src/Views/HardwareView.vala b/src/Views/HardwareView.vala | ||
| index f8113634..3794bad8 100644 | ||
| --- a/src/Views/HardwareView.vala | ||
| +++ b/src/Views/HardwareView.vala | ||
| @@ -179,7 +179,7 @@ public class About.HardwareView : Gtk.Grid { | ||
|
|
||
| // Graphics | ||
| try { | ||
| - Process.spawn_command_line_sync ("lspci", out graphics); | ||
| + Process.spawn_command_line_sync ("@pciutils@/bin/lspci", out graphics); | ||
|
|
||
| if ("VGA" in graphics) { //VGA-keyword indicates graphics-line | ||
| string[] lines = graphics.split("\n"); |
13 changes: 0 additions & 13 deletions
13
pkgs/desktops/pantheon/apps/switchboard-plugs/about/lspci-path.patch
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.