diff --git a/lib/maintainers.nix b/lib/maintainers.nix index a15800d177b..376191520ba 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -109,6 +109,7 @@ cwoac = "Oliver Matthews "; DamienCassou = "Damien Cassou "; danbst = "Danylo Hlynskyi "; + danielfullmer = "Daniel Fullmer "; dasuxullebt = "Christoph-Simon Senjak "; davidak = "David Kleuker "; davidrusu = "David Rusu "; diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index dc10b8d2ec8..adbadba411c 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "rclone-${version}"; - version = "1.33"; + version = "1.35"; goPackagePath = "github.com/ncw/rclone"; @@ -10,16 +10,14 @@ buildGoPackage rec { owner = "ncw"; repo = "rclone"; rev = "v${version}"; - sha256 = "00y48ww40x73xpdvkzfhllwvbh9a2ffmmkc6ri9343wvmb53laqk"; + sha256 = "15dmppb7qgr3vg76dsv770l51lmsl8n8k3rvbnhhks5a2cz0kf2i"; }; - goDeps = ./deps.nix; - - meta = { + meta = with stdenv.lib; { description = "Command line program to sync files and directories to and from major cloud storage"; homepage = "http://rclone.org"; - license = stdenv.lib.licenses.mit; - maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + license = licenses.mit; + maintainers = with maintainers; [ danielfullmer ]; + platforms = platforms.all; }; } diff --git a/pkgs/applications/networking/sync/rclone/deps.nix b/pkgs/applications/networking/sync/rclone/deps.nix deleted file mode 100644 index 4fd802f66c0..00000000000 --- a/pkgs/applications/networking/sync/rclone/deps.nix +++ /dev/null @@ -1,219 +0,0 @@ -# This file was generated by go2nix. -[ - { - goPackagePath = "bazil.org/fuse"; - fetch = { - type = "git"; - url = "https://github.com/bazil/fuse"; - rev = "371fbbdaa8987b715bdd21d6adc4c9b20155f748"; - sha256 = "1x5p301py7mcxgwklfm6pqqkzssln0nfzllng49pnk60m03ilp4w"; - }; - } - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "90296fd601ebfc594192e722a022663b0c3f8756"; - sha256 = "0qg0d1afhqmpfaq2lh29c87d18s5148yshg0s295dhzdn1m9nhww"; - }; - } - { - goPackagePath = "github.com/Unknwon/goconfig"; - fetch = { - type = "git"; - url = "https://github.com/Unknwon/goconfig"; - rev = "5aa4f8cd5a472c2411c778b4680f59f2223f1966"; - sha256 = "0r6na17sz762c1dyn6gb16v2zhvzg6krmz7pcjg1m0l5wxdf4n0d"; - }; - } - { - goPackagePath = "github.com/VividCortex/ewma"; - fetch = { - type = "git"; - url = "https://github.com/VividCortex/ewma"; - rev = "c595cd886c223c6c28fc9ae2727a61b5e4693d85"; - sha256 = "0f09886vm4rkhgqqh2b20r8rws4syvny3la107hh6qby027bpab2"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "13a12060f716145019378a10e2806c174356b857"; - sha256 = "09yl85kk2y4ayk44af5rbnkq4vy82vbh2z5ac4vpl2vgv7zyh46h"; - }; - } - { - goPackagePath = "github.com/cpuguy83/go-md2man"; - fetch = { - type = "git"; - url = "https://github.com/cpuguy83/go-md2man"; - rev = "a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa"; - sha256 = "1rm3zjrmfpzy0l3qp02xmd5pqzl77pdql9pbxhl0k1qw2vfzrjv6"; - }; - } - { - goPackagePath = "github.com/google/go-querystring"; - fetch = { - type = "git"; - url = "https://github.com/google/go-querystring"; - rev = "9235644dd9e52eeae6fa48efd539fdc351a0af53"; - sha256 = "0q398679fwp7vlnpd2rlzz452a7a4qvpcspak81psfl3xwimpzgq"; - }; - } - { - goPackagePath = "github.com/mreiferson/go-httpclient"; - fetch = { - type = "git"; - url = "https://github.com/mreiferson/go-httpclient"; - rev = "31f0106b4474f14bc441575c19d3a5fa21aa1f6c"; - sha256 = "1iz95p7fl43smyh1lzjnwk6gq9y7q15m2qdkf0f4kxf3x5731v9i"; - }; - } - { - goPackagePath = "github.com/ncw/go-acd"; - fetch = { - type = "git"; - url = "https://github.com/ncw/go-acd"; - rev = "56da839497f9854a91f99fe752c33c7977a6f48b"; - sha256 = "1va6hpl73ps443r0s2icplcx113gkhmi2gbsgpaw2iii5lji5085"; - }; - } - { - goPackagePath = "github.com/ncw/swift"; - fetch = { - type = "git"; - url = "https://github.com/ncw/swift"; - rev = "b964f2ca856aac39885e258ad25aec08d5f64ee6"; - sha256 = "0c86ap1zb56r6g96cnbn5j3i3r96c5l8rl98h3sxlqi5agwp3km4"; - }; - } - { - goPackagePath = "github.com/ogier/pflag"; - fetch = { - type = "git"; - url = "https://github.com/ogier/pflag"; - rev = "45c278ab3607870051a2ea9040bb85fcb8557481"; - sha256 = "0620v75wppfd84d95n312wpngcb73cph4q3ivs1h0waljfnsrd5l"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - { - goPackagePath = "github.com/rfjakob/eme"; - fetch = { - type = "git"; - url = "https://github.com/rfjakob/eme"; - rev = "601d0e278ceda9aa2085a61c9265f6e690ef5255"; - sha256 = "1ryh5f2a42psrqcpjh73shk3p0mva2vcyyfav4nhxmfqall77k5z"; - }; - } - { - goPackagePath = "github.com/skratchdot/open-golang"; - fetch = { - type = "git"; - url = "https://github.com/skratchdot/open-golang"; - rev = "75fb7ed4208cf72d323d7d02fd1a5964a7a9073c"; - sha256 = "1b67imqbsdvg19vif1q1dfmapxy3v2anagacbql95fwnnw0v8jga"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "9c28e4bbd74e5c3ed7aacbc552b2cab7cfdfe744"; - sha256 = "02bgp0yy9bi05k2in9axqi3db1c6mjffdsmki51pn9iryxz4zkh3"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "c7e63cf4530bcd3ba943729cee0efeff2ebea63f"; - sha256 = "197mlkgb01zk86fxfl8r8maymcxsspqblg7hmngjxf7ivdid1i1l"; - }; - } - { - goPackagePath = "github.com/stacktic/dropbox"; - fetch = { - type = "git"; - url = "https://github.com/stacktic/dropbox"; - rev = "58f839b21094d5e0af7caf613599830589233d20"; - sha256 = "1psmxpnn40ri9bgjvivljnd4p977f635mh3w7m5mglxxgc9392pi"; - }; - } - { - goPackagePath = "github.com/tsenart/tb"; - fetch = { - type = "git"; - url = "https://github.com/tsenart/tb"; - rev = "19f4c3d79d2bd67d0911b2e310b999eeea4454c1"; - sha256 = "148vy4xij5qm8dq5plyczx2wbpi4gpg8ksr5r3b4m8j0z1kjws8y"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "5dc8cb4b8a8eb076cbb5a06bc3b8682c15bdbbd3"; - sha256 = "18c1vpqlj10z1id66hglgnv51d9gwphgsdvxgghc6mcm01f1g5xj"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "6acef71eb69611914f7a30939ea9f6e194c78172"; - sha256 = "1fcsv50sbq0lpzrhx3m9jw51wa255fsbqjwsx9iszq4d0gysnnvc"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "3c3a985cb79f52a3190fbc056984415ca6763d01"; - sha256 = "0c7x8wkya56z03j2qfm61932npsddgqyggi75hkla9755d1inqlv"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "a71fd10341b064c10f4a81ceac72bcf70f26ea34"; - sha256 = "1igxqrgnnb6983fl0yck0xal2hwnkcgbslr7cxyrg7a65vawd0q1"; - }; - } - { - goPackagePath = "google.golang.org/api"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/google-api-go-client"; - rev = "eb84d1a029af1654777e7ba65c979085305c3e38"; - sha256 = "0ldmzcx5lxa81lcr39djcvyhd0ls11jlswj5877rinq3505ayf5l"; - }; - } - { - goPackagePath = "github.com/stretchr/testify/"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "1f4a1643a57e798696635ea4c126e9127adb7d3c"; - sha256 = "0nam9d68rn8ha8ldif22kkgv6k6ph3y88fp26159wdrs63ca3bzl"; - }; - } -]