add holochain-launcher
This commit is contained in:
parent
46f1997ddd
commit
59ae28722f
5 changed files with 38 additions and 8 deletions
|
@ -28,6 +28,7 @@ in {
|
|||
zshCurried
|
||||
../programs/podman.nix
|
||||
../programs/vscode
|
||||
../programs/holochain-launcher.nix
|
||||
];
|
||||
|
||||
nixpkgs.config = {
|
||||
|
|
7
nix/home-manager/programs/holochain-launcher.nix
Normal file
7
nix/home-manager/programs/holochain-launcher.nix
Normal file
|
@ -0,0 +1,7 @@
|
|||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
home.packages = [
|
||||
pkgs.holochain-launcher
|
||||
];
|
||||
}
|
|
@ -7,7 +7,7 @@ let
|
|||
|
||||
nixpkgs-master = import <nixpkgs-master> { inherit (super) config; };
|
||||
nixpkgs-unstable = import <channels-nixos-unstable> { inherit (super) config; };
|
||||
nixpkgs-staging-steveej = import sources.nixpkgs_staging_steveej { inherit (super) config; };
|
||||
pr-holochain-launcher-bin = import sources.pr-holochain-launcher-bin { inherit (super) config; };
|
||||
|
||||
in {
|
||||
inherit nixpkgs-master;
|
||||
|
@ -32,5 +32,7 @@ in {
|
|||
]);
|
||||
});
|
||||
|
||||
inherit (pr-holochain-launcher-bin) holochain-launcher;
|
||||
|
||||
# logseq = nixpkgs-staging-steveej.logseq;
|
||||
}
|
||||
|
|
|
@ -11,16 +11,16 @@
|
|||
"url": "https://github.com/NixOS/nixpkgs/archive/26fe7618c7efbbfe28db9a52a21fb87e67ebaf06.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
},
|
||||
"nixpkgs_staging_steveej": {
|
||||
"branch": "staging-steveej",
|
||||
"pr-holochain-launcher-bin": {
|
||||
"branch": "pr-holochain-launcher-bin",
|
||||
"description": "Nix Packages collection",
|
||||
"homepage": "https://github.com/steveeJ-forks/nixpkgs",
|
||||
"homepage": null,
|
||||
"owner": "steveeJ-forks",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "bc052ff801e0c4917e9c78232e59c93f993f40c1",
|
||||
"sha256": "1yb8pv0gn3m0zgj2sgq6qswq984p40bgz9j7h1pd6zkji9kj8yzh",
|
||||
"rev": "11f978d53355759a47d60d688709921f2e0fb158",
|
||||
"sha256": "03mdx63gjynj297b55wkjcnaicsm8n2chgpp2v80sx8ixgllmxiw",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/steveeJ-forks/nixpkgs/archive/bc052ff801e0c4917e9c78232e59c93f993f40c1.tar.gz",
|
||||
"url": "https://github.com/steveeJ-forks/nixpkgs/archive/11f978d53355759a47d60d688709921f2e0fb158.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -31,8 +31,28 @@ let
|
|||
if spec ? branch then "refs/heads/${spec.branch}" else
|
||||
if spec ? tag then "refs/tags/${spec.tag}" else
|
||||
abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!";
|
||||
submodules = if spec ? submodules then spec.submodules else false;
|
||||
submoduleArg =
|
||||
let
|
||||
nixSupportsSubmodules = builtins.compareVersions builtins.nixVersion "2.4" >= 0;
|
||||
emptyArgWithWarning =
|
||||
if submodules == true
|
||||
then
|
||||
builtins.trace
|
||||
(
|
||||
"The niv input \"${name}\" uses submodules "
|
||||
+ "but your nix's (${builtins.nixVersion}) builtins.fetchGit "
|
||||
+ "does not support them"
|
||||
)
|
||||
{}
|
||||
else {};
|
||||
in
|
||||
builtins.fetchGit { url = spec.repo; inherit (spec) rev; inherit ref; };
|
||||
if nixSupportsSubmodules
|
||||
then { inherit submodules; }
|
||||
else emptyArgWithWarning;
|
||||
in
|
||||
builtins.fetchGit
|
||||
({ url = spec.repo; inherit (spec) rev; inherit ref; } // submoduleArg);
|
||||
|
||||
fetch_local = spec: spec.path;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue