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

Commits on Jan 8, 2020

  1. nixpkgs-github-update: is_list

    @worldofpeace
    worldofpeace committed Jan 8, 2020
    Copy the full SHA
    6e40111 View commit details

  2. pantheon.elementary-files: 4.2.0 -> 4.3.0 

    Added libgit2-glib for git plugin support.

https://github.com/elementary/files/releases/tag/4.3.0
    @worldofpeace
    worldofpeace committed Jan 8, 2020
    Copy the full SHA
    ffe6b95 View commit details
12 changes: 4 additions & 8 deletions pkgs/desktops/pantheon/apps/elementary-files/default.nix
View file
Original file line number Diff line number Diff line change
@@ -24,13 +24,13 @@
, glib-networking
, elementary-icon-theme
, libcloudproviders
, fetchpatch
, libgit2-glib
, wrapGAppsHook
}:

stdenv.mkDerivation rec {
pname = "elementary-files";
version = "4.2.0";
version = "4.3.0";

repoName = "files";

@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "12f0hzb62nchksyqd2gwj3cv001rph24ggd9wywh9i1qwppx4b5k";
sha256 = "0brckm0vi9lh8l4g3cy37pbyrdh6g0mdsv3cpii069y2drrh8mz5";
};

passthru = {
@@ -70,6 +70,7 @@ stdenv.mkDerivation rec {
libcloudproviders
libdbusmenu-gtk3
libgee
libgit2-glib
libnotify
libunity
pango
@@ -80,11 +81,6 @@ stdenv.mkDerivation rec {

patches = [
./hardcode-gsettings.patch
# Fixes https://github.com/elementary/files/issues/1081
(fetchpatch {
url = "https://github.com/elementary/files/commit/76b5cc95466733c2c100a99127ecd4fbd4d2a5ec.patch";
sha256 = "0dn8a9l7i2rdgia1rsc50332fsw0yrbfvpb5z8ba4iiki3lxy2nn";
})
];

postPatch = ''
2 changes: 1 addition & 1 deletion ...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
@@ -24,7 +24,7 @@ defmodule NixpkgsGitHubUpdate.GitHubLatestVersion do
String.to_charlist("#{System.get_env("OAUTH_TOKEN")}")
end

defp put_token(headers, token) when is_binary(token) do
defp put_token(headers, token) when is_list(token) do
Map.put_new(headers, 'Authorization', 'token #{token}')
end