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

Commits on Jan 21, 2020

  1. morph: add openssh to PATH

    Jan Hrnko committed Jan 21, 2020
    Copy the full SHA
    7ccb1db View commit details

Commits on Jan 26, 2020

  1. Merge pull request #78107 from 1000101/morph 

    morph: add openssh to PATH
    @mmahut
    mmahut authored Jan 26, 2020

    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
    34996ef View commit details
Showing with 3 additions and 1 deletion.
  1. +3 −1 pkgs/tools/package-management/morph/default.nix
4 changes: 3 additions & 1 deletion pkgs/tools/package-management/morph/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ buildGoPackage, fetchFromGitHub, go-bindata, lib }:
{ buildGoPackage, fetchFromGitHub, go-bindata, openssh, makeWrapper, lib }:

buildGoPackage rec {
pname = "morph";
@@ -14,6 +14,7 @@ buildGoPackage rec {
goPackagePath = "github.com/dbcdk/morph";
goDeps = ./deps.nix;

nativeBuildInputs = [ makeWrapper ];
buildInputs = [ go-bindata ];

buildFlagsArray = ''
@@ -29,6 +30,7 @@ buildGoPackage rec {
postInstall = ''
mkdir -p $lib
cp -v $src/data/*.nix $lib
wrapProgram $bin/bin/morph --prefix PATH : ${lib.makeBinPath [ openssh ]};
'';

outputs = [ "out" "bin" "lib" ];