oh: extracted from goPackages
This commit is contained in:
parent
bce93755b9
commit
c7bf8afbfc
5 changed files with 52 additions and 15 deletions
|
@ -4,8 +4,8 @@
|
|||
"fetch": {
|
||||
"type": "git",
|
||||
"url": "https://go.googlesource.com/sys",
|
||||
"rev": "7a56174f0086b32866ebd746a794417edbc678a1",
|
||||
"sha256": "13jaz47wyrfak066ywkrvqnk1ijxik0nlvi7vkpi3gaiwcrlb5g2"
|
||||
"rev": "d9157a9621b69ad1d8d77a1933590c416593f24f",
|
||||
"sha256": "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
@ -475,5 +475,23 @@
|
|||
"rev": "fab41e4e62cbef5d92998746ec25f7e195100f38",
|
||||
"sha256": "04yfnch7pdabjjqfl2qxjmsaknvp4m1rbjlv8qrpmnqwjkxzx0hb"
|
||||
}
|
||||
},
|
||||
{
|
||||
"goPackagePath": "github.com/michaelmacinnis/adapted",
|
||||
"fetch": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/michaelmacinnis/adapted",
|
||||
"rev": "0dd5fa34d6f9d74c7c0deed1fc224f9a87e02978",
|
||||
"sha256": "16n3a87m33pqx4qih713q3gw2j6ksj1q3ngjax6bpn5b11rqvikv"
|
||||
}
|
||||
},
|
||||
{
|
||||
"goPackagePath": "github.com/peterh/liner",
|
||||
"fetch": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/peterh/liner",
|
||||
"rev": "ad1edfd30321d8f006ccf05f1e0524adeb943060",
|
||||
"sha256": "0c24d9j1gnq7r982h1l2isp3d37379qw155hr8ihx9i2mhpfz317"
|
||||
}
|
||||
}
|
||||
]
|
||||
]
|
||||
|
|
20
pkgs/shells/oh/default.nix
Normal file
20
pkgs/shells/oh/default.nix
Normal file
|
@ -0,0 +1,20 @@
|
|||
# This file was generated by go2nix.
|
||||
{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
|
||||
|
||||
with goPackages;
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "oh-${version}";
|
||||
version = "20160522-${stdenv.lib.strings.substring 0 7 rev}";
|
||||
rev = "0daaf4081475fb9d6b3801c85019bdd57b2ee9b4";
|
||||
|
||||
goPackagePath = "github.com/michaelmacinnis/oh";
|
||||
|
||||
src = fetchgit {
|
||||
inherit rev;
|
||||
url = "https://github.com/michaelmacinnis/oh";
|
||||
sha256 = "0ajidzs0aisbw74nri9ks6sx6644nmwkisc9mvxm3f89zmnlsgwr";
|
||||
};
|
||||
|
||||
goDeps = ./deps.json;
|
||||
}
|
10
pkgs/shells/oh/deps.json
Normal file
10
pkgs/shells/oh/deps.json
Normal file
|
@ -0,0 +1,10 @@
|
|||
[
|
||||
{
|
||||
"include": "../../libs.json",
|
||||
"packages": [
|
||||
"github.com/michaelmacinnis/adapted",
|
||||
"github.com/peterh/liner",
|
||||
"golang.org/x/sys"
|
||||
]
|
||||
}
|
||||
]
|
|
@ -4085,7 +4085,7 @@ in
|
|||
|
||||
mksh = callPackage ../shells/mksh { };
|
||||
|
||||
oh = goPackages.oh.bin // { outputs = [ "bin" ]; };
|
||||
oh = (callPackage ../shells/oh { }).bin;
|
||||
|
||||
pash = callPackage ../shells/pash { };
|
||||
|
||||
|
|
|
@ -2643,17 +2643,6 @@ let
|
|||
doCheck = false; # check this again
|
||||
};
|
||||
|
||||
oh = buildFromGitHub {
|
||||
rev = "0daaf4081475fb9d6b3801c85019bdd57b2ee9b4";
|
||||
version = "2016-05-23";
|
||||
owner = "michaelmacinnis";
|
||||
repo = "oh";
|
||||
sha256 = "0ajidzs0aisbw74nri9ks6sx6644nmwkisc9mvxm3f89zmnlsgwr";
|
||||
goPackageAliases = [ "github.com/michaelmacinnis/oh" ];
|
||||
buildInputs = [ adapted liner ];
|
||||
disabled = isGo14;
|
||||
};
|
||||
|
||||
openssl = buildFromGitHub {
|
||||
rev = "4c6dbafa5ec35b3ffc6a1b1e1fe29c3eba2053ec";
|
||||
owner = "10gen";
|
||||
|
|
Loading…
Reference in a new issue