diff --git a/flake.nix b/flake.nix index ccf0eda..266451c 100644 --- a/flake.nix +++ b/flake.nix @@ -50,8 +50,6 @@ apps = { alacritty = mkApp { drv = pkgs.alacritty-ligatures; exePath = "/bin/alacritty"; }; - protonmail-bridge = mkApp { drv = pkgs.protonmail-bridge; }; - protonmail-bridge-headless = mkApp { drv = pkgs.protonmail-bridge; }; psst-cli = mkApp { drv = pkgs.psst; exePath = "/bin/psst-cli"; }; psst-gui = mkApp { drv = pkgs.psst; exePath = "/bin/psst-gui"; }; samrewritten = mkApp { drv = pkgs.samrewritten; }; diff --git a/pkgs/applications/networking/protonmail-bridge/app.nix b/pkgs/applications/networking/protonmail-bridge/app.nix deleted file mode 100644 index f9032f8..0000000 --- a/pkgs/applications/networking/protonmail-bridge/app.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ qtbase, go, goModules }: - -{ - pname = "protonmail-bridge"; - - tags = "pmapi_prod"; - - QT_PKG_CONFIG = "true"; - QT_VERSION = qtbase.version; - - nativeBuildInputs = [ - goModules.qt - qtbase - ]; - - buildPhase = '' - cp cmd/Desktop-Bridge/main.go . - - ## Enable writable vendor - GOMODULE=gomodule - mv vendor $GOMODULE-vendor - mkdir vendor - readarray -t files < <(find $GOMODULE-vendor/ -type f | grep -v github.com/therecipe/qt | sed "s/$GOMODULE-//") - for f in "''${files[@]}"; do - mkdir -p $(dirname $f) - cp -s $PWD/$GOMODULE-$f $f - done - unset GOMODULE - - ## - mkdir -p vendor/github.com/therecipe - cp -r gomodule-vendor/github.com/therecipe/qt vendor/github.com/therecipe/qt - chmod -R a+w vendor/github.com/therecipe/qt - - # Add vendor to GOPATH because fuck - mkdir -p $GOPATH - ln -s $PWD/vendor $GOPATH/src - - qtsetup check - GOROOT=${go}/share/go qtdeploy "''${buildFlagsArray[@]}" build desktop - ''; - - meta.broken = true; -} diff --git a/pkgs/applications/networking/protonmail-bridge/common.nix b/pkgs/applications/networking/protonmail-bridge/common.nix deleted file mode 100644 index b962681..0000000 --- a/pkgs/applications/networking/protonmail-bridge/common.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, fetchFromGitHub -, buildGoModule -, pkg-config -, libsecret -}: - -{ pname -, tags -, ... -}@args: - -buildGoModule (lib.recursiveUpdate args rec { - inherit pname; - version = "1.8.10"; - - src = fetchFromGitHub { - owner = "ProtonMail"; - repo = "proton-bridge"; - rev = "br-${version}"; - sha256 = "1na8min9cmn82lpad58abw6837k303fr09l6cvzswaxs73f231ig"; - }; - - vendorSha256 = "1219xa1347877bfhnid15y6w9s4hf1czbrmll2iha4gpsmg066bb"; - - nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ - pkg-config - ]; - - buildInputs = (args.buildInputs or [ ]) ++ [ - libsecret - ]; - - inherit tags; - - ldflags = [ - "-X github.com/ProtonMail/proton-bridge/pkg/constants.Version=${version}" - "-X github.com/ProtonMail/proton-bridge/pkg/constants.Revision=${version}" - "-X github.com/ProtonMail/proton-bridge/pkg/constants.BuildDate=unknown" - ]; - - meta = with lib; { - description = "Integrate ProtonMail paid account with any program that supports IMAP and SMTP"; - homepage = "https://protonmail.com"; - license = licenses.gpl3; - plaforms = platforms.x86_64; - }; -}) diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix deleted file mode 100644 index 6408092..0000000 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib -, fetchFromGitHub -, buildGoModule - -, go -, goModules -, libsecret -, pkg-config -, qtbase -}: -let - builder = import ./common.nix { - inherit lib fetchFromGitHub buildGoModule libsecret pkg-config; - }; -in -{ - protonmail-bridge = builder (import ./app.nix { inherit qtbase go goModules; }); - protonmail-bridge-headless = builder (import ./headless.nix { }); -} diff --git a/pkgs/applications/networking/protonmail-bridge/deps.nix b/pkgs/applications/networking/protonmail-bridge/deps.nix deleted file mode 100644 index 7ae392d..0000000 --- a/pkgs/applications/networking/protonmail-bridge/deps.nix +++ /dev/null @@ -1,768 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/0xAX/notificator"; - fetch = { - type = "git"; - url = "https://github.com/0xAX/notificator"; - rev = "3962a5ea8da1"; - sha256 = "1lkn6mmghsd4a2h3na8x0r5xgckjn3c0v5vsp6bzhl2k1zxb640p"; - }; - } - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "v0.3.1"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - { - goPackagePath = "github.com/ProtonMail/go-appdir"; - fetch = { - type = "git"; - url = "https://github.com/ProtonMail/go-appdir"; - rev = "v1.1.0"; - sha256 = "1pl43h5f79g2r0z98glrxasbb69yzigpd85csl7zmyhg63vzbkqw"; - }; - } - { - goPackagePath = "github.com/ProtonMail/go-apple-mobileconfig"; - fetch = { - type = "git"; - url = "https://github.com/ProtonMail/go-apple-mobileconfig"; - rev = "7ea9927a11f6"; - sha256 = "1vlm9m54xmq0r8bhgwzdmxnxf97sz01lgi6lw8pcjbljmzb9l75f"; - }; - } - { - goPackagePath = "github.com/ProtonMail/go-autostart"; - fetch = { - type = "git"; - url = "https://github.com/ProtonMail/go-autostart"; - rev = "c5272053443a"; - sha256 = "0cjnsbqrkhlapma2070cqcxr4wkvv55is3byqn8zmkzi0l3217nf"; - }; - } - { - goPackagePath = "github.com/ProtonMail/go-imap-id"; - fetch = { - type = "git"; - url = "https://github.com/ProtonMail/go-imap-id"; - rev = "ed0baee567ee"; - sha256 = "1kljw64pi3kabbd3gi7zy9wqzaypsxrdi5mfwf6akl438bq44jm4"; - }; - } - { - goPackagePath = "github.com/ProtonMail/go-mime"; - fetch = { - type = "git"; - url = "https://github.com/ProtonMail/go-mime"; - rev = "09454e3dbe72"; - sha256 = "1ncca6191nf0lsfhhhdxdbhxg3b2q1cmvjhq2428g0b50dlfkrnn"; - }; - } - { - goPackagePath = "github.com/ProtonMail/go-vcard"; - fetch = { - type = "git"; - url = "https://github.com/ProtonMail/go-vcard"; - rev = "33aaa0a0c8a5"; - sha256 = "19cify6lxd2yirqc92yfgzvn5qlc8a01a2kxjdg83jv0lx6ps26q"; - }; - } - { - goPackagePath = "github.com/ProtonMail/gopenpgp"; - fetch = { - type = "git"; - url = "https://github.com/ProtonMail/gopenpgp"; - rev = "d398098113ed"; - sha256 = "0ry69mymb6q00g4khdbzllrz7b44zhxvdzavhz6936n9dzsay13v"; - }; - } - { - goPackagePath = "github.com/abiosoft/ishell"; - fetch = { - type = "git"; - url = "https://github.com/abiosoft/ishell"; - rev = "v2.0.0"; - sha256 = "11r6l133aaz6khm60x0a410ckpzvqzv2az7z5b088c2vddnp538r"; - }; - } - { - goPackagePath = "github.com/abiosoft/readline"; - fetch = { - type = "git"; - url = "https://github.com/abiosoft/readline"; - rev = "155bce2042db"; - sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r"; - }; - } - { - goPackagePath = "github.com/allan-simon/go-singleinstance"; - fetch = { - type = "git"; - url = "https://github.com/allan-simon/go-singleinstance"; - rev = "79edcfdc2dfc"; - sha256 = "06xrxifz5cd98iji7v46zq9xf63zf77sqbr72w1ics3s2hyfkpjz"; - }; - } - { - goPackagePath = "github.com/andybalholm/cascadia"; - fetch = { - type = "git"; - url = "https://github.com/andybalholm/cascadia"; - rev = "v1.1.0"; - sha256 = "1slh68ysbixc21gbni4msrgq971n59gnn2x3ys196jd413a6qf0f"; - }; - } - { - goPackagePath = "github.com/cention-sany/utf7"; - fetch = { - type = "git"; - url = "https://github.com/cention-sany/utf7"; - rev = "26cad61bd60a"; - sha256 = "1jy15ryfcln1iwchrksqyrnyfy41gisymm4f9sr1d73ja029bznm"; - }; - } - { - goPackagePath = "github.com/certifi/gocertifi"; - fetch = { - type = "git"; - url = "https://github.com/certifi/gocertifi"; - rev = "c7c1fbc02894"; - sha256 = "018bsy1vclsdk2kns9f37giabibg3kggk3vpj0yr3dv0k72gzybk"; - }; - } - { - goPackagePath = "github.com/chzyer/logex"; - fetch = { - type = "git"; - url = "https://github.com/chzyer/logex"; - rev = "v1.1.10"; - sha256 = "08pbjj3wx9acavlwyr055isa8a5hnmllgdv5k6ra60l5y1brmlq4"; - }; - } - { - goPackagePath = "github.com/chzyer/test"; - fetch = { - type = "git"; - url = "https://github.com/chzyer/test"; - rev = "a1ea475d72b1"; - sha256 = "0rns2aqk22i9xsgyap0pq8wi4cfaxsri4d9q6xxhhyma8jjsnj2k"; - }; - } - { - goPackagePath = "github.com/cpuguy83/go-md2man"; - fetch = { - type = "git"; - url = "https://github.com/cpuguy83/go-md2man"; - rev = "f79a8a8ca69d"; - sha256 = "0r1f7v475dxxgzqci1mxfliwadcrk86ippflx9n411325l4g3ghv"; - }; - } - { - goPackagePath = "github.com/cucumber/godog"; - fetch = { - type = "git"; - url = "https://github.com/cucumber/godog"; - rev = "v0.8.1"; - sha256 = "00bplmx3r7mjaxyf1ky1mh9ps17p78656xjpkqf3wkfhchssm3ny"; - }; - } - { - goPackagePath = "github.com/danieljoos/wincred"; - fetch = { - type = "git"; - url = "https://github.com/danieljoos/wincred"; - rev = "v1.0.2"; - sha256 = "1ym8mygjrf3rw1qka9irw76b2yisr2l5pq2w581s40yldnbfq4lc"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/docker/docker-credential-helpers"; - fetch = { - type = "git"; - url = "https://github.com/ProtonMail/docker-credential-helpers"; - rev = "0326642117d8"; - sha256 = "02qfw1w6v14kfjlc6slg7hvv2raan5263ivymdn2pjm3hdcgs7lh"; - }; - } - { - goPackagePath = "github.com/emersion/go-imap"; - fetch = { - type = "git"; - url = "https://github.com/ProtonMail/go-imap"; - rev = "0e686f0e855f"; - sha256 = "1gijqy3wq6lbqbrljl4l12w5snji3c9fpvywhk9wyd56mdsy7wyr"; - }; - } - { - goPackagePath = "github.com/emersion/go-imap-appendlimit"; - fetch = { - type = "git"; - url = "https://github.com/emersion/go-imap-appendlimit"; - rev = "beeb382f2a42"; - sha256 = "089kgnryvignl9z5c3fi5bxyc3jl7jgmz6ykhk73n8nqp8kgi43b"; - }; - } - { - goPackagePath = "github.com/emersion/go-imap-idle"; - fetch = { - type = "git"; - url = "https://github.com/emersion/go-imap-idle"; - rev = "e03ba1e0ed89"; - sha256 = "0yavndwl9g3q4j97659kq1mpyc22q27vq0lg0f7v704irmbbkanp"; - }; - } - { - goPackagePath = "github.com/emersion/go-imap-move"; - fetch = { - type = "git"; - url = "https://github.com/emersion/go-imap-move"; - rev = "88aef42b0f1d"; - sha256 = "006l76qxkf7gnb0kc7r9xmxg7nmmwfw8sf5lsg05093rwcg232f4"; - }; - } - { - goPackagePath = "github.com/emersion/go-imap-quota"; - fetch = { - type = "git"; - url = "https://github.com/ProtonMail/go-imap-quota"; - rev = "20f0ba8904de"; - sha256 = "1qvhzsm0wjg0ndk963l9wcmdiyacbrmslhvmg1zhj3k9np41ravv"; - }; - } - { - goPackagePath = "github.com/emersion/go-imap-specialuse"; - fetch = { - type = "git"; - url = "https://github.com/emersion/go-imap-specialuse"; - rev = "ba031ced6a62"; - sha256 = "0f8rxgr4z5a7nphhz6vnsqgjr04wwrvdcnsxp5rl2lh60yvj3wig"; - }; - } - { - goPackagePath = "github.com/emersion/go-imap-unselect"; - fetch = { - type = "git"; - url = "https://github.com/emersion/go-imap-unselect"; - rev = "1e6dc73ac8fe"; - sha256 = "0higgjn41ksgsl11zphljbz690i17swzhfkij51dghjnj9q287ff"; - }; - } - { - goPackagePath = "github.com/emersion/go-sasl"; - fetch = { - type = "git"; - url = "https://github.com/emersion/go-sasl"; - rev = "430746ea8b9b"; - sha256 = "11rhbayr1w3zhpl3q7gd6i15qz97pk0k4xs0n39m91hrgl1fj03c"; - }; - } - { - goPackagePath = "github.com/emersion/go-smtp"; - fetch = { - type = "git"; - url = "https://github.com/ProtonMail/go-smtp"; - rev = "8261df20d309"; - sha256 = "0n6k7xbffzsxfjcc74q21nh8dp5s44v3xh9hrsi7a147n8qm83iq"; - }; - } - { - goPackagePath = "github.com/emersion/go-textwrapper"; - fetch = { - type = "git"; - url = "https://github.com/emersion/go-textwrapper"; - rev = "d0e65e56babe"; - sha256 = "1nw8qpjjbpkz49wd19yg2qsln1dmdfxi83wp2aa819cv6xxf2y7l"; - }; - } - { - goPackagePath = "github.com/emersion/go-vcard"; - fetch = { - type = "git"; - url = "https://github.com/emersion/go-vcard"; - rev = "8856043f13c5"; - sha256 = "1dzw5awqbkf2nc09ynmn3zlylj4n1na96rziv5z8p42b1bmbklwk"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "v1.9.0"; - sha256 = "086z8ssmr1fn9ba4mqnw7pnccfpys6l5yfhvycv1gdrsk7n27mvs"; - }; - } - { - goPackagePath = "github.com/flynn-archive/go-shlex"; - fetch = { - type = "git"; - url = "https://github.com/flynn-archive/go-shlex"; - rev = "3f9db97f8568"; - sha256 = "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia"; - }; - } - { - goPackagePath = "github.com/getsentry/raven-go"; - fetch = { - type = "git"; - url = "https://github.com/getsentry/raven-go"; - rev = "v0.2.0"; - sha256 = "0imfwmsb72168fqandf2lxhzhngf2flxhzaar8hcnnfjv2a291lf"; - }; - } - { - goPackagePath = "github.com/go-resty/resty"; - fetch = { - type = "git"; - url = "https://github.com/go-resty/resty"; - rev = "v2.2.0"; - sha256 = "0khfcq07kq6z2vq0i42an8fd16pl1rc980rlf7c1x4szsf8qcajm"; - }; - } - { - goPackagePath = "github.com/go-test/deep"; - fetch = { - type = "git"; - url = "https://github.com/go-test/deep"; - rev = "v1.0.2"; - sha256 = "1dax5bbp95lvkns0jjwf6l3rqj5q4xxd37whpqa8nyyjcakdxnqd"; - }; - } - { - goPackagePath = "github.com/gogs/chardet"; - fetch = { - type = "git"; - url = "https://github.com/gogs/chardet"; - rev = "2404f7772561"; - sha256 = "1dki2pqhnzcmzlqrq4d4jwknnjxm82xqnmizjjdblb6h98ans1cd"; - }; - } - { - goPackagePath = "github.com/golang/mock"; - fetch = { - type = "git"; - url = "https://github.com/golang/mock"; - rev = "v1.4.3"; - sha256 = "1p37xnja1dgq5ykx24n7wincwz2gahjh71b95p8vpw7ss2g8j8wx"; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "v0.4.0"; - sha256 = "1x5pvl3fb5sbyng7i34431xycnhmx8xx94gq2n19g6p0vz68z2v2"; - }; - } - { - goPackagePath = "github.com/gopherjs/gopherjs"; - fetch = { - type = "git"; - url = "https://github.com/gopherjs/gopherjs"; - rev = "3e4dfb77656c"; - sha256 = "0bmapn4dskpr4a79kcr5irkw19px4a71ls5gspffxiva7sapgyvw"; - }; - } - { - goPackagePath = "github.com/hashicorp/errwrap"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/errwrap"; - rev = "v1.0.0"; - sha256 = "0slfb6w3b61xz04r32bi0a1bygc82rjzhqkxj2si2074wynqnr1c"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-multierror"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-multierror"; - rev = "v1.0.0"; - sha256 = "00nyn8llqzbfm8aflr9kwsvpzi4kv8v45c141v88xskxp5xf6z49"; - }; - } - { - goPackagePath = "github.com/jameskeane/bcrypt"; - fetch = { - type = "git"; - url = "https://github.com/ProtonMail/bcrypt"; - rev = "7509ea014998"; - sha256 = "12xi8i4sb6q4h4wd6w1phqpzxpff5c629ard8cnkjp7qmznvcc20"; - }; - } - { - goPackagePath = "github.com/jaytaylor/html2text"; - fetch = { - type = "git"; - url = "https://github.com/jaytaylor/html2text"; - rev = "61d9dc4d7195"; - sha256 = "19cn6k8anx8w2ar8kwza6vlijim2xbj4hqxy1m79y0m386b2hapl"; - }; - } - { - goPackagePath = "github.com/jhillyerd/enmime"; - fetch = { - type = "git"; - url = "https://github.com/jhillyerd/enmime"; - rev = "v0.8.0"; - sha256 = "1wzz3hzf8bnn0wbxznzrfdrs4x7qxdgqpf1xirlsisq8z0r8hn9z"; - }; - } - { - goPackagePath = "github.com/kardianos/osext"; - fetch = { - type = "git"; - url = "https://github.com/kardianos/osext"; - rev = "2bc1f35cddc0"; - sha256 = "1pvrbrvmrf4mx0fxbfaphbzgqgwn8v6lkfk2vyrs0znxrs1xyc5r"; - }; - } - { - goPackagePath = "github.com/keybase/go-keychain"; - fetch = { - type = "git"; - url = "https://github.com/keybase/go-keychain"; - rev = "86d4642e4ce2"; - sha256 = "05prxx2bbcqwk5lwk1gdqsrwy256mp4k4im316h9ar3sh42frha6"; - }; - } - { - goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; - fetch = { - type = "git"; - url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.2"; - sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7"; - }; - } - { - goPackagePath = "github.com/logrusorgru/aurora"; - fetch = { - type = "git"; - url = "https://github.com/logrusorgru/aurora"; - rev = "e9ef32dff381"; - sha256 = "19laya9dav84miw3d0c9vgiv577wzrhydv5mdiii59sgbd780hhq"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "v0.1.4"; - sha256 = "1yxcz08kminqr1221zxpibnbzfcgs3fafin0z9zqb3gqvf74jywz"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.11"; - sha256 = "0h671sv7hfprja495kavazkalkx7xzaqksjh13brcnwq67ijrali"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "v0.0.4"; - sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs"; - }; - } - { - goPackagePath = "github.com/miekg/dns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/dns"; - rev = "v1.1.29"; - sha256 = "1bkk930cg46w1akii60bqqkgy9h9axlcfnqk252r6w8qqpf4z5hh"; - }; - } - { - goPackagePath = "github.com/myesui/uuid"; - fetch = { - type = "git"; - url = "https://github.com/myesui/uuid"; - rev = "v1.0.0"; - sha256 = "1si8cfjin9dyzprnyvfk8pckbsvg97hzs9hffz91505lpidlb9bc"; - }; - } - { - goPackagePath = "github.com/nsf/jsondiff"; - fetch = { - type = "git"; - url = "https://github.com/nsf/jsondiff"; - rev = "8443391ee9b6"; - sha256 = "1zxk0mzil5x197zaqjld403f3vvzilgvciq1z62zl1c1vbwbpwch"; - }; - } - { - goPackagePath = "github.com/olekukonko/tablewriter"; - fetch = { - type = "git"; - url = "https://github.com/olekukonko/tablewriter"; - rev = "v0.0.1"; - sha256 = "0hh95glg7d2md185r03wn52j2r33jc4zil0qvcrs66ka7bdxi7vj"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.9.1"; - sha256 = "1761pybhc2kqr6v5fm8faj08x9bql8427yqg6vnfv6nhrasx1mwq"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/russross/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "v2.0.1"; - sha256 = "0nlz7isdd4rgnwzs68499hlwicxz34j2k2a0b8jy0y7ycd2bcr5j"; - }; - } - { - goPackagePath = "github.com/saintfish/chardet"; - fetch = { - type = "git"; - url = "https://github.com/saintfish/chardet"; - rev = "3af4cd4741ca"; - sha256 = "0czh50md64k9lbllayq0asir3174saxb88yzxrh640yhfxd98pcb"; - }; - } - { - goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; - fetch = { - type = "git"; - url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "v1.0.0"; - sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "v1.4.2"; - sha256 = "087k2lxrr9p9dh68yw71d05h5g9p5v26zbwd6j7lghinjfaw334x"; - }; - } - { - goPackagePath = "github.com/skratchdot/open-golang"; - fetch = { - type = "git"; - url = "https://github.com/skratchdot/open-golang"; - rev = "eef842397966"; - sha256 = "0n6387csjn024db8wldadsiy8ljz7lk7szl6ls28fcbkax7rw86y"; - }; - } - { - goPackagePath = "github.com/ssor/bom"; - fetch = { - type = "git"; - url = "https://github.com/ssor/bom"; - rev = "6386211fdfcf"; - sha256 = "09g5496ifwqxqclh2iw58plcwcz0sczlnxwqxzwmnl4shdl371ld"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.2.0"; - sha256 = "0pcdvakxgddaiwcdj73ra4da05a3q4cgwbpm2w75ycq4kzv8ij8k"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.5.1"; - sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl"; - }; - } - { - goPackagePath = "github.com/therecipe/qt"; - fetch = { - type = "git"; - url = "https://github.com/therecipe/qt"; - rev = "5074eb6d8c41"; - sha256 = "1zpil531gjravag76p1032c7wizpskzanymdpc74rs8ixckws9zi"; - }; - } - { - goPackagePath = "github.com/twinj/uuid"; - fetch = { - type = "git"; - url = "https://github.com/twinj/uuid"; - rev = "v1.0.0"; - sha256 = "1si8cfjin9dyzprnyvfk8pckbsvg97hzs9hffz91505lpidlb9bc"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "v1.22.3"; - sha256 = "1lz6i6h4mcb4zqclj2lgy34hwpj1bpkxwzkgrqikfsd8pp9wyq9q"; - }; - } - { - goPackagePath = "go.etcd.io/bbolt"; - fetch = { - type = "git"; - url = "https://github.com/etcd-io/bbolt"; - rev = "v1.3.3"; - sha256 = "0dn0zngks9xiz0rrrb3911f73ghl64z84jsmzai2yfmzqr7cdkqc"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://github.com/ProtonMail/crypto"; - rev = "d3d8a14a4d4f"; - sha256 = "1w5q5snw1nqsdwqffvk0rlmsqx5b6mpfi45adr2j4lzzpw1ab03a"; - }; - } - { - goPackagePath = "golang.org/x/mod"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mod"; - rev = "c90efee705ee"; - sha256 = "0i5md645rmcy5z5ij9ng428k9rz4g3k1kjy3blsq1264rn426gdf"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "244492dfa37a"; - sha256 = "0vm2q44phz4vjnzq9428rjk58c82fxf003whczp7c9ryn9fazh7s"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "112230192c58"; - sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "33540a1f6037"; - sha256 = "0fjcv0vzvi6za0b4xmnk3932pr9f9gczzf03y0kgq3ry9rqg169y"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.2"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "49a3e744a425"; - sha256 = "0xx4gv9wpv36crk7gv7imf5vzzs2mz7zla2q2jkck3xnzff8fw3v"; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "9bdfabe68543"; - sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; - }; - } - { - goPackagePath = "gopkg.in/stretchr/testify.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/stretchr/testify.v1"; - rev = "v1.2.2"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.2"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; - }; - } - { - goPackagePath = "rsc.io/quote"; - fetch = { - type = "git"; - url = "https://github.com/rsc/quote"; - rev = "v3.1.0"; - sha256 = "0nvv97hwwrl1mx5gzsbdm1ndnwpg3m7i2jb10ig9wily7zmvki0i"; - }; - } - { - goPackagePath = "rsc.io/sampler"; - fetch = { - type = "git"; - url = "https://github.com/rsc/sampler"; - rev = "v1.3.0"; - sha256 = "0byxk2ynba50py805kcvbvjzh59l1r308i1xgyzpw6lff4xx9xjh"; - }; - } -] diff --git a/pkgs/applications/networking/protonmail-bridge/headless.nix b/pkgs/applications/networking/protonmail-bridge/headless.nix deleted file mode 100644 index 0371fdd..0000000 --- a/pkgs/applications/networking/protonmail-bridge/headless.nix +++ /dev/null @@ -1,17 +0,0 @@ -{}: - -{ - pname = "protonmail-bridge-headless"; - - tags = [ "pmapi_prod" "nogui" ]; - - # REVIEW: Some issue with IMAP tests that probably fail due to network - # sandboxing. - doCheck = false; - - # Fix up name. - postInstall = '' - mv $out/bin/Desktop-Bridge $out/bin/protonmail-bridge - mv $out/bin/Import-Export $out/bin/protonmail-import-export - ''; -} diff --git a/pkgs/development/go-modules/qt/default.nix b/pkgs/development/go-modules/qt/default.nix deleted file mode 100644 index 49db4fa..0000000 --- a/pkgs/development/go-modules/qt/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ lib -, fetchFromGitHub -, buildGoModule -, makeWrapper - -, go -, pkg-config -, qmake -, removeReferencesTo -}: - -buildGoModule rec { - pname = "go-qt"; - version = "20200904.gc0c124a"; - - src = fetchFromGitHub { - owner = "therecipe"; - repo = "qt"; - rev = "c0c124a5770d357908f16fa57e0aa0ec6ccd3f91"; - sha256 = "197wdh2v0g5g2dpb1gcd5gp0g4wqzip34cawisvy6z7mygmsc8rd"; - }; - - # fails with `GOFLAGS=-vendor=mod -trimpath` - allowGoReference = true; - preFixup = '' - find $out -type f -exec ${removeReferencesTo}/bin/remove-references-to -t ${go} '{}' + - ''; - - vendorSha256 = "00wghn93xz240ddj47b8mkbx3cg7c0486igp6vv0x9r6ylhywsm6"; - subPackages = [ "cmd/..." ]; - - nativeBuildInputs = [ makeWrapper ]; - - # Fixes inconsistent vendoring. - postPatch = '' - cat <>go.mod - require ( - github.com/therecipe/env_darwin_amd64_513 v0.0.0-20190626001412-d8e92e8db4d0 - github.com/therecipe/env_linux_amd64_513 v0.0.0-20190626000307-e137a3934da6 - github.com/therecipe/env_windows_amd64_513 v0.0.0-20190626000028-79ec8bd06fb2 - github.com/therecipe/env_windows_amd64_513/Tools v0.0.0-20190626000028-79ec8bd06fb2 - github.com/therecipe/qt/internal/binding/files/docs/5.12.0 v0.0.0-20200904063919-c0c124a5770d - github.com/therecipe/qt/internal/binding/files/docs/5.13.0 v0.0.0-20200904063919-c0c124a5770d - ) - EOM - ''; - - doCheck = true; - checkPhase = '' - $GOPATH/bin/qtsetup test - ''; - - postFixup = '' - for bin in $out/bin/*; do - wrapProgram $bin \ - --set QT_PKG_CONFIG true \ - --prefix PATH : ${pkg-config}/bin \ - --prefix PATH : ${qmake}/bin - done - ''; - - meta = with lib; { - homepage = "https://github.com/therecipe/qt"; - description = "Qt bindings for Go"; - license = licenses.lgpl3; - broken = true; - }; -} diff --git a/pkgs/development/go-modules/qt/deps.nix b/pkgs/development/go-modules/qt/deps.nix deleted file mode 100644 index f85db3f..0000000 --- a/pkgs/development/go-modules/qt/deps.nix +++ /dev/null @@ -1,111 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/gopherjs/gopherjs"; - fetch = { - type = "git"; - url = "https://github.com/gopherjs/gopherjs"; - rev = "bd77b112433e"; - sha256 = "0bsj69jb0glfvqhqld4c78840iagd0iy2b92878i5w4sgp40k7i1"; - }; - } - { - goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; - fetch = { - type = "git"; - url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.2"; - sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "v1.4.1"; - sha256 = "1m7ny9jkb98cxqhsp13xa5hnqh1s9f25x04q6arsala4zswsw33c"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.2.0"; - sha256 = "0pcdvakxgddaiwcdj73ra4da05a3q4cgwbpm2w75ycq4kzv8ij8k"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.3.0"; - sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://github.com/golang/crypto"; - rev = "df01cb2cc480549d72034218dd98bf97671450ac"; - sha256 = "1fhz0rym06j0fds0wg8xf6i9mm37m6qgdv83qxfh3nh0mgzf19qs"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://github.com/golang/net"; - rev = "afa5a82059c6356159f699d81beff22a81842231"; - sha256 = "1zhcr1m7n550m0lqjqg1rl2qrnghkl3a25vcm6cgpiqvk89f8lba"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://github.com/golang/sys"; - rev = "e8e3143a4f4a00f1fafef0dd82ba78223281b01b"; - sha256 = "02pdj4gr658r99kqwxy6v4lb8w2h0zaiqq1jyqrsxqiyapijhw87"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://github.com/golang/text"; - rev = "f4905fbd45b6790792202848439271c74074bbfd"; - sha256 = "184d6ap2g92jvx0532lymdqbnx9vi9ips4dq5lnqbby0caccc6r1"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://github.com/golang/tools"; - rev = "aa740d4807891cb493e9f727901baf334b9fabce"; - sha256 = "0431y2xw39dss0ldxhbmm7ip4d2cr2w9km2a5psgwan6v481kz0a"; - }; - } -] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index de47326..72dbe63 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1,10 +1,6 @@ { pkgs }: rec { - goModules = pkgs.recurseIntoAttrs rec { - qt = pkgs.libsForQt5.callPackage ../development/go-modules/qt { }; - }; - # A functional Jetbrains IDE-with-plugins package set. jetbrains = pkgs.dontRecurseIntoAttrs rec { jetbrainsPluginsFor = variant: import ../top-level/jetbrains-plugins.nix { @@ -33,13 +29,5 @@ rec { py-sonic = pkgs.python3.pkgs.callPackage ../development/python-modules/py-sonic { }; }; - # The one in Nixpkgs still extracts the pre-built Debian package instead - # of building from source. - protonmailBridgePackages = pkgs.libsForQt5.callPackage ../applications/networking/protonmail-bridge { - inherit goModules; - }; - protonmail-bridge = protonmailBridgePackages.protonmail-bridge; - protonmail-bridge-headless = protonmailBridgePackages.protonmail-bridge-headless; - radeon-profile-daemon = pkgs.libsForQt5.callPackage ../tools/misc/radeon-profile-daemon { }; }