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: 0f1560fab2cb
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: 303729afa024
Choose a head ref
  • 6 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. cargo-graph: init at 0.2.0-d895af1 

    (cherry picked from commit c2f3f16)
    @basvandijk
    basvandijk committed Jun 20, 2019
    Copy the full SHA
    ec8b820 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
    Copy the full SHA
    b00b797 View commit details

  2. cargo-graph: update cargoSha256 for 19.03

    @basvandijk
    basvandijk committed Jun 21, 2019
    Copy the full SHA
    633baf9 View commit details

  3. Merge pull request #63556 from basvandijk/cargo-graph-0.2.0-d895af1-r… 

    …elease-19.03

Backport "cargo-graph: init at 0.2.0-d895af1" to 19.03
    @basvandijk
    basvandijk authored Jun 21, 2019
    Copy the full SHA
    303729a View commit details
Showing with 29 additions and 5 deletions.
  1. +5 −5 pkgs/tools/admin/nomachine-client/default.nix
  2. +23 −0 pkgs/tools/package-management/cargo-graph/default.nix
  3. +1 −0 pkgs/top-level/all-packages.nix
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}";
23 changes: 23 additions & 0 deletions pkgs/tools/package-management/cargo-graph/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
name = "cargo-graph-${version}";
version = "0.2.0-d895af1";

src = fetchFromGitHub {
owner = "kbknapp";
repo = "cargo-graph";
# The last release (v0.2.0) is from 2015. Since then there have been some
# bug fixes committed that would be good to have.
rev = "d895af1b7840c7ae8eddaf4e990bfa594c22ba01";
sha256 = "0myg26cssmbakz53dl61lswsbaqnjqlbc30c2571pq8f7gvz2qv5";
};

cargoSha256 = "0pixdz584rv2hxc55dd7cninrw1b2n3p3zc55k2jgcam8a7babrh";

meta = with lib; {
description = "A cargo subcommand for creating GraphViz DOT files and dependency graphs";
license = with licenses; [ mit ];
maintainers = with maintainers; [ basvandijk ];
platforms = platforms.all;
};
}
1 change: 1 addition & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -7616,6 +7616,7 @@ in

cargo-download = callPackage ../tools/package-management/cargo-download { };
cargo-edit = callPackage ../tools/package-management/cargo-edit { };
cargo-graph = callPackage ../tools/package-management/cargo-graph { };
cargo-release = callPackage ../tools/package-management/cargo-release {
inherit (darwin.apple_sdk.frameworks) Security;
};