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: f1a3fa1909da
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: b00b7970e94b
Choose a head ref
  • 5 commits
  • 3 files changed
  • 3 contributors

Commits on Jun 17, 2019

  1. nomachine-client: 6.5.6 -> 6.6.8 

    (cherry picked from commit 9d1e509)
    @talyz @etu
    talyz authored and etu committed Jun 17, 2019
    Copy the full SHA
    14f8e5d View commit details

  2. nomachine-client: 6.6.8 -> 6.7.6 

    (cherry picked from commit 93a6806)
    @talyz @etu
    talyz authored and etu committed Jun 17, 2019
    Copy the full SHA
    5ef01e7 View commit details

Commits on Jun 20, 2019

  1. pantheon.elementary-gtk-theme: 5.2.3 -> 5.2.4 

    https://github.com/elementary/stylesheet/releases/tag/5.2.4
(cherry picked from commit d72ef07)
    @worldofpeace
    worldofpeace committed Jun 20, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9a7c5c8 View commit details

  2. pantheon.gala: 2018-05-14 -> 2019-05-31 

    Fixes minimize animation in HiDPI monitor

(cherry picked from commit c7b4b3b)
    @worldofpeace
    worldofpeace committed Jun 20, 2019
    Copy the full SHA
    0f1560f View commit details

Commits on Jun 21, 2019

  1. Merge pull request #63292 from etu/1903-nomachine-client 

    [19.03] nomachine-client: 6.5.6 -> 6.7.6
    @etu
    etu authored Jun 21, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b00b797 View commit details
4 changes: 2 additions & 2 deletions pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

stdenv.mkDerivation rec {
pname = "stylesheet";
version = "5.2.3";
version = "5.2.4";

name = "elementary-gtk-theme-${version}";

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1ghb6zl9yszsrxdkg8va1b29kyazbny2kncr9fdw6v2rbjnp7zhr";
sha256 = "1zhh9s4bmmk69k6j0klvfjmyv32wnwf0g575brm6gswn47nr2fni";
};

passthru = {
6 changes: 3 additions & 3 deletions pkgs/desktops/pantheon/desktop/gala/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,13 +5,13 @@

stdenv.mkDerivation rec {
pname = "gala";
version = "unstable-2019-05-14"; # Is tracking https://github.com/elementary/gala/commits/stable/juno
version = "unstable-2019-05-31"; # Is tracking https://github.com/elementary/gala/commits/stable/juno

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = "3ae100da4bbd9dabe353f468778ef63ef2dcd5d7";
sha256 = "08xcj4z9mq511w8hdpr60nmd6j1cj7rs7rgs4s5ivyg11kg5w17b";
rev = "1024813560668152814a72fd93dc6a93b226eb04";
sha256 = "14kzf9vih3j492dssmlc5vbdw21n0h7v7sxlc1fc9givls4g5i83";
};

passthru = {
10 changes: 5 additions & 5 deletions pkgs/tools/admin/nomachine-client/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{ stdenv, lib, file, fetchurl, makeWrapper,
autoPatchelfHook, jsoncpp, libpulseaudio }:
let
versionMajor = "6.5";
versionMajor = "6.7";
versionMinor = "6";
versionBuild_x86_64 = "9";
versionBuild_i686 = "8";
versionBuild_x86_64 = "11";
versionBuild_i686 = "11";
in
stdenv.mkDerivation rec {
pname = "nomachine-client";
@@ -14,12 +14,12 @@ in
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz";
sha256 = "07lg5yadxpl5qfvvh067b3kxd8hm3xv95ralm2pyjl4lw6aql46p";
sha256 = "1mka0a7p03y53zsf0srrcj4f7sigda5vndrwqhr0vncc2qws03k0";
}
else if stdenv.hostPlatform.system == "i686-linux" then
fetchurl {
url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz";
sha256 = "1a23isw09vicazkrypq0kxbb8qy2i4vxiarrgz5xmasjhiy5999a";
sha256 = "1g94s65bp99nfmzvwv1wasvjhgjbfg9jkc089qimi0lvr8ajabkx";
}
else
throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}";