summaryrefslogtreecommitdiffstats
path: root/pkgs
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2017-12-29 15:28:56 -0500
committerJohn Ericson <John.Ericson@Obsidian.Systems>2017-12-29 15:28:56 -0500
commitbc3a6e260a9fc9924f86c36fc522a996df5d3e26 (patch)
tree21f852d980f96e4e89e4402b5bed5e9eea7b4db4 /pkgs
parent5d336d36bb0cb20d8966e9e426f8621629ac6e03 (diff)
parent3afe325a3e2f906ba512fb7a2f28f79496711592 (diff)
Merge commit '3afe325a3e2f906ba512fb7a2f28f79496711592' into mingw32-w64-fix
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/altcoins/bitcoin.nix20
-rw-r--r--pkgs/applications/altcoins/default.nix9
-rw-r--r--pkgs/applications/altcoins/go-ethereum.nix4
-rw-r--r--pkgs/applications/altcoins/hivemind.nix39
-rw-r--r--pkgs/applications/altcoins/zcash/default.nix6
-rw-r--r--pkgs/applications/audio/amarok/kf5.nix37
-rw-r--r--pkgs/applications/audio/audacity/default.nix10
-rw-r--r--pkgs/applications/audio/deadbeef/default.nix2
-rw-r--r--pkgs/applications/audio/kid3/default.nix2
-rw-r--r--pkgs/applications/audio/mopidy-iris/default.nix4
-rw-r--r--pkgs/applications/audio/musescore/darwin.nix16
-rw-r--r--pkgs/applications/audio/ncmpc/default.nix2
-rw-r--r--pkgs/applications/audio/schismtracker/default.nix7
-rw-r--r--pkgs/applications/audio/tomahawk/default.nix3
-rw-r--r--pkgs/applications/backup/deja-dup/default.nix32
-rw-r--r--pkgs/applications/editors/android-studio/default.nix6
-rw-r--r--pkgs/applications/editors/aseprite/default.nix4
-rw-r--r--pkgs/applications/editors/atom/beta.nix4
-rw-r--r--pkgs/applications/editors/atom/default.nix4
-rw-r--r--pkgs/applications/editors/ed/default.nix4
-rw-r--r--pkgs/applications/editors/emacs-modes/elpa-generated.nix38
-rw-r--r--pkgs/applications/editors/emacs-modes/elpa-packages.nix1
-rw-r--r--pkgs/applications/editors/emacs-modes/ess-R-object-popup/default.nix22
-rw-r--r--pkgs/applications/editors/emacs-modes/filesets-plus/default.nix22
-rw-r--r--pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix4
-rw-r--r--pkgs/applications/editors/emacs-modes/header2/default.nix23
-rw-r--r--pkgs/applications/editors/emacs-modes/helm-words/default.nix23
-rw-r--r--pkgs/applications/editors/emacs-modes/hexrgb/default.nix23
-rw-r--r--pkgs/applications/editors/emacs-modes/lib-requires/default.nix23
-rw-r--r--pkgs/applications/editors/emacs-modes/melpa-generated.nix1954
-rw-r--r--pkgs/applications/editors/emacs-modes/melpa-packages.nix3
-rw-r--r--pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix480
-rw-r--r--pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix3
-rw-r--r--pkgs/applications/editors/emacs-modes/org-generated.nix12
-rw-r--r--pkgs/applications/editors/emacs-modes/org-mac-link/default.nix31
-rw-r--r--pkgs/applications/editors/emacs-modes/perl-completion/default.nix23
-rw-r--r--pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix6
-rw-r--r--pkgs/applications/editors/emacs-modes/railgun/default.nix22
-rw-r--r--pkgs/applications/editors/emacs-modes/redshank/default.nix23
-rw-r--r--pkgs/applications/editors/emacs-modes/stgit/default.nix25
-rw-r--r--pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix23
-rw-r--r--pkgs/applications/editors/emacs-modes/yaoddmuse/default.nix30
-rw-r--r--pkgs/applications/editors/emacs-modes/zeitgeist/default.nix25
-rw-r--r--pkgs/applications/editors/geany/default.nix4
-rw-r--r--pkgs/applications/editors/jetbrains/default.nix46
-rw-r--r--pkgs/applications/editors/kdevelop5/kdevplatform.nix2
-rw-r--r--pkgs/applications/editors/nano/default.nix8
-rw-r--r--pkgs/applications/editors/nano/nano-2.9.1-darwin.patch9
-rw-r--r--pkgs/applications/editors/neovim/default.nix54
-rw-r--r--pkgs/applications/editors/neovim/neovim-remote.nix2
-rw-r--r--pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock6
-rw-r--r--pkgs/applications/editors/neovim/ruby_provider/gemset.nix14
-rw-r--r--pkgs/applications/editors/sublime3/default.nix14
-rw-r--r--pkgs/applications/editors/texstudio/default.nix4
-rw-r--r--pkgs/applications/editors/vscode/default.nix8
-rw-r--r--pkgs/applications/gis/qgis/default.nix4
-rw-r--r--pkgs/applications/graphics/ImageMagick/default.nix4
-rw-r--r--pkgs/applications/graphics/gimp/plugins/default.nix14
-rw-r--r--pkgs/applications/graphics/k3d/default.nix2
-rw-r--r--pkgs/applications/graphics/photoqt/default.nix5
-rw-r--r--pkgs/applications/graphics/photoqt/photoqt-1.5.1-qt-5.9.patch13
-rw-r--r--pkgs/applications/graphics/renderdoc/default.nix24
-rw-r--r--pkgs/applications/kde/default.nix1
-rw-r--r--pkgs/applications/kde/kruler.nix17
-rw-r--r--pkgs/applications/misc/alacritty/default.nix16
-rw-r--r--pkgs/applications/misc/calibre/default.nix2
-rw-r--r--pkgs/applications/misc/cheat/default.nix18
-rw-r--r--pkgs/applications/misc/deepin-terminal/default.nix11
-rw-r--r--pkgs/applications/misc/exercism/default.nix4
-rw-r--r--pkgs/applications/misc/gnuradio-ais/default.nix11
-rw-r--r--pkgs/applications/misc/gnuradio-gsm/default.nix4
-rw-r--r--pkgs/applications/misc/gnuradio-nacl/default.nix4
-rw-r--r--pkgs/applications/misc/gnuradio-osmosdr/default.nix6
-rw-r--r--pkgs/applications/misc/gnuradio-rds/default.nix4
-rw-r--r--pkgs/applications/misc/gnuradio/default.nix82
-rw-r--r--pkgs/applications/misc/hello/default.nix14
-rw-r--r--pkgs/applications/misc/hubstaff/default.nix2
-rw-r--r--pkgs/applications/misc/ipmiview/default.nix4
-rw-r--r--pkgs/applications/misc/jgmenu/default.nix40
-rw-r--r--pkgs/applications/misc/libosmocore/default.nix26
-rw-r--r--pkgs/applications/misc/monero/default.nix4
-rw-r--r--pkgs/applications/misc/mupdf/default.nix26
-rw-r--r--pkgs/applications/misc/octoprint/default.nix8
-rw-r--r--pkgs/applications/misc/oneko/default.nix34
-rw-r--r--pkgs/applications/misc/qsyncthingtray/default.nix4
-rw-r--r--pkgs/applications/misc/qsyncthingtray/qsyncthingtray-0.5.8-qt-5.6.3.patch13
-rw-r--r--pkgs/applications/misc/rescuetime/default.nix6
-rw-r--r--pkgs/applications/misc/rtl-sdr/default.nix4
-rw-r--r--pkgs/applications/misc/sdcv/default.nix4
-rw-r--r--pkgs/applications/misc/urh/default.nix2
-rw-r--r--pkgs/applications/misc/usync/default.nix34
-rw-r--r--pkgs/applications/misc/verbiste/default.nix6
-rw-r--r--pkgs/applications/misc/xiphos/default.nix21
-rw-r--r--pkgs/applications/networking/browsers/chromium/plugins.nix4
-rw-r--r--pkgs/applications/networking/browsers/chromium/upstream-info.nix12
-rw-r--r--pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix772
-rw-r--r--pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix770
-rw-r--r--pkgs/applications/networking/browsers/firefox-bin/release_sources.nix762
-rw-r--r--pkgs/applications/networking/browsers/firefox/common.nix6
-rw-r--r--pkgs/applications/networking/browsers/firefox/env_var_for_system_dir.patch14
-rw-r--r--pkgs/applications/networking/browsers/firefox/packages.nix16
-rw-r--r--pkgs/applications/networking/browsers/firefox/wrapper.nix279
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix10
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix6
-rw-r--r--pkgs/applications/networking/browsers/palemoon/default.nix4
-rw-r--r--pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix6
-rw-r--r--pkgs/applications/networking/cluster/docker-machine/default.nix4
-rw-r--r--pkgs/applications/networking/cluster/docker-machine/xhyve-deps.nix21
-rw-r--r--pkgs/applications/networking/cluster/docker-machine/xhyve.nix27
-rw-r--r--pkgs/applications/networking/cluster/kompose/default.nix23
-rw-r--r--pkgs/applications/networking/cluster/mesos/default.nix2
-rw-r--r--pkgs/applications/networking/cluster/minikube/default.nix8
-rw-r--r--pkgs/applications/networking/cluster/minikube/localkube.patch20
-rw-r--r--pkgs/applications/networking/cluster/spark/default.nix6
-rw-r--r--pkgs/applications/networking/cluster/terraform/default.nix11
-rw-r--r--pkgs/applications/networking/cluster/terraform/providers/data.nix102
-rw-r--r--pkgs/applic