summaryrefslogtreecommitdiffstats
path: root/pkgs
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2018-02-26 10:50:18 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2018-02-26 10:50:18 +0100
commit4f08b0fbac17c201216abbd776ce3bb292ed4946 (patch)
tree129bb0b85b424612237e81d2cf303f7d5c0200fe /pkgs
parent6b381d4c9bed35caee62265a92986cec189243b2 (diff)
parent1d6abdd1775d12f7a90414c6e6b4c45ffc612246 (diff)
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/audio/ario/default.nix4
-rw-r--r--pkgs/applications/audio/asunder/default.nix4
-rw-r--r--pkgs/applications/audio/audacious/default.nix8
-rw-r--r--pkgs/applications/audio/audacious/qt-5.nix4
-rw-r--r--pkgs/applications/audio/audacity/default.nix4
-rw-r--r--pkgs/applications/audio/deadbeef/default.nix6
-rw-r--r--pkgs/applications/audio/deadbeef/plugins/opus.nix31
-rw-r--r--pkgs/applications/audio/drumkv1/default.nix4
-rw-r--r--pkgs/applications/audio/easytag/default.nix4
-rw-r--r--pkgs/applications/audio/fluidsynth/default.nix4
-rw-r--r--pkgs/applications/audio/gjay/default.nix4
-rw-r--r--pkgs/applications/audio/gmpc/default.nix4
-rw-r--r--pkgs/applications/audio/gradio/default.nix12
-rw-r--r--pkgs/applications/audio/gtkpod/default.nix8
-rw-r--r--pkgs/applications/audio/guitarix/default.nix8
-rw-r--r--pkgs/applications/audio/mopidy/default.nix4
-rw-r--r--pkgs/applications/audio/pamix/default.nix12
-rw-r--r--pkgs/applications/audio/paprefs/default.nix4
-rw-r--r--pkgs/applications/audio/patchage/default.nix4
-rw-r--r--pkgs/applications/audio/pavucontrol/default.nix4
-rw-r--r--pkgs/applications/audio/radiotray-ng/default.nix4
-rw-r--r--pkgs/applications/audio/rhythmbox/default.nix4
-rw-r--r--pkgs/applications/audio/sonata/default.nix6
-rw-r--r--pkgs/applications/audio/sound-juicer/default.nix8
-rw-r--r--pkgs/applications/audio/tomahawk/default.nix6
-rw-r--r--pkgs/applications/backup/deja-dup/default.nix8
-rw-r--r--pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix4
-rw-r--r--pkgs/applications/editors/atom/env.nix4
-rw-r--r--pkgs/applications/editors/eclipse/build-eclipse.nix4
-rw-r--r--pkgs/applications/editors/eclipse/default.nix4
-rw-r--r--pkgs/applications/editors/emacs/default.nix8
-rw-r--r--pkgs/applications/editors/geany/default.nix4
-rw-r--r--pkgs/applications/editors/jucipp/default.nix4
-rw-r--r--pkgs/applications/editors/kdevelop5/kdevelop.nix4
-rw-r--r--pkgs/applications/editors/lighttable/default.nix4
-rw-r--r--pkgs/applications/editors/monodevelop/default.nix4
-rw-r--r--pkgs/applications/graphics/darktable/default.nix8
-rw-r--r--pkgs/applications/graphics/feh/default.nix4
-rw-r--r--pkgs/applications/graphics/gcolor3/default.nix4
-rw-r--r--pkgs/applications/graphics/geeqie/default.nix21
-rw-r--r--pkgs/applications/graphics/geeqie/geeqie-no-changelog.patch14
-rw-r--r--pkgs/applications/graphics/giv/default.nix4
-rw-r--r--pkgs/applications/graphics/glabels/default.nix6
-rw-r--r--pkgs/applications/graphics/gthumb/default.nix12
-rw-r--r--pkgs/applications/graphics/nomacs/default.nix4
-rw-r--r--pkgs/applications/graphics/rawtherapee/default.nix4
-rw-r--r--pkgs/applications/graphics/shotwell/default.nix10
-rw-r--r--pkgs/applications/graphics/viewnior/default.nix4
-rw-r--r--pkgs/applications/graphics/vimiv/default.nix4
-rw-r--r--pkgs/applications/kde/akonadi-mime.nix4
-rw-r--r--pkgs/applications/kde/akonadi/default.nix4
-rw-r--r--pkgs/applications/kde/k3b.nix4
-rw-r--r--pkgs/applications/kde/kdenlive.nix4
-rw-r--r--pkgs/applications/kde/kdepim-runtime.nix4
-rw-r--r--pkgs/applications/kde/kio-extras.nix4
-rw-r--r--pkgs/applications/kde/kmail-account-wizard.nix4
-rw-r--r--pkgs/applications/kde/marble.nix4
-rw-r--r--pkgs/applications/kde/okteta.nix4
-rw-r--r--pkgs/applications/misc/artha/default.nix4
-rw-r--r--pkgs/applications/misc/clipit/default.nix4
-rw-r--r--pkgs/applications/misc/cura/default.nix6
-rw-r--r--pkgs/applications/misc/curaengine/default.nix6
-rw-r--r--pkgs/applications/misc/deepin-terminal/default.nix4
-rw-r--r--pkgs/applications/misc/devilspie2/default.nix4
-rw-r--r--pkgs/applications/misc/finalterm/default.nix8
-rw-r--r--pkgs/applications/misc/font-manager/default.nix6
-rw-r--r--pkgs/applications/misc/gksu/default.nix6
-rw-r--r--pkgs/applications/misc/gmtp/default.nix4
-rw-r--r--pkgs/applications/misc/gpx-viewer/default.nix6
-rw-r--r--pkgs/applications/misc/gramps/default.nix2
-rw-r--r--pkgs/applications/misc/guake/default.nix2
-rw-r--r--pkgs/applications/misc/hamster-time-tracker/default.nix8
-rw-r--r--pkgs/applications/misc/josm/default.nix4
-rw-r--r--pkgs/applications/misc/keepass/default.nix29
-rw-r--r--pkgs/applications/misc/keepass/keepass-plugins-load.patch1
-rw-r--r--pkgs/applications/misc/keepass/keepass-plugins.patch13
-rw-r--r--pkgs/applications/misc/kiwix/default.nix4
-rw-r--r--pkgs/applications/misc/kupfer/default.nix4
-rw-r--r--pkgs/applications/misc/lxterminal/default.nix5
-rw-r--r--pkgs/applications/misc/mediainfo-gui/default.nix4
-rw-r--r--pkgs/applications/misc/mysql-workbench/default.nix10
-rw-r--r--pkgs/applications/misc/notify-osd/default.nix6
-rw-r--r--pkgs/applications/misc/onboard/default.nix12
-rw-r--r--pkgs/applications/misc/orca/default.nix10
-rw-r--r--pkgs/applications/misc/pdfmod/default.nix4
-rw-r--r--pkgs/applications/misc/pdfshuffler/default.nix6
-rw-r--r--pkgs/applications/misc/qsyncthingtray/default.nix3
-rw-r--r--pkgs/applications/misc/roxterm/default.nix12
-rw-r--r--pkgs/applications/misc/sequeler/default.nix40
-rw-r--r--pkgs/applications/misc/simplenote/default.nix4
-rw-r--r--pkgs/applications/misc/spacefm/default.nix8
-rw-r--r--pkgs/applications/misc/sweethome3d/default.nix6
-rw-r--r--pkgs/applications/misc/sweethome3d/editors.nix6
-rw-r--r--pkgs/applications/misc/synapse/default.nix6
-rw-r--r--pkgs/applications/misc/tilix/default.nix6
-rw-r--r--pkgs/applications/misc/tint2/default.nix4
-rw-r--r--pkgs/applications/misc/udiskie/default.nix4
-rw-r--r--pkgs/applications/misc/viking/default.nix4
-rw-r--r--pkgs/applications/misc/volnoti/default.nix4
-rw-r--r--pkgs/applications/misc/workrave/default.nix4
-rw-r--r--pkgs/applications/misc/xiphos/default.nix8
-rw-r--r--pkgs/applications/networking/browsers/chromium/browser.nix4
-rw-r--r--pkgs/applications/networking/browsers/chromium/common.nix8
-rw-r--r--pkgs/applications/networking/browsers/chromium/default.nix4
-rw-r--r--pkgs/applications/networking/browsers/chromium/upstream-info.nix18
-rw-r--r--pkgs/applications/networking/browsers/dwb/default.nix8
-rw-r--r--pkgs/applications/networking/browsers/eolie/default.nix6
-rw-r--r--pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix778
-rw-r--r--pkgs/applications/networking/browsers/firefox-bin/default.nix8
-rw-r--r--pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix778
-rw-r--r--pkgs/applications/networking/browsers/firefox/common.nix4
-rw-r--r--pkgs/applications/networking/browsers/firefox/wrapper.nix8
-rw-r--r--pkgs/applications/networking/browsers/google-chrome/default.nix8
-rw-r--r--pkgs/applications/networking/browsers/jumanji/default.nix8
-rw-r--r--pkgs/applications/networking/browsers/midori/default.nix10
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix4
-rw-r--r--pkgs/applications/networking/browsers/palemoon/default.nix4
-rw-r--r--pkgs/applications/networking/browsers/qutebrowser/default.nix4
-rw-r--r--pkgs/applications/networking/browsers/surf/default.nix4
-rw-r--r--