Branch: refs/heads/release-14.04
Home: https://github.com/NixOS/nixpkgs
Commit: 8d413eb4a7bc0bea6288317f6b25c7924d4436e5
https://github.com/NixOS/nixpkgs/commit/8d413eb4a7bc0bea6288317f6b25c7924d4436e5
Author: Vladimír Čunát <[email protected]>
Date: 2014-08-12 (Tue, 12 Aug 2014)
Changed paths:
M pkgs/development/libraries/glibc/2.19/common.nix
A pkgs/development/libraries/glibc/2.19/cve-2014-0475.patch
Log Message:
-----------
glibc: fix CVE-2014-0475 by upstream patches (close #3445)
https://sourceware.org/bugzilla/show_bug.cgi?id=17137
(cherry picked from commit 9253a95f6b3f65ecc701ebb10620acfb6d251f17)
Commit: 2abcf20f7b4c45523da0693e4785548904396445
https://github.com/NixOS/nixpkgs/commit/2abcf20f7b4c45523da0693e4785548904396445
Author: Austin Seipp <[email protected]>
Date: 2014-08-14 (Thu, 14 Aug 2014)
Changed paths:
M pkgs/tools/security/tor/default.nix
M pkgs/tools/security/tor/torbrowser.nix
Log Message:
-----------
Merge pull request #2924 from doublec/tor_0_2_4_22
Update tor to 0.2.4.22 and tor browser to 3.6.2 (close #3136)
(cherry picked from commit cf4b0a1222d9c594b1cbd61b3c52f1660f376694)
Commit: f9f5be6113105626cea102763efe871ce521dd50
https://github.com/NixOS/nixpkgs/commit/f9f5be6113105626cea102763efe871ce521dd50
Author: Mateusz Kowalczyk <[email protected]>
Date: 2014-08-14 (Thu, 14 Aug 2014)
Changed paths:
M pkgs/applications/audio/abcde/default.nix
M pkgs/applications/audio/audacity/default.nix
M pkgs/applications/audio/aumix/default.nix
M pkgs/applications/audio/cd-discid/default.nix
M pkgs/applications/audio/espeak/default.nix
M pkgs/applications/audio/espeak/edit.nix
M pkgs/applications/audio/gmu/default.nix
M pkgs/applications/audio/gtkpod/default.nix
M pkgs/applications/audio/id3v2/default.nix
M pkgs/applications/audio/jackmeter/default.nix
M pkgs/applications/audio/lingot/default.nix
M pkgs/applications/audio/mikmod/default.nix
M pkgs/applications/audio/mp3info/default.nix
M pkgs/applications/audio/mpc/default.nix
M pkgs/applications/audio/mpc123/default.nix
M pkgs/applications/audio/mpg321/default.nix
M pkgs/applications/audio/pavucontrol/default.nix
M pkgs/applications/audio/praat/default.nix
M pkgs/applications/audio/spotify/default.nix
M pkgs/applications/audio/vorbis-tools/default.nix
M pkgs/applications/editors/bvi/default.nix
M pkgs/applications/editors/ed/default.nix
M pkgs/applications/editors/emacs-modes/auto-complete/default.nix
M pkgs/applications/editors/emacs-modes/calfw/default.nix
M pkgs/applications/editors/emacs-modes/cedet/default.nix
M pkgs/applications/editors/emacs-modes/coffee/default.nix
M pkgs/applications/editors/emacs-modes/color-theme/default.nix
M pkgs/applications/editors/emacs-modes/darcsum/default.nix
M pkgs/applications/editors/emacs-modes/ecb/default.nix
M
pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
M pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
M pkgs/applications/editors/emacs-modes/emms/default.nix
M pkgs/applications/editors/emacs-modes/gh/default.nix
M pkgs/applications/editors/emacs-modes/gist/default.nix
M pkgs/applications/editors/emacs-modes/idris/default.nix
M pkgs/applications/editors/emacs-modes/jade/default.nix
M pkgs/applications/editors/emacs-modes/jdee/default.nix
M pkgs/applications/editors/emacs-modes/logito/default.nix
M pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix
M pkgs/applications/editors/emacs-modes/magit/default.nix
M pkgs/applications/editors/emacs-modes/maude/default.nix
M pkgs/applications/editors/emacs-modes/org/default.nix
M pkgs/applications/editors/emacs-modes/org2blog/default.nix
M pkgs/applications/editors/emacs-modes/pcache/default.nix
M pkgs/applications/editors/emacs-modes/proofgeneral/default.nix
M pkgs/applications/editors/emacs-modes/quack/default.nix
M pkgs/applications/editors/emacs-modes/rect-mark/default.nix
M pkgs/applications/editors/emacs-modes/remember/default.nix
M pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix
M pkgs/applications/editors/emacs-modes/writegood/default.nix
M pkgs/applications/editors/emacs-modes/xml-rpc/default.nix
M pkgs/applications/editors/flpsed/default.nix
M pkgs/applications/editors/gobby/default.nix
M pkgs/applications/editors/sublime/default.nix
M pkgs/applications/editors/sublime3/default.nix
M pkgs/applications/editors/texmacs/default.nix
M pkgs/applications/editors/zile/default.nix
M pkgs/applications/graphics/autopanosiftc/default.nix
M pkgs/applications/graphics/comical/default.nix
M pkgs/applications/graphics/djview/default.nix
M pkgs/applications/graphics/geeqie/default.nix
M pkgs/applications/graphics/gimp/plugins/default.nix
M pkgs/applications/graphics/giv/default.nix
M pkgs/applications/graphics/gocr/default.nix
M pkgs/applications/graphics/hugin/default.nix
M pkgs/applications/graphics/ipe/default.nix
M pkgs/applications/graphics/mcomix/default.nix
M pkgs/applications/graphics/meshlab/default.nix
M pkgs/applications/graphics/minidjvu/default.nix
M pkgs/applications/graphics/mirage/default.nix
M pkgs/applications/graphics/ocrad/default.nix
M pkgs/applications/graphics/panotools/default.nix
M pkgs/applications/graphics/pinta/default.nix
M pkgs/applications/graphics/qtpfsgui/default.nix
M pkgs/applications/graphics/sane/backends.nix
M pkgs/applications/graphics/sane/frontends.nix
M pkgs/applications/graphics/sane/xsane.nix
M pkgs/applications/graphics/smartdeblur/default.nix
M pkgs/applications/graphics/sxiv/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/abook/default.nix
M pkgs/applications/misc/adobe-reader/default.nix
M pkgs/applications/misc/audio/soxr/default.nix
M pkgs/applications/misc/bibletime/default.nix
M pkgs/applications/misc/bitcoin/default.nix
M pkgs/applications/misc/d4x/default.nix
M pkgs/applications/misc/dmenu/default.nix
M pkgs/applications/misc/epdfview/default.nix
M pkgs/applications/misc/evopedia/default.nix
M pkgs/applications/misc/evtest/default.nix
M pkgs/applications/misc/freicoin/default.nix
M pkgs/applications/misc/gkrellm/default.nix
M pkgs/applications/misc/googleearth/default.nix
M pkgs/applications/misc/gpsbabel/default.nix
M pkgs/applications/misc/gpscorrelate/default.nix
M pkgs/applications/misc/grip/default.nix
M pkgs/applications/misc/gv/default.nix
M pkgs/applications/misc/htmldoc/default.nix
M pkgs/applications/misc/ikiwiki/default.nix
M pkgs/applications/misc/jigdo/default.nix
M pkgs/applications/misc/librecad/2.0.nix
M pkgs/applications/misc/librecad/default.nix
M pkgs/applications/misc/lyx/default.nix
M pkgs/applications/misc/merkaartor/default.nix
M pkgs/applications/misc/mupdf/default.nix
M pkgs/applications/misc/navipowm/default.nix
M pkgs/applications/misc/navit/default.nix
M pkgs/applications/misc/openjump/default.nix
M pkgs/applications/misc/qgis/default.nix
M pkgs/applications/misc/redshift/default.nix
M pkgs/applications/misc/sakura/default.nix
M pkgs/applications/misc/st/default.nix
M pkgs/applications/misc/stardict/stardict.nix
M pkgs/applications/misc/surf/default.nix
M pkgs/applications/misc/tangogps/default.nix
M pkgs/applications/misc/taskjuggler/default.nix
M pkgs/applications/misc/vanitygen/default.nix
M pkgs/applications/misc/viking/default.nix
M pkgs/applications/misc/wmname/default.nix
M pkgs/applications/misc/xfe/default.nix
M pkgs/applications/misc/xneur/default.nix
M pkgs/applications/networking/browsers/elinks/default.nix
M
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
M
pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
M pkgs/applications/networking/browsers/netsurf/default.nix
M pkgs/applications/networking/browsers/netsurf/libCSS.nix
M pkgs/applications/networking/browsers/netsurf/libParserUtils.nix
M pkgs/applications/networking/browsers/netsurf/libnsbmp.nix
M pkgs/applications/networking/browsers/netsurf/libnsgif.nix
M pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix
M pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix
M pkgs/applications/networking/ids/daq/default.nix
M pkgs/applications/networking/ids/snort/default.nix
M pkgs/applications/networking/instant-messengers/bitlbee/default.nix
M pkgs/applications/networking/instant-messengers/centerim/default.nix
M pkgs/applications/networking/instant-messengers/gtmess/default.nix
M pkgs/applications/networking/instant-messengers/kadu/default.nix
M pkgs/applications/networking/instant-messengers/linphone/default.nix
M
pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix
M
pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix
M
pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix
M pkgs/applications/networking/instant-messengers/sflphone/default.nix
M pkgs/applications/networking/instant-messengers/silc-client/default.nix
M
pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix
M pkgs/applications/networking/instant-messengers/skype/default.nix
M pkgs/applications/networking/instant-messengers/telegram-cli/default.nix
M pkgs/applications/networking/instant-messengers/toxic/default.nix
M pkgs/applications/networking/iptraf/default.nix
M pkgs/applications/networking/irc/ii/default.nix
M pkgs/applications/networking/irc/irssi/fish/default.nix
M pkgs/applications/networking/irc/irssi/otr/default.nix
M pkgs/applications/networking/irc/quassel/default.nix
M pkgs/applications/networking/mailreaders/mutt/default.nix
M pkgs/applications/networking/p2p/freenet/default.nix
M pkgs/applications/networking/p2p/gnunet/default.nix
M pkgs/applications/networking/p2p/gnunet/svn.nix
M pkgs/applications/networking/p2p/tribler/default.nix
M pkgs/applications/networking/pjsip/default.nix
M pkgs/applications/networking/remote/remmina/default.nix
M pkgs/applications/networking/remote/ssvnc/default.nix
M pkgs/applications/networking/remote/teamviewer/8.nix
M pkgs/applications/networking/remote/teamviewer/default.nix
M pkgs/applications/networking/sniffers/etherape/default.nix
M pkgs/applications/networking/sync/unison/default.nix
M pkgs/applications/networking/vnstat/default.nix
M pkgs/applications/networking/yafc/default.nix
M pkgs/applications/office/eventlist/default.nix
M pkgs/applications/office/gnucash/default.nix
M pkgs/applications/office/gnumeric/default.nix
M pkgs/applications/office/homebank/default.nix
M pkgs/applications/office/impressive/default.nix
M pkgs/applications/office/keepnote/default.nix
M pkgs/applications/office/mmex/default.nix
M pkgs/applications/office/scribus/default.nix
M pkgs/applications/science/astronomy/gravit/default.nix
M pkgs/applications/science/biology/plink/default.nix
M pkgs/applications/science/electronics/archimedes/default.nix
M pkgs/applications/science/electronics/caneda/default.nix
M pkgs/applications/science/electronics/gtkwave/default.nix
M pkgs/applications/science/electronics/kicad/default.nix
M pkgs/applications/science/electronics/qucs/default.nix
M pkgs/applications/science/electronics/tkgate/1.x.nix
M pkgs/applications/science/electronics/tkgate/2.x.nix
M pkgs/applications/science/electronics/verilog/default.nix
M pkgs/applications/science/electronics/xoscope/default.nix
M pkgs/applications/science/geometry/tetgen/default.nix
M pkgs/applications/science/logic/iprover/default.nix
M pkgs/applications/science/logic/logisim/default.nix
M pkgs/applications/science/logic/matita/130312.nix
M pkgs/applications/science/logic/matita/default.nix
M pkgs/applications/science/logic/minisat/default.nix
M pkgs/applications/science/logic/opensmt/default.nix
M pkgs/applications/science/logic/picosat/default.nix
M pkgs/applications/science/math/eukleides/default.nix
M pkgs/applications/science/math/gap/default.nix
M pkgs/applications/science/math/mathematica/default.nix
M pkgs/applications/science/math/maxima/default.nix
M pkgs/applications/science/math/singular/default.nix
M pkgs/applications/science/math/weka/default.nix
M pkgs/applications/science/math/wxmaxima/default.nix
M pkgs/applications/science/math/yacas/default.nix
M pkgs/applications/science/misc/boinc/default.nix
M pkgs/applications/science/misc/golly/default.nix
M pkgs/applications/science/misc/simgrid/default.nix
M pkgs/applications/science/misc/tulip/default.nix
M pkgs/applications/search/doodle/default.nix
M pkgs/applications/version-management/cvsps/default.nix
M pkgs/applications/version-management/git-and-tools/qgit/default.nix
M pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix
M pkgs/applications/version-management/git-and-tools/topgit/default.nix
M pkgs/applications/version-management/meld/default.nix
M pkgs/applications/version-management/mercurial/default.nix
M pkgs/applications/version-management/mr/default.nix
M pkgs/applications/version-management/rapidsvn/default.nix
M pkgs/applications/version-management/rcs/default.nix
M pkgs/applications/version-management/tkcvs/default.nix
M pkgs/applications/video/avxsynth/default.nix
M pkgs/applications/video/bangarang/default.nix
M pkgs/applications/video/cinelerra/default.nix
M pkgs/applications/video/coriander/default.nix
M pkgs/applications/video/dvb-apps/default.nix
M pkgs/applications/video/gnash/default.nix
M pkgs/applications/video/kino/default.nix
M pkgs/applications/video/lxdvdrip/default.nix
M pkgs/applications/video/makemkv/default.nix
M pkgs/applications/video/mplayer/default.nix
M pkgs/applications/video/mplayer2/default.nix
M pkgs/applications/video/ogmtools/default.nix
M pkgs/applications/video/omxplayer/default.nix
M pkgs/applications/video/quvi/tool.nix
M pkgs/applications/video/xvidcap/default.nix
M pkgs/applications/virtualization/virtinst/default.nix
M pkgs/applications/window-managers/awesome/3.4.nix
M pkgs/applications/window-managers/dwm/default.nix
M pkgs/applications/window-managers/fvwm/default.nix
M pkgs/applications/window-managers/matchbox/default.nix
M pkgs/applications/window-managers/openbox/default.nix
M pkgs/applications/window-managers/ratpoison/default.nix
M pkgs/data/fonts/freefont-ttf/default.nix
M pkgs/data/misc/miscfiles/default.nix
M pkgs/desktops/gnome-2/desktop/vte/default.nix
M pkgs/desktops/gnome-2/platform/gconfmm/default.nix
M pkgs/desktops/gnome-2/platform/gtkglext/default.nix
M pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix
M pkgs/desktops/gnome-3/core/evince/default.nix
M pkgs/desktops/gnome-3/core/folks/default.nix
M pkgs/desktops/gnome-3/core/vte/default.nix
M pkgs/desktops/gnome-3/misc/goffice/default.nix
M pkgs/desktops/kde-4.12/applications/kate.nix
M pkgs/desktops/kde-4.12/applications/konsole.nix
M pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix
M pkgs/desktops/kde-4.12/kde-workspace.nix
M pkgs/desktops/kde-4.12/kdebindings/smokegen.nix
M pkgs/desktops/kde-4.12/kdebindings/smokeqt.nix
M pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix
M pkgs/desktops/kde-4.12/kdegraphics/kamera.nix
M pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix
M pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-mobipocket.nix
M pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-strigi-analyzer.nix
M pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-thumbnailers.nix
M pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix
M pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix
M pkgs/desktops/kde-4.12/kdegraphics/kruler.nix
M pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix
M pkgs/desktops/kde-4.12/kdegraphics/ksnapshot.nix
M pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix
M pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix
M pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix
M pkgs/desktops/kde-4.12/kdegraphics/libksane.nix
M pkgs/desktops/kde-4.12/kdegraphics/okular.nix
M pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix
M pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix
M pkgs/desktops/kde-4.12/kdelibs/nepomuk-widgets.nix
M pkgs/desktops/xfce/applications/mousepad.nix
M pkgs/desktops/xfce/applications/ristretto.nix
M pkgs/desktops/xfce/applications/terminal.nix
M pkgs/desktops/xfce/applications/xfce4-mixer.nix
M pkgs/desktops/xfce/applications/xfce4-notifyd.nix
M pkgs/desktops/xfce/applications/xfce4-screenshooter.nix
M pkgs/desktops/xfce/core/exo.nix
M pkgs/desktops/xfce/core/garcon.nix
M pkgs/desktops/xfce/core/gtk-xfce-engine.nix
M pkgs/desktops/xfce/core/libxfce4ui.nix
M pkgs/desktops/xfce/core/libxfcegui4.nix
M pkgs/desktops/xfce/core/thunar-archive-plugin.nix
M pkgs/desktops/xfce/core/thunar-volman.nix
M pkgs/desktops/xfce/core/thunar.nix
M pkgs/desktops/xfce/core/tumbler.nix
M pkgs/desktops/xfce/core/xfce4-appfinder.nix
M pkgs/desktops/xfce/core/xfce4-dev-tools.nix
M pkgs/desktops/xfce/core/xfce4-panel.nix
M pkgs/desktops/xfce/core/xfce4-power-manager.nix
M pkgs/desktops/xfce/core/xfce4-session.nix
M pkgs/desktops/xfce/core/xfce4-settings.nix
M pkgs/desktops/xfce/core/xfconf.nix
M pkgs/desktops/xfce/core/xfdesktop.nix
M pkgs/desktops/xfce/core/xfwm4.nix
M pkgs/development/compilers/adobe-flex-sdk/default.nix
Log Message:
-----------
Turn some license strings into lib.licenses values
(cherry picked from commit 7a459962331e095cabd0cf5d56106727648a1824)
Conflicts:
pkgs/applications/audio/espeak/default.nix
pkgs/applications/audio/espeak/edit.nix
pkgs/applications/editors/emacs-modes/metaweblog/default.nix
pkgs/applications/editors/emacs-modes/proofgeneral/default.nix
pkgs/applications/editors/sublime3/default.nix
pkgs/applications/graphics/potrace/default.nix
pkgs/applications/science/electronics/tkgate/2.x.nix
pkgs/desktops/gnome-3/3.10/core/folks/default.nix
pkgs/desktops/gnome-3/3.10/misc/goffice/default.nix
pkgs/desktops/gnome-3/3.12/core/evince/default.nix
pkgs/desktops/gnome-3/3.12/core/vte/default.nix
pkgs/development/compilers/jdk/jdk7-linux.nix
pkgs/development/compilers/opendylan/bin.nix
pkgs/development/compilers/opendylan/default.nix
pkgs/development/libraries/clutter/1.18.nix
pkgs/development/libraries/gsl/default.nix
pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix
pkgs/development/libraries/science/math/liblbfgs/default.nix
pkgs/development/libraries/sword/default.nix
pkgs/development/libraries/tbb/default.nix
pkgs/development/ocaml-modules/lablgl/default.nix
pkgs/games/crrcsim/default.nix
pkgs/games/openxcom/default.nix
pkgs/games/tibia/default.nix
pkgs/os-specific/linux/disk-indicator/default.nix
pkgs/os-specific/linux/keyutils/default.nix
pkgs/os-specific/linux/usermount/default.nix
pkgs/servers/mpd/clientlib.nix
pkgs/servers/search/elasticsearch/default.nix
pkgs/tools/misc/t1utils/default.nix
pkgs/top-level/perl-packages.nix
pkgs/top-level/python-packages-generated.nix
pkgs/top-level/python-packages.nix
Commit: 0d133f7c62f1ab774096637e5d06de5e125031d0
https://github.com/NixOS/nixpkgs/commit/0d133f7c62f1ab774096637e5d06de5e125031d0
Author: Peter Simons <[email protected]>
Date: 2014-08-14 (Thu, 14 Aug 2014)
Changed paths:
M pkgs/top-level/perl-packages.nix
Log Message:
-----------
perl-packages.nix: partially revert 7a459962331e095c
The commit referred to non-existent license "stdenv.lib.licenses.perl5".
(cherry picked from commit 4895ace12757d277f3f2c80289915ddff9bc9697)
Conflicts:
pkgs/top-level/perl-packages.nix
Commit: 217724b340d02b42b4cdd72baaafe43cd76f5fc2
https://github.com/NixOS/nixpkgs/commit/217724b340d02b42b4cdd72baaafe43cd76f5fc2
Author: Peter Simons <[email protected]>
Date: 2014-08-14 (Thu, 14 Aug 2014)
Changed paths:
M pkgs/applications/misc/d4x/default.nix
M pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
M pkgs/development/perl-modules/DBD-Pg/default.nix
M pkgs/games/simutrans/default.nix
M pkgs/tools/typesetting/biber/default.nix
Log Message:
-----------
Partially revert 7a45996 some more.
Removing more references to the non-existent license
"stdenv.lib.licenses.perl5".
Thanks to @FlashKorten for catching those.
(cherry picked from commit 5cc55e952335c7303fb238583359ae76d916b62f)
Commit: 23789cc23e6206087b9390b3006db45475b3cbf4
https://github.com/NixOS/nixpkgs/commit/23789cc23e6206087b9390b3006db45475b3cbf4
Author: Vladimír Čunát <[email protected]>
Date: 2014-08-14 (Thu, 14 Aug 2014)
Changed paths:
M pkgs/development/libraries/SDL/default.nix
M pkgs/development/libraries/SDL2_mixer/default.nix
M pkgs/development/libraries/SDL_image/default.nix
M pkgs/development/libraries/SDL_mixer/default.nix
Log Message:
-----------
SDL: minor sync from master
Commit: 1c0068a0c94b1b1216ebfa3c048a8cda46ca3257
https://github.com/NixOS/nixpkgs/commit/1c0068a0c94b1b1216ebfa3c048a8cda46ca3257
Author: Gergely Risko <[email protected]>
Date: 2014-08-14 (Thu, 14 Aug 2014)
Changed paths:
M pkgs/development/compilers/gcc/4.8/default.nix
M pkgs/development/compilers/gcc/4.9/default.nix
Log Message:
-----------
Enable parallel building for GCC.
Even if using profiledbootstrap. This was unsafe before 4.8, and
then the documentation was not fixed on time.
The documentation got fixed here:
https://github.com/gcc-mirror/gcc/commit/c763997f340ec1fab37ad538b57afdad4f4bf747
But the actual code was already fixed here:
https://github.com/gcc-mirror/gcc/commit/5d2fca09d543d4b42b99fe20f412efb78cc50ec3
So this is safe both for GCC 4.8 and GCC 4.9.
(cherry picked from commit f199e115d2d9acf2bee330c325a0fe19cf9d8235)
Commit: b79e3ce6a7d3f1c294974da6f5aace6274b4f5aa
https://github.com/NixOS/nixpkgs/commit/b79e3ce6a7d3f1c294974da6f5aace6274b4f5aa
Author: Gergely Risko <[email protected]>
Date: 2014-08-14 (Thu, 14 Aug 2014)
Changed paths:
M pkgs/tools/compression/xz/default.nix
Log Message:
-----------
Get rid of bootstrap-tools dependency from xz (and therefore stdenv)
0769fc5b77eb76c6a794187f173c48f912fc837c broke this by setting CONFIG_SHELL.
(cherry picked from commit 59291fdbf4e26a2b09a1d39a0582a874d78d6797)
Commit: 48a10fc66e3ec73c1e81309b56cb1ab67bd1a2d6
https://github.com/NixOS/nixpkgs/commit/48a10fc66e3ec73c1e81309b56cb1ab67bd1a2d6
Author: Vladimír Čunát <[email protected]>
Date: 2014-08-14 (Thu, 14 Aug 2014)
Changed paths:
M pkgs/development/libraries/boost/1.55.nix
M pkgs/development/libraries/dbus/default.nix
M pkgs/development/libraries/farstream/default.nix
M pkgs/development/libraries/ffmpeg/0.10.nix
M pkgs/development/libraries/ffmpeg/0.6.90.nix
M pkgs/development/libraries/ffmpeg/1.x.nix
M pkgs/development/libraries/ffmpeg/2.x.nix
M pkgs/development/libraries/fftw/default.nix
M pkgs/development/libraries/freealut/default.nix
M pkgs/development/libraries/freetype/default.nix
M pkgs/development/libraries/gdk-pixbuf/default.nix
M pkgs/development/libraries/gdk-pixbuf/setup-hook.sh
M pkgs/development/libraries/glib/default.nix
M pkgs/development/libraries/gsl/default.nix
M pkgs/development/libraries/gtest/default.nix
M pkgs/development/libraries/gtk+/2.x.nix
M pkgs/development/libraries/gtk+/3.x.nix
M pkgs/development/libraries/ibus/default.nix
M pkgs/development/libraries/icu/default.nix
M pkgs/development/libraries/libav/default.nix
M pkgs/development/libraries/libc++/default.nix
M pkgs/development/libraries/libc++abi/default.nix
M pkgs/development/libraries/libdrm/default.nix
M pkgs/development/libraries/libogg/default.nix
M pkgs/development/libraries/libpng/default.nix
M pkgs/development/libraries/libsamplerate/default.nix
M pkgs/development/libraries/libtasn1/default.nix
M pkgs/development/libraries/libtiff/default.nix
M pkgs/development/libraries/libvdpau/default.nix
M pkgs/development/libraries/ncurses/default.nix
M pkgs/development/libraries/openjpeg/default.nix
M pkgs/development/libraries/pango/default.nix
M pkgs/development/libraries/pixman/default.nix
M pkgs/development/libraries/ppl/default.nix
M pkgs/development/libraries/webkitgtk/default.nix
M pkgs/development/libraries/wxGTK-3.0/default.nix
M pkgs/development/libraries/zlib/default.nix
Log Message:
-----------
sync from master: pkgs/development/libraries/*
Picked what looked like non-intrusive changes to relatively used libs.
Commit: aed21bd6d5335924f6012cc4e7e6511d98f2a5ad
https://github.com/NixOS/nixpkgs/commit/aed21bd6d5335924f6012cc4e7e6511d98f2a5ad
Author: Vladimír Čunát <[email protected]>
Date: 2014-08-14 (Thu, 14 Aug 2014)
Changed paths:
A doc/contributing.xml
M doc/manual.xml
M doc/meta.xml
M doc/quick-start.xml
M doc/release-notes.xml
M doc/stdenv.xml
Log Message:
-----------
sync from master: doc/*
Commit: 2048460bdfd1ee402d658cf2ab7abefc84d84a96
https://github.com/NixOS/nixpkgs/commit/2048460bdfd1ee402d658cf2ab7abefc84d84a96
Author: Vladimír Čunát <[email protected]>
Date: 2014-08-14 (Thu, 14 Aug 2014)
Changed paths:
M pkgs/desktops/xfce/core/libxfce4util.nix
M pkgs/desktops/xfce/core/xfce4-appfinder.nix
M pkgs/desktops/xfce/core/xfce4-power-manager.nix
M pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix
Log Message:
-----------
sync from master: xfce minor updates
Commit: f0a363c910c4c05687feaad4416e551d66179db8
https://github.com/NixOS/nixpkgs/commit/f0a363c910c4c05687feaad4416e551d66179db8
Author: Vladimír Čunát <[email protected]>
Date: 2014-08-14 (Thu, 14 Aug 2014)
Changed paths:
M pkgs/development/compilers/llvm/3.4/clang.nix
M pkgs/development/compilers/llvm/3.4/default.nix
M pkgs/development/compilers/llvm/3.4/dragonegg.nix
M pkgs/development/compilers/llvm/3.4/lld.nix
M pkgs/development/compilers/llvm/3.4/llvm.nix
Log Message:
-----------
sync from master: llvm-3.4 maintenance update
Commit: 9cc04de7eb98572a5977deaaeaf547df5dcabd38
https://github.com/NixOS/nixpkgs/commit/9cc04de7eb98572a5977deaaeaf547df5dcabd38
Author: Vladimír Čunát <[email protected]>
Date: 2014-08-14 (Thu, 14 Aug 2014)
Changed paths:
M pkgs/servers/x11/xorg/default.nix
Log Message:
-----------
sync from master: xorg
Commit: 7d031e5a2c79f435dcc9057f26b24ab914c63a60
https://github.com/NixOS/nixpkgs/commit/7d031e5a2c79f435dcc9057f26b24ab914c63a60
Author: Cillian de Róiste <[email protected]>
Date: 2014-08-14 (Thu, 14 Aug 2014)
Changed paths:
M pkgs/applications/misc/kde-wacomtablet/default.nix
Log Message:
-----------
kde4_next.kde_wacomtablet: update from 2.0 to 2.0.2, potentially fixes
CVE-2012-4514, CVE-2012-4514
(cherry picked from commit d4fb2e83db495764ad0d5ac55fc7144628bca6ac)
Commit: b7f86f56d1fe2d980c1cb8dd17318a0f74636dcb
https://github.com/NixOS/nixpkgs/commit/b7f86f56d1fe2d980c1cb8dd17318a0f74636dcb
Author: Marc Weber <[email protected]>
Date: 2014-08-14 (Thu, 14 Aug 2014)
Changed paths:
M pkgs/servers/http/apache-httpd/2.4.nix
Log Message:
-----------
apache 2_4 update, fixes some CVE's
See http://www.apache.org/dist/httpd/Announcement2.4.html It compiles,
didn't run it. I guess minor update doesn't cause much trouble even
though there are some new features
(cherry picked from commit ba154ec9d4c06fdee2f58a57d06520ada4b7fdf7)
Commit: 5a06477a3df4677439183a1a183eefbd3d36b61c
https://github.com/NixOS/nixpkgs/commit/5a06477a3df4677439183a1a183eefbd3d36b61c
Author: Eelco Dolstra <[email protected]>
Date: 2014-08-14 (Thu, 14 Aug 2014)
Changed paths:
M pkgs/os-specific/linux/kernel/linux-3.10.nix
M pkgs/os-specific/linux/kernel/linux-3.14.nix
M pkgs/os-specific/linux/kernel/linux-3.15.nix
M pkgs/os-specific/linux/kernel/linux-3.2.nix
M pkgs/os-specific/linux/kernel/linux-3.4.nix
Log Message:
-----------
Merge pull request #3595 from wkennington/master.kernel
Kernel Updates
(cherry picked from commit 08b8eaae1cba30ed9e55c70b52d2c80c6dcaa95f)
Conflicts (skipping some intermediate bump commits):
pkgs/os-specific/linux/kernel/linux-3.10.nix
pkgs/os-specific/linux/kernel/linux-3.14.nix
pkgs/os-specific/linux/kernel/linux-3.15.nix
pkgs/os-specific/linux/kernel/linux-3.16.nix
pkgs/os-specific/linux/kernel/linux-3.4.nix
Commit: bd5036c890ddb678b897a925efb6d6624a170e03
https://github.com/NixOS/nixpkgs/commit/bd5036c890ddb678b897a925efb6d6624a170e03
Author: Vladimír Čunát <[email protected]>
Date: 2014-08-14 (Thu, 14 Aug 2014)
Changed paths:
M pkgs/development/libraries/ffmpeg/2.x.nix
Log Message:
-----------
ffmpeg: fix forgotten hash
Commit: a0e7caac60a6823ff7e4044eb69f88fa466ab04a
https://github.com/NixOS/nixpkgs/commit/a0e7caac60a6823ff7e4044eb69f88fa466ab04a
Author: Vladimír Čunát <[email protected]>
Date: 2014-08-15 (Fri, 15 Aug 2014)
Changed paths:
M pkgs/development/compilers/llvm/3.4/llvm.nix
Log Message:
-----------
llvm: fixup the paxmark phase (not here yet)
Commit: e8b62a519ae72505d56d0d6b07b7eccf852f81a2
https://github.com/NixOS/nixpkgs/commit/e8b62a519ae72505d56d0d6b07b7eccf852f81a2
Author: Vladimír Čunát <[email protected]>
Date: 2014-08-15 (Fri, 15 Aug 2014)
Changed paths:
M pkgs/servers/x11/xorg/default.nix
Log Message:
-----------
xorg: revert larger updates from master
I'll better be more conservative.
Compare: https://github.com/NixOS/nixpkgs/compare/351aec700243...e8b62a519ae7_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
