diff --git a/flake.lock b/flake.lock index 97389ee..aa27517 100644 --- a/flake.lock +++ b/flake.lock @@ -1,28 +1,5 @@ { "nodes": { - "gomod2nix": { - "inputs": { - "flake-utils": [ - "utils" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1710154385, - "narHash": "sha256-4c3zQ2YY4BZOufaBJB4v9VBBeN2dH7iVdoJw8SDNCfI=", - "owner": "tweag", - "repo": "gomod2nix", - "rev": "872b63ddd28f318489c929d25f1f0a3c6039c971", - "type": "github" - }, - "original": { - "owner": "tweag", - "repo": "gomod2nix", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1711703276, @@ -40,7 +17,6 @@ }, "root": { "inputs": { - "gomod2nix": "gomod2nix", "nixpkgs": "nixpkgs", "utils": "utils" } diff --git a/flake.nix b/flake.nix index 9246626..6624b0f 100644 --- a/flake.nix +++ b/flake.nix @@ -4,15 +4,9 @@ inputs = { nixpkgs.url = "nixpkgs/nixos-unstable"; utils.url = "github:numtide/flake-utils"; - - gomod2nix = { - url = "github:tweag/gomod2nix"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "utils"; - }; }; - outputs = { self, nixpkgs, utils, gomod2nix }: + outputs = { self, nixpkgs, utils }: utils.lib.eachSystem [ "x86_64-linux" "aarch64-linux" @@ -20,33 +14,22 @@ "aarch64-darwin" ] (system: let - graft = pkgs: pkg: pkg.override { - buildGoModule = pkgs.buildGo122Module; - }; - pkgs = import nixpkgs { - inherit system; - overlays = [ gomod2nix.overlays.default (final: prev: { - go = prev.go; - go-tools = graft prev prev.go-tools; - gotools = graft prev prev.gotools; - gopls = graft prev prev.gopls; - }) ]; - }; version = builtins.substring 0 8 self.lastModifiedDate; + pkgs = import nixpkgs { inherit system; }; in { packages = rec { - tclipd = pkgs.buildGoApplication { + tclipd = pkgs.buildGo122Module { pname = "tclipd"; version = "0.1.0-${version}"; go = pkgs.go; src = ./.; subPackages = "cmd/tclipd"; - modules = ./gomod2nix.toml; + vendorHash = "sha256-7iOEp0NrcmvBNrxl5kjrJOAhVfKYPNpI4ssNxaf6g3M="; }; - tclip = pkgs.buildGoApplication { + tclip = pkgs.buildGo122Module { pname = "tclip"; - inherit (tclipd) src version modules; + inherit (tclipd) src version vendorHash; subPackages = "cmd/tclip"; go = pkgs.go; @@ -90,7 +73,6 @@ gopls gotools go-tools - gomod2nix.packages.${system}.default sqlite-interactive yarn diff --git a/gomod2nix.toml b/gomod2nix.toml deleted file mode 100644 index dcdef72..0000000 --- a/gomod2nix.toml +++ /dev/null @@ -1,294 +0,0 @@ -schema = 3 - -[mod] - [mod."filippo.io/edwards25519"] - version = "v1.1.0" - hash = "sha256-9ACANrgWZSd5HYPfDZHY8DVbPSC9LOMgy8deq3rDOoc=" - [mod."github.com/akutz/memconn"] - version = "v0.1.0" - hash = "sha256-WOs/RQYjQbn41ui8ztHgWSd4jxydE+fvIrl/0dmHD9Y=" - [mod."github.com/alexbrainman/sspi"] - version = "v0.0.0-20231016080023-1a75b4708caa" - hash = "sha256-Joa/NfBofK7lRlknQ5LVYD4M/dpd9xaCqsvYUBhKW0I=" - [mod."github.com/aws/aws-sdk-go-v2"] - version = "v1.24.1" - hash = "sha256-qZDUrodVDWWtdQ6zYuNHxpXt2quK56pPoZsKdRGmYzk=" - [mod."github.com/aws/aws-sdk-go-v2/config"] - version = "v1.26.5" - hash = "sha256-RAXQlnUAsxgi2BndS+Uh2Cw+TCbtUx9BB0Tqqz50rLE=" - [mod."github.com/aws/aws-sdk-go-v2/credentials"] - version = "v1.16.16" - hash = "sha256-qjtE3/VxNAEtS68nLXULgjO+LO3EkayGkr2iU300xdA=" - [mod."github.com/aws/aws-sdk-go-v2/feature/ec2/imds"] - version = "v1.14.11" - hash = "sha256-j8LHZYM+rBmWHV1PT/H6lDL/3vgBqvQxoY2bVuOi7zo=" - [mod."github.com/aws/aws-sdk-go-v2/internal/configsources"] - version = "v1.2.10" - hash = "sha256-fhrws72g+ecgXnkiip0GQ206XfVdxDA7/Rz9X3nvgd8=" - [mod."github.com/aws/aws-sdk-go-v2/internal/endpoints/v2"] - version = "v2.5.10" - hash = "sha256-Rbj+matn96a/3Nj8EpLgrTycSV+331+WWJd5Lpk1LlQ=" - [mod."github.com/aws/aws-sdk-go-v2/internal/ini"] - version = "v1.7.2" - hash = "sha256-6ev22rRSz4TuoX1AoCDr67qA15kg+cHMuQeTXwp8AFg=" - [mod."github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding"] - version = "v1.10.4" - hash = "sha256-Wvbil3pNKlCyn0SWNXCobxzJGeE+2Eb7GNP2OZATTfY=" - [mod."github.com/aws/aws-sdk-go-v2/service/internal/presigned-url"] - version = "v1.10.10" - hash = "sha256-vUSnrZzo3mzfZsthjjZRmGNrXkQ4D2B7Glzu66N5MrQ=" - [mod."github.com/aws/aws-sdk-go-v2/service/ssm"] - version = "v1.44.7" - hash = "sha256-U7XGN5O0Ksp6O3a2Nkb0WinTwuIHjCw5UNSwPjrMo8k=" - [mod."github.com/aws/aws-sdk-go-v2/service/sso"] - version = "v1.18.7" - hash = "sha256-+1q43+9Cx/K3/T+LJJLV1h2PLHsG/YKHUSgwC5r3uNQ=" - [mod."github.com/aws/aws-sdk-go-v2/service/ssooidc"] - version = "v1.21.7" - hash = "sha256-aoolSWOU3Sb3weV2yf2wACuh3fYaUmyGXCZ2dTvcg4A=" - [mod."github.com/aws/aws-sdk-go-v2/service/sts"] - version = "v1.26.7" - hash = "sha256-0LGfjSa65wNKuV/TH66XfN/uF4lZF9bSszbfTFWcLjY=" - [mod."github.com/aws/smithy-go"] - version = "v1.19.0" - hash = "sha256-KsQMOHJFIXRF+8c4WxiXA/u1Ok6hEF6eylvnfdRGivg=" - [mod."github.com/aymerick/douceur"] - version = "v0.2.0" - hash = "sha256-NiBX8EfOvLXNiK3pJaZX4N73YgfzdrzRXdiBFe3X3sE=" - [mod."github.com/coreos/go-iptables"] - version = "v0.7.0" - hash = "sha256-6zG74a2qK8NnmKGL3Cv1IGDP/MSY/PYZpEcJT8bl7JU=" - [mod."github.com/coreos/go-systemd/v22"] - version = "v22.5.0" - hash = "sha256-E2zXikbmIQImghstLUWuey1YgA0Folu3F+fi5k4hCxA=" - [mod."github.com/dblohm7/wingoes"] - version = "v0.0.0-20240119213807-a09d6be7affa" - hash = "sha256-zUj7jSZQiX53+4OyRq7LaQXp8nx8+JRpyT6IFdktyw0=" - [mod."github.com/digitalocean/go-smbios"] - version = "v0.0.0-20180907143718-390a4f403a8e" - hash = "sha256-Hgx1ML3rigdYXx5ntnEYD5JEk6kJv1cL0+/GDbnPkbo=" - [mod."github.com/dustin/go-humanize"] - version = "v1.0.1" - hash = "sha256-yuvxYYngpfVkUg9yAmG99IUVmADTQA0tMbBXe0Fq0Mc=" - [mod."github.com/fxamacker/cbor/v2"] - version = "v2.5.0" - hash = "sha256-2rhvuNZjeidDP+Og6Q0u4ROiaPrEOjoI5wCb17XRnOQ=" - [mod."github.com/go-enry/go-enry/v2"] - version = "v2.8.7" - hash = "sha256-eC3O3nuM/MdLfOvqIIunfrlX+sVIe3rty/5ut/keoD0=" - [mod."github.com/go-enry/go-oniguruma"] - version = "v1.2.1" - hash = "sha256-DoCNyX75CuCgFnfSZs63VB4+HAIMDBgwcQglXXHRj/I=" - [mod."github.com/go-ole/go-ole"] - version = "v1.3.0" - hash = "sha256-tF8t3VcV71jQ4jbPL91BwR59AKDpUAFV1waIKzkXJu8=" - [mod."github.com/godbus/dbus/v5"] - version = "v5.1.1-0.20230522191255-76236955d466" - hash = "sha256-OdcyeoGQ4xWUpl21WKXkbAm8yZHMDp8giY02arupjb4=" - [mod."github.com/golang/groupcache"] - version = "v0.0.0-20210331224755-41bb18bfe9da" - hash = "sha256-7Gs7CS9gEYZkbu5P4hqPGBpeGZWC64VDwraSKFF+VR0=" - [mod."github.com/google/btree"] - version = "v1.1.2" - hash = "sha256-K7V2obq3pLM71Mg0vhhHtZ+gtaubwXPQx3xcIyZDCjM=" - [mod."github.com/google/go-cmp"] - version = "v0.6.0" - hash = "sha256-qgra5jze4iPGP0JSTVeY5qV5AvEnEu39LYAuUCIkMtg=" - [mod."github.com/google/nftables"] - version = "v0.1.1-0.20230115205135-9aa6fdf5a28c" - hash = "sha256-Q5MtyGT1as7WzU+gZWVeD8/mQuA7GxmmjACY4qZsYHA=" - [mod."github.com/google/uuid"] - version = "v1.5.0" - hash = "sha256-DasOte4xANR1VND5XEHKGhpGiyYq74TJmNrgWeIRX4U=" - [mod."github.com/gorilla/csrf"] - version = "v1.7.2" - hash = "sha256-pzOWbw8AOjhdRJYKlPBfh1j9a8TGNxgrlS4AmZpE1s8=" - [mod."github.com/gorilla/css"] - version = "v1.0.0" - hash = "sha256-Mmt/IqHpgrtWpbr/AKcJyf/USQTqEuv1HVivY4eHzoQ=" - [mod."github.com/gorilla/securecookie"] - version = "v1.1.2" - hash = "sha256-KeMHNM9emxX+N0WYiZsTii7n8sNsmjWwbnQ9SaJfTKE=" - [mod."github.com/hashicorp/golang-lru/v2"] - version = "v2.0.7" - hash = "sha256-t1bcXLgrQNOYUVyYEZ0knxcXpsTk4IuJZDjKvyJX75g=" - [mod."github.com/hdevalence/ed25519consensus"] - version = "v0.2.0" - hash = "sha256-KTbeKMOT/HCJjDHqyciQjJPPgpNk6H0VyQCCbeGgs7Y=" - [mod."github.com/illarion/gonotify"] - version = "v1.0.1" - hash = "sha256-73KDUfk5iNo12u+nNN2H4UTfJ1FlLifahnFNPzV1P/k=" - [mod."github.com/insomniacslk/dhcp"] - version = "v0.0.0-20231206064809-8c70d406f6d2" - hash = "sha256-PHiso7HGNjCGbGdZ7TMGnSGzPDUTpvWpqAccoKPAaWM=" - [mod."github.com/jmespath/go-jmespath"] - version = "v0.4.0" - hash = "sha256-xpT9g2qIXmPq7eeHUXHiDqJeQoHCudh44G/KCSFbcuo=" - [mod."github.com/josharian/native"] - version = "v1.1.1-0.20230202152459-5c7d0dd6ab86" - hash = "sha256-dgyrLXuM55z8FAoUjyt5TDlzim6HfphWo5wx1/DHLwE=" - [mod."github.com/jsimonetti/rtnetlink"] - version = "v1.4.0" - hash = "sha256-GnrF2yxgm/h1JSTN1PwI4ysTl+oY0AyWzf3Ni7LZqRM=" - [mod."github.com/klauspost/compress"] - version = "v1.17.4" - hash = "sha256-5E7dDtDKfL3jy7zJxHBMV57WlHZrP/OoEX5e6cOPba0=" - [mod."github.com/kortschak/wol"] - version = "v0.0.0-20200729010619-da482cc4850a" - hash = "sha256-lnr9r/KNv4EeeNohFImC3Vd5E9nJ0N+4ZZ0VHFjwHps=" - [mod."github.com/mattn/go-isatty"] - version = "v0.0.20" - hash = "sha256-qhw9hWtU5wnyFyuMbKx+7RB8ckQaFQ8D+8GKPkN3HHQ=" - [mod."github.com/mdlayher/genetlink"] - version = "v1.3.2" - hash = "sha256-pgwXkyDY1dlB8tmV1lQ0Bz/2g0zmJOyXvQjacACy924=" - [mod."github.com/mdlayher/netlink"] - version = "v1.7.2" - hash = "sha256-08qlkKvG1+XFY3MDx7M1jdvaDMsmF9qv5/xMNaw3snc=" - [mod."github.com/mdlayher/sdnotify"] - version = "v1.0.0" - hash = "sha256-O7MJt6Bam2bUoede07Z1T6EtW+kCJ+/4dJtYopZct1s=" - [mod."github.com/mdlayher/socket"] - version = "v0.5.0" - hash = "sha256-3zEbix66G+LQ2xAQW9XmkyubK9R+Vwnm09H5fqqLC7w=" - [mod."github.com/microcosm-cc/bluemonday"] - version = "v1.0.26" - hash = "sha256-ZX4QUWHVEoGBeTHfPcLD5XoiubeO8GhkdqkC4Me8nRE=" - [mod."github.com/miekg/dns"] - version = "v1.1.58" - hash = "sha256-UGvyC1Abh2S5VaAUCV9AUuDMrCvpiWQy/UnYM9DfIB8=" - [mod."github.com/mitchellh/go-ps"] - version = "v1.0.0" - hash = "sha256-HzxVHNLHZpnsBuPcub0G+9jjDcDOsxM/6wifbsxf7EY=" - [mod."github.com/ncruces/go-strftime"] - version = "v0.1.9" - hash = "sha256-T0iw+UEckzueWHT88PkTnZZixyKCEa+DTLzIiiohuWY=" - [mod."github.com/niklasfasching/go-org"] - version = "v1.7.0" - hash = "sha256-i3NdcfER5JSIJv3GIJxeNJJpOyxiyxQKPZPpK2teQt4=" - [mod."github.com/pierrec/lz4/v4"] - version = "v4.1.21" - hash = "sha256-u47Lm4tN2ChGDLGyR+Jpi/Mi0bOFBVT6PTpPFdu2rMU=" - [mod."github.com/remyoudompheng/bigfft"] - version = "v0.0.0-20230129092748-24d4a6f8daec" - hash = "sha256-vYmpyCE37eBYP/navhaLV4oX4/nu0Z/StAocLIFqrmM=" - [mod."github.com/russross/blackfriday"] - version = "v1.6.0" - hash = "sha256-tyqVArfv2d9sKGaG83SyZm//5QxLtGp1+qLgaz0SwAw=" - [mod."github.com/safchain/ethtool"] - version = "v0.3.0" - hash = "sha256-q5bQGHB7cyEejA9tQkrhpvzpfYRvXcmClbWBgfs3Ymc=" - [mod."github.com/tailscale/certstore"] - version = "v0.1.1-0.20231202035212-d3fa0460f47e" - hash = "sha256-Q0HLTQPRsIizRqvdBBaLGoLascQiSpQm+X3NW3ytpDQ=" - [mod."github.com/tailscale/go-winio"] - version = "v0.0.0-20231025203758-c4f33415bf55" - hash = "sha256-WFW20c02gIk2MhafeVVNydmSfszPZegshDd2Y5abGgY=" - [mod."github.com/tailscale/golang-x-crypto"] - version = "v0.0.0-20240108194725-7ce1f622c780" - hash = "sha256-jJeEXJ4J8IRxAiS/rU7Ynx64ZrkbzexzLx26wbHlQmQ=" - [mod."github.com/tailscale/goupnp"] - version = "v1.0.1-0.20210804011211-c64d0f06ea05" - hash = "sha256-PRMJcYY+wjpbHkC9dQWTPErh2ID29UnFxehxmYR704I=" - [mod."github.com/tailscale/hujson"] - version = "v0.0.0-20221223112325-20486734a56a" - hash = "sha256-q9c2IjwbL0IgYPznVpQP1XT/8lrzH1niI3E+wjNcf5Y=" - [mod."github.com/tailscale/netlink"] - version = "v1.1.1-0.20211101221916-cabfb018fe85" - hash = "sha256-bMK5qqObMcxIbPy5XhOZP8TGDaXvDAHsE0FR68VMLi8=" - [mod."github.com/tailscale/peercred"] - version = "v0.0.0-20240214030740-b535050b2aa4" - hash = "sha256-82cdwvTUr47qMP2MHiMdY5O8vr/hA2aJ/KW2VTu97KI=" - [mod."github.com/tailscale/web-client-prebuilt"] - version = "v0.0.0-20240226180453-5db17b287bf1" - hash = "sha256-iE8PCr0At4P75cG7dDa6fwhARJUIUw9pwvgtQNMOjAA=" - [mod."github.com/tailscale/wireguard-go"] - version = "v0.0.0-20231121184858-cc193a0b3272" - hash = "sha256-gbzFLxFUeAg/BBsIZ0ZGryldxlR+UhFCVpPhoKz4AZo=" - [mod."github.com/tcnksm/go-httpstat"] - version = "v0.2.0" - hash = "sha256-bCWn8E+DcZY6+yPu07AF3hCcDZx3CFdD74qfpDIgVqI=" - [mod."github.com/u-root/uio"] - version = "v0.0.0-20240118234441-a3c409a6018e" - hash = "sha256-rUjQMG+HprbgHKzrIPFrQ6S3BCEyYQyUbA/D72mY8iU=" - [mod."github.com/vishvananda/netlink"] - version = "v1.2.1-beta.2" - hash = "sha256-ePReedgYT0KuAx/HOUgG76zDZ2XpW/u8bGlsWysxKzE=" - [mod."github.com/vishvananda/netns"] - version = "v0.0.4" - hash = "sha256-tEba2cxyk3GdCYvEIttQ8aZCzHcB0ZiUt6fUEARDkWU=" - [mod."github.com/x448/float16"] - version = "v0.8.4" - hash = "sha256-VKzMTMS9pIB/cwe17xPftCSK9Mf4Y6EuBEJlB4by5mE=" - [mod."go4.org/mem"] - version = "v0.0.0-20220726221520-4f986261bf13" - hash = "sha256-H2Fsuvzbqp/6JKzC03XPTQTSQBcGs+B5VGsBjrQDY3c=" - [mod."go4.org/netipx"] - version = "v0.0.0-20231129151722-fdeea329fbba" - hash = "sha256-qFrVlacz5R3Lpkzqeg1/1MYew3DJzY9hG0Uh/ua+SOU=" - [mod."golang.org/x/crypto"] - version = "v0.18.0" - hash = "sha256-BuMVUxOIyfLo8MOhqYt+uQ8NDN6P2KdblKyfPxINzQ4=" - [mod."golang.org/x/exp"] - version = "v0.0.0-20240119083558-1b970713d09a" - hash = "sha256-JQ3JLywTjgboNhs12blhOkS3ty7m8sUa/zaWv1k/X28=" - [mod."golang.org/x/mod"] - version = "v0.14.0" - hash = "sha256-sx3hWp5l99DBfIrn821ohfoBwvaITSHMWbzPvX0btLM=" - [mod."golang.org/x/net"] - version = "v0.20.0" - hash = "sha256-PCttIsWSBQd6fDXL49jepszUAMLnAGAKR//5EDO3XDk=" - [mod."golang.org/x/sync"] - version = "v0.6.0" - hash = "sha256-LLims/wjDZtIqlYCVHREewcUOX4hwRwplEuZKPOJ/HI=" - [mod."golang.org/x/sys"] - version = "v0.17.0" - hash = "sha256-e0qnE+SitE02IzvnJKI4Uzpq9EOZY+zvE8Wf5b2e6Kg=" - [mod."golang.org/x/term"] - version = "v0.16.0" - hash = "sha256-9qlHcsCI1sa7ZI4Q+fJbOp3mG5Y+uV16e+pGmG+MQe0=" - [mod."golang.org/x/text"] - version = "v0.14.0" - hash = "sha256-yh3B0tom1RfzQBf1RNmfdNWF1PtiqxV41jW1GVS6JAg=" - [mod."golang.org/x/time"] - version = "v0.5.0" - hash = "sha256-W6RgwgdYTO3byIPOFxrP2IpAZdgaGowAaVfYby7AULU=" - [mod."golang.org/x/tools"] - version = "v0.17.0" - hash = "sha256-CxuHfKKtUkn3VjA7D9WQjzvV1EUbyI/xMNhb5CxO6IQ=" - [mod."golang.zx2c4.com/wintun"] - version = "v0.0.0-20230126152724-0fa3db229ce2" - hash = "sha256-cjMLNjKnnupVROWmeASORVieAL9ieYdzX3cFzG8bCpo=" - [mod."golang.zx2c4.com/wireguard/windows"] - version = "v0.5.3" - hash = "sha256-wcJWS/4Fqbc+1RHSntex0zBdlHiZfzrea4QabYkNKvU=" - [mod."gvisor.dev/gvisor"] - version = "v0.0.0-20240306221502-ee1e1f6070e3" - hash = "sha256-veCyTYMx5N/K7xU86GgQupjAjjiL3hlvIjz+jhBFM/0=" - [mod."modernc.org/gc/v3"] - version = "v3.0.0-20240107210532-573471604cb6" - hash = "sha256-UO6/mPf3y3Iz5wnDAIRWHiCRQ+ElTECVbXXaekUkxA8=" - [mod."modernc.org/libc"] - version = "v1.41.0" - hash = "sha256-/wNLluSteDsaKZBfGseJy/voH81/gtQ7AAZp0mWfgq8=" - [mod."modernc.org/mathutil"] - version = "v1.6.0" - hash = "sha256-lfuEiS1odd2TWrTylnaGihSJ9myqKs3FLdpvd7PqTnE=" - [mod."modernc.org/memory"] - version = "v1.7.2" - hash = "sha256-694SlJPGKJvDYs0U/nAWAWDObsQbEJfkuG4+5yKz/yc=" - [mod."modernc.org/sqlite"] - version = "v1.29.5" - hash = "sha256-SZLHeGKpsOn+Ek/2P6f92eYe7uD5/WYBK840DdU/GXQ=" - [mod."modernc.org/strutil"] - version = "v1.2.0" - hash = "sha256-NTYIWMRZjHmR77LMvsFOMCitt7toKTfH+zChYAMzZ2Y=" - [mod."modernc.org/token"] - version = "v1.1.0" - hash = "sha256-m8WyXJ9Mdw6B43wmy2+3HE7zHEi9ocBrhwe/eq+zdu8=" - [mod."nhooyr.io/websocket"] - version = "v1.8.10" - hash = "sha256-EsUWUFIA2uJTap1DfsYuSxlPMH3UHDpxEohJMalDOcI=" - [mod."tailscale.com"] - version = "v1.62.1" - hash = "sha256-1gtHDB0buq2Ay4FVroZ+AfcfyaH0IqwpRGe0DqSiBrY="