summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/maintainers.nix1
-rw-r--r--lib/types.nix6
-rw-r--r--nixos/doc/manual/configuration.xml9
-rw-r--r--nixos/modules/config/users-groups.nix2
-rw-r--r--nixos/modules/installer/tools/nixos-install.sh2
-rw-r--r--nixos/modules/system/boot/systemd.nix2
-rw-r--r--nixos/modules/virtualisation/containers.nix48
-rw-r--r--nixos/modules/virtualisation/nixos-container.pl52
-rw-r--r--pkgs/applications/graphics/hoodle/default.nix1
-rw-r--r--pkgs/applications/graphics/tesseract/default.nix3
-rw-r--r--pkgs/applications/misc/slic3r/default.nix32
-rw-r--r--pkgs/applications/misc/taffybar/default.nix18
-rw-r--r--pkgs/applications/networking/browsers/chromium/browser.nix2
-rw-r--r--pkgs/applications/networking/browsers/chromium/common.nix2
-rw-r--r--pkgs/applications/networking/dropbox/default.nix9
-rw-r--r--pkgs/applications/networking/instant-messengers/teamspeak/client.nix32
-rw-r--r--pkgs/applications/networking/instant-messengers/twinkle/boost_regex.patch17
-rw-r--r--pkgs/applications/networking/instant-messengers/twinkle/default.nix33
-rw-r--r--pkgs/applications/networking/instant-messengers/twinkle/libgsm.patch70
-rw-r--r--pkgs/applications/networking/instant-messengers/twinkle/localetime_r_conflict.diff13
-rw-r--r--pkgs/applications/networking/instant-messengers/twinkle/newer-libccrtp.diff22
-rw-r--r--pkgs/applications/networking/irc/weechat/default.nix11
-rw-r--r--pkgs/applications/networking/irc/weechat/fix-gnutls-32.diff16
-rw-r--r--pkgs/applications/science/logic/coq/HEAD.nix6
-rw-r--r--pkgs/applications/science/logic/ssreflect/default.nix6
-rw-r--r--pkgs/applications/version-management/git-and-tools/git-annex/default.nix55
-rw-r--r--pkgs/applications/version-management/git-and-tools/git/default.nix5
-rw-r--r--pkgs/applications/version-management/meld/default.nix6
-rw-r--r--pkgs/applications/video/mplayer/default.nix11
-rw-r--r--pkgs/applications/window-managers/bar/default.nix42
-rw-r--r--pkgs/build-support/cabal/default.nix17
-rw-r--r--pkgs/data/documentation/man-pages/default.nix4
-rw-r--r--pkgs/desktops/gnome-3/3.12/core/gdm/default.nix2
-rw-r--r--pkgs/development/compilers/fsharp/default.nix11
-rw-r--r--pkgs/development/compilers/ghc/head.nix6
-rw-r--r--pkgs/development/compilers/jhc/default.nix11
-rwxr-xr-xpkgs/development/compilers/manticore/builder.sh24
-rw-r--r--pkgs/development/compilers/manticore/default.nix28
-rw-r--r--pkgs/development/compilers/uhc/default.nix5
-rw-r--r--pkgs/development/interpreters/elixir/default.nix4
-rw-r--r--pkgs/development/libraries/boringssl/default.nix30
-rw-r--r--pkgs/development/libraries/concurrencykit/default.nix8
-rw-r--r--pkgs/development/libraries/dbus/default.nix2
-rw-r--r--pkgs/development/libraries/fmod/default.nix6
-rw-r--r--pkgs/development/libraries/haskell/DAV/default.nix18
-rw-r--r--pkgs/development/libraries/haskell/Graphalyze/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/HaskellNet-SSL/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/Strafunski-StrategyLib/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/aeson/0.7.0.6.nix28
-rw-r--r--pkgs/development/libraries/haskell/algebra/default.nix21
-rw-r--r--pkgs/development/libraries/haskell/amqp/default.nix10
-rw-r--r--pkgs/development/libraries/haskell/authenticate/default.nix8
-rw-r--r--pkgs/development/libraries/haskell/aws/default.nix31
-rw-r--r--pkgs/development/libraries/haskell/base32-bytestring/default.nix18
-rw-r--r--pkgs/development/libraries/haskell/bits-extras/default.nix18
-rw-r--r--pkgs/development/libraries/haskell/bytes/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/clientsession/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/conduit-extra/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/constraints/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/contravariant/default.nix9
-rw-r--r--pkgs/development/libraries/haskell/data-fin/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/distributed-process/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/djinn-ghc/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/djinn-lib/default.nix17
-rw-r--r--pkgs/development/libraries/haskell/double-conversion/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/dynamic-cabal/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/ekg/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/fay/default.nix6
-rw-r--r--pkgs/development/libraries/haskell/filesystem-conduit/default.nix2
-rw-r--r--pkgs/development/libraries/haskell/force-layout/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/ghc-heap-view/default.nix7
-rw-r--r--pkgs/development/libraries/haskell/ghc-mod/4.1.6.nix (renamed from pkgs/development/libraries/haskell/ghc-mod/default.nix)0
-rw-r--r--pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix59
-rw-r--r--pkgs/development/libraries/haskell/ghc-vis/default.nix6
-rw-r--r--pkgs/development/libraries/haskell/github/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/gitit/default.nix2
-rw-r--r--pkgs/development/libraries/haskell/gtk-traymanager/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/gtk3/default.nix23
-rw-r--r--pkgs/development/libraries/haskell/haddock-library/default.nix17
-rw-r--r--pkgs/development/libraries/haskell/hakyll/default.nix2
-rw-r--r--pkgs/development/libraries/haskell/happstack/happstack-server.nix16
-rw-r--r--pkgs/development/libraries/haskell/haskell-mpi/default.nix2
-rw-r--r--pkgs/development/libraries/haskell/haskelldb/default.nix2
-rw-r--r--pkgs/development/libraries/haskell/haskoin/default.nix27
-rw-r--r--pkgs/development/libraries/haskell/haskore/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/haxr-th/default.nix2
-rw-r--r--pkgs/development/libraries/haskell/hcltest/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/hdaemonize/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/hex/default.nix14
-rw-r--r--pkgs/development/libraries/haskell/hoauth/default.nix2
-rw-r--r--pkgs/development/libraries/haskell/holy-project/default.nix2
-rw-r--r--pkgs/development/libraries/haskell/hoodle-builder/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/hoodle-core/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/hoodle-extra/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/hoodle-parser/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/hoodle-render/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/hoodle-types/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/hoogle/local.nix4
-rw-r--r--pkgs/development/libraries/haskell/hspec-wai/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/hspread/default.nix2
-rw-r--r--pkgs/development/libraries/haskell/http-client/default.nix13
-rw-r--r--pkgs/development/libraries/haskell/hxt-http/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/hxt/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/imm/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/implicit/default.nix25
-rw-r--r--pkgs/development/libraries/haskell/instant-generics/default.nix2
-rw-r--r--pkgs/development/libraries/haskell/ivor/default.nix2
-rw-r--r--pkgs/development/libraries/haskell/jmacro-rpc-happstack/default.nix2
-rw-r--r--pkgs/development/libraries/haskell/json-assertions/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/json-rpc/default.nix27
-rw-r--r--pkgs/development/libraries/haskell/kansas-lava/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/lambdacube-engine/default.nix2
-rw-r--r--pkgs/development/libraries/haskell/language-c-inline/default.nix2
-rw-r--r--pkgs/development/libraries/haskell/language-glsl/default.nix13
-rw-r--r--pkgs/development/libraries/haskell/liblastfm/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/lockfree-queue/default.nix2
-rw-r--r--pkgs/development/libraries/haskell/loop/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/markov-chain/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/matrix/default.nix10
-rw-r--r--pkgs/development/libraries/haskell/monad-journal/default.nix20
-rw-r--r--pkgs/development/libraries/haskell/monad-peel/default.nix2
-rw-r--r--pkgs/development/libraries/haskell/monad-supply/default.nix15
-rw-r--r--pkgs/development/libraries/haskell/network-transport-tests/default.nix2
-rw-r--r--pkgs/development/libraries/haskell/network-uri/default.nix22
-rw-r--r--pkgs/development/libraries/haskell/pandoc-citeproc/default.nix15
-rw-r--r--