From 06327d22d68749e03adcb39e731a1027b8867b39 Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Sun, 5 Jun 2016 10:02:21 +0200 Subject: [PATCH] syncthing012: extracted from goPackages --- .../networking/syncthing012/default.nix | 27 ++++++ .../networking/syncthing012/deps.json | 21 +++++ pkgs/development/go-modules/libs.json | 90 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/go-packages.nix | 43 --------- 5 files changed, 139 insertions(+), 44 deletions(-) create mode 100644 pkgs/applications/networking/syncthing012/default.nix create mode 100644 pkgs/applications/networking/syncthing012/deps.json diff --git a/pkgs/applications/networking/syncthing012/default.nix b/pkgs/applications/networking/syncthing012/default.nix new file mode 100644 index 000000000000..dcf5e30551c1 --- /dev/null +++ b/pkgs/applications/networking/syncthing012/default.nix @@ -0,0 +1,27 @@ +# This file was generated by go2nix. +{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }: + +with goPackages; + +buildGoPackage rec { + name = "syncthing-${version}"; + version = "0.12.15"; + rev = "v${version}"; + + buildFlags = "--tags noupgrade,release"; + + goPackagePath = "github.com/syncthing/syncthing"; + + src = fetchgit { + inherit rev; + url = "https://github.com/syncthing/syncthing"; + sha256 = "108w7gvm3nbbsgp3h5p84fj4ba0siaz932i7yyryly486gzvpm43"; + }; + + goDeps = ./deps.json; + + postPatch = '' + # Mostly a cosmetic change + sed -i 's,unknown-dev,${version},g' cmd/syncthing/main.go + ''; +} diff --git a/pkgs/applications/networking/syncthing012/deps.json b/pkgs/applications/networking/syncthing012/deps.json new file mode 100644 index 000000000000..75e10397017a --- /dev/null +++ b/pkgs/applications/networking/syncthing012/deps.json @@ -0,0 +1,21 @@ +[ + { + "include": "../../libs.json", + "packages": [ + "github.com/bkaradzic/go-lz4", + "github.com/calmh/luhn", + "golang.org/x/text", + "github.com/kardianos/osext", + "github.com/vitrun/qart", + "github.com/calmh/du", + "github.com/calmh/xdr", + "github.com/juju/ratelimit", + "github.com/thejerf/suture", + "github.com/golang/snappy", + "github.com/rcrowley/go-metrics", + "github.com/syndtr/goleveldb", + "golang.org/x/crypto", + "golang.org/x/net" + ] + } +] diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json index ca1a5e495c7f..b0686f3205a3 100644 --- a/pkgs/development/go-modules/libs.json +++ b/pkgs/development/go-modules/libs.json @@ -1006,5 +1006,95 @@ "rev": "535138d7bcd717d6531c701ef5933d98b1866257", "sha256": "1m7nc1gvv5yqnq8ii75f33485il6y6prf8gxl97dimsw94qccc5v" } + }, + { + "goPackagePath": "github.com/bkaradzic/go-lz4", + "fetch": { + "type": "git", + "url": "https://github.com/bkaradzic/go-lz4", + "rev": "74ddf82598bc4745b965729e9c6a463bedd33049", + "sha256": "1vdid8v0c2v2qhrg9rzn3l7ya1h34jirrxfnir7gv7w6s4ivdvc1" + } + }, + { + "goPackagePath": "github.com/calmh/luhn", + "fetch": { + "type": "git", + "url": "https://github.com/calmh/luhn", + "rev": "0c8388ff95fa92d4094011e5a04fc99dea3d1632", + "sha256": "1hfj1lx7wdpifn16zqrl4xml6cj5gxbn6hfz1f46g2a6bdf0gcvs" + } + }, + { + "goPackagePath": "golang.org/x/text", + "fetch": { + "type": "git", + "url": "https://go.googlesource.com/text", + "rev": "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e", + "sha256": "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14" + } + }, + { + "goPackagePath": "github.com/vitrun/qart", + "fetch": { + "type": "git", + "url": "https://github.com/vitrun/qart", + "rev": "ccb109cf25f0cd24474da73b9fee4e7a3e8a8ce0", + "sha256": "0bhp768b8ha6f25dmhwn9q8m2lkbn4qnjf8n7pizk25jn5zjdvc8" + } + }, + { + "goPackagePath": "github.com/calmh/du", + "fetch": { + "type": "git", + "url": "https://github.com/calmh/du", + "rev": "3c0690cca16228b97741327b1b6781397afbdb24", + "sha256": "1mv6mkbslfc8giv47kyl97ny0igb3l7jya5hc75sm54xi6g205wa" + } + }, + { + "goPackagePath": "github.com/calmh/xdr", + "fetch": { + "type": "git", + "url": "https://github.com/calmh/xdr", + "rev": "e467b5aeb65ca8516fb3925c84991bf1d7cc935e", + "sha256": "1bi4b2xkjzcr0vq1wxz14i9943k71sj092dam0gdmr9yvdrg0nra" + } + }, + { + "goPackagePath": "github.com/juju/ratelimit", + "fetch": { + "type": "git", + "url": "https://github.com/juju/ratelimit", + "rev": "772f5c38e468398c4511514f4f6aa9a4185bc0a0", + "sha256": "02rs61ay6sq499lxxszjsrxp33m6zklds1xrmnr5fk73vpqfa28p" + } + }, + { + "goPackagePath": "github.com/thejerf/suture", + "fetch": { + "type": "git", + "url": "https://github.com/thejerf/suture", + "rev": "99c1f2d613756768fc4299acd9dc621e11ed3fd7", + "sha256": "094ksr2nlxhvxr58nbnzzk0prjskb21r86jmxqjr3rwg4rkwn6d4" + } + }, + { + "goPackagePath": "github.com/golang/snappy", + "fetch": { + "type": "git", + "url": "https://github.com/golang/snappy", + "rev": "723cc1e459b8eea2dea4583200fd60757d40097a", + "sha256": "0bprq0qb46f5511b5scrdqqzskqqi2z8b4yh3216rv0n1crx536h" + } + }, + { + "goPackagePath": "github.com/syndtr/goleveldb", + "fetch": { + "type": "git", + "url": "https://github.com/syndtr/goleveldb", + "rev": "1a9d62f03ea92815b46fcaab357cfd4df264b1a0", + "sha256": "04ywbif36fiah4fw0x2abr5q3p4fdhi6q57d5icc2mz03q889vhb" + } } ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9ceacfb948d..801a8d94d70d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14282,7 +14282,7 @@ in syncthing = callPackage ../applications/networking/syncthing { }; - syncthing012 = goPackages.syncthing012.bin // { outputs = [ "bin" ]; }; + syncthing012 = callPackage ../applications/networking/syncthing012 { }; # linux only by now synergy = callPackage ../applications/misc/synergy { }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index ff1ca2f853e5..8ac969a88772 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -3084,14 +3084,6 @@ let sha256 = "1m7nc1gvv5yqnq8ii75f33485il6y6prf8gxl97dimsw94qccc5v"; }; - relaysrv = buildFromGitHub rec { - rev = "7fe1fdd8c751df165ea825bc8d3e895f118bb236"; - owner = "syncthing"; - repo = "relaysrv"; - sha256 = "0qy14pa0z2dq5mix5ylv2raabwxqwj31g5kkz905wzki6d4j5lnp"; - buildInputs = [ xdr syncthing-protocol011 ratelimit syncthing-lib ]; - }; - reflectwalk = buildFromGitHub { rev = "eecf4c70c626c7cfbb95c90195bc34d386c74ac6"; owner = "mitchellh"; @@ -3311,41 +3303,6 @@ let sha256 = "094ksr2nlxhvxr58nbnzzk0prjskb21r86jmxqjr3rwg4rkwn6d4"; }; - syncthing012 = buildFromGitHub rec { - version = "0.12.25"; - rev = "v${version}"; - owner = "syncthing"; - repo = "syncthing"; - sha256 = "108w7gvm3nbbsgp3h5p84fj4ba0siaz932i7yyryly486gzvpm43"; - buildFlags = [ "-tags noupgrade,release" ]; - disabled = isGo14; - buildInputs = [ - go-lz4 du luhn xdr snappy ratelimit osext - goleveldb suture qart crypto net text rcrowley.go-metrics - ]; - postPatch = '' - # Mostly a cosmetic change - sed -i 's,unknown-dev,${version},g' cmd/syncthing/main.go - ''; - }; - - syncthing-lib = buildFromGitHub { - inherit (syncthing012) rev owner repo sha256; - subPackages = [ "lib/sync" ]; - propagatedBuildInputs = syncthing012.buildInputs; - }; - - syncthing-protocol = buildFromGitHub { - inherit (syncthing012) rev owner repo sha256; - subPackages = [ "lib/protocol" ]; - propagatedBuildInputs = [ - go-lz4 - logger - luhn - xdr - text ]; - }; - syncthing-protocol011 = buildFromGitHub { rev = "84365882de255d2204d0eeda8dee288082a27f98"; version = "2015-08-28";