diff options
author | Kamil Chmielewski <kamil.chm@gmail.com> | 2016-08-11 23:07:09 +0200 |
---|---|---|
committer | Kamil Chmielewski <kamil.chm@gmail.com> | 2016-08-11 23:07:09 +0200 |
commit | da3ddd48e41dbc2e507da5ddc1cda2a10ae6f9bf (patch) | |
tree | 10e34ffdf51e8e9dcb22d247d4096caea0b7a386 /pkgs/development/go-modules/generic | |
parent | e26ac7afd49daefc6d0dd560e3c2ccda56233149 (diff) |
buildGoPackage: remove Go deps file `libs.json`
After #16017 there were a lot
of comments saying that `nix` would be better than `JSON`
for Go packages dependency sets.
As said in https://github.com/NixOS/nixpkgs/pull/16017#issuecomment-229624046
> Because of the content-addressable store, if two programs have the
> same dependency it will already result in the same derivation in
> the
> store. Git also has compression in the pack files so it won't make
> much difference to duplicate the dependencies on disk. And finally
> most users will just use the binary builds so it won't make any
> differences to them.
This PR removes `libs.json` file and puts all package dependencies in
theirs `deps.json`.
Diffstat (limited to 'pkgs/development/go-modules/generic')
-rw-r--r-- | pkgs/development/go-modules/generic/default.nix | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index e6373c1d50e..72c91daac40 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -55,13 +55,8 @@ let else abort "Unrecognized package fetch type"; }; - importGodeps = { depsFile, filterPackages ? [] }: - let - deps = lib.importJSON depsFile; - external = filter (d: d ? include) deps; - direct = filter (d: d ? goPackagePath && (length filterPackages == 0 || elem d.goPackagePath filterPackages)) deps; - in - concatLists (map importGodeps (map (d: { depsFile = ./. + d.include; filterPackages = d.packages; }) external)) ++ (map dep2src direct); + importGodeps = { depsFile }: + map dep2src (lib.importJSON depsFile); goPath = if goDeps != null then importGodeps { depsFile = goDeps; } ++ extraSrcs else extraSrcs; |