summaryrefslogtreecommitdiffstats
path: root/pkgs
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2016-05-18 17:10:02 +0200
committerFranz Pletz <fpletz@fnordicwalking.de>2016-05-18 17:10:02 +0200
commitf8d481754cf842ca6e6ac1427ce0f571f5a44108 (patch)
tree70e702285987429aed275e0d5e2dc15c050e1f8c /pkgs
parent9fbc20e2f89bc045efac7ade41949a2c2d571dec (diff)
parent3cd63ade1614d4c581735ffb0cebe181bf87dfc8 (diff)
Merge remote-tracking branch 'origin/master' into hardened-stdenv
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/altcoins/bitcoin-classic.nix2
-rw-r--r--pkgs/applications/altcoins/bitcoin-xt.nix2
-rw-r--r--pkgs/applications/altcoins/bitcoin.nix2
-rw-r--r--pkgs/applications/altcoins/dashpay.nix2
-rw-r--r--pkgs/applications/altcoins/dogecoin.nix2
-rw-r--r--pkgs/applications/altcoins/litecoin.nix2
-rw-r--r--pkgs/applications/altcoins/memorycoin.nix2
-rw-r--r--pkgs/applications/altcoins/primecoin.nix2
-rw-r--r--pkgs/applications/audio/CharacterCompressor/default.nix8
-rw-r--r--pkgs/applications/audio/CompBus/default.nix8
-rw-r--r--pkgs/applications/audio/LazyLimiter/default.nix8
-rw-r--r--pkgs/applications/audio/MBdistortion/default.nix8
-rw-r--r--pkgs/applications/audio/RhythmDelay/default.nix8
-rw-r--r--pkgs/applications/audio/amarok/default.nix4
-rw-r--r--pkgs/applications/audio/audacious/default.nix2
-rw-r--r--pkgs/applications/audio/baudline/default.nix2
-rw-r--r--pkgs/applications/audio/cava/default.nix30
-rw-r--r--pkgs/applications/audio/constant-detune-chorus/default.nix16
-rw-r--r--pkgs/applications/audio/deadbeef/default.nix11
-rw-r--r--pkgs/applications/audio/faust/faust1.nix5
-rw-r--r--pkgs/applications/audio/faust/faust1git.nix210
-rw-r--r--pkgs/applications/audio/faust/faust2.nix4
-rw-r--r--pkgs/applications/audio/faust/faust2lv2gui.nix14
-rw-r--r--pkgs/applications/audio/faustCompressors/default.nix39
-rw-r--r--pkgs/applications/audio/flacon/default.nix30
-rw-r--r--pkgs/applications/audio/fmit/default.nix26
-rw-r--r--pkgs/applications/audio/i-score/default.nix85
-rw-r--r--pkgs/applications/audio/linuxband/default.nix34
-rw-r--r--pkgs/applications/audio/ncmpcpp/default.nix4
-rw-r--r--pkgs/applications/audio/qjackctl/default.nix14
-rw-r--r--pkgs/applications/audio/quodlibet/default.nix3
-rw-r--r--pkgs/applications/audio/sonic-visualiser/default.nix1
-rw-r--r--pkgs/applications/audio/tomahawk/default.nix4
-rw-r--r--pkgs/applications/backup/crashplan/default.nix4
-rw-r--r--pkgs/applications/editors/atom/default.nix4
-rw-r--r--pkgs/applications/editors/atom/env.nix2
-rw-r--r--pkgs/applications/editors/eclipse/plugins.nix4
-rw-r--r--pkgs/applications/editors/ed/default.nix6
-rw-r--r--pkgs/applications/editors/emacs-24/default.nix2
-rw-r--r--pkgs/applications/editors/emacs-25/default.nix6
-rw-r--r--pkgs/applications/editors/emacs-modes/dash/default.nix24
-rw-r--r--pkgs/applications/editors/emacs-modes/elpa-generated.nix60
-rw-r--r--pkgs/applications/editors/emacs-modes/flycheck/default.nix32
-rw-r--r--pkgs/applications/editors/emacs-modes/git-modes/default.nix29
-rw-r--r--pkgs/applications/editors/emacs-modes/haskell/default.nix2
-rw-r--r--pkgs/applications/editors/emacs-modes/icicles/default.nix2
-rw-r--r--pkgs/applications/editors/emacs-modes/let-alist/default.nix1
-rw-r--r--pkgs/applications/editors/emacs-modes/magit/default.nix54
-rw-r--r--pkgs/applications/editors/emacs-modes/maude/default.nix2
-rw-r--r--pkgs/applications/editors/emacs-modes/melpa-generated.nix15029
-rw-r--r--pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix3783
-rw-r--r--pkgs/applications/editors/emacs-modes/org-generated.nix28
-rw-r--r--pkgs/applications/editors/emacs-modes/org-packages.nix37
-rw-r--r--pkgs/applications/editors/idea/default.nix82
-rw-r--r--pkgs/applications/editors/joe/default.nix4
-rw-r--r--pkgs/applications/editors/neovim/default.nix2
-rw-r--r--pkgs/applications/editors/netbeans/default.nix6
-rw-r--r--pkgs/applications/editors/sublime3/default.nix8
-rw-r--r--pkgs/applications/editors/tiled/default.nix4
-rw-r--r--pkgs/applications/editors/vim/ft-nix-support.patch2
-rw-r--r--pkgs/applications/editors/vim/macvim.nix5
-rw-r--r--pkgs/applications/graphics/ImageMagick/default.nix49
-rw-r--r--pkgs/applications/graphics/ImageMagick/imagetragick.patch15
-rw-r--r--pkgs/applications/graphics/antimony/default.nix1
-rw-r--r--pkgs/applications/graphics/darktable/default.nix4
-rw-r--r--pkgs/applications/graphics/digikam/default.nix6
-rw-r--r--pkgs/applications/graphics/gocr/default.nix2
-rw-r--r--pkgs/applications/graphics/hugin/default.nix38
-rw-r--r--pkgs/applications/graphics/sane/backends/brscan4/default.nix15
-rw-r--r--pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix9
-rw-r--r--pkgs/applications/graphics/sane/backends/generic.nix2
-rw-r--r--pkgs/applications/graphics/sane/backends/git.nix6
-rw-r--r--pkgs/applications/graphics/sane/frontends.nix2
-rw-r--r--pkgs/applications/graphics/sane/xsane.nix2
-rw-r--r--pkgs/applications/graphics/shotwell/default.nix2
-rw-r--r--pkgs/applications/graphics/simple-scan/default.nix22
-rw-r--r--pkgs/applications/graphics/synfigstudio/default.nix47
-rw-r--r--pkgs/applications/misc/calibre/default.nix7
-rw-r--r--pkgs/applications/misc/cbatticon/default.nix2
-rw-r--r--pkgs/applications/misc/cdrtools/default.nix5
-rw-r--r--pkgs/applications/misc/dunst/default.nix2
-rw-r--r--pkgs/applications/misc/fetchmail/default.nix2
-rw-r--r--pkgs/applications/misc/flamerobin/default.nix33
-rw-r--r--pkgs/applications/misc/gnuradio/default.nix4
-rw-r--r--pkgs/applications/misc/grip/default.nix2
-rw-r--r--pkgs/applications/misc/guake/default.nix2
-rw-r--r--pkgs/applications/misc/ikiwiki/default.nix2
-rw-r--r--pkgs/applications/misc/jbidwatcher/default.nix3
-rw-r--r--pkgs/applications/misc/jekyll/Gemfile1
-rw-r--r--pkgs/applications/misc/jekyll/Gemfile.lock1
-rw-r--r--pkgs/applications/misc/jekyll/gemset.nix8
-rw-r--r--pkgs/applications/misc/kdeconnect/default.nix2
-rw-r--r--pkgs/applications/misc/keepass/default.nix12
-rw-r--r--pkgs/applications/misc/makeself/default.nix2
-rw-r--r--pkgs/applications/misc/milu/default.nix41
-rw-r--r--pkgs/applications/misc/mupdf/default.nix2
-rw-r--r--pkgs/applications/misc/ocropus/default.nix2
-rw-r--r--pkgs/applications/misc/pgadmin/default.nix2
-rw-r--r--pkgs/applications/misc/phwmon/default.nix40
-rw-r--r--pkgs/applications/misc/rescuetime/default.nix14
-rw-r--r--pkgs/applications/misc/rofi-menugen/default.nix28
-rw-r--r--pkgs/applications/misc/rofi/default.nix28
-rw-r--r--pkgs/applications/misc/roxterm/default.nix2
-rw-r--r--pkgs/applications/misc/rxvt_unicode-plugins/urxvt-theme-switch/default.nix27
-rw-r--r--pkgs/applications/misc/rxvt_unicode/default.nix9
-rw-r--r--pkgs/applications/misc/rxvt_unicode/wrapper.nix3
-rw-r--r--pkgs/applications/misc/terminal-notifier/default.nix2
-rw-r--r--pkgs/applications/misc/termite/default.nix59
-rw-r--r--pkgs/applications/misc/thinking-rock/default.nix2
-rw-r--r--pkgs/applications/misc/tint2/default.nix13
-rw-r--r--pkgs/applications/misc/vue/default.nix2
-rw-r--r--pkgs/applications/misc/xpdf/default.nix2
-rw-r--r--pkgs/applications/networking/bittorrentsync/1.4.x.nix47
-rw-r--r--pkgs/applications/networking/bittorrentsync/2.0.x.nix46
-rw-r--r--pkgs/applications/networking/bittorrentsync/generic.nix40
-rw-r--r--pkgs/applications/networking/browsers/chromium/browser.nix4
-rw-r--r--pkgs/applications/networking/browsers/chromium/default.nix7
-rw-r--r--pkgs/applications/networking/browsers/chromium/plugins.nix2
-rw-r--r--pkgs/applications/networking/browsers/chromium/update.nix15
-rw-r--r--pkgs/applications/networking/browsers/chromium/upstream-info.nix18
-rw-r--r--