Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0a65c2b7e931
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bea1a232c615
Choose a head ref
  • 6 commits
  • 6 files changed
  • 1 contributor

Commits on Jan 19, 2020

  1. nixpkgs-github-update: slowness

    @worldofpeace
    worldofpeace committed Jan 19, 2020
    Copy the full SHA
    b85c3ae View commit details

  2. pantheon.elementary-terminal: 5.5.0 -> 5.5.1 

    https://github.com/elementary/terminal/releases/tag/5.5.1
    @worldofpeace
    worldofpeace committed Jan 19, 2020
    Copy the full SHA
    6a3c188 View commit details

  3. pantheon.switchboard: 2.3.7 -> 2.3.8 

    https://github.com/elementary/switchboard/releases/tag/2.3.8
    @worldofpeace
    worldofpeace committed Jan 19, 2020
    Copy the full SHA
    312f643 View commit details

  4. pantheon.elementary-icon-theme: 5.1.0 -> 5.2.0 

    https://github.com/elementary/icons/releases/tag/5.2.0
    @worldofpeace
    worldofpeace committed Jan 19, 2020
    Copy the full SHA
    6198a0e View commit details

  5. pantheon.elementary-default-settings: 5.1.1 -> 5.1.2 

    https://github.com/elementary/default-settings/releases/tag/5.1.2
    @worldofpeace
    worldofpeace committed Jan 19, 2020
    Copy the full SHA
    1e9a4da View commit details

  6. pantheon.wingpanel-indicator-session: 2.2.6 -> 2.2.7 

    https://github.com/elementary/wingpanel-indicator-session/releases/tag/2.2.7
    @worldofpeace
    worldofpeace committed Jan 19, 2020
    Copy the full SHA
    bea1a23 View commit details
4 changes: 2 additions & 2 deletions pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
View file
Original file line number Diff line number Diff line change
@@ -20,15 +20,15 @@

stdenv.mkDerivation rec {
pname = "elementary-terminal";
version = "5.5.0";
version = "5.5.1";

repoName = "terminal";

src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "1wna3kcg621qjyvg70dzk4lfq8si2snnlm9fnl5gj0w6b707gz2x";
sha256 = "1b8fzs9s7djhwp02l3fwjpwxylklpbnw7x46mv7c8ksbp0m75iyj";
};

passthru = {
4 changes: 2 additions & 2 deletions pkgs/desktops/pantheon/apps/switchboard/default.nix
View file
Original file line number Diff line number Diff line change
@@ -17,13 +17,13 @@

stdenv.mkDerivation rec {
pname = "switchboard";
version = "2.3.7";
version = "2.3.8";

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "160aar5dqd019vn28cm0d0ijj1i6mwpqkl7a1l4lpasw12drxwxz";
sha256 = "1y254irl07fp70228zm268w20zd7risz0sk9i9wz59yynxwjshbx";
};

passthru = {
8 changes: 6 additions & 2 deletions pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,19 +6,21 @@
, ninja
, hicolor-icon-theme
, gtk3
, inkscape
, xorg
}:

stdenv.mkDerivation rec {
pname = "elementary-icon-theme";
version = "5.1.0";
version = "5.2.0";

repoName = "icons";

src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "1yrf92ysjh1yfm42wznlw0lh9zsm5whghwzx3b3wcdkwdhkdg24z";
sha256 = "1irkjj8xfpgkl5p56xhqa3w2s98b8lav7d1lxxrabdi87cjv3n33";
};

passthru = {
@@ -29,9 +31,11 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [
gtk3
inkscape
meson
ninja
python3
xorg.xcursorgen
];

propagatedBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,15 +14,15 @@

stdenv.mkDerivation rec {
pname = "elementary-default-settings";
version = "5.1.1";
version = "5.1.2";

repoName = "default-settings";

src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "10sdy8v34y6bgb3mabwy7k3b5dbqrnab504dvhashpfxr9n9xncy";
sha256 = "00z31alwn2skhksrhp2jk75f6jlaipzk91hclx7na4gbcyrw7ahw";
};

passthru = {
4 changes: 2 additions & 2 deletions pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,13 +14,13 @@

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

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

passthru = {
6 changes: 3 additions & 3 deletions ...esktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/github_latest_version.ex
View file
Original file line number Diff line number Diff line change
@@ -21,11 +21,11 @@ defmodule NixpkgsGitHubUpdate.GitHubLatestVersion do
end

defp get_token do
String.to_charlist("#{System.get_env("OAUTH_TOKEN")}")
System.get_env("OAUTH_TOKEN")
end

defp put_token(headers, token) when is_list(token) do
Map.put_new(headers, 'Authorization', 'token #{token}')
defp put_token(headers, token) when token != nil do
Map.put_new(headers, 'Authorization', 'token #{String.to_charlist(token)}')
end

defp put_token(headers, _), do: headers