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: 8a9807f1941d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 476a4fa40d80
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 21, 2020

  1. nomachine-client: 6.8.1 -> 6.9.2

    @talyz
    talyz committed Jan 21, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    mbbx6spp Susan Potter
    GPG key ID: 99027A421FF928FB
    Verified
    Learn about vigilant mode
    Copy the full SHA
    62af780 View commit details

Commits on Jan 25, 2020

  1. Merge pull request #78149 from talyz/nomachine-6.9.2 

    nomachine-client: 6.8.1 -> 6.9.2
    @marsam
    marsam authored Jan 25, 2020
    Copy the full SHA
    476a4fa View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 pkgs/tools/admin/nomachine-client/default.nix
8 changes: 4 additions & 4 deletions pkgs/tools/admin/nomachine-client/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ stdenv, file, fetchurl, makeWrapper,
autoPatchelfHook, jsoncpp, libpulseaudio }:
let
versionMajor = "6.8";
versionMinor = "1";
versionMajor = "6.9";
versionMinor = "2";
versionBuild_x86_64 = "1";
versionBuild_i686 = "1";
in
@@ -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 = "07330sxqjmzdn8kwxn9r49j28lsbp7mmrsxcyl8r32c3g355wskl";
sha256 = "1z2pcfkzicjma4lxrj4qx43xyml993v7qyjd7k8xy8hw85fwnzii";
}
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 = "03b2648nzmc2amgrqflsxihx5yjp7rz906g655az4j2hl7y0b0bs";
sha256 = "03421s0k91c02ga9k6bdvixw71brlgi13q82cinnfayg3fhb0rb6";
}
else
throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}";