Branch: refs/heads/staging
Home: https://github.com/NixOS/nixpkgs
Commit: b0f2d3419c3340978026272496c306287a8cdbd9
https://github.com/NixOS/nixpkgs/commit/b0f2d3419c3340978026272496c306287a8cdbd9
Author: Eelco Dolstra <[email protected]>
Date: 2014-08-09 (Sat, 09 Aug 2014)
Changed paths:
M pkgs/stdenv/generic/setup.sh
Log Message:
-----------
Allow multiple hooks with the same name
You can now register multiple values per named hook, e.g.
addHook preConfigure "echo foo"
addHook preConfigure "echo bar"
will cause ‘runHook preConfigure’ to run both ‘echo foo’ and ‘echo
bar’ (in that order). It will also call the shell function
preConfigure() or eval the shell variable $preConfigure, if
defined. Thus, if you don't call addHook, it works like the old hook
mechanism.
Allowing multiple hooks makes stdenv more modular and extensible. For
instance, multiple setup hooks can define a preFixup hook, and all of
these will be executed.
Commit: 37889e2b5ea444fce8a48fe3bf9250c9ddafa7d0
https://github.com/NixOS/nixpkgs/commit/37889e2b5ea444fce8a48fe3bf9250c9ddafa7d0
Author: Eelco Dolstra <[email protected]>
Date: 2014-08-09 (Sat, 09 Aug 2014)
Changed paths:
M pkgs/stdenv/generic/setup.sh
Log Message:
-----------
Provide a hook for per-output fixup
Commit: 0a8605ded168751dbe8bcd0d00d1e38b9d1feded
https://github.com/NixOS/nixpkgs/commit/0a8605ded168751dbe8bcd0d00d1e38b9d1feded
Author: Eelco Dolstra <[email protected]>
Date: 2014-08-09 (Sat, 09 Aug 2014)
Changed paths:
M pkgs/stdenv/generic/default.nix
Log Message:
-----------
Formatting
Commit: b23dbb1a5dffbfa3abb47fcd0f1579ac2e6f29fc
https://github.com/NixOS/nixpkgs/commit/b23dbb1a5dffbfa3abb47fcd0f1579ac2e6f29fc
Author: Eelco Dolstra <[email protected]>
Date: 2014-08-09 (Sat, 09 Aug 2014)
Changed paths:
M pkgs/stdenv/generic/setup.sh
Log Message:
-----------
Allow buildInputs to be regular files
If a build input is a regular file, use it as a setup hook. This makes
setup hooks more efficient to create: you don't need a derivation that
copies them to $out/nix-support/setup-hook, instead you can use the
file as is.
Commit: 83a41771abbfcfc027270671be55eb3ed1606a46
https://github.com/NixOS/nixpkgs/commit/83a41771abbfcfc027270671be55eb3ed1606a46
Author: Eelco Dolstra <[email protected]>
Date: 2014-08-09 (Sat, 09 Aug 2014)
Changed paths:
M pkgs/development/tools/misc/patchelf/default.nix
A pkgs/development/tools/misc/patchelf/setup-hook.sh
M pkgs/stdenv/generic/setup.sh
M pkgs/stdenv/linux/default.nix
Log Message:
-----------
Move RPATH shrinking from stdenv to a setup hook provided by patchelf
Commit: d7a4fa26b064aa294b1f52c61b02770feed6903b
https://github.com/NixOS/nixpkgs/commit/d7a4fa26b064aa294b1f52c61b02770feed6903b
Author: Eelco Dolstra <[email protected]>
Date: 2014-08-09 (Sat, 09 Aug 2014)
Changed paths:
M pkgs/development/tools/misc/patchelf/setup-hook.sh
Log Message:
-----------
Fix dontPatchELF being set after the setup script has been sourced
Commit: daa66b8b1cb2ea5359f9914418350f63f0a53d7e
https://github.com/NixOS/nixpkgs/commit/daa66b8b1cb2ea5359f9914418350f63f0a53d7e
Author: Eelco Dolstra <[email protected]>
Date: 2014-08-09 (Sat, 09 Aug 2014)
Changed paths:
A pkgs/build-support/setup-hooks/compress-man-pages.sh
A pkgs/build-support/setup-hooks/patch-shebangs.sh
A pkgs/build-support/setup-hooks/strip.sh
M pkgs/stdenv/generic/default.nix
M pkgs/stdenv/generic/setup.sh
Log Message:
-----------
Factor out fixup phase stuff into separate setup hooks
Commit: 5e82aab5d4c6916fb4f35370b6f162d88bc6bf69
https://github.com/NixOS/nixpkgs/commit/5e82aab5d4c6916fb4f35370b6f162d88bc6bf69
Author: Eelco Dolstra <[email protected]>
Date: 2014-08-09 (Sat, 09 Aug 2014)
Changed paths:
M pkgs/build-support/setup-hooks/strip.sh
Log Message:
-----------
Drop redundant space
Commit: 1a44dbbbb900acb993fc68995fc3cfb50e5122ba
https://github.com/NixOS/nixpkgs/commit/1a44dbbbb900acb993fc68995fc3cfb50e5122ba
Author: Eelco Dolstra <[email protected]>
Date: 2014-08-09 (Sat, 09 Aug 2014)
Changed paths:
M pkgs/build-support/fetchzip/default.nix
M pkgs/stdenv/generic/setup.sh
Log Message:
-----------
unpackFile: Always copy directories
If $src refers to a directory, then always copy it. Previously, we
checked the extension first, so if the directory had an extension like
.tar, unpackPhase would fail.
Commit: 3e33c975fb850e903feaac4925b8e267493a6205
https://github.com/NixOS/nixpkgs/commit/3e33c975fb850e903feaac4925b8e267493a6205
Author: Eelco Dolstra <[email protected]>
Date: 2014-08-09 (Sat, 09 Aug 2014)
Changed paths:
M pkgs/stdenv/generic/setup.sh
Log Message:
-----------
stdenv: Make unpackFile extensible via the hook mechanism
unpackCmd is now a regular hook, so there can be multiple functions
hooking into it.
Commit: f97ee61255478e9ca683d1fb7c9fd777247293cb
https://github.com/NixOS/nixpkgs/commit/f97ee61255478e9ca683d1fb7c9fd777247293cb
Author: Eelco Dolstra <[email protected]>
Date: 2014-08-09 (Sat, 09 Aug 2014)
Changed paths:
M pkgs/tools/archivers/unzip/default.nix
Log Message:
-----------
unzip: Clean up expression
Commit: d7b356f73b41640f5ee741f004c4fb41e0471d30
https://github.com/NixOS/nixpkgs/commit/d7b356f73b41640f5ee741f004c4fb41e0471d30
Author: Eelco Dolstra <[email protected]>
Date: 2014-08-09 (Sat, 09 Aug 2014)
Changed paths:
M pkgs/stdenv/generic/setup.sh
M pkgs/tools/archivers/unzip/default.nix
A pkgs/tools/archivers/unzip/setup-hook.sh
Log Message:
-----------
stdenv: Move unzip support to unzip's setup hook
Commit: 9f822e5477bc32b77af39b5bf8cf50b56b97c196
https://github.com/NixOS/nixpkgs/commit/9f822e5477bc32b77af39b5bf8cf50b56b97c196
Author: Eelco Dolstra <[email protected]>
Date: 2014-08-09 (Sat, 09 Aug 2014)
Changed paths:
M pkgs/os-specific/linux/paxctl/default.nix
A pkgs/os-specific/linux/paxctl/setup-hook.sh
M pkgs/stdenv/generic/builder.sh
M pkgs/stdenv/generic/default.nix
M pkgs/stdenv/generic/setup.sh
Log Message:
-----------
stdenv: Move paxmark function to paxctl's setup hook
Commit: 15103e5e5fb01556e9c5758ef99d7e7f5d0f7699
https://github.com/NixOS/nixpkgs/commit/15103e5e5fb01556e9c5758ef99d7e7f5d0f7699
Author: Eelco Dolstra <[email protected]>
Date: 2014-08-09 (Sat, 09 Aug 2014)
Changed paths:
M pkgs/build-support/clang-wrapper/setup-hook.sh
M pkgs/build-support/gcc-wrapper/setup-hook.sh
M pkgs/stdenv/generic/builder.sh
M pkgs/stdenv/generic/default.nix
M pkgs/stdenv/generic/setup.sh
Log Message:
-----------
stdenv: Remove the special handling of gcc
Now gcc is just another build input, making it possible in the future
to have a stdenv that doesn't depend on a C compiler. This is very
useful on NixOS, since it would allow trivial builders like
writeTextFile to work without pulling in the C compiler.
Commit: cd948c093faef02b964f15a973313129fb029613
https://github.com/NixOS/nixpkgs/commit/cd948c093faef02b964f15a973313129fb029613
Author: Eelco Dolstra <[email protected]>
Date: 2014-08-09 (Sat, 09 Aug 2014)
Changed paths:
M pkgs/stdenv/generic/default.nix
Log Message:
-----------
stdenv: Reindent
Commit: be3fc3ae2f3a782226d2b8b8ec36c37f18fa12a3
https://github.com/NixOS/nixpkgs/commit/be3fc3ae2f3a782226d2b8b8ec36c37f18fa12a3
Author: Eelco Dolstra <[email protected]>
Date: 2014-08-09 (Sat, 09 Aug 2014)
Changed paths:
M pkgs/stdenv/default.nix
M pkgs/stdenv/linux/default.nix
M pkgs/stdenv/nix/default.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
Prevent an unnecessary evaluation of lib
Commit: e3875297fac671f20feb803306e7c55789ac749e
https://github.com/NixOS/nixpkgs/commit/e3875297fac671f20feb803306e7c55789ac749e
Author: Eelco Dolstra <[email protected]>
Date: 2014-08-09 (Sat, 09 Aug 2014)
Changed paths:
M pkgs/stdenv/generic/builder.sh
M pkgs/stdenv/generic/default.nix
M pkgs/stdenv/generic/setup.sh
Log Message:
-----------
stdenv: Don't use sed to build the setup script
Commit: 2def8e74990d89bd91b8943c00110027a1f5fafa
https://github.com/NixOS/nixpkgs/commit/2def8e74990d89bd91b8943c00110027a1f5fafa
Author: Eelco Dolstra <[email protected]>
Date: 2014-08-09 (Sat, 09 Aug 2014)
Changed paths:
M pkgs/build-support/setup-hooks/compress-man-pages.sh
M pkgs/build-support/setup-hooks/patch-shebangs.sh
M pkgs/build-support/setup-hooks/strip.sh
M pkgs/development/tools/misc/patchelf/setup-hook.sh
M pkgs/stdenv/generic/setup.sh
M pkgs/tools/archivers/unzip/setup-hook.sh
Log Message:
-----------
Remove addHook
Just use bash arrays directly. I.e.
addHook preConfigure myPreConfigure
is now
preConfigureHooks+=(myPreConfigure)
Commit: 11dc9036d0b1f7bb9e277240848e699c0de90d4e
https://github.com/NixOS/nixpkgs/commit/11dc9036d0b1f7bb9e277240848e699c0de90d4e
Author: Eelco Dolstra <[email protected]>
Date: 2014-08-09 (Sat, 09 Aug 2014)
Changed paths:
M pkgs/stdenv/generic/setup.sh
Log Message:
-----------
Allow passing arguments to hooks
This allows envHooks and crossEnvHooks to be handled using the regular
hook mechanism.
Commit: 2db867eec9f09648cae4c6e4ab8e4eae4cfc98f1
https://github.com/NixOS/nixpkgs/commit/2db867eec9f09648cae4c6e4ab8e4eae4cfc98f1
Author: Eelco Dolstra <[email protected]>
Date: 2014-08-09 (Sat, 09 Aug 2014)
Changed paths:
M pkgs/stdenv/generic/setup.sh
Log Message:
-----------
fixupPhase: Fix making the outputs writable
Commit: e3f7dbbac800124baa26317fcf792fe08f140655
https://github.com/NixOS/nixpkgs/commit/e3f7dbbac800124baa26317fcf792fe08f140655
Author: Eelco Dolstra <[email protected]>
Date: 2014-08-09 (Sat, 09 Aug 2014)
Changed paths:
M pkgs/applications/science/math/R/setup-hook.sh
M pkgs/build-support/clang-wrapper/setup-hook.sh
M pkgs/build-support/gcc-cross-wrapper/setup-hook.sh
M pkgs/build-support/gcc-wrapper/setup-hook.sh
M pkgs/build-support/setup-hooks/set-java-classpath.sh
M pkgs/desktops/e17/e_dbus/setup-hook.sh
M pkgs/development/interpreters/guile/setup-hook-2.0.sh
M pkgs/development/interpreters/guile/setup-hook.sh
M pkgs/development/interpreters/perl/5.10/setup-hook.sh
M pkgs/development/interpreters/perl/5.14/setup-hook.sh
M pkgs/development/interpreters/perl/5.16/setup-hook.sh
M pkgs/development/interpreters/perl/5.20/setup-hook.sh
M pkgs/development/interpreters/perl/5.8/setup-hook.sh
M pkgs/development/interpreters/perl/sys-perl/setup-hook.sh
M pkgs/development/interpreters/pypy/2.3/setup-hook.sh
M pkgs/development/interpreters/python/2.6/setup-hook.sh
M pkgs/development/interpreters/python/2.7/setup-hook.sh
M pkgs/development/interpreters/python/3.2/setup-hook.sh
M pkgs/development/interpreters/python/3.3/setup-hook.sh
M pkgs/development/interpreters/python/3.4/setup-hook.sh
M pkgs/development/libraries/gstreamer/core/setup-hook.sh
M pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh
M pkgs/development/libraries/libxml2/setup-hook.sh
M pkgs/development/libraries/slib/setup-hook.sh
M pkgs/development/lisp-modules/clwrapper/setup-hook.sh
M pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh
M pkgs/development/tools/misc/automake/setup-hook.sh
M pkgs/development/tools/misc/pkgconfig/setup-hook.sh
M pkgs/development/tools/ocaml/findlib/default.nix
M pkgs/development/web/nodejs/setup-hook.sh
M pkgs/tools/text/sgml/opensp/setup-hook.sh
M pkgs/tools/typesetting/tex/tetex/setup-hook.sh
M pkgs/tools/typesetting/tex/texlive/setup-hook.sh
Log Message:
-----------
Cleanup: Use += to append to envHooks
Commit: 9e31c66d1b4e71c5e09719931d77c794a9608acb
https://github.com/NixOS/nixpkgs/commit/9e31c66d1b4e71c5e09719931d77c794a9608acb
Author: Eelco Dolstra <[email protected]>
Date: 2014-08-09 (Sat, 09 Aug 2014)
Changed paths:
A pkgs/build-support/setup-hooks/move-docs.sh
M pkgs/stdenv/generic/default.nix
M pkgs/stdenv/generic/setup.sh
Log Message:
-----------
stdenv: Put moving docs to $out/share in a separate setup hook
Commit: a8fc68a5c02488a2228a1dc4984a3fa6351002eb
https://github.com/NixOS/nixpkgs/commit/a8fc68a5c02488a2228a1dc4984a3fa6351002eb
Author: Eelco Dolstra <[email protected]>
Date: 2014-08-09 (Sat, 09 Aug 2014)
Changed paths:
M pkgs/build-support/setup-hooks/move-docs.sh
Log Message:
-----------
Move share/{man,info,doc} to the corresponding output
Commit: 1e389c976cc5326b08bd166785e643364bb2d8b4
https://github.com/NixOS/nixpkgs/commit/1e389c976cc5326b08bd166785e643364bb2d8b4
Author: Vladimír Čunát <[email protected]>
Date: 2014-09-08 (Mon, 08 Sep 2014)
Changed paths:
M .gitignore
M doc/meta.xml
M lib/licenses.nix
M lib/maintainers.nix
M lib/platforms.nix
M nixos/doc/manual/configuration.xml
M nixos/doc/manual/default.nix
M nixos/doc/manual/manual.xml
M nixos/doc/manual/options-to-docbook.xsl
M nixos/modules/config/pulseaudio.nix
A nixos/modules/config/update-users-groups.pl
M nixos/modules/config/users-groups.nix
M nixos/modules/installer/tools/nixos-generate-config.pl
M nixos/modules/installer/tools/nixos-rebuild.sh
M nixos/modules/misc/ids.nix
M nixos/modules/module-list.nix
M nixos/modules/profiles/demo.nix
A nixos/modules/programs/dconf.nix
A nixos/modules/programs/nano.nix
M nixos/modules/security/rngd.nix
M nixos/modules/security/setuid-wrappers.nix
M nixos/modules/services/audio/mopidy.nix
A nixos/modules/services/hardware/tcsd.nix
A nixos/modules/services/logging/syslog-ng.nix
M nixos/modules/services/networking/dhcpd.nix
M nixos/modules/services/networking/ssh/lshd.nix
M nixos/modules/services/networking/znc.nix
M nixos/modules/services/web-servers/lighttpd/default.nix
M nixos/modules/services/x11/desktop-managers/gnome3.nix
A nixos/modules/services/x11/display-managers/gdm.nix
A nixos/modules/services/x11/window-managers/bspwm.nix
M nixos/modules/services/x11/window-managers/default.nix
M nixos/modules/system/activation/activation-script.nix
M nixos/modules/system/boot/stage-2-init.sh
M nixos/modules/virtualisation/container-config.nix
M nixos/modules/virtualisation/containers.nix
M nixos/modules/virtualisation/nixos-container.pl
M nixos/release.nix
M nixos/tests/common/user-account.nix
M nixos/tests/ipv6.nix
M pkgs/applications/audio/clementine/default.nix
M pkgs/applications/audio/lastwatch/default.nix
M pkgs/applications/audio/mopidy-moped/default.nix
M pkgs/applications/audio/mopidy/default.nix
A pkgs/applications/editors/emacs-24/darwin-new-sections.patch
M pkgs/applications/editors/emacs-24/default.nix
M pkgs/applications/editors/emacs-24/macport.nix
M pkgs/applications/editors/idea/pycharm.nix
M pkgs/applications/editors/nano/default.nix
M pkgs/applications/editors/yi/yi-contrib.nix
M pkgs/applications/editors/yi/yi.nix
M pkgs/applications/graphics/hoodle/default.nix
M pkgs/applications/graphics/hugin/default.nix
M pkgs/applications/graphics/inkscape/default.nix
M pkgs/applications/graphics/kipi-plugins/default.nix
A pkgs/applications/graphics/luminance-hdr/default.nix
M pkgs/applications/graphics/openimageio/default.nix
M pkgs/applications/misc/bitcoin/default.nix
M pkgs/applications/misc/blender/default.nix
M pkgs/applications/misc/dunst/default.nix
M pkgs/applications/misc/lyx/default.nix
M pkgs/applications/misc/xfontsel/default.nix
M pkgs/applications/misc/xlsfonts/default.nix
M pkgs/applications/misc/xmobar/default.nix
M pkgs/applications/misc/xterm/default.nix
M pkgs/applications/networking/browsers/dwb/default.nix
A pkgs/applications/networking/browsers/firefox/30.nix
M pkgs/applications/networking/browsers/vimb/default.nix
M pkgs/applications/networking/dropbox/default.nix
M pkgs/applications/networking/instant-messengers/ekiga/default.nix
M pkgs/applications/networking/instant-messengers/kadu/default.nix
M
pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix
M pkgs/applications/networking/newsreaders/liferea/default.nix
A pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
M pkgs/applications/office/hledger-interest/default.nix
M pkgs/applications/office/hledger-irr/default.nix
M pkgs/applications/office/libreoffice/default.nix
M pkgs/applications/office/libreoffice/libreoffice-srcs.nix
R pkgs/applications/office/libreoffice/ooxmlexport.diff
M pkgs/applications/office/zotero/default.nix
M pkgs/applications/science/logic/leo2/default.nix
A pkgs/applications/science/logic/leo2/default.upstream
A pkgs/applications/science/misc/fityk/default.nix
M pkgs/applications/science/misc/simgrid/default.nix
M
pkgs/applications/version-management/git-and-tools/github-backup/default.nix
M pkgs/applications/version-management/mercurial/default.nix
M pkgs/applications/version-management/subversion/default.nix
M pkgs/applications/video/aegisub/default.nix
M pkgs/applications/virtualization/qemu/default.nix
M pkgs/applications/virtualization/virt-manager/default.nix
A pkgs/applications/window-managers/bar/default.nix
A pkgs/applications/window-managers/bspwm/default.nix
A pkgs/applications/window-managers/sxhkd/default.nix
M pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
M pkgs/applications/window-managers/xmonad/xmonad-extras.nix
M pkgs/build-support/fetchgit/nix-prefetch-git
M pkgs/build-support/fetchurl/mirrors.nix
M pkgs/build-support/release/ant-build.nix
M pkgs/build-support/release/functions.sh
M pkgs/build-support/vm/default.nix
M pkgs/desktops/gnome-3/3.10/apps/gedit/default.nix
M pkgs/desktops/gnome-3/3.10/apps/gnome-documents/default.nix
M pkgs/desktops/gnome-3/3.10/apps/gnome-music/default.nix
M pkgs/desktops/gnome-3/3.10/core/dconf/default.nix
M pkgs/desktops/gnome-3/3.12/core/gdm/default.nix
A pkgs/desktops/gnome-3/3.12/core/gdm/disable_x_access_control.patch
A pkgs/desktops/gnome-3/3.12/core/gdm/propagate_xdgconfigdirs.patch
A pkgs/desktops/gnome-3/3.12/core/gdm/sessions_dir.patch
A pkgs/desktops/gnome-3/3.12/core/gdm/xserver_path.patch
M pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix
M pkgs/desktops/gnome-3/3.12/core/vino/default.nix
M pkgs/desktops/gnome-3/3.12/default.nix
M pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix
A pkgs/desktops/gnome-3/3.12/misc/gpaste/default.nix
M pkgs/development/compilers/chicken/default.nix
M pkgs/development/compilers/cryptol/1.8.x.nix
M pkgs/development/compilers/epic/default.nix
M pkgs/development/compilers/gcc/3.3/default.nix
M pkgs/development/compilers/gcc/4.2-apple64/default.nix
M pkgs/development/compilers/gcc/4.8/default.nix
M pkgs/development/compilers/gcc/4.9/default.nix
M pkgs/development/compilers/ocaml/4.01.0.nix
M pkgs/development/compilers/opa/default.nix
M pkgs/development/compilers/pakcs/default.nix
M pkgs/development/compilers/stalin/default.nix
M pkgs/development/interpreters/erlang/R17.nix
M pkgs/development/interpreters/lua-5/5.0.3.nix
M pkgs/development/interpreters/lua-5/5.1.nix
M pkgs/development/interpreters/lua-5/5.2.nix
M pkgs/development/interpreters/lua-5/expat.nix
M pkgs/development/interpreters/lua-5/filesystem.nix
M pkgs/development/interpreters/lua-5/sec.nix
M pkgs/development/interpreters/lua-5/sockets.nix
M pkgs/development/interpreters/perl/5.16/default.nix
M pkgs/development/interpreters/python/2.6/default.nix
M pkgs/development/libraries/allegro/5-unstable.nix
M pkgs/development/libraries/buddy/default.nix
M pkgs/development/libraries/cln/default.nix
M pkgs/development/libraries/cloog-ppl/default.nix
M pkgs/development/libraries/cloog/default.nix
M pkgs/development/libraries/commoncpp2/default.nix
M pkgs/development/libraries/dbus/default.nix
M pkgs/development/libraries/ffmpeg/2.x.nix
M pkgs/development/libraries/freeglut/default.nix
M pkgs/development/libraries/glib/default.nix
A pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
M pkgs/development/libraries/gobject-introspection/default.nix
M pkgs/development/libraries/gstreamer/bad/default.nix
M pkgs/development/libraries/gstreamer/base/default.nix
M pkgs/development/libraries/gstreamer/core/default.nix
M pkgs/development/libraries/gstreamer/ges/default.nix
M pkgs/development/libraries/gstreamer/gnonlin/default.nix
M pkgs/development/libraries/gstreamer/good/default.nix
M pkgs/development/libraries/gstreamer/libav/default.nix
M pkgs/development/libraries/gstreamer/python/default.nix
M pkgs/development/libraries/gstreamer/ugly/default.nix
M pkgs/development/libraries/haskell/AC-Vector/default.nix
M pkgs/development/libraries/haskell/Boolean/default.nix
M pkgs/development/libraries/haskell/Cabal/1.14.0.nix
M pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix
M pkgs/development/libraries/haskell/Cabal/1.18.1.3.nix
M pkgs/development/libraries/haskell/Cabal/1.20.0.2.nix
M pkgs/development/libraries/haskell/Chart-cairo/default.nix
M pkgs/development/libraries/haskell/Chart-diagrams/default.nix
M pkgs/development/libraries/haskell/Chart-gtk/default.nix
M pkgs/development/libraries/haskell/Chart/default.nix
M pkgs/development/libraries/haskell/ConfigFile/default.nix
M pkgs/development/libraries/haskell/CouchDB/default.nix
M pkgs/development/libraries/haskell/Crypto/default.nix
M pkgs/development/libraries/haskell/Diff/default.nix
M pkgs/development/libraries/haskell/EitherT/default.nix
M pkgs/development/libraries/haskell/FerryCore/default.nix
M pkgs/development/libraries/haskell/GLFW/default.nix
M pkgs/development/libraries/haskell/GLURaw/1.3.0.0.nix
M pkgs/development/libraries/haskell/GLURaw/1.4.0.1.nix
M pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix
M pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix
M pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix
M pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix
M pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix
M pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix
M pkgs/development/libraries/haskell/GLUT/2.5.1.1.nix
M pkgs/development/libraries/haskell/GlomeVec/default.nix
A pkgs/development/libraries/haskell/Graphalyze/default.nix
M pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix
M pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix
M pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix
M pkgs/development/libraries/haskell/HDBC/HDBC.nix
M pkgs/development/libraries/haskell/HFuse/default.nix
M pkgs/development/libraries/haskell/HList/default.nix
M pkgs/development/libraries/haskell/HStringTemplate/default.nix
M pkgs/development/libraries/haskell/HTTP/4000.0.6.nix
M pkgs/development/libraries/haskell/HTTP/4000.0.9.nix
M pkgs/development/libraries/haskell/HTTP/4000.1.1.nix
M pkgs/development/libraries/haskell/HTTP/4000.1.2.nix
M pkgs/development/libraries/haskell/HTTP/4000.2.1.nix
M pkgs/development/libraries/haskell/HTTP/4000.2.2.nix
M pkgs/development/libraries/haskell/HTTP/4000.2.3.nix
M pkgs/development/libraries/haskell/HTTP/4000.2.5.nix
M pkgs/development/libraries/haskell/HTTP/4000.2.8.nix
M pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix
M pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix
M pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix
M pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix
M pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix
M pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix
M pkgs/development/libraries/haskell/HUnit/1.2.5.2.nix
M pkgs/development/libraries/haskell/HaXml/default.nix
M pkgs/development/libraries/haskell/HaskellForMaths/default.nix
A pkgs/development/libraries/haskell/HaskellNet/default.nix
M pkgs/development/libraries/haskell/HsOpenSSL/default.nix
M pkgs/development/libraries/haskell/HsSyck/0.51.nix
M pkgs/development/libraries/haskell/HsSyck/0.52.nix
M pkgs/development/libraries/haskell/IOSpec/default.nix
M pkgs/development/libraries/haskell/IfElse/default.nix
M pkgs/development/libraries/haskell/IntervalMap/default.nix
M pkgs/development/libraries/haskell/JuicyPixels/default.nix
M pkgs/development/libraries/haskell/ListLike/default.nix
M pkgs/development/libraries/haskell/MFlow/default.nix
M pkgs/development/libraries/haskell/MaybeT/default.nix
M pkgs/development/libraries/haskell/MemoTrie/default.nix
M pkgs/development/libraries/haskell/MissingH/default.nix
M pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix
M pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
M pkgs/development/libraries/haskell/MonadPrompt/default.nix
M pkgs/development/libraries/haskell/MonadRandom/default.nix
M pkgs/development/libraries/haskell/NumInstances/default.nix
M pkgs/development/libraries/haskell/ObjectName/default.nix
M pkgs/development/libraries/haskell/OneTuple/default.nix
M pkgs/development/libraries/haskell/OpenAL/default.nix
M pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix
M pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix
M pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix
M pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix
M pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix
M pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix
M pkgs/development/libraries/haskell/OpenGL/2.9.2.0.nix
M pkgs/development/libraries/haskell/OpenGLRaw/1.3.0.0.nix
M pkgs/development/libraries/haskell/OpenGLRaw/1.4.0.0.nix
M pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix
M pkgs/development/libraries/haskell/PSQueue/default.nix
M pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix
M pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix
M pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix
M pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix
M pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix
M pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix
M pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix
M pkgs/development/libraries/haskell/QuickCheck/2.6.nix
M pkgs/development/libraries/haskell/QuickCheck/2.7.5.nix
M pkgs/development/libraries/haskell/QuickCheck/2.7.6.nix
M pkgs/development/libraries/haskell/RSA/default.nix
M pkgs/development/libraries/haskell/Ranged-sets/default.nix
M pkgs/development/libraries/haskell/RefSerialize/default.nix
M pkgs/development/libraries/haskell/RepLib/default.nix
M pkgs/development/libraries/haskell/SDL-image/default.nix
M pkgs/development/libraries/haskell/SDL-mixer/default.nix
M pkgs/development/libraries/haskell/SDL-ttf/default.nix
M pkgs/development/libraries/haskell/SDL/default.nix
M pkgs/development/libraries/haskell/SHA/default.nix
M pkgs/development/libraries/haskell/SMTPClient/default.nix
M pkgs/development/libraries/haskell/Shellac/Shellac.nix
M pkgs/development/libraries/haskell/StateVar/default.nix
M pkgs/development/libraries/haskell/Stream/default.nix
M pkgs/development/libraries/haskell/TCache/default.nix
M pkgs/development/libraries/haskell/TableAlgebra/default.nix
M pkgs/development/libraries/haskell/Tensor/default.nix
M pkgs/development/libraries/haskell/TypeCompose/default.nix
M pkgs/development/libraries/haskell/Vec/default.nix
M pkgs/development/libraries/haskell/Workflow/default.nix
M pkgs/development/libraries/haskell/X11-xft/default.nix
M pkgs/development/libraries/haskell/X11/default.nix
M pkgs/development/libraries/haskell/abstract-deque/default.nix
M pkgs/development/libraries/haskell/abstract-par/default.nix
M pkgs/development/libraries/haskell/accelerate-cuda/default.nix
M pkgs/development/libraries/haskell/accelerate-examples/default.nix
M pkgs/development/libraries/haskell/aeson-utils/default.nix
M pkgs/development/libraries/haskell/aeson/0.7.0.4.nix
R pkgs/development/libraries/haskell/aeson/0.7.0.6.nix
M pkgs/development/libraries/haskell/aeson/0.8.0.0.nix
M pkgs/development/libraries/haskell/ansi-terminal/default.nix
M pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix
M pkgs/development/libraries/haskell/ariadne/default.nix
M pkgs/development/libraries/haskell/arrows/default.nix
M pkgs/development/libraries/haskell/asn1-data/default.nix
M pkgs/development/libraries/haskell/async/2.0.1.3.nix
M pkgs/development/libraries/haskell/async/2.0.1.4.nix
M pkgs/development/libraries/haskell/async/2.0.1.5.nix
M pkgs/development/libraries/haskell/attempt/default.nix
M pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
M pkgs/development/libraries/haskell/attoparsec-enumerator/default.nix
M pkgs/development/libraries/haskell/attoparsec/0.10.4.0.nix
M pkgs/development/libraries/haskell/attoparsec/0.11.3.1.nix
M pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix
M pkgs/development/libraries/haskell/attoparsec/0.12.1.1.nix
M pkgs/development/libraries/haskell/authenticate-oauth/default.nix
M pkgs/development/libraries/haskell/authenticate/default.nix
M pkgs/development/libraries/haskell/aws/default.nix
M pkgs/development/libraries/haskell/base-unicode-symbols/default.nix
M pkgs/development/libraries/haskell/base16-bytestring/default.nix
Log Message:
-----------
merge 'staging' into modular-stdenv
In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.
Conflicts:
pkgs/stdenv/generic/default.nix
Commit: 82797f98f2917e164db8691b516ed7f354b40ff4
https://github.com/NixOS/nixpkgs/commit/82797f98f2917e164db8691b516ed7f354b40ff4
Author: Vladimír Čunát <[email protected]>
Date: 2014-09-08 (Mon, 08 Sep 2014)
Changed paths:
M default.nix
R doc/Makefile
A doc/default.nix
M doc/manual.xml
M doc/meta.xml
M doc/quick-start.xml
M lib/licenses.nix
M lib/maintainers.nix
M lib/modules.nix
M lib/sources.nix
M lib/strings.nix
M lib/types.nix
R nixos/doc/config-examples/basic.nix
R nixos/doc/config-examples/closed-install-configuration.nix
R nixos/doc/config-examples/root-on-lvm.nix
R nixos/doc/config-examples/svn-server.nix
R nixos/doc/config-examples/x86_64-usbstick.nix
A nixos/doc/manual/administration/boot-problems.xml
A nixos/doc/manual/administration/cleaning-store.xml
A nixos/doc/manual/administration/container-networking.xml
A nixos/doc/manual/administration/containers.xml
A nixos/doc/manual/administration/control-groups.xml
A nixos/doc/manual/administration/declarative-containers.xml
A nixos/doc/manual/administration/imperative-containers.xml
A nixos/doc/manual/administration/logging.xml
A nixos/doc/manual/administration/maintenance-mode.xml
A nixos/doc/manual/administration/network-problems.xml
A nixos/doc/manual/administration/rebooting.xml
A nixos/doc/manual/administration/rollback.xml
A nixos/doc/manual/administration/running.xml
A nixos/doc/manual/administration/service-mgmt.xml
A nixos/doc/manual/administration/store-corruption.xml
A nixos/doc/manual/administration/troubleshooting.xml
A nixos/doc/manual/administration/user-sessions.xml
R nixos/doc/manual/configuration.xml
A nixos/doc/manual/configuration/abstractions.xml
A nixos/doc/manual/configuration/ad-hoc-network-config.xml
A nixos/doc/manual/configuration/ad-hoc-packages.xml
A nixos/doc/manual/configuration/adding-custom-packages.xml
A nixos/doc/manual/configuration/config-file.xml
A nixos/doc/manual/configuration/config-syntax.xml
A nixos/doc/manual/configuration/configuration.xml
A nixos/doc/manual/configuration/customizing-packages.xml
A nixos/doc/manual/configuration/declarative-packages.xml
A nixos/doc/manual/configuration/file-systems.xml
A nixos/doc/manual/configuration/firewall.xml
A nixos/doc/manual/configuration/ipv4-config.xml
A nixos/doc/manual/configuration/ipv6-config.xml
A nixos/doc/manual/configuration/linux-kernel.xml
A nixos/doc/manual/configuration/luks-file-systems.xml
A nixos/doc/manual/configuration/modularity.xml
A nixos/doc/manual/configuration/network-manager.xml
A nixos/doc/manual/configuration/networking.xml
A nixos/doc/manual/configuration/package-mgmt.xml
A nixos/doc/manual/configuration/ssh.xml
A nixos/doc/manual/configuration/summary.xml
A nixos/doc/manual/configuration/user-mgmt.xml
A nixos/doc/manual/configuration/wireless.xml
A nixos/doc/manual/configuration/x-windows.xml
R nixos/doc/manual/containers.xml
M nixos/doc/manual/default.nix
R nixos/doc/manual/development.xml
A nixos/doc/manual/development/building-nixos.xml
A nixos/doc/manual/development/building-parts.xml
A nixos/doc/manual/development/development.xml
A nixos/doc/manual/development/nixos-tests.xml
A nixos/doc/manual/development/option-declarations.xml
A nixos/doc/manual/development/option-def.xml
A nixos/doc/manual/development/running-nixos-tests.xml
A nixos/doc/manual/development/sources.xml
A nixos/doc/manual/development/testing-installer.xml
A nixos/doc/manual/development/writing-modules.xml
A nixos/doc/manual/development/writing-nixos-tests.xml
R nixos/doc/manual/installation.xml
A nixos/doc/manual/installation/changing-config.xml
A nixos/doc/manual/installation/installation.xml
A nixos/doc/manual/installation/installing-uefi.xml
A nixos/doc/manual/installation/installing-usb.xml
A nixos/doc/manual/installation/installing.xml
A nixos/doc/manual/installation/obtaining.xml
A nixos/doc/manual/installation/upgrading.xml
M nixos/doc/manual/man-nixos-option.xml
M nixos/doc/manual/manual.xml
R nixos/doc/manual/release-notes.xml
A nixos/doc/manual/release-notes/release-notes.xml
A nixos/doc/manual/release-notes/rl-1310.xml
A nixos/doc/manual/release-notes/rl-1404.xml
A nixos/doc/manual/release-notes/rl-1410.xml
R nixos/doc/manual/running.xml
M nixos/doc/manual/style.css
R nixos/doc/manual/troubleshooting.xml
M nixos/lib/build-vms.nix
M nixos/lib/make-system-tarball.nix
M nixos/lib/make-system-tarball.sh
M nixos/lib/utils.nix
A nixos/maintainers/scripts/azure/create-azure.sh
M nixos/maintainers/scripts/gce/create-gce.sh
M nixos/modules/config/fonts/fonts.nix
A nixos/modules/config/gtk-exe-env.nix
M nixos/modules/config/networking.nix
M nixos/modules/config/nsswitch.nix
M nixos/modules/config/power-management.nix
M nixos/modules/config/pulseaudio.nix
A nixos/modules/config/qt-plugin-env.nix
M nixos/modules/config/shells-environment.nix
M nixos/modules/config/system-path.nix
M nixos/modules/config/update-users-groups.pl
M nixos/modules/config/users-groups.nix
A nixos/modules/config/vpnc.nix
M nixos/modules/installer/cd-dvd/iso-image.nix
M nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
M nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
M nixos/modules/installer/cd-dvd/system-tarball.nix
M nixos/modules/installer/tools/nixos-generate-config.pl
M nixos/modules/installer/tools/nixos-install.sh
M nixos/modules/installer/tools/nixos-option.sh
M nixos/modules/installer/tools/tools.nix
M nixos/modules/installer/virtualbox-demo.nix
M nixos/modules/misc/crashdump.nix
M nixos/modules/misc/ids.nix
M nixos/modules/misc/locate.nix
A nixos/modules/misc/meta.nix
M nixos/modules/module-list.nix
M nixos/modules/profiles/all-hardware.nix
M nixos/modules/profiles/base.nix
M nixos/modules/programs/environment.nix
A nixos/modules/programs/freetds.nix
M nixos/modules/programs/shadow.nix
A nixos/modules/programs/uim.nix
M nixos/modules/programs/virtualbox.nix
M nixos/modules/security/pam.nix
M nixos/modules/security/setuid-wrappers.nix
M nixos/modules/services/audio/mopidy.nix
M nixos/modules/services/backup/rsnapshot.nix
A nixos/modules/services/databases/neo4j.nix
A nixos/modules/services/databases/postgresql.xml
M nixos/modules/services/hardware/tcsd.nix
A nixos/modules/services/hardware/thermald.nix
M nixos/modules/services/logging/logstash.nix
M nixos/modules/services/logging/syslog-ng.nix
A nixos/modules/services/mail/mlmmj.nix
A nixos/modules/services/misc/mesos-master.nix
A nixos/modules/services/misc/mesos-slave.nix
M nixos/modules/services/misc/nixos-manual.nix
A nixos/modules/services/misc/phd.nix
A nixos/modules/services/misc/siproxd.nix
A nixos/modules/services/misc/uhub.nix
A nixos/modules/services/misc/zookeeper.nix
M nixos/modules/services/monitoring/apcupsd.nix
M nixos/modules/services/monitoring/munin.nix
A nixos/modules/services/monitoring/riemann-dash.nix
A nixos/modules/services/monitoring/riemann.nix
M nixos/modules/services/monitoring/smartd.nix
A nixos/modules/services/network-filesystems/diod.nix
M nixos/modules/services/network-filesystems/nfsd.nix
A nixos/modules/services/network-filesystems/yandex-disk.nix
A nixos/modules/services/networking/atftpd.nix
M nixos/modules/services/networking/cjdns.nix
A nixos/modules/services/networking/copy-com.nix
M nixos/modules/services/networking/dhcpcd.nix
M nixos/modules/services/networking/dnsmasq.nix
M nixos/modules/services/networking/ircd-hybrid/default.nix
M nixos/modules/services/networking/nat.nix
M nixos/modules/services/networking/nsd.nix
A nixos/modules/services/networking/openntpd.nix
M nixos/modules/services/networking/privoxy.nix
M nixos/modules/services/networking/radvd.nix
M nixos/modules/services/networking/ssh/sshd.nix
M nixos/modules/services/networking/unbound.nix
M nixos/modules/services/networking/znc.nix
M nixos/modules/services/printing/cupsd.nix
M nixos/modules/services/security/clamav.nix
M nixos/modules/services/security/fail2ban.nix
M nixos/modules/services/system/nscd.nix
M nixos/modules/services/ttys/agetty.nix
M nixos/modules/services/web-servers/apache-httpd/default.nix
R
nixos/modules/services/web-servers/apache-httpd/mediawiki-postgresql-fixes.patch
M nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
M nixos/modules/services/web-servers/apache-httpd/phabricator.nix
M nixos/modules/services/web-servers/tomcat.nix
M nixos/modules/services/x11/desktop-managers/gnome3.nix
M nixos/modules/services/x11/desktop-managers/kde4.nix
M nixos/modules/services/x11/desktop-managers/xfce.nix
M nixos/modules/services/x11/display-managers/default.nix
M nixos/modules/services/x11/display-managers/slim.nix
A nixos/modules/services/x11/window-managers/fluxbox.nix
M nixos/modules/services/x11/xserver.nix
M nixos/modules/system/boot/kernel.nix
M nixos/modules/system/boot/loader/grub/grub.nix
M nixos/modules/system/boot/loader/grub/install-grub.pl
M nixos/modules/system/boot/loader/gummiboot/gummiboot.nix
M nixos/modules/system/boot/luksroot.nix
M nixos/modules/system/boot/modprobe.nix
M nixos/modules/system/boot/stage-1.nix
M nixos/modules/system/boot/systemd.nix
M nixos/modules/tasks/cpu-freq.nix
M nixos/modules/tasks/filesystems/nfs.nix
M nixos/modules/tasks/filesystems/zfs.nix
M nixos/modules/tasks/network-interfaces.nix
M nixos/modules/tasks/trackpoint.nix
A nixos/modules/virtualisation/azure-config.nix
A nixos/modules/virtualisation/azure-image.nix
M nixos/modules/virtualisation/container-config.nix
M nixos/modules/virtualisation/containers.nix
A nixos/modules/virtualisation/docker-image.nix
M nixos/modules/virtualisation/docker.nix
M nixos/modules/virtualisation/libvirtd.nix
M nixos/modules/virtualisation/nixos-container.pl
A nixos/modules/virtualisation/openvswitch.nix
M nixos/modules/virtualisation/qemu-vm.nix
M nixos/release-combined.nix
M nixos/release.nix
M nixos/tests/bittorrent.nix
M nixos/tests/containers.nix
M nixos/tests/gnome3.nix
M nixos/tests/gnome3_12.nix
M nixos/tests/installer.nix
M nixos/tests/jenkins.nix
M nixos/tests/munin.nix
M nixos/tests/nat.nix
A nixos/tests/nsd.nix
M nixos/tests/phabricator.nix
M pkgs/applications/audio/audacious/default.nix
M pkgs/applications/audio/beast/default.nix
M pkgs/applications/audio/cantata/default.nix
M pkgs/applications/audio/cmus/default.nix
M pkgs/applications/audio/fldigi/default.nix
M pkgs/applications/audio/gpodder/default.nix
M pkgs/applications/audio/guitarix/default.nix
M pkgs/applications/audio/hydrogen/default.nix
R pkgs/applications/audio/hydrogen/scons-env.patch
M pkgs/applications/audio/jalv/default.nix
M pkgs/applications/audio/lmms/default.nix
M pkgs/applications/audio/moc/default.nix
M pkgs/applications/audio/mp3info/default.nix
M pkgs/applications/audio/mpc123/default.nix
M pkgs/applications/audio/mpg321/default.nix
M pkgs/applications/audio/pamixer/default.nix
M pkgs/applications/audio/petrifoo/default.nix
M pkgs/applications/audio/pianobar/default.nix
M pkgs/applications/audio/picard/default.nix
M pkgs/applications/audio/spotify/default.nix
M pkgs/applications/audio/yoshimi/default.nix
M pkgs/applications/audio/zynaddsubfx/default.nix
M pkgs/applications/editors/eclipse/default.nix
M pkgs/applications/editors/ed/default.nix
M pkgs/applications/editors/emacs-24/default.nix
A pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix
A pkgs/applications/editors/emacs-modes/dash/default.nix
A pkgs/applications/editors/emacs-modes/ensime/default.nix
M pkgs/applications/editors/emacs-modes/idris/default.nix
M pkgs/applications/editors/emacs-modes/js2/default.nix
A pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix
A pkgs/applications/editors/emacs-modes/s/default.nix
M pkgs/applications/editors/emacs-modes/scala-mode/v2.nix
M pkgs/applications/editors/idea/default.nix
M pkgs/applications/editors/mg/default.nix
M pkgs/applications/editors/texmacs/default.nix
A pkgs/applications/editors/wxhexeditor/default.nix
M pkgs/applications/editors/yi/yi-contrib.nix
M pkgs/applications/editors/yi/yi.nix
M pkgs/applications/editors/zile/default.nix
M pkgs/applications/graphics/geeqie/default.nix
M pkgs/applications/graphics/gimp/2.8.nix
M pkgs/applications/graphics/grafx2/default.nix
M pkgs/applications/graphics/hoodle/default.nix
M pkgs/applications/graphics/jbrout/default.nix
R pkgs/applications/graphics/k3d/debian-patches.nix
R pkgs/applications/graphics/k3d/debian-patches.txt
M pkgs/applications/graphics/k3d/default.nix
A pkgs/applications/graphics/k3d/k3d_gtkmm224.patch
A pkgs/applications/graphics/k3d/libpng-1.4.patch
A pkgs/applications/graphics/kgraphviewer/default.nix
M pkgs/applications/graphics/mcomix/default.nix
M pkgs/applications/graphics/ocrad/default.nix
A pkgs/applications/graphics/processing/default.nix
A pkgs/applications/graphics/processing/use-nixpkgs-jre.patch
M pkgs/applications/graphics/qiv/default.nix
M pkgs/applications/graphics/synfigstudio/default.nix
M pkgs/applications/graphics/tesseract/default.nix
M pkgs/applications/graphics/ufraw/default.nix
M pkgs/applications/graphics/viewnior/default.nix
M pkgs/applications/graphics/xaos/default.nix
M pkgs/applications/misc/arbtt/default.nix
M pkgs/applications/misc/audio/sox/default.nix
A pkgs/applications/misc/bitcoin/altcoins.nix
M pkgs/applications/misc/bitcoin/default.nix
A pkgs/applications/misc/bitcoin/dogecoin.nix
A pkgs/applications/misc/bitcoin/namecoin_dynamic.patch
M pkgs/applications/misc/calibre/default.nix
M pkgs/applications/misc/camlistore/default.nix
A pkgs/applications/misc/clipit/default.nix
A pkgs/applications/misc/cool-old-term/default.nix
M pkgs/applications/misc/cura/default.nix
M pkgs/applications/misc/curaengine/default.nix
M pkgs/applications/misc/eaglemode/default.nix
A pkgs/applications/misc/evilvte/default.nix
A pkgs/applications/misc/fme/default.nix
M pkgs/applications/misc/gnuradio/default.nix
M pkgs/applications/misc/gpsbabel/default.nix
M pkgs/applications/misc/gv/default.nix
Log Message:
-----------
Merge branch 'staging' into modular-stdenv
Conflicts:
pkgs/development/interpreters/perl/5.10/setup-hook.sh
pkgs/development/interpreters/perl/5.8/setup-hook.sh
pkgs/stdenv/linux/default.nix
Commit: 88822dc23ca04de51adeb9e1d6af3477455bf0ed
https://github.com/NixOS/nixpkgs/commit/88822dc23ca04de51adeb9e1d6af3477455bf0ed
Author: Eelco Dolstra <[email protected]>
Date: 2014-09-08 (Mon, 08 Sep 2014)
Changed paths:
M pkgs/applications/science/math/R/setup-hook.sh
M pkgs/build-support/clang-wrapper/setup-hook.sh
M pkgs/build-support/fetchzip/default.nix
M pkgs/build-support/gcc-cross-wrapper/setup-hook.sh
M pkgs/build-support/gcc-wrapper/setup-hook.sh
A pkgs/build-support/setup-hooks/compress-man-pages.sh
A pkgs/build-support/setup-hooks/move-docs.sh
A pkgs/build-support/setup-hooks/patch-shebangs.sh
M pkgs/build-support/setup-hooks/set-java-classpath.sh
A pkgs/build-support/setup-hooks/strip.sh
M pkgs/desktops/e17/e_dbus/setup-hook.sh
M pkgs/development/interpreters/guile/setup-hook-2.0.sh
M pkgs/development/interpreters/guile/setup-hook.sh
M pkgs/development/interpreters/perl/5.14/setup-hook.sh
M pkgs/development/interpreters/perl/5.16/setup-hook.sh
M pkgs/development/interpreters/perl/5.20/setup-hook.sh
M pkgs/development/interpreters/perl/sys-perl/setup-hook.sh
M pkgs/development/interpreters/pypy/2.3/setup-hook.sh
M pkgs/development/interpreters/python/2.6/setup-hook.sh
M pkgs/development/interpreters/python/2.7/setup-hook.sh
M pkgs/development/interpreters/python/3.2/setup-hook.sh
M pkgs/development/interpreters/python/3.3/setup-hook.sh
M pkgs/development/interpreters/python/3.4/setup-hook.sh
M pkgs/development/libraries/gstreamer/core/setup-hook.sh
M pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh
M pkgs/development/libraries/libxml2/setup-hook.sh
M pkgs/development/libraries/slib/setup-hook.sh
M pkgs/development/lisp-modules/clwrapper/setup-hook.sh
M pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh
M pkgs/development/tools/misc/automake/setup-hook.sh
M pkgs/development/tools/misc/patchelf/default.nix
A pkgs/development/tools/misc/patchelf/setup-hook.sh
M pkgs/development/tools/misc/pkgconfig/setup-hook.sh
M pkgs/development/tools/ocaml/findlib/default.nix
M pkgs/development/web/nodejs/setup-hook.sh
M pkgs/os-specific/linux/paxctl/default.nix
A pkgs/os-specific/linux/paxctl/setup-hook.sh
M pkgs/stdenv/default.nix
M pkgs/stdenv/generic/builder.sh
M pkgs/stdenv/generic/default.nix
M pkgs/stdenv/generic/setup.sh
M pkgs/stdenv/linux/default.nix
M pkgs/stdenv/nix/default.nix
M pkgs/tools/archivers/unzip/default.nix
A pkgs/tools/archivers/unzip/setup-hook.sh
M pkgs/tools/text/sgml/opensp/setup-hook.sh
M pkgs/tools/typesetting/tex/tetex/setup-hook.sh
M pkgs/tools/typesetting/tex/texlive/setup-hook.sh
M pkgs/top-level/all-packages.nix
Log Message:
-----------
Merge branch 'p/orig-modular-stdenv' of github.com:vcunat/nixpkgs into staging
Commit: 42ee2261841c754c44e04f7ec9fee4fd62a69696
https://github.com/NixOS/nixpkgs/commit/42ee2261841c754c44e04f7ec9fee4fd62a69696
Author: Eelco Dolstra <[email protected]>
Date: 2014-09-08 (Mon, 08 Sep 2014)
Changed paths:
M pkgs/tools/archivers/unzip/setup-hook.sh
Log Message:
-----------
Fix unzip setup hook
Compare: https://github.com/NixOS/nixpkgs/compare/e4e39f26baf4...42ee2261841c_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
