Skip to content
This repository was archived by the owner on Aug 26, 2021. It is now read-only.

Commit db05ec3

Browse files
committed
Pure NIX deps replaced with NIXON
NixOS/nixpkgs#17254
1 parent 32173f8 commit db05ec3

File tree

5 files changed

+11
-9
lines changed

5 files changed

+11
-9
lines changed

default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ buildGoPackage rec {
1313
go generate ./...
1414
'';
1515

16-
goDeps = import ./deps.nix { inherit (pkgs) fetchgit fetchhg fetchbzr fetchsvn; };
16+
goDeps = ./deps.nix;
1717
}

deps.nix

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
# This file was generated by go2nix.
2-
{ fetchgit, fetchhg, fetchbzr, fetchsvn }:
32
[
43
{
54
goPackagePath = "github.com/Masterminds/vcs";
6-
src = fetchgit {
5+
fetch = {
6+
type = "git";
77
url = "https://github.com/Masterminds/vcs";
88
rev = "fbe9fb6ad5b5f35b3e82a7c21123cfc526cbf895";
99
sha256 = "09rdq8k2smwgy6wdslddcq13wg3lzd4amzpy0f8kd0hlxxvas89c";
1010
};
1111
}
1212
{
1313
goPackagePath = "github.com/jawher/mow.cli";
14-
src = fetchgit {
14+
fetch = {
15+
type = "git";
1516
url = "https://github.com/jawher/mow.cli";
1617
rev = "772320464101e904cd51198160eb4d489be9cc49";
1718
sha256 = "1a8hnh2k3vc3prjhnz4rjbiwhqq6r3mi18h9cdb6fc6s6yzjc19j";

depsjson2nix.nix

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ let
88
dep2nix = goDep: with goDep; ''
99
{
1010
goPackagePath = "${goPackagePath}";
11-
src = fetch${fetch.type} {
11+
fetch = {
12+
type = ${fetch.type};
1213
url = "${fetch.url}";
1314
rev = "${fetch.rev}";
1415
sha256 = "${fetch.sha256}";
@@ -22,7 +23,7 @@ let
2223
external = filter (d: d ? include) deps;
2324
direct = filter (d: d ? goPackagePath && (length filterPackages == 0 || elem d.goPackagePath filterPackages)) deps;
2425
in
25-
foldl' (p: n: p + n) "{ fetchgit, fetchhg, fetchbzr, fetchsvn }:\n[\n"
26+
foldl' (p: n: p + n) "[\n"
2627
((map importGodeps (map (d: { depsFile = <nixpkgs> + "/pkgs/development/go-modules/generic/" + d.include; filterPackages = d.packages; }) external)) ++ (map dep2nix direct)) + "]\n";
2728

2829
depsNix = toFile "deps.nix" (importGodeps { depsFile = toPath depsJson; });

templates/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ buildGoPackage rec {
1717
sha256 = "[[ .Pkg.Hash ]]";
1818
};
1919

20-
goDeps = import ./deps.nix { inherit fetchgit fetchhg fetchbzr fetchsvn; };
20+
goDeps = ./deps.nix;
2121

2222
# TODO: add metadata https://nixos.org/nixpkgs/manual/#sec-standard-meta-attributes
2323
meta = {

templates/deps.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# This file was generated by go2nix.
2-
{ fetchgit, fetchhg, fetchbzr, fetchsvn }:
32
[
43
[[- range . ]]
54
{
65
goPackagePath = "[[ .GoPackagePath ]]";
7-
src = fetch[[ .Fetch.Type ]] {
6+
fetch = {
7+
type = "[[ .Fetch.Type ]]";
88
url = "[[ .Fetch.Url ]]";
99
rev = "[[ .Fetch.Rev ]]";
1010
sha256 = "[[ .Fetch.Sha256 ]]";

0 commit comments

Comments
 (0)