Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d04e10b3d70e
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bb1013511e1e
Choose a head ref
  • 20 commits
  • 26 files changed
  • 2 contributors

Commits on Nov 29, 2019

  1. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    rnhmjoj Michele Guerini Rocco
    Copy the full SHA
    1598f3d View commit details

Commits on Dec 1, 2019

  1. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    rnhmjoj Michele Guerini Rocco
    Copy the full SHA
    40d4c3c View commit details
  2. pantheon.updateScript: support an OAUTH_TOKEN

    Sometimes I get rate limited.
    worldofpeace committed Dec 1, 2019
    Copy the full SHA
    0e7b294 View commit details
  3. Copy the full SHA
    3b7f411 View commit details
  4. Copy the full SHA
    6bd1a22 View commit details
  5. Copy the full SHA
    5ddded7 View commit details
  6. Copy the full SHA
    5f8ae4a View commit details
  7. Copy the full SHA
    1ab687e View commit details
  8. Copy the full SHA
    6761cd3 View commit details
  9. Copy the full SHA
    8e2d53c View commit details
  10. Merge pull request #63607 from rnhmjoj/remove-obex

    nixos/bluetooth: don't install obex tools by default
    worldofpeace authored Dec 1, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    15951cb View commit details
  11. Copy the full SHA
    df58afa View commit details
  12. Copy the full SHA
    e857974 View commit details
  13. Copy the full SHA
    23b11cc View commit details
  14. pantheon.switchboard-with-plugs: don't use hardcode patches

    There are really becoming a pain to maintain.
    worldofpeace committed Dec 1, 2019
    Copy the full SHA
    1575b39 View commit details
  15. pantheon.switchboard-plug-power: don't override pkgconfig

    We submitted a patch upstream to fix this.
    worldofpeace committed Dec 1, 2019
    Copy the full SHA
    a0f3043 View commit details
  16. Copy the full SHA
    5b2f269 View commit details
  17. Copy the full SHA
    e43b203 View commit details
  18. Copy the full SHA
    8d29ff6 View commit details
  19. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    bb10135 View commit details
Showing with 129 additions and 271 deletions.
  1. +7 −0 nixos/doc/manual/release-notes/rl-2003.xml
  2. +1 −1 nixos/modules/services/hardware/bluetooth.nix
  3. +1 −1 nixos/modules/services/x11/desktop-managers/plasma5.nix
  4. +2 −2 pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
  5. +3 −4 pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
  6. +2 −2 pkgs/desktops/pantheon/apps/elementary-videos/default.nix
  7. +3 −11 pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
  8. +0 −76 .../desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/hardcode-settings-daemon-gsettings.patch
  9. +2 −10 pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
  10. +0 −39 pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/hardcode-gsettings.patch
  11. +2 −13 pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
  12. +0 −20 pkgs/desktops/pantheon/apps/switchboard-plugs/power/hardcode-gsettings.patch
  13. +1 −9 pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
  14. +0 −33 pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/hardcode-gsettings.patch
  15. +16 −5 pkgs/desktops/pantheon/apps/switchboard/wrapper.nix
  16. +11 −10 pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix
  17. +4 −7 pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
  18. +24 −0 pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/fix-paths.patch
  19. +2 −4 pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
  20. +2 −2 pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
  21. +2 −4 pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
  22. +2 −4 pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
  23. +2 −4 pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
  24. +18 −7 pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix
  25. +2 −2 pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
  26. +20 −1 pkgs/desktops/pantheon/update.sh
7 changes: 7 additions & 0 deletions nixos/doc/manual/release-notes/rl-2003.xml
Original file line number Diff line number Diff line change
@@ -199,6 +199,13 @@
This has led to drastically reduced closed sizes for some rust crates since development dependencies are now in the <literal>lib</literal> output.
</para>
</listitem>
<listitem>
<para>
The packages <literal>openobex</literal> and <literal>obexftp</literal>
are no loger installed when enabling bluetooth via
<option>hardware.bluetooth.enable</option>.
</para>
</listitem>
</itemizedlist>
</section>

2 changes: 1 addition & 1 deletion nixos/modules/services/hardware/bluetooth.nix
Original file line number Diff line number Diff line change
@@ -72,7 +72,7 @@ in {
};
};

environment.systemPackages = [ bluez-bluetooth pkgs.openobex pkgs.obexftp ];
environment.systemPackages = [ bluez-bluetooth ];

environment.etc = singleton {
source = pkgs.writeText "main.conf" (generators.toINI { } cfg.config + optionalString (cfg.extraConfig != null) cfg.extraConfig);
2 changes: 1 addition & 1 deletion nixos/modules/services/x11/desktop-managers/plasma5.nix
Original file line number Diff line number Diff line change
@@ -169,7 +169,7 @@ in
++ lib.optional (cfg.phononBackend == "vlc") libsForQt5.phonon-backend-vlc

# Optional hardware support features
++ lib.optionals config.hardware.bluetooth.enable [ bluedevil bluez-qt ]
++ lib.optionals config.hardware.bluetooth.enable [ bluedevil bluez-qt openobex obexftp ]
++ lib.optional config.networking.networkmanager.enable plasma-nm
++ lib.optional config.hardware.pulseaudio.enable plasma-pa
++ lib.optional config.powerManagement.enable powerdevil
4 changes: 2 additions & 2 deletions pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
Original file line number Diff line number Diff line change
@@ -18,15 +18,15 @@

stdenv.mkDerivation rec {
pname = "elementary-calculator";
version = "1.5.3";
version = "1.5.4";

repoName = "calculator";

src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "0ibnj3zm93p8ghiy8gbbm0vlig9mnqjsvvp1cpw62dnap0qixdcg";
sha256 = "0053bdzn5viqlni6qg6q39nma6bsddmhnafa0mzggiv8l4qasbrx";
};

passthru = {
7 changes: 3 additions & 4 deletions pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
Original file line number Diff line number Diff line change
@@ -25,22 +25,21 @@

stdenv.mkDerivation rec {
pname = "elementary-calendar";
version = "unstable-2019-10-29";
version = "5.0.3";

repoName = "calendar";

src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
rev = "7d201fc5ea9e8dc25c46427397594fcab2016ed6"; # needed for libical 2.0 compat
sha256 = "11bqf3nxrj1sfd0qq5h0jsmimc6mwkd2g7q9ycizn9x5ak2gb8xi";
rev = version;
sha256 = "1dqcmh585fjib4m8bs7qy23fv429s7q9nbcqnn0vvmy1n36fic4m";
};

passthru = {
updateScript = pantheon.updateScript {
inherit repoName;
attrPath = pname;
versionPolicy = "master";
};
};

4 changes: 2 additions & 2 deletions pkgs/desktops/pantheon/apps/elementary-videos/default.nix
Original file line number Diff line number Diff line change
@@ -19,15 +19,15 @@

stdenv.mkDerivation rec {
pname = "elementary-videos";
version = "2.6.3";
version = "2.7.0";

repoName = "videos";

src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "1ncm8kh6dcy83p8pmpilnk03b4dx3b1jm8w13izq2dkglfgdwvqx";
sha256 = "1b6dqqmxa83fwlh9r0v918ikxd3mnwk0j5xssw1wk5l7q72s43w7";
};

passthru = {
Original file line number Diff line number Diff line change
@@ -15,24 +15,15 @@

stdenv.mkDerivation rec {
pname = "switchboard-plug-mouse-touchpad";
version = "2.3.0";
version = "2.3.1";

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1cg69nbdf4mcr16mi71aw9j8877lyj8yxjfk9bd3sml8f4fh7mmr";
sha256 = "1974zdr5w3xd882gi95fp7axgilfni1sclsr750qm32yhl7d9bfn";
};

patches = [
./hardcode-settings-daemon-gsettings.patch
];

postPatch = ''
substituteInPlace src/Views/Clicking.vala \
--subst-var-by GSD_GSETTINGS ${glib.getSchemaPath elementary-settings-daemon}
'';

passthru = {
updateScript = pantheon.updateScript {
repoName = pname;
@@ -51,6 +42,7 @@ stdenv.mkDerivation rec {
granite
gtk3
libgee
elementary-settings-daemon
switchboard
];

This file was deleted.

Original file line number Diff line number Diff line change
@@ -36,24 +36,16 @@ stdenv.mkDerivation rec {
granite
gtk3
libgee
gala
wingpanel
plank
switchboard
];

patches = [
./backgrounds.patch # Having https://github.com/elementary/switchboard-plug-pantheon-shell/issues/166 would make this patch uneeded
./hardcode-gsettings.patch
];

postPatch = ''
substituteInPlace src/Views/Appearance.vala \
--subst-var-by GALA_GSETTINGS_PATH ${glib.getSchemaPath gala}
substituteInPlace src/Views/HotCorners.vala \
--subst-var-by GALA_GSETTINGS_PATH ${glib.getSchemaPath gala}
substituteInPlace src/Views/Appearance.vala \
--subst-var-by WINGPANEL_GSETTINGS_PATH ${glib.getSchemaPath wingpanel}
'';

meta = with stdenv.lib; {
description = "Switchboard Desktop Plug";
homepage = https://github.com/elementary/switchboard-plug-pantheon-shell;

This file was deleted.

15 changes: 2 additions & 13 deletions pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
Original file line number Diff line number Diff line change
@@ -43,6 +43,8 @@ stdenv.mkDerivation rec {

buildInputs = [
dbus
elementary-dpms-helper
elementary-settings-daemon
glib
granite
gtk3
@@ -56,21 +58,8 @@ stdenv.mkDerivation rec {
src = ./dpms-helper-exec.patch;
elementary_dpms_helper = elementary-dpms-helper;
})
./hardcode-gsettings.patch
];

postPatch = ''
substituteInPlace src/MainView.vala \
--subst-var-by DPMS_HELPER_GSETTINGS_PATH ${glib.getSchemaPath elementary-dpms-helper}
substituteInPlace src/MainView.vala \
--subst-var-by GSD_GSETTINGS_PATH ${glib.getSchemaPath elementary-settings-daemon}
'';

PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
PKG_CONFIG_DBUS_1_SYSTEM_BUS_SERVICES_DIR = "${placeholder "out"}/share/dbus-1/system-services";
PKG_CONFIG_DBUS_1_SYSCONFDIR = "${placeholder "out"}/etc";
PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions";

meta = with stdenv.lib; {
description = "Switchboard Power Plug";
homepage = https://github.com/elementary/switchboard-plug-power;

This file was deleted.

Original file line number Diff line number Diff line change
@@ -48,21 +48,13 @@ stdenv.mkDerivation rec {
libgee
polkit
switchboard
lightlocker
zeitgeist
];

patches = [
./hardcode-gsettings.patch
];

postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
substituteInPlace src/Views/LockPanel.vala \
--subst-var-by LIGHTLOCKER_GSETTINGS_PATH ${glib.getSchemaPath lightlocker}
substituteInPlace src/Views/FirewallPanel.vala \
--subst-var-by SWITCHBOARD_SEC_PRIV_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"}
'';

meta = with stdenv.lib; {

This file was deleted.

21 changes: 16 additions & 5 deletions pkgs/desktops/pantheon/apps/switchboard/wrapper.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{ makeWrapper
{ wrapGAppsHook
, glib
, lib
, symlinkJoin
, switchboard
, switchboardPlugs
@@ -11,13 +13,22 @@ in
symlinkJoin {
name = "${switchboard.name}-with-plugs";

paths = [ switchboard ] ++ selectedPlugs;
paths = [
switchboard
] ++ selectedPlugs;

buildInputs = [ makeWrapper ];
buildInputs = [
wrapGAppsHook
glib
] ++ (lib.forEach selectedPlugs (x: x.buildInputs))
++ selectedPlugs;

postBuild = ''
wrapProgram $out/bin/io.elementary.switchboard \
--set SWITCHBOARD_PLUGS_PATH "$out/lib/switchboard"
make_glib_find_gsettings_schemas
gappsWrapperArgs+=(--set SWITCHBOARD_PLUGS_PATH "$out/lib/switchboard")
wrapGAppsHook
'';

inherit (switchboard) meta;
21 changes: 11 additions & 10 deletions pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix
Original file line number Diff line number Diff line change
@@ -1,36 +1,37 @@
{ stdenv
, fetchFromGitHub
, pantheon
, meson
, ninja
, gettext
}:

stdenv.mkDerivation rec {
pname = "elementary-wallpapers";
version = "5.4";
version = "5.5.0";

repoName = "wallpapers";

src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "1ihvv9v8m5f2n2v3bgg769l52wbg241zgp3d45q6phk7p8s1gz3s";
sha256 = "0c63nds2ylqgcp39s13mfwhipgyw8cirn0bhybp291l5g86ii6s3";
};

nativeBuildInputs = [
gettext
meson
ninja
];

passthru = {
updateScript = pantheon.updateScript {
inherit repoName;
attrPath = pname;
};
};

dontBuild = true;
dontConfigure = true;

installPhase = ''
mkdir -p $out/share/backgrounds/elementary
cp -av *.jpg $out/share/backgrounds/elementary
'';

meta = with stdenv.lib; {
description = "Collection of wallpapers for elementary";
homepage = https://github.com/elementary/wallpapers;
Original file line number Diff line number Diff line change
@@ -26,15 +26,15 @@

stdenv.mkDerivation rec {
pname = "wingpanel-applications-menu";
version = "2.4.4";
version = "2.5.0";

repoName = "applications-menu";

src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "09ssxn264v6nzrxgk529kpdxq5j3b14z8mbwq0gni1bgjcla773d";
sha256 = "1zry9xvcljsn5fnl8qs21x7q8rpwv0sxvp2dmnx3ddqnvj4q2m7d";
};

passthru = {
@@ -73,13 +73,10 @@ stdenv.mkDerivation rec {
"--sysconfdir=${placeholder "out"}/etc"
];

PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";

patches = [
(substituteAll {
src = ./bc.patch;
exec = "${bc}/bin/bc";
src = ./fix-paths.patch;
bc = "${bc}/bin/bc";
})
];

Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
diff --git a/src/synapse-plugins/calculator-plugin.vala b/src/synapse-plugins/calculator-plugin.vala
index 18ca3af..f5d1076 100644
--- a/src/synapse-plugins/calculator-plugin.vala
+++ b/src/synapse-plugins/calculator-plugin.vala
@@ -44,9 +44,7 @@ namespace Synapse {
_("Calculator"),
_("Calculate basic expressions."),
"accessories-calculator",
- register_plugin,
- Environment.find_program_in_path ("bc") != null,
- _("bc is not installed")
+ register_plugin
);
}

@@ -87,7 +85,7 @@ namespace Synapse {
if (matched) {
Pid pid;
int read_fd, write_fd;
- string[] argv = {"bc", "-l"};
+ string[] argv = {"@bc@", "-l"};
string? solution = null;

try {
Original file line number Diff line number Diff line change
@@ -16,13 +16,13 @@

stdenv.mkDerivation rec {
pname = "wingpanel-indicator-bluetooth";
version = "2.1.3";
version = "2.1.4";

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "04ggakf7qp4q0kah5xksbwjn78wpdrp9kdgkj6ibzsb97ngn70g9";
sha256 = "05v3qy4rxi4l3g1ql99vcjylb01hz3galh19c2jc3lqc1mf1z1j1";
};

passthru = {
@@ -48,8 +48,6 @@ stdenv.mkDerivation rec {
wingpanel
];

PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";

postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
Original file line number Diff line number Diff line change
@@ -35,13 +35,13 @@ in

stdenv.mkDerivation rec {
pname = "wingpanel-indicator-datetime";
version = "2.2.0";
version = "2.2.1";

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1whdx0vgm0qbbzsw8dg2liz3cbh3ad5ybkriy4lmx5ynyhpbz0sx";
sha256 = "0y8lfrrkzcj8nw94jqawbxr4jz41ac0z539kkr3n3x0qmx72md2y";
};

passthru = {
Original file line number Diff line number Diff line change
@@ -14,13 +14,13 @@

stdenv.mkDerivation rec {
pname = "wingpanel-indicator-notifications";
version = "2.1.2";
version = "2.1.3";

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1960s3xcsx6yjlnk0csf1m66s1z1sj5rym9b2fy7pm2nan47z3ld";
sha256 = "1lx023z7xxlgwh0br48fw5w7xw673p2sqxwl1gz9f54xx7rv81py";
};

passthru = {
@@ -44,8 +44,6 @@ stdenv.mkDerivation rec {
wingpanel
];

PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";

meta = with stdenv.lib; {
description = "Notifications Indicator for Wingpanel";
homepage = https://github.com/elementary/wingpanel-indicator-notifications;
Original file line number Diff line number Diff line change
@@ -14,13 +14,13 @@

stdenv.mkDerivation rec {
pname = "wingpanel-indicator-session";
version = "2.2.5";
version = "2.2.6";

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0lqh9g6qq09m744gncspm79lbwx1vjl1d6j2szwcq9f0jdm01pm5";
sha256 = "0pzknbm0hg4kf2izfg1mcmyildfzwyq1hh0xhlq16gsmakq4ld26";
};

passthru = {
@@ -44,8 +44,6 @@ stdenv.mkDerivation rec {
wingpanel
];

PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";

meta = with stdenv.lib; {
description = "Session Indicator for Wingpanel";
homepage = https://github.com/elementary/wingpanel-indicator-session;
Original file line number Diff line number Diff line change
@@ -18,13 +18,13 @@

stdenv.mkDerivation rec {
pname = "wingpanel-indicator-sound";
version = "2.1.3";
version = "2.1.4";

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0lgjl969c7s31nszh6d4pr1vsxfdsizplsihvd8r02mm1mlxmsda";
sha256 = "00r3dqkyp7k34xwn12l0dbzfmz70084lblxchykmk77pgzid2a0b";
};

passthru = {
@@ -52,8 +52,6 @@ stdenv.mkDerivation rec {
wingpanel
];

PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";

postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
25 changes: 18 additions & 7 deletions pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ lib
, makeWrapper
, wrapGAppsHook
, glib
, symlinkJoin
, wingpanel
, wingpanelIndicators
@@ -13,17 +14,27 @@ in
symlinkJoin {
name = "${wingpanel.name}-with-indicators";

paths = [ wingpanel ] ++ selectedIndicators;
paths = [
wingpanel
] ++ selectedIndicators;

buildInputs = [ makeWrapper ];
buildInputs = [
glib
wrapGAppsHook
] ++ (lib.forEach selectedIndicators (x: x.buildInputs))
++ selectedIndicators;

# We have to set SWITCHBOARD_PLUGS_PATH because wingpanel-applications-menu
# has a plugin to search switchboard settings
postBuild = ''
wrapProgram $out/bin/wingpanel \
--set WINGPANEL_INDICATORS_PATH "$out/lib/wingpanel" \
--set SWITCHBOARD_PLUGS_PATH "${switchboard-with-plugs}/lib/switchboard" \
--suffix XDG_DATA_DIRS : ${lib.concatMapStringsSep ":" (indicator: ''${indicator}/share/gsettings-schemas/${indicator.name}'') selectedIndicators}
make_glib_find_gsettings_schemas
gappsWrapperArgs+=(
--set WINGPANEL_INDICATORS_PATH "$out/lib/wingpanel"
--set SWITCHBOARD_PLUGS_PATH "${switchboard-with-plugs}/lib/switchboard"
)
wrapGAppsHook
'';

inherit (wingpanel) meta;
Original file line number Diff line number Diff line change
@@ -17,15 +17,15 @@

stdenv.mkDerivation rec {
pname = "elementary-capnet-assist";
version = "2.2.3";
version = "2.2.4";

repoName = "capnet-assist";

src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "15cnwimkmmsb4rwvgm8bizcsn1krsj6k3qc88izn79is75y6wwji";
sha256 = "0yz827gs1qv6csgv4v993rjmqzc6dbymbvznsy45ghlh19l4l7j1";
};

passthru = {
21 changes: 20 additions & 1 deletion pkgs/desktops/pantheon/update.sh
Original file line number Diff line number Diff line change
@@ -114,7 +114,26 @@ EOF
function get_latest_tag ( ) {
repo_name="$1"

curl --silent --show-error --fail -X GET "https://api.github.com/repos/elementary/$repo_name/releases/latest" | jq -r '.tag_name'
OAUTH_TOKEN=$(printenv OAUTH_TOKEN)

if [ -n "$OAUTH_TOKEN" ]; then
curl \
--silent \
--show-error \
--fail \
-X GET \
--header "Authorization: token $OAUTH_TOKEN" \
"https://api.github.com/repos/elementary/$repo_name/releases/latest" \
| jq -r '.tag_name'
else
curl \
--silent \
--show-error \
--fail \
-X GET \
"https://api.github.com/repos/elementary/$repo_name/releases/latest" \
| jq -r '.tag_name'
fi
}

#