diff --git a/pkgs/tools/package-management/gx/default.nix b/pkgs/tools/package-management/gx/default.nix index 60fbdd4941f..0384cbce772 100644 --- a/pkgs/tools/package-management/gx/default.nix +++ b/pkgs/tools/package-management/gx/default.nix @@ -1,20 +1,19 @@ -# This file was generated by go2nix. -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "gx"; - version = "0.14.1"; - - goPackagePath = "github.com/whyrusleeping/gx"; + version = "0.14.3"; src = fetchFromGitHub { owner = "whyrusleeping"; repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "0pfx2p59xdbmqzfbgaf8xvlnzh8m05hkg596glq5kvl8ib65i4ha"; + rev = "v${version}"; + sha256 = "sha256-jGtUsb2gm8dN45wniD+PYoUlk8m1ssrfj1a7PPYEYuo="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-6tdVpMztaBjoQRVG2vaUWuvnPq05zjbNAX9HBiC50t0="; + + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "A packaging tool built around IPFS"; diff --git a/pkgs/tools/package-management/gx/deps.nix b/pkgs/tools/package-management/gx/deps.nix deleted file mode 100644 index 766e58775b4..00000000000 --- a/pkgs/tools/package-management/gx/deps.nix +++ /dev/null @@ -1,246 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/blang/semver"; - fetch = { - type = "git"; - url = "https://github.com/blang/semver"; - rev = "3c1074078d32d767e08ab2c8564867292da86926"; - sha256 = "1vqkjrag8nn5hvjz34cf9zsrgwd13ss63y6sp7y5jq39j7bcprdx"; - }; - } - { - goPackagePath = "github.com/btcsuite/btcd"; - fetch = { - type = "git"; - url = "https://github.com/btcsuite/btcd"; - rev = "67e573d211ace594f1366b4ce9d39726c4b19bd0"; - sha256 = "04s92gsy71w1jirlr5lkk9y6r5cparbas7nmf6ywbp7kq7fn8ajn"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "07eab6a8298cf32fac45cceaac59424f98421bbc"; - sha256 = "1l2v9yq74qsiq3q7kii091rzx67jx6isz5szs27hyhsdwvy0y2p7"; - }; - } - { - goPackagePath = "github.com/gxed/hashland"; - fetch = { - type = "git"; - url = "https://github.com/gxed/hashland"; - rev = "d9f6b97f8db22dd1e090fd0bbbe98f09cc7dd0a8"; - sha256 = "1q23y4lacsz46k9gmgfw4iwwydw36j2601rbidmmswl94grpc386"; - }; - } - { - goPackagePath = "github.com/ipfs/go-ipfs-api"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-ipfs-api"; - rev = "b4fd7838d9771414868cb78fa8c4f97e47cad013"; - sha256 = "1kb0ja6bji9q1ly66hx3490mjmk3w56zpwl9c0pkfy6da9x4dkyr"; - }; - } - { - goPackagePath = "github.com/ipfs/go-ipfs-files"; - fetch = { - type = "git"; - url = "https://github.com/ipfs/go-ipfs-files"; - rev = "90d206a6f3947f904673ebffd376a2dcbbd84942"; - sha256 = "0bq6lciqba362lqmszjf1x33qwdpfrfik6r680iqr5c4sybywzqv"; - }; - } - { - goPackagePath = "github.com/libp2p/go-flow-metrics"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-flow-metrics"; - rev = "7e5a55af485341567f98d6847a373eb5ddcdcd43"; - sha256 = "1p87iyk6q6f3g3xkncssx400qlld8f2z93qiz8m1f97grfyhjif1"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-crypto"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-crypto"; - rev = "3120e9f9526fe05f2d3905961a5e0701b85579d9"; - sha256 = "05i8jcfmk51zln634x782jvjmmn5l11104ylzqfnjxgjibz9pyd7"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-metrics"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-metrics"; - rev = "2d5733beaa2a9fdd05ef696d7a734aa61549fb2a"; - sha256 = "1g59z1mn483npmzgdyxn5w7w1k94phi5lgqkw3lq8i1b2jdy5mci"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-peer"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-peer"; - rev = "d3df4bca884d7a9c2d350c8120240db3c2b0f2ee"; - sha256 = "0hn75dnr80f846jj38bpcjw5z73iw292ygcqsfbghvdrwl2pf5xm"; - }; - } - { - goPackagePath = "github.com/libp2p/go-libp2p-protocol"; - fetch = { - type = "git"; - url = "https://github.com/libp2p/go-libp2p-protocol"; - rev = "b29f3d97e3a2fb8b29c5d04290e6cb5c5018004b"; - sha256 = "1xgjfnx9zcqglg9li29wdqywsp8hz22wx6phns9zscni2jsfidld"; - }; - } - { - goPackagePath = "github.com/minio/blake2b-simd"; - fetch = { - type = "git"; - url = "https://github.com/minio/blake2b-simd"; - rev = "3f5f724cb5b182a5c278d6d3d55b40e7f8c2efb4"; - sha256 = "0b6jbnj62c0gmmfd4zdmh8xbg01p80f13yygir9xprqkzk6fikmd"; - }; - } - { - goPackagePath = "github.com/minio/sha256-simd"; - fetch = { - type = "git"; - url = "https://github.com/minio/sha256-simd"; - rev = "51976451ce1942acbb55707a983ed232fa027110"; - sha256 = "0kaxvpidf6ygkkb06vi95pirll31jnmywhyalfjvf7djhim2wr8f"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "ae18d6b8b3205b561c79e8e5f69bff09736185f4"; - sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq"; - }; - } - { - goPackagePath = "github.com/mr-tron/base58"; - fetch = { - type = "git"; - url = "https://github.com/mr-tron/base58"; - rev = "c8897612421d88a51012eaa53bf7267686173ae5"; - sha256 = "10lr50ia7xccfdvg772f7nb2azn81djcpnckhblhwq6l6a1fpm48"; - }; - } - { - goPackagePath = "github.com/multiformats/go-multiaddr"; - fetch = { - type = "git"; - url = "https://github.com/multiformats/go-multiaddr"; - rev = "ec8630b6b7436b5d7f6c1c2366d3d7214d1b29e2"; - sha256 = "1npx4d3scj087a54m6my2xnd0wga8bkklswnbhzghwhhpsgmy800"; - }; - } - { - goPackagePath = "github.com/multiformats/go-multiaddr-net"; - fetch = { - type = "git"; - url = "https://github.com/multiformats/go-multiaddr-net"; - rev = "f0af4033635f1241179700537dacdc04f2803df8"; - sha256 = "0s90ix09mm6dc8319l48g3zhnjl1mkih168wsdh6fdf73801lhg5"; - }; - } - { - goPackagePath = "github.com/multiformats/go-multihash"; - fetch = { - type = "git"; - url = "https://github.com/multiformats/go-multihash"; - rev = "a91e75d03bf4dba801af7b159c8b2aa7b5f47ea8"; - sha256 = "1xvj944qg17vmdgzhyn5qryqrksyxi1q188f91my52wfkz23qmmm"; - }; - } - { - goPackagePath = "github.com/sabhiram/go-gitignore"; - fetch = { - type = "git"; - url = "https://github.com/sabhiram/go-gitignore"; - rev = "d3107576ba9425fc1c85f4b3569c4631b805a02e"; - sha256 = "1rdwyxgcsiwgmlqnc3k6h300mzlvjc3j21np4yh1h476wc8dvl0l"; - }; - } - { - goPackagePath = "github.com/spaolacci/murmur3"; - fetch = { - type = "git"; - url = "https://github.com/spaolacci/murmur3"; - rev = "f09979ecbc725b9e6d41a297405f65e7e8804acc"; - sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "b67dcf995b6a7b7f14fad5fcb7cc5441b05e814b"; - sha256 = "0n5vq4nydlhb7w12jiwphvxqdy4jwpxc3zwlxyhf05lq1nxfb56h"; - }; - } - { - goPackagePath = "github.com/whyrusleeping/json-filter"; - fetch = { - type = "git"; - url = "https://github.com/whyrusleeping/json-filter"; - rev = "ff25329a9528f01c5175414f16cc0a6a162a5b8b"; - sha256 = "0cai0drvx4c8j686l908vpcsz3mw3vxi3ziz94b0f3c5ylpj07j7"; - }; - } - { - goPackagePath = "github.com/whyrusleeping/progmeter"; - fetch = { - type = "git"; - url = "https://github.com/whyrusleeping/progmeter"; - rev = "f3e57218a75b913eff88d49a52c1debf9684ea04"; - sha256 = "0xs8rz6yhpvj9512c5v3b8dwr2kivywnyyfxzdfbr6fy1xc8zskb"; - }; - } - { - goPackagePath = "github.com/whyrusleeping/stump"; - fetch = { - type = "git"; - url = "https://github.com/whyrusleeping/stump"; - rev = "206f8f13aae1697a6fc1f4a55799faf955971fc5"; - sha256 = "1s40qdppjnk8gijk7x6kbviiqz62nz3h6gic2q9cwcmq8r5isw7n"; - }; - } - { - goPackagePath = "github.com/whyrusleeping/tar-utils"; - fetch = { - type = "git"; - url = "https://github.com/whyrusleeping/tar-utils"; - rev = "8c6c8ba81d5c71fd69c0f48dbde4b2fb422b6dfc"; - sha256 = "14jjdw3yics0k467xsyk388684wdpi0bbx8nqj0y4pqxa0s0in6s"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "3d3f9f413869b949e48070b5bc593aa22cc2b8f2"; - sha256 = "0rbkcq48lkiw043sm8hciprqy2d77s4agpj6rwy2qgbqm8gvv3a6"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "ec83556a53fe16b65c452a104ea9d1e86a671852"; - sha256 = "1ijlbyn5gs8g6z2pjlj5h77lg7wrljqxdls4xlcfqxmghxiyci2f"; - }; - } -] diff --git a/pkgs/tools/package-management/gx/go/default.nix b/pkgs/tools/package-management/gx/go/default.nix index ad4435c9e2d..bc5b90993a6 100644 --- a/pkgs/tools/package-management/gx/go/default.nix +++ b/pkgs/tools/package-management/gx/go/default.nix @@ -1,7 +1,5 @@ # This file was generated by go2nix. -{ lib, buildGoPackage, fetchFromGitHub -, gx -}: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gx-go"; @@ -18,13 +16,6 @@ buildGoPackage rec { goDeps = ./deps.nix; - extraSrcs = [ - { - goPackagePath = gx.goPackagePath; - src = gx.src; - } - ]; - meta = with lib; { description = "A tool for importing go packages into gx"; homepage = "https://github.com/whyrusleeping/gx-go";