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/tools/misc | |
parent | e26ac7afd49daefc6d0dd560e3c2ccda56233149 (diff) | |
download | nixpkgs-da3ddd48e41dbc2e507da5ddc1cda2a10ae6f9bf.tar nixpkgs-da3ddd48e41dbc2e507da5ddc1cda2a10ae6f9bf.tar.gz nixpkgs-da3ddd48e41dbc2e507da5ddc1cda2a10ae6f9bf.tar.bz2 nixpkgs-da3ddd48e41dbc2e507da5ddc1cda2a10ae6f9bf.tar.lz nixpkgs-da3ddd48e41dbc2e507da5ddc1cda2a10ae6f9bf.tar.xz nixpkgs-da3ddd48e41dbc2e507da5ddc1cda2a10ae6f9bf.tar.zst nixpkgs-da3ddd48e41dbc2e507da5ddc1cda2a10ae6f9bf.zip |
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/tools/misc')
-rw-r--r-- | pkgs/tools/misc/gawp/deps.json | 31 | ||||
-rw-r--r-- | pkgs/tools/misc/i3cat/deps.json | 15 | ||||
-rw-r--r-- | pkgs/tools/misc/mongodb-tools/deps.json | 55 | ||||
-rw-r--r-- | pkgs/tools/misc/upower-notify/deps.json | 15 |
4 files changed, 88 insertions, 28 deletions
diff --git a/pkgs/tools/misc/gawp/deps.json b/pkgs/tools/misc/gawp/deps.json index 28b9216ca00..a51c1725353 100644 --- a/pkgs/tools/misc/gawp/deps.json +++ b/pkgs/tools/misc/gawp/deps.json @@ -1,10 +1,29 @@ [ { - "include": "../../../../development/go-modules/libs.json", - "packages": [ - "golang.org/x/sys", - "gopkg.in/yaml.v2", - "gopkg.in/fsnotify.v1" - ] + "goPackagePath": "golang.org/x/sys", + "fetch": { + "type": "git", + "url": "https://go.googlesource.com/sys", + "rev": "d9157a9621b69ad1d8d77a1933590c416593f24f", + "sha256": "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931" + } + }, + { + "goPackagePath": "gopkg.in/fsnotify.v1", + "fetch": { + "type": "git", + "url": "https://gopkg.in/fsnotify.v1", + "rev": "96c060f6a6b7e0d6f75fddd10efeaca3e5d1bcb0", + "sha256": "1308z1by82fbymcra26wjzw7lpjy91kbpp2skmwqcq4q1iwwzvk2" + } + }, + { + "goPackagePath": "gopkg.in/yaml.v2", + "fetch": { + "type": "git", + "url": "https://gopkg.in/yaml.v2", + "rev": "a83829b6f1293c91addabc89d0571c246397bbf4", + "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh" + } } ] diff --git a/pkgs/tools/misc/i3cat/deps.json b/pkgs/tools/misc/i3cat/deps.json index cd4c703aed6..0db944a8361 100644 --- a/pkgs/tools/misc/i3cat/deps.json +++ b/pkgs/tools/misc/i3cat/deps.json @@ -1,8 +1,11 @@ [ - { - "include": "../../libs.json", - "packages": [ - "github.com/vincent-petithory/structfield" - ] - } + { + "goPackagePath": "github.com/vincent-petithory/structfield", + "fetch": { + "type": "git", + "url": "https://github.com/vincent-petithory/structfield", + "rev": "01a738558a47fbf16712994d1737fb31c77e7d11", + "sha256": "1kyx71z13mf6hc8ly0j0b9zblgvj5lzzvgnc3fqh61wgxrsw24dw" + } + } ] diff --git a/pkgs/tools/misc/mongodb-tools/deps.json b/pkgs/tools/misc/mongodb-tools/deps.json index 1489b9e57ad..c1cc7f96f75 100644 --- a/pkgs/tools/misc/mongodb-tools/deps.json +++ b/pkgs/tools/misc/mongodb-tools/deps.json @@ -1,12 +1,47 @@ [ - { - "include": "../../../go-modules/libs.json", - "packages": [ - "github.com/howeyc/gopass", - "github.com/jessevdk/go-flags", - "golang.org/x/crypto", - "gopkg.in/mgo.v2", - "gopkg.in/tomb.v2" - ] - } + { + "goPackagePath": "golang.org/x/crypto", + "fetch": { + "type": "git", + "url": "https://go.googlesource.com/crypto", + "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", + "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" + } + }, + { + "goPackagePath": "github.com/howeyc/gopass", + "fetch": { + "type": "git", + "url": "https://github.com/howeyc/gopass", + "rev": "2c70fa70727c953c51695f800f25d6b44abb368e", + "sha256": "152lrkfxk205rlxiign0w5wb0fmfh910yz4jhlv4f4l1qr1h2lx8" + } + }, + { + "goPackagePath": "gopkg.in/mgo.v2", + "fetch": { + "type": "git", + "url": "https://gopkg.in/mgo.v2", + "rev": "c6a7dce14133ccac2dcac3793f1d6e2ef048503a", + "sha256": "0rg232q1bkq3y3kd5816hgk1jpf7i38aha5q5ia7j6p9xashz7vj" + } + }, + { + "goPackagePath": "gopkg.in/tomb.v2", + "fetch": { + "type": "git", + "url": "https://gopkg.in/tomb.v2", + "rev": "14b3d72120e8d10ea6e6b7f87f7175734b1faab8", + "sha256": "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5" + } + }, + { + "goPackagePath": "github.com/jessevdk/go-flags", + "fetch": { + "type": "git", + "url": "https://github.com/jessevdk/go-flags", + "rev": "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539", + "sha256": "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680" + } + } ] diff --git a/pkgs/tools/misc/upower-notify/deps.json b/pkgs/tools/misc/upower-notify/deps.json index 3a254084ae3..96db25d0c7d 100644 --- a/pkgs/tools/misc/upower-notify/deps.json +++ b/pkgs/tools/misc/upower-notify/deps.json @@ -1,8 +1,11 @@ [ - { - "include": "../../../go-modules/libs.json", - "packages": [ - "github.com/godbus/dbus" - ] - } + { + "goPackagePath": "github.com/godbus/dbus", + "fetch": { + "type": "git", + "url": "https://github.com/godbus/dbus", + "rev": "32c6cc29c14570de4cf6d7e7737d68fb2d01ad15", + "sha256": "0v401f761l88yapiaw23pxvxviqrwl2r2vfd6lq02044i7x4i5r3" + } + } ] |