Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: 88fd7f452703f3280a3747e97b938c8e50ae962c
https://github.com/NixOS/nixpkgs/commit/88fd7f452703f3280a3747e97b938c8e50ae962c
Author: Vladimír Čunát <[email protected]>
Date: 2014-12-30 (Tue, 30 Dec 2014)
Changed paths:
M pkgs/os-specific/linux/util-linux/default.nix
Log Message:
-----------
Re-Revert merge #5505: util-linux: use /run/current-system/sw/bin/*
This reverts commit 6222093eecf1f314f82deafa3162c2ad923e66d3.
Commit: d0bad145f5e78f2be6d745da305067398722df17
https://github.com/NixOS/nixpkgs/commit/d0bad145f5e78f2be6d745da305067398722df17
Author: Alexander Kjeldaas <[email protected]>
Date: 2014-12-30 (Tue, 30 Dec 2014)
Changed paths:
M pkgs/development/perl-modules/generic/default.nix
Log Message:
-----------
perl-modules: do not create perllocal.pod, for determinism
Commit: e53471eb54aa4de31a85fe072abb9c5e0f552ffc
https://github.com/NixOS/nixpkgs/commit/e53471eb54aa4de31a85fe072abb9c5e0f552ffc
Author: Alexander Kjeldaas <[email protected]>
Date: 2014-12-30 (Tue, 30 Dec 2014)
Changed paths:
M pkgs/top-level/all-packages.nix
Log Message:
-----------
makeInitrd: use deterministic compression
Commit: d8c5d95330d9806b3ee30569de76660f3931d5ee
https://github.com/NixOS/nixpkgs/commit/d8c5d95330d9806b3ee30569de76660f3931d5ee
Author: Vladimír Čunát <[email protected]>
Date: 2014-12-30 (Tue, 30 Dec 2014)
Changed paths:
M pkgs/development/interpreters/perl/5.16/no-impure-config-time.patch
M pkgs/development/libraries/libgcrypt/no-build-timestamp.patch
M pkgs/development/libraries/libgpg-error/default.nix
M pkgs/os-specific/linux/kernel/generic.nix
M pkgs/os-specific/linux/kernel/manual-config.nix
Log Message:
-----------
determinism: change some fixed timestamp to != (time_t)0
vcunat removed the unrelated glib change.
Conflicts:
pkgs/development/libraries/glib/default.nix
pkgs/os-specific/linux/kernel/generic.nix
pkgs/os-specific/linux/kernel/manual-config.nix
Commit: 512fbb280f72980e84230b72b631258df1755919
https://github.com/NixOS/nixpkgs/commit/512fbb280f72980e84230b72b631258df1755919
Author: Domen Kožar <[email protected]>
Date: 2015-01-02 (Fri, 02 Jan 2015)
Changed paths:
M doc/stdenv.xml
M pkgs/applications/audio/caudec/default.nix
M pkgs/applications/editors/geany/default.nix
M pkgs/applications/graphics/shotwell/default.nix
M pkgs/applications/graphics/xara/default.nix
M pkgs/applications/misc/bibletime/default.nix
M pkgs/applications/misc/xiphos/default.nix
M pkgs/applications/networking/browsers/chromium/source/default.nix
M pkgs/applications/networking/cluster/kubernetes/default.nix
M pkgs/applications/networking/instant-messengers/freetalk/default.nix
M pkgs/applications/networking/instant-messengers/jitsi/default.nix
M pkgs/applications/networking/instant-messengers/kadu/default.nix
M pkgs/applications/networking/mailreaders/thunderbird/default.nix
M pkgs/applications/networking/p2p/gnunet/default.nix
M pkgs/applications/networking/p2p/gnunet/svn.nix
M pkgs/applications/science/logic/cvc4/default.nix
M pkgs/applications/science/logic/isabelle/default.nix
M pkgs/applications/video/cmplayer/default.nix
M pkgs/applications/video/mplayer2/default.nix
M pkgs/applications/video/mpv/default.nix
M pkgs/applications/virtualization/docker/default.nix
M pkgs/applications/window-managers/i3/default.nix
M pkgs/build-support/setup-hooks/patch-shebangs.sh
M pkgs/data/documentation/stdman/default.nix
M pkgs/desktops/cinnamon/cjs.nix
M pkgs/desktops/cinnamon/muffin.nix
M pkgs/desktops/gnome-3/3.12/core/caribou/default.nix
M pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix
M pkgs/desktops/gnome-3/3.12/core/vte/0.38.0.nix
M pkgs/development/compilers/go/1.1-darwin.nix
M pkgs/development/compilers/go/1.1.nix
M pkgs/development/compilers/go/1.2.nix
M pkgs/development/compilers/go/default.nix
M pkgs/development/compilers/julia/0.3.3.nix
M pkgs/development/compilers/mono/default.nix
M pkgs/development/compilers/opa/default.nix
M pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix
M pkgs/development/libraries/dbus/default.nix
M pkgs/development/libraries/folly/default.nix
M pkgs/development/libraries/hspell/default.nix
M pkgs/development/libraries/ibus/default.nix
M pkgs/development/libraries/libcouchbase/default.nix
M pkgs/development/libraries/libctemplate/default.nix
M pkgs/development/libraries/libqmi/default.nix
M pkgs/development/libraries/libsoup/default.nix
M pkgs/development/libraries/libvirt/default.nix
M pkgs/development/libraries/lirc/default.nix
M pkgs/development/libraries/mesa-darwin/default.nix
M pkgs/development/libraries/mesa/default.nix
M pkgs/development/libraries/polkit/default.nix
M pkgs/development/libraries/qpdf/default.nix
M pkgs/development/libraries/sword/default.nix
M pkgs/development/libraries/webkitgtk/2.4.6.nix
M pkgs/development/libraries/webkitgtk/default.nix
M pkgs/development/libraries/zeitgeist/default.nix
M pkgs/development/ocaml-modules/javalib/default.nix
M pkgs/development/ocaml-modules/sawja/default.nix
M pkgs/development/python-modules/dbus/default.nix
M pkgs/development/r-modules/default.nix
M pkgs/development/tools/build-managers/icmake/default.nix
M pkgs/development/tools/documentation/doxygen/default.nix
M pkgs/development/tools/misc/yodl/default.nix
M pkgs/games/crawl/default.nix
M pkgs/misc/vim-plugins/default.nix
M pkgs/os-specific/darwin/cctools-port/default.nix
M pkgs/os-specific/linux/hwdata/default.nix
M pkgs/os-specific/linux/x86info/default.nix
M pkgs/servers/amqp/rabbitmq-server/default.nix
M pkgs/servers/fleet/default.nix
M pkgs/servers/gpsd/default.nix
M pkgs/servers/http/openresty/default.nix
M pkgs/servers/nosql/rethinkdb/default.nix
M pkgs/servers/nosql/riak/1.3.1.nix
M pkgs/servers/openafs-client/default.nix
M pkgs/tools/backup/bup/default.nix
M pkgs/tools/cd-dvd/dvdisaster/default.nix
M pkgs/tools/filesystems/nixpart/0.4/pyparted.nix
M pkgs/tools/misc/convmv/default.nix
M pkgs/tools/misc/opentsdb/default.nix
M pkgs/tools/misc/parted/default.nix
M pkgs/tools/misc/pipelight/default.nix
M pkgs/tools/security/mbox/default.nix
M pkgs/tools/typesetting/tex/latex2html/default.nix
M pkgs/tools/virtualization/cloud-init/default.nix
M pkgs/top-level/perl-packages.nix
M pkgs/top-level/python-packages.nix
Log Message:
-----------
Introduce patchShebangsPhase ran in preConfigurePhases
(cherry picked from commit 91c7e8747af1fdc2a70cd98594ccbb12a5c6902d)
Signed-off-by: Domen Kožar <[email protected]>
Commit: c33716f5f6eed40fa4da766ba05717cb09668eca
https://github.com/NixOS/nixpkgs/commit/c33716f5f6eed40fa4da766ba05717cb09668eca
Author: Domen Kožar <[email protected]>
Date: 2015-01-02 (Fri, 02 Jan 2015)
Changed paths:
M doc/stdenv.xml
M pkgs/applications/audio/caudec/default.nix
M pkgs/applications/editors/geany/default.nix
M pkgs/applications/graphics/shotwell/default.nix
M pkgs/applications/graphics/xara/default.nix
M pkgs/applications/misc/bibletime/default.nix
M pkgs/applications/misc/xiphos/default.nix
M pkgs/applications/networking/browsers/chromium/source/default.nix
M pkgs/applications/networking/cluster/kubernetes/default.nix
M pkgs/applications/networking/instant-messengers/freetalk/default.nix
M pkgs/applications/networking/instant-messengers/jitsi/default.nix
M pkgs/applications/networking/instant-messengers/kadu/default.nix
M pkgs/applications/networking/mailreaders/thunderbird/default.nix
M pkgs/applications/networking/p2p/gnunet/default.nix
M pkgs/applications/networking/p2p/gnunet/svn.nix
M pkgs/applications/science/logic/cvc4/default.nix
M pkgs/applications/science/logic/isabelle/default.nix
M pkgs/applications/video/cmplayer/default.nix
M pkgs/applications/video/mplayer2/default.nix
M pkgs/applications/video/mpv/default.nix
M pkgs/applications/virtualization/docker/default.nix
M pkgs/applications/window-managers/i3/default.nix
M pkgs/build-support/setup-hooks/patch-shebangs.sh
M pkgs/data/documentation/stdman/default.nix
M pkgs/desktops/cinnamon/cjs.nix
M pkgs/desktops/cinnamon/muffin.nix
M pkgs/desktops/gnome-3/3.12/core/caribou/default.nix
M pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix
M pkgs/desktops/gnome-3/3.12/core/vte/0.38.0.nix
M pkgs/development/compilers/go/1.1-darwin.nix
M pkgs/development/compilers/go/1.1.nix
M pkgs/development/compilers/go/1.2.nix
M pkgs/development/compilers/go/default.nix
M pkgs/development/compilers/julia/0.3.3.nix
M pkgs/development/compilers/mono/default.nix
M pkgs/development/compilers/opa/default.nix
M pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix
M pkgs/development/libraries/dbus/default.nix
M pkgs/development/libraries/folly/default.nix
M pkgs/development/libraries/hspell/default.nix
M pkgs/development/libraries/ibus/default.nix
M pkgs/development/libraries/libcouchbase/default.nix
M pkgs/development/libraries/libctemplate/default.nix
M pkgs/development/libraries/libqmi/default.nix
M pkgs/development/libraries/libsoup/default.nix
M pkgs/development/libraries/libvirt/default.nix
M pkgs/development/libraries/lirc/default.nix
M pkgs/development/libraries/mesa-darwin/default.nix
M pkgs/development/libraries/mesa/default.nix
M pkgs/development/libraries/polkit/default.nix
M pkgs/development/libraries/qpdf/default.nix
M pkgs/development/libraries/sword/default.nix
M pkgs/development/libraries/webkitgtk/2.4.6.nix
M pkgs/development/libraries/webkitgtk/default.nix
M pkgs/development/libraries/zeitgeist/default.nix
M pkgs/development/ocaml-modules/javalib/default.nix
M pkgs/development/ocaml-modules/sawja/default.nix
M pkgs/development/python-modules/dbus/default.nix
M pkgs/development/r-modules/default.nix
M pkgs/development/tools/build-managers/icmake/default.nix
M pkgs/development/tools/documentation/doxygen/default.nix
M pkgs/development/tools/misc/yodl/default.nix
M pkgs/games/crawl/default.nix
M pkgs/misc/vim-plugins/default.nix
M pkgs/os-specific/darwin/cctools-port/default.nix
M pkgs/os-specific/linux/hwdata/default.nix
M pkgs/os-specific/linux/x86info/default.nix
M pkgs/servers/amqp/rabbitmq-server/default.nix
M pkgs/servers/fleet/default.nix
M pkgs/servers/gpsd/default.nix
M pkgs/servers/http/openresty/default.nix
M pkgs/servers/nosql/rethinkdb/default.nix
M pkgs/servers/nosql/riak/1.3.1.nix
M pkgs/servers/openafs-client/default.nix
M pkgs/tools/backup/bup/default.nix
M pkgs/tools/cd-dvd/dvdisaster/default.nix
M pkgs/tools/filesystems/nixpart/0.4/pyparted.nix
M pkgs/tools/misc/convmv/default.nix
M pkgs/tools/misc/opentsdb/default.nix
M pkgs/tools/misc/parted/default.nix
M pkgs/tools/misc/pipelight/default.nix
M pkgs/tools/security/mbox/default.nix
M pkgs/tools/typesetting/tex/latex2html/default.nix
M pkgs/tools/virtualization/cloud-init/default.nix
M pkgs/top-level/perl-packages.nix
M pkgs/top-level/python-packages.nix
Log Message:
-----------
Merge pull request #5525 from iElectric/staging.patchShebangs
Introduce patchShebangsPhase in preConfigurePhases
Commit: c510f3da4980feab839b24a5f953a669358794a8
https://github.com/NixOS/nixpkgs/commit/c510f3da4980feab839b24a5f953a669358794a8
Author: Domen Kožar <[email protected]>
Date: 2015-01-02 (Fri, 02 Jan 2015)
Changed paths:
M pkgs/os-specific/linux/kernel/manual-config.nix
Log Message:
-----------
fix eval /cc @vcunat
Commit: 6671aff83e4082f3a825c456cf259b9e30ae702c
https://github.com/NixOS/nixpkgs/commit/6671aff83e4082f3a825c456cf259b9e30ae702c
Author: Vladimír Čunát <[email protected]>
Date: 2015-01-03 (Sat, 03 Jan 2015)
Changed paths:
M pkgs/os-specific/linux/kernel/generic.nix
M pkgs/os-specific/linux/kernel/manual-config.nix
Log Message:
-----------
linux kernel determinism: unify timestamp style
Testing showed the linux build is sensitive to /usr/include/ncursesw
unless chrooted (on non-nixos).
On a single chrooted nixos machine, -A linux is binary reproducible.
CC #2281 & @alexanderkjeldaas.
Commit: 9b7b2ce8eb855b99598183b06bbd2f021e01d359
https://github.com/NixOS/nixpkgs/commit/9b7b2ce8eb855b99598183b06bbd2f021e01d359
Author: Domen Kožar <[email protected]>
Date: 2015-01-08 (Thu, 08 Jan 2015)
Changed paths:
M doc/stdenv.xml
M pkgs/applications/audio/caudec/default.nix
M pkgs/applications/editors/geany/default.nix
M pkgs/applications/graphics/shotwell/default.nix
M pkgs/applications/graphics/xara/default.nix
M pkgs/applications/misc/bibletime/default.nix
M pkgs/applications/misc/xiphos/default.nix
M pkgs/applications/networking/browsers/chromium/source/default.nix
M pkgs/applications/networking/cluster/kubernetes/default.nix
M pkgs/applications/networking/instant-messengers/freetalk/default.nix
M pkgs/applications/networking/instant-messengers/jitsi/default.nix
M pkgs/applications/networking/instant-messengers/kadu/default.nix
M pkgs/applications/networking/mailreaders/thunderbird/default.nix
M pkgs/applications/networking/p2p/gnunet/default.nix
M pkgs/applications/networking/p2p/gnunet/svn.nix
M pkgs/applications/science/logic/cvc4/default.nix
M pkgs/applications/science/logic/isabelle/default.nix
M pkgs/applications/video/cmplayer/default.nix
M pkgs/applications/video/mplayer2/default.nix
M pkgs/applications/video/mpv/default.nix
M pkgs/applications/virtualization/docker/default.nix
M pkgs/applications/window-managers/i3/default.nix
M pkgs/build-support/setup-hooks/patch-shebangs.sh
M pkgs/data/documentation/stdman/default.nix
M pkgs/desktops/cinnamon/cjs.nix
M pkgs/desktops/cinnamon/muffin.nix
M pkgs/desktops/gnome-3/3.12/core/caribou/default.nix
M pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix
M pkgs/desktops/gnome-3/3.12/core/vte/0.38.0.nix
M pkgs/development/compilers/go/1.1-darwin.nix
M pkgs/development/compilers/go/1.1.nix
M pkgs/development/compilers/go/1.2.nix
M pkgs/development/compilers/go/default.nix
M pkgs/development/compilers/julia/0.3.3.nix
M pkgs/development/compilers/mono/default.nix
M pkgs/development/compilers/opa/default.nix
M pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix
M pkgs/development/libraries/dbus/default.nix
M pkgs/development/libraries/folly/default.nix
M pkgs/development/libraries/hspell/default.nix
M pkgs/development/libraries/ibus/default.nix
M pkgs/development/libraries/libcouchbase/default.nix
M pkgs/development/libraries/libctemplate/default.nix
M pkgs/development/libraries/libqmi/default.nix
M pkgs/development/libraries/libsoup/default.nix
M pkgs/development/libraries/libvirt/default.nix
M pkgs/development/libraries/lirc/default.nix
M pkgs/development/libraries/mesa-darwin/default.nix
M pkgs/development/libraries/mesa/default.nix
M pkgs/development/libraries/polkit/default.nix
M pkgs/development/libraries/qpdf/default.nix
M pkgs/development/libraries/sword/default.nix
M pkgs/development/libraries/webkitgtk/2.4.6.nix
M pkgs/development/libraries/webkitgtk/default.nix
M pkgs/development/libraries/zeitgeist/default.nix
M pkgs/development/ocaml-modules/javalib/default.nix
M pkgs/development/ocaml-modules/sawja/default.nix
M pkgs/development/python-modules/dbus/default.nix
M pkgs/development/r-modules/default.nix
M pkgs/development/tools/build-managers/icmake/default.nix
M pkgs/development/tools/documentation/doxygen/default.nix
M pkgs/development/tools/misc/yodl/default.nix
M pkgs/games/crawl/default.nix
M pkgs/misc/vim-plugins/default.nix
M pkgs/os-specific/darwin/cctools-port/default.nix
M pkgs/os-specific/linux/hwdata/default.nix
M pkgs/os-specific/linux/x86info/default.nix
M pkgs/servers/amqp/rabbitmq-server/default.nix
M pkgs/servers/fleet/default.nix
M pkgs/servers/gpsd/default.nix
M pkgs/servers/http/openresty/default.nix
M pkgs/servers/nosql/rethinkdb/default.nix
M pkgs/servers/nosql/riak/1.3.1.nix
M pkgs/servers/openafs-client/default.nix
M pkgs/tools/backup/bup/default.nix
M pkgs/tools/cd-dvd/dvdisaster/default.nix
M pkgs/tools/filesystems/nixpart/0.4/pyparted.nix
M pkgs/tools/misc/convmv/default.nix
M pkgs/tools/misc/opentsdb/default.nix
M pkgs/tools/misc/parted/default.nix
M pkgs/tools/misc/pipelight/default.nix
M pkgs/tools/security/mbox/default.nix
M pkgs/tools/typesetting/tex/latex2html/default.nix
M pkgs/tools/virtualization/cloud-init/default.nix
M pkgs/top-level/perl-packages.nix
M pkgs/top-level/python-packages.nix
Log Message:
-----------
Revert "Introduce patchShebangsPhase ran in preConfigurePhases"
This reverts commit 512fbb280f72980e84230b72b631258df1755919.
See #5368
Commit: 71c3c1963899e0bc6e18e32a7191670993c3e583
https://github.com/NixOS/nixpkgs/commit/71c3c1963899e0bc6e18e32a7191670993c3e583
Author: Eelco Dolstra <[email protected]>
Date: 2015-01-12 (Mon, 12 Jan 2015)
Changed paths:
M pkgs/stdenv/generic/setup.sh
Log Message:
-----------
stdenv: Remove redundant "building ..." message
Nix already shows what paths are being built.
Commit: 2533a1124192c9da20087514986c3d37cc106c15
https://github.com/NixOS/nixpkgs/commit/2533a1124192c9da20087514986c3d37cc106c15
Author: Vladimír Čunát <[email protected]>
Date: 2015-01-13 (Tue, 13 Jan 2015)
Changed paths:
M pkgs/stdenv/generic/setup.sh
Log Message:
-----------
stdenv substitute: avoid using a temporary file
- IMO using a temporary is not needed here (anymore),
- temporary at that location can cause a problem (in a specific case):
for example, when using the substituteAll function from nixpkgs
on a single file directly under /nix/store/ (or ./foo-file),
the stdenv's substitute tries to create a temporary directly under
/nix/store, which causes problems on chrooted darwin
(according to @copumpkin earlier today on IRC)
Commit: 309b956215309b7cc17a3877b98eba062969f8f3
https://github.com/NixOS/nixpkgs/commit/309b956215309b7cc17a3877b98eba062969f8f3
Author: Vladimír Čunát <[email protected]>
Date: 2015-01-13 (Tue, 13 Jan 2015)
Changed paths:
M lib/licenses.nix
Log Message:
-----------
lib/licenses: add IJG (Independent JPEG...)
Commit: 51fdc6e2385116bf28cb21c1b94b025b1c4055f4
https://github.com/NixOS/nixpkgs/commit/51fdc6e2385116bf28cb21c1b94b025b1c4055f4
Author: Vladimír Čunát <[email protected]>
Date: 2015-01-13 (Tue, 13 Jan 2015)
Changed paths:
M pkgs/development/libraries/libjpeg-turbo/default.nix
Log Message:
-----------
libjpeg-turbo: major update, and populate meta
TODO: also some darwin packaging improvements were in the news.
Maybe it would be suitable to have this as the default libjpeg in there.
Commit: e85c899f8d247d26d5f76849187d96f623546555
https://github.com/NixOS/nixpkgs/commit/e85c899f8d247d26d5f76849187d96f623546555
Author: Vladimír Čunát <[email protected]>
Date: 2015-01-13 (Tue, 13 Jan 2015)
Changed paths:
M pkgs/development/libraries/harfbuzz/default.nix
Log Message:
-----------
harfbuzz: small update
Commit: 1c0477c08cfcb04d41bf7c0b828d642ce2956b4d
https://github.com/NixOS/nixpkgs/commit/1c0477c08cfcb04d41bf7c0b828d642ce2956b4d
Author: Vladimír Čunát <[email protected]>
Date: 2015-01-13 (Tue, 13 Jan 2015)
Changed paths:
M pkgs/development/libraries/dbus/default.nix
Log Message:
-----------
dbus: a security-hardening update
Commit: 1575bc652eeee758816d63efccd1ab6eca16d2c9
https://github.com/NixOS/nixpkgs/commit/1575bc652eeee758816d63efccd1ab6eca16d2c9
Author: Vladimír Čunát <[email protected]>
Date: 2015-01-13 (Tue, 13 Jan 2015)
Changed paths:
M README.md
M default.nix
M lib/attrsets.nix
M lib/customisation.nix
M lib/maintainers.nix
M lib/modules.nix
M lib/options.nix
M maintainers/scripts/travis-nox-review-pr.sh
M nixos/doc/manual/administration/control-groups.xml
M nixos/doc/manual/configuration/summary.xml
M nixos/doc/manual/default.nix
M nixos/doc/manual/installation/obtaining.xml
M nixos/doc/manual/installation/upgrading.xml
M nixos/doc/manual/man-nixos-install.xml
M nixos/doc/manual/man-pages.xml
M nixos/doc/manual/options-to-docbook.xsl
M nixos/doc/manual/release-notes/rl-1412.xml
M nixos/maintainers/scripts/ec2/create-ebs-amis.py
M nixos/maintainers/scripts/ec2/create-s3-amis.sh
M nixos/maintainers/scripts/ec2/ebs-creator.nix
M nixos/maintainers/scripts/gce/create-gce.sh
M nixos/modules/config/users-groups.nix
M nixos/modules/misc/ids.nix
M nixos/modules/module-list.nix
M nixos/modules/profiles/base.nix
M nixos/modules/programs/zsh/zsh.nix
M nixos/modules/rename.nix
M nixos/modules/security/pam.nix
M nixos/modules/security/rngd.nix
M nixos/modules/services/databases/postgresql.xml
M nixos/modules/services/mail/postfix.nix
M nixos/modules/services/misc/nix-daemon.nix
M nixos/modules/services/monitoring/dd-agent.nix
M nixos/modules/services/monitoring/riemann.nix
M nixos/modules/services/network-filesystems/samba.nix
A nixos/modules/services/networking/mstpd.nix
M nixos/modules/services/networking/ssh/sshd.nix
M nixos/modules/services/networking/unifi.nix
M nixos/modules/services/search/solr.nix
A nixos/modules/services/security/fprintd.nix
M nixos/modules/services/web-servers/winstone.nix
M nixos/modules/system/boot/systemd.nix
M nixos/modules/tasks/network-interfaces-scripted.nix
M nixos/modules/tasks/network-interfaces.nix
M nixos/modules/virtualisation/containers.nix
M nixos/modules/virtualisation/google-compute-image.nix
M nixos/release-small.nix
M pkgs/applications/audio/faust-compiler/default.nix
M pkgs/applications/audio/faust/default.nix
A pkgs/applications/audio/fmit/default.nix
M pkgs/applications/audio/lmms/default.nix
M pkgs/applications/audio/mp3gain/default.nix
M pkgs/applications/audio/mpg321/default.nix
M pkgs/applications/audio/pianobar/default.nix
M pkgs/applications/audio/yoshimi/default.nix
M pkgs/applications/editors/eclipse/default.nix
A pkgs/applications/editors/emacs-24/at-fdcwd.patch
M pkgs/applications/editors/emacs-24/default.nix
A pkgs/applications/editors/emacs-modes/d/default.nix
M pkgs/applications/editors/idea/default.nix
M pkgs/applications/editors/jedit/default.nix
M pkgs/applications/editors/netbeans/default.nix
M pkgs/applications/graphics/darktable/default.nix
M pkgs/applications/graphics/geeqie/default.nix
M pkgs/applications/misc/blender/default.nix
M pkgs/applications/misc/calibre/default.nix
M pkgs/applications/misc/k3b/default.nix
M pkgs/applications/misc/mediainfo-gui/default.nix
M pkgs/applications/misc/mediainfo/default.nix
M pkgs/applications/misc/pgadmin/default.nix
M pkgs/applications/misc/qtbitcointrader/default.nix
A pkgs/applications/misc/workrave/default.nix
M pkgs/applications/misc/zathura/core/default.nix
M pkgs/applications/networking/bittorrentsync/default.nix
M
pkgs/applications/networking/browsers/chromium/source/sandbox_userns_36.patch
M pkgs/applications/networking/browsers/midori/default.nix
A pkgs/applications/networking/enhanced-ctorrent/default.nix
M pkgs/applications/networking/instant-messengers/baresip/default.nix
M pkgs/applications/networking/instant-messengers/freetalk/default.nix
M pkgs/applications/networking/instant-messengers/mcabber/default.nix
A pkgs/applications/networking/instant-messengers/profanity/default.nix
M
pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
M pkgs/applications/networking/mailreaders/notmuch/default.nix
M pkgs/applications/networking/mailreaders/sylpheed/default.nix
M pkgs/applications/networking/msmtp/default.nix
M pkgs/applications/networking/mumble/default.nix
M pkgs/applications/networking/pond/default.nix
M pkgs/applications/networking/remote/ssvnc/default.nix
M pkgs/applications/networking/seafile-client/default.nix
M pkgs/applications/networking/sniffers/wireshark/default.nix
M pkgs/applications/networking/syncthing/default.nix
M pkgs/applications/office/calligra/default.nix
R pkgs/applications/office/calligra/fix-kde4.10-build.patch
A pkgs/applications/office/calligra/librevenge.patch
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/science/logic/abc/default.nix
M pkgs/applications/science/logic/alt-ergo/default.nix
M pkgs/applications/science/logic/matita/130312.nix
M pkgs/applications/version-management/git-and-tools/default.nix
M pkgs/applications/version-management/git-and-tools/fast-export/default.nix
M pkgs/applications/version-management/git-and-tools/git-annex/default.nix
M pkgs/applications/version-management/git-and-tools/hub/default.nix
M pkgs/applications/version-management/mercurial/default.nix
M pkgs/applications/version-management/smartgithg/default.nix
M pkgs/applications/version-management/subversion/default.nix
M pkgs/applications/video/handbrake/default.nix
M pkgs/applications/video/miro/default.nix
M pkgs/applications/video/mkvtoolnix/default.nix
M pkgs/applications/video/simplescreenrecorder/default.nix
M pkgs/applications/video/smtube/default.nix
M pkgs/applications/virtualization/xen/default.nix
R pkgs/applications/virtualization/xen/gcc-4.5.patch
R pkgs/applications/virtualization/xen/has-header.patch
M pkgs/applications/window-managers/stumpwm/default.nix
M pkgs/build-support/cabal/default.nix
A pkgs/build-support/cabal/ghcjs.nix
M pkgs/build-support/fetchgit/default.nix
M pkgs/build-support/gcc-wrapper/setup-hook.sh
M pkgs/build-support/release/ant-build.nix
M pkgs/build-support/vm/default.nix
M pkgs/desktops/e19/enlightenment.nix
M pkgs/desktops/e19/rage.nix
M pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix
M pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix
M pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix
M pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix
M pkgs/desktops/gnome-3/3.12/core/yelp/default.nix
M pkgs/desktops/gnome-3/3.12/misc/geary/default.nix
M pkgs/development/compilers/aldor/default.nix
M pkgs/development/compilers/ats/default.nix
M pkgs/development/compilers/ats2/default.nix
M pkgs/development/compilers/bigloo/default.nix
A pkgs/development/compilers/elm/0001-remove-custom-build-step.patch
M pkgs/development/compilers/elm/elm-make.nix
M pkgs/development/compilers/elm/elm-reactor.nix
M pkgs/development/compilers/ghc/head.nix
A pkgs/development/compilers/ghcjs/default.nix
A pkgs/development/compilers/ghcjs/ghcjs.patch
A pkgs/development/compilers/ghcjs/wrapper.nix
M pkgs/development/compilers/go/1.3.nix
A pkgs/development/compilers/go/1.4.nix
A pkgs/development/compilers/go/cacert-1.4.patch
M pkgs/development/compilers/go/gox.nix
A pkgs/development/compilers/hop/default.nix
M pkgs/development/compilers/icedtea-web/default.nix
A pkgs/development/compilers/icedtea/currency-date-range.patch
M pkgs/development/compilers/icedtea/default.nix
R pkgs/development/compilers/julia/0.3.3.nix
A pkgs/development/compilers/julia/0.3.5.nix
M pkgs/development/compilers/mercury/default.nix
M pkgs/development/compilers/openjdk-darwin/default.nix
A pkgs/development/compilers/openjdk/currency-date-range.patch
M pkgs/development/compilers/openjdk/default.nix
M pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
M pkgs/development/compilers/pakcs/adjust-buildsystem.patch
M pkgs/development/compilers/pakcs/default.nix
M pkgs/development/compilers/rustc/0.12.nix
M pkgs/development/compilers/rustc/common.nix
M pkgs/development/compilers/rustc/head.nix
A pkgs/development/compilers/sbcl/1.2.5.nix
M pkgs/development/compilers/sbcl/default.nix
A pkgs/development/coq-modules/fiat/default.nix
A pkgs/development/haskell-modules/compat-layer.nix
A pkgs/development/haskell-modules/configuration-common.nix
A pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
A pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
A pkgs/development/haskell-modules/configuration-ghc-7.9.x.nix
A pkgs/development/haskell-modules/configuration-ghcjs.nix
A pkgs/development/haskell-modules/default.nix
A pkgs/development/haskell-modules/generic-builder.nix
A pkgs/development/haskell-modules/ghc-paths-nix.patch
A pkgs/development/haskell-modules/hackage-packages.nix
A pkgs/development/haskell-modules/lib.nix
A pkgs/development/haskell-modules/with-packages-wrapper.nix
M pkgs/development/interpreters/octave/default.nix
M pkgs/development/interpreters/php/5.4.nix
M pkgs/development/interpreters/python/3.4/default.nix
M pkgs/development/interpreters/ruby/generated.nix
M pkgs/development/libraries/adns/default.nix
M pkgs/development/libraries/allegro/5-unstable.nix
M pkgs/development/libraries/botan/default.nix
M pkgs/development/libraries/botan/default.upstream
M pkgs/development/libraries/botan/generic.nix
M pkgs/development/libraries/botan/unstable.nix
M pkgs/development/libraries/botan/unstable.upstream
M pkgs/development/libraries/capnproto/default.nix
A pkgs/development/libraries/ctdb/default.nix
M pkgs/development/libraries/cyrus-sasl/default.nix
M pkgs/development/libraries/gdal/default.nix
M pkgs/development/libraries/gdome2/default.nix
A pkgs/development/libraries/gdome2/xml-document.patch
M pkgs/development/libraries/getdata/default.nix
A pkgs/development/libraries/gettext/0.19.nix
M pkgs/development/libraries/gettext/default.nix
M pkgs/development/libraries/glib/default.nix
M pkgs/development/libraries/gperftools/default.nix
R pkgs/development/libraries/haskell/Cabal/1.20.0.2.nix
A pkgs/development/libraries/haskell/Cabal/1.20.0.3.nix
A pkgs/development/libraries/haskell/Cabal/1.22.0.0.nix
M pkgs/development/libraries/haskell/HaTeX/default.nix
M pkgs/development/libraries/haskell/HsOpenSSL/default.nix
A pkgs/development/libraries/haskell/classy-prelude-yesod/default.nix
A pkgs/development/libraries/haskell/diagrams/builder/default.nix
A pkgs/development/libraries/haskell/diagrams/builder/wrapper.nix
A pkgs/development/libraries/haskell/exhaustive/default.nix
M pkgs/development/libraries/haskell/ghc-mod/default.nix
M pkgs/development/libraries/haskell/ghcjs-dom/default.nix
A pkgs/development/libraries/haskell/ghcjs-prim/default.nix
M pkgs/development/libraries/haskell/hask/default.nix
M pkgs/development/libraries/haskell/hledger-lib/default.nix
M pkgs/development/libraries/haskell/hledger-web/default.nix
M pkgs/development/libraries/haskell/hledger/default.nix
A pkgs/development/libraries/haskell/intern/default.nix
M pkgs/development/libraries/haskell/ipprint/default.nix
M pkgs/development/libraries/haskell/machines-directory/default.nix
M pkgs/development/libraries/haskell/machines-io/default.nix
M pkgs/development/libraries/haskell/netwire/default.nix
A pkgs/development/libraries/haskell/non-empty/default.nix
A pkgs/development/libraries/haskell/psqueues/default.nix
M pkgs/development/libraries/haskell/purescript/default.nix
A pkgs/development/libraries/haskell/reverse-apply/default.nix
A pkgs/development/libraries/haskell/sitemap/default.nix
A pkgs/development/libraries/haskell/slack-api/default.nix
M pkgs/development/libraries/haskell/taggy/default.nix
A pkgs/development/libraries/haskell/unique/default.nix
M pkgs/development/libraries/haskell/webkit/default.nix
A pkgs/development/libraries/haskell/webkitgtk3/default.nix
A pkgs/development/libraries/haskell/xmonad-screenshot/default.nix
A pkgs/development/libraries/haskell/yesod-newsfeed/default.nix
M pkgs/development/libraries/iniparser/default.nix
M pkgs/development/libraries/kerberos/heimdal.nix
M pkgs/development/libraries/ldb/default.nix
A pkgs/development/libraries/libfprint/0001-lib-Add-VFS5011-driver.patch
A pkgs/development/libraries/libfprint/default.nix
A pkgs/development/libraries/libfprint/master.nix
M pkgs/development/libraries/libgphoto2/default.nix
M pkgs/development/libraries/libmediainfo/default.nix
M pkgs/development/libraries/libmwaw/default.nix
M pkgs/development/libraries/librevenge/default.nix
M pkgs/development/libraries/libsearpc/default.nix
M pkgs/development/libraries/libsoup/default.nix
A pkgs/development/libraries/libstrophe/default.nix
M pkgs/development/libraries/libu2f-host/default.nix
M pkgs/development/libraries/libva/default.nix
M pkgs/development/libraries/loudmouth/default.nix
M pkgs/development/libraries/mdds/default.nix
M pkgs/development/libraries/mpfr/default.nix
M pkgs/development/libraries/nss/nss-3.17-gentoo-fixups.patch
A pkgs/development/libraries/ntdb/default.nix
M pkgs/development/libraries/openssl/default.nix
R pkgs/development/libraries/openssl/no-date-in-library.patch
M pkgs/development/libraries/portmidi/default.nix
M pkgs/development/libraries/science/math/ipopt/default.nix
M pkgs/development/libraries/serf/default.nix
M pkgs/development/libraries/skalibs/default.nix
R pkgs/development/libraries/skalibs/getpeereid.patch
A pkgs/development/libraries/svrcore/default.nix
M pkgs/development/libraries/t1lib/default.nix
M pkgs/development/libraries/talloc/default.nix
M pkgs/development/libraries/tdb/default.nix
M pkgs/development/libraries/tevent/default.nix
M pkgs/development/libraries/ti-rpc/default.nix
A pkgs/development/libraries/uthash/default.nix
M pkgs/development/libraries/vaapi-intel/default.nix
M pkgs/development/libraries/webkitgtk/2.4.6.nix
M pkgs/development/libraries/webkitgtk/default.nix
M pkgs/development/libraries/zlib/default.nix
M pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix
M pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix
M pkgs/development/mobile/titaniumenv/titaniumsdk-3.3.nix
M pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix
M pkgs/development/ocaml-modules/camlpdf/default.nix
A pkgs/development/ocaml-modules/config-file/default.nix
A pkgs/development/ocaml-modules/gtktop/default.nix
A pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix
A pkgs/development/ocaml-modules/lablgtk-extras/default.nix
M pkgs/development/ocaml-modules/lablgtkmathview/default.nix
M pkgs/development/ocaml-modules/lambda-term/default.nix
A pkgs/development/ocaml-modules/re/default.nix
A pkgs/development/ocaml-modules/stringext/default.nix
A pkgs/development/ocaml-modules/uri/default.nix
M pkgs/development/python-modules/pycrypto/default.nix
M pkgs/development/r-modules/cran-packages.nix
M pkgs/development/r-modules/default.nix
A pkgs/development/tools/analysis/coan/default.nix
M pkgs/development/tools/build-managers/cargo/common.nix
M pkgs/development/tools/build-managers/cargo/snapshot.nix
A pkgs/development/tools/build-managers/gnumake/4.1/default.nix
A pkgs/development/tools/build-managers/gnumake/4.1/impure-dirs.patch
M pkgs/development/tools/build-managers/leiningen/builder.sh
M pkgs/development/tools/build-managers/leiningen/default.nix
R pkgs/development/tools/build-managers/skarnet/default.nix
R pkgs/development/tools/build-managers/skarnet/setup-hook.sh
M pkgs/development/tools/golint/default.nix
M pkgs/development/tools/haskell/cabal2nix/default.nix
M pkgs/development/tools/haskell/ihaskell/wrapper.nix
A pkgs/development/tools/haskell/liquid-fixpoint/default.nix
A pkgs/development/tools/haskell/liquidhaskell/default.nix
M pkgs/development/tools/libsigrok/default.nix
M pkgs/development/tools/misc/ccache/default.nix
M pkgs/development/tools/misc/coccinelle/default.nix
M pkgs/development/tools/misc/dfu-programmer/default.nix
A pkgs/development/tools/misc/fswatch/default.nix
M pkgs/development/tools/misc/gdb/default.nix
M pkgs/development/tools/misc/grafana/default.nix
M pkgs/development/tools/neoload/default.nix
M pkgs/development/tools/rust/racer/default.nix
M pkgs/development/tools/sqsh/default.nix
M pkgs/development/web/grails/default.nix
M pkgs/games/dwarf-fortress/default.nix
M pkgs/games/gltron/default.nix
M pkgs/games/gnuchess/default.nix
M pkgs/games/minecraft-server/default.nix
M pkgs/games/openarena/default.nix
M pkgs/misc/emulators/dolphin-emu/master.nix
A pkgs/misc/emulators/fs-uae/default.nix
M pkgs/misc/emulators/wine/unstable.nix
M pkgs/misc/seafile-shared/default.nix
M pkgs/os-specific/linux/afuse/default.nix
M pkgs/os-specific/linux/cifs-utils/default.nix
M pkgs/os-specific/linux/firmware/iwlwifi/default.nix
A pkgs/os-specific/linux/flashbench/default.nix
M pkgs/os-specific/linux/kernel/common-config.nix
M pkgs/os-specific/linux/kernel/linux-3.10.nix
M pkgs/os-specific/linux/kernel/linux-3.14.nix
R pkgs/os-specific/linux/kernel/linux-3.16.nix
M pkgs/os-specific/linux/kernel/linux-3.17.nix
M pkgs/os-specific/linux/kernel/linux-3.18.nix
M pkgs/os-specific/linux/kernel/linux-3.2.nix
M pkgs/os-specific/linux/kernel/patches.nix
A pkgs/os-specific/linux/mstpd/default.nix
A pkgs/os-specific/linux/mstpd/fixes.patch
M pkgs/os-specific/linux/pam_krb5/default.nix
A pkgs/os-specific/linux/radeontop/default.nix
M pkgs/os-specific/linux/s6-linux-utils/default.nix
M pkgs/os-specific/linux/spl/git.nix
A pkgs/os-specific/linux/spl/install_prefix-git.patch
R pkgs/os-specific/linux/spl/kernel-3.16.patch
R pkgs/os-specific/linux/spl/kernel-3.17.patch
M pkgs/os-specific/linux/util-linux/default.nix
A pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch
R pkgs/os-specific/linux/zfs/bc151f7b312dea09c6ec5b9a320e65140789643a.patch
M pkgs/os-specific/linux/zfs/default.nix
M pkgs/os-specific/linux/zfs/git.nix
A pkgs/os-specific/linux/zfs/nix-build-git.patch
R pkgs/os-specific/linux/zfs/remove-lock-checks.patch
M pkgs/servers/http/lighttpd/default.nix
M pkgs/servers/http/nginx/default.nix
M pkgs/servers/http/nginx/unstable.nix
M pkgs/servers/http/nix-binary-cache/nix-binary-cache-start.in
M pkgs/servers/http/nix-binary-cache/nix-binary-cache.cgi.in
M pkgs/servers/http/yaws/default.nix
A pkgs/servers/ldap/389/default.nix
A pkgs/servers/ldap/389/no-etc.patch
A pkgs/servers/ldap/389/perl-path.patch
M pkgs/servers/mail/dovecot/default.nix
M pkgs/servers/monitoring/bosun/default.nix
M pkgs/servers/monitoring/munin/default.nix
M pkgs/servers/monitoring/net-snmp/default.nix
M pkgs/servers/monitoring/riemann/default.nix
M pkgs/servers/mpd/default.nix
M pkgs/servers/nosql/hyperdex/default.nix
M pkgs/servers/openafs-client/default.nix
M pkgs/servers/s6/default.nix
A pkgs/servers/samba/3.x.nix
A pkgs/servers/samba/4.x-no-persistent-install.patch
A pkgs/servers/samba/4.x.nix
R pkgs/servers/samba/default.nix
M pkgs/servers/search/elasticsearch/default.nix
M pkgs/servers/search/elasticsearch/es-home.patch
A pkgs/servers/sql/postgresql/9.4.x.nix
R pkgs/servers/sql/postgresql/9.4beta2.nix
R pkgs/servers/sql/postgresql/9.4beta3.nix
M pkgs/servers/x11/xquartz/default.nix
M pkgs/servers/xmpp/prosody/default.nix
M pkgs/stdenv/generic/default.nix
M pkgs/stdenv/linux/default.nix
M pkgs/tools/X11/xkb-switch/default.nix
A pkgs/tools/archivers/unzip/CVE-2014-8139.diff
A pkgs/tools/archivers/unzip/CVE-2014-8140.diff
A pkgs/tools/archivers/unzip/CVE-2014-8141.diff
M pkgs/tools/archivers/unzip/default.nix
A pkgs/tools/audio/beets/default.nix
A pkgs/tools/audio/beets/mediafile-codec-fix.patch
A pkgs/tools/audio/beets/replaygain-default-audiotools.patch
A pkgs/tools/audio/beets/test-bucket-fix-year.patch
M pkgs/tools/audio/mpdcron/default.nix
A pkgs/tools/audio/qastools/default.nix
M pkgs/tools/backup/attic/default.nix
A pkgs/tools/compression/dtrx/default.nix
A pkgs/tools/filesystems/boxfs/default.nix
M pkgs/tools/filesystems/btrfsprogs/default.nix
M pkgs/tools/filesystems/ceph/default.nix
M pkgs/tools/filesystems/duff/default.nix
A pkgs/tools/filesystems/go-mtpfs/default.nix
A pkgs/tools/filesystems/mp3fs/default.nix
A pkgs/tools/graphics/graphviz/0001-vimdot-lookup-vim-in-PATH.patch
M pkgs/tools/graphics/graphviz/default.nix
A pkgs/tools/graphics/unpaper/default.nix
M pkgs/tools/graphics/zxing/default.nix
A pkgs/tools/misc/bibtool/default.nix
A pkgs/tools/misc/ddate/default.nix
M pkgs/tools/misc/execline/default.nix
M pkgs/tools/misc/expect/default.nix
M pkgs/tools/misc/fontforge/default.nix
M pkgs/tools/misc/ipxe/default.nix
M pkgs/tools/misc/ldapvi/default.nix
M pkgs/tools/misc/logstash-forwarder/default.nix
M pkgs/tools/misc/mdbtools/git.nix
M pkgs/tools/misc/mysql2pgsql/default.nix
M pkgs/tools/misc/pipelight/default.nix
M pkgs/tools/misc/s6-portable-utils/default.nix
R pkgs/tools/misc/shebangfix/default.nix
R pkgs/tools/misc/shebangfix/shebangfix.pl
A pkgs/tools/misc/svtplay-dl/default.nix
M pkgs/tools/misc/youtube-dl/default.nix
M pkgs/tools/misc/yubikey-personalization-gui/default.nix
M pkgs/tools/misc/yubikey-personalization/default.nix
M pkgs/tools/networking/ccnet/default.nix
M pkgs/tools/networking/cjdns/default.nix
M pkgs/tools/networking/dd-agent/default.nix
M pkgs/tools/networking/fdm/default.nix
M pkgs/tools/networking/i2pd/default.nix
M pkgs/tools/networking/iperf/3.nix
A pkgs/tools/networking/ipv6calc/default.nix
M pkgs/tools/networking/radvd/default.nix
M pkgs/tools/networking/s6-dns/default.nix
M pkgs/tools/networking/s6-networking/default.nix
M pkgs/tools/networking/tinc/pre.nix
M pkgs/tools/networking/wicd/default.nix
A pkgs/tools/networking/wicd/urwid-api-update.patch
R pkgs/tools/package-management/cabal-install/1.20.0.4.nix
A pkgs/tools/package-management/cabal-install/1.20.0.6.nix
A pkgs/tools/package-management/cabal-install/1.22.0.0.nix
M pkgs/tools/package-management/nox/default.nix
A pkgs/tools/security/fprint_demo/default.nix
A pkgs/tools/security/fprintd/default.nix
A pkgs/tools/security/fprintd/pod.patch
M pkgs/tools/security/gnupg/20.nix
M pkgs/tools/system/freeipmi/default.nix
M pkgs/tools/system/proot/default.nix
A pkgs/tools/system/stress/default.nix
M pkgs/tools/text/sgml/opensp/setup-hook.sh
A pkgs/tools/text/xidel/default.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/haskell-defaults.nix
A pkgs/top-level/haskell-ng.nix
M pkgs/top-level/haskell-packages.nix
M pkgs/top-level/node-packages-generated.nix
M pkgs/top-level/node-packages.json
M pkgs/top-level/perl-packages.nix
M pkgs/top-level/php-packages.nix
M pkgs/top-level/python-packages.nix
M pkgs/top-level/release-lib.nix
M pkgs/top-level/release.nix
Log Message:
-----------
Merge branch 'master' into staging
Conflicts (simple):
pkgs/os-specific/linux/util-linux/default.nix
It seems this merge creates a new stdenv hash,
because we had changes on both branches :-/
Commit: 48f63c2f2e3752df2a0b73cad9b9bba9eda8ac60
https://github.com/NixOS/nixpkgs/commit/48f63c2f2e3752df2a0b73cad9b9bba9eda8ac60
Author: Eric Seidel <[email protected]>
Date: 2015-01-14 (Wed, 14 Jan 2015)
Changed paths:
M pkgs/applications/editors/vim/configurable.nix
M pkgs/applications/editors/vim/qvim.nix
A pkgs/build-support/cc-wrapper/add-flags
A pkgs/build-support/cc-wrapper/cc-wrapper.sh
A pkgs/build-support/cc-wrapper/default.nix
A pkgs/build-support/cc-wrapper/gnat-wrapper.sh
A pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh
A pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh
A pkgs/build-support/cc-wrapper/ld-wrapper.sh
A pkgs/build-support/cc-wrapper/setup-hook.sh
A pkgs/build-support/cc-wrapper/utils.sh
R pkgs/build-support/gcc-wrapper/add-flags
R pkgs/build-support/gcc-wrapper/default.nix
R pkgs/build-support/gcc-wrapper/gcc-wrapper.sh
R pkgs/build-support/gcc-wrapper/gnat-wrapper.sh
R pkgs/build-support/gcc-wrapper/gnatlink-wrapper.sh
R pkgs/build-support/gcc-wrapper/ld-solaris-wrapper.sh
R pkgs/build-support/gcc-wrapper/ld-wrapper.sh
R pkgs/build-support/gcc-wrapper/setup-hook.sh
R pkgs/build-support/gcc-wrapper/utils.sh
M pkgs/stdenv/adapters.nix
M pkgs/stdenv/darwin/default.nix
M pkgs/stdenv/linux/default.nix
M pkgs/stdenv/native/default.nix
M pkgs/stdenv/nix/default.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
rename gcc-wrapper to cc-wrapper.
also makes cc-wrapper compatible with clang in the darwin fork.
Commit: 16fe4be790f541d68c01897640fda11f9673b8e9
https://github.com/NixOS/nixpkgs/commit/16fe4be790f541d68c01897640fda11f9673b8e9
Author: Shea Levy <[email protected]>
Date: 2015-01-14 (Wed, 14 Jan 2015)
Changed paths:
M pkgs/development/compilers/gcc/4.8/default.nix
M pkgs/development/libraries/glibc/default.nix
M pkgs/stdenv/linux/default.nix
Log Message:
-----------
Add isGNU attribute to gccs
Commit: f3c6827373be102caae5dcbadd31e73ed60fa17f
https://github.com/NixOS/nixpkgs/commit/f3c6827373be102caae5dcbadd31e73ed60fa17f
Author: Eric Seidel <[email protected]>
Date: 2015-01-14 (Wed, 14 Jan 2015)
Changed paths:
M pkgs/applications/audio/google-musicmanager/default.nix
M pkgs/applications/audio/spotify/default.nix
M pkgs/applications/editors/atom/default.nix
M pkgs/applications/editors/idea/default.nix
M pkgs/applications/editors/lighttable/default.nix
M pkgs/applications/editors/sublime/default.nix
M pkgs/applications/editors/sublime3/default.nix
M pkgs/applications/misc/adobe-reader/default.nix
M pkgs/applications/misc/googleearth/default.nix
M pkgs/applications/networking/browsers/chromium/plugins.nix
M pkgs/applications/networking/browsers/firefox-bin/default.nix
M
pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
M pkgs/applications/networking/browsers/opera/default.nix
M pkgs/applications/networking/instant-messengers/baresip/default.nix
M pkgs/applications/networking/instant-messengers/fuze/default.nix
M pkgs/applications/networking/instant-messengers/hipchat/default.nix
M pkgs/applications/networking/instant-messengers/skype/default.nix
M pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
M pkgs/applications/networking/remote/teamviewer/8.nix
M pkgs/applications/networking/remote/teamviewer/9.nix
M pkgs/applications/networking/remote/teamviewer/default.nix
M pkgs/applications/office/zotero/firefox-bin/default.nix
M pkgs/applications/science/electronics/eagle/default.nix
M pkgs/applications/science/logic/verifast/default.nix
M pkgs/applications/video/makemkv/default.nix
M pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
M pkgs/development/compilers/cryptol/1.8.x.nix
M pkgs/development/compilers/cudatoolkit/5.5.nix
M pkgs/development/compilers/cudatoolkit/6.0.nix
M pkgs/development/compilers/gcl/default.nix
M pkgs/development/compilers/julia/0.2.1.nix
M pkgs/development/compilers/julia/0.3.5.nix
M pkgs/development/compilers/llvm/3.3/clang.nix
M pkgs/development/compilers/llvm/3.4/clang.nix
M pkgs/development/compilers/mozart/binary.nix
M pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
M pkgs/development/compilers/rustc/0.12.nix
M pkgs/development/compilers/rustc/head.nix
M pkgs/development/guile-modules/guile-lib/default.nix
M pkgs/development/interpreters/dart/default.nix
M pkgs/development/libraries/fmod/default.nix
M pkgs/development/libraries/glib/default.nix
M pkgs/development/libraries/glibc/default.nix
M pkgs/development/libraries/libre/default.nix
M pkgs/development/libraries/librem/default.nix
M pkgs/development/libraries/v8/default.nix
M pkgs/development/libraries/wtk/default.nix
M pkgs/development/misc/amdapp-sdk/default.nix
M pkgs/development/mobile/androidenv/androidsdk.nix
M pkgs/development/tools/atom-shell/default.nix
M pkgs/development/tools/build-managers/cargo/snapshot.nix
M pkgs/development/tools/misc/saleae-logic/default.nix
M pkgs/development/tools/node-webkit/default.nix
M pkgs/development/tools/phantomjs/default.nix
M pkgs/games/adom/default.nix
M pkgs/games/andyetitmoves/default.nix
M pkgs/games/dwarf-fortress/default.nix
M pkgs/games/gsb/default.nix
M pkgs/games/megaglest/default.nix
M pkgs/games/oilrush/default.nix
M pkgs/games/planetaryannihilation/default.nix
M pkgs/games/quake3/wrapper/default.nix
M pkgs/games/sdlmame/default.nix
M pkgs/games/spring/default.nix
M pkgs/games/tibia/default.nix
M pkgs/games/ue4demos/default.nix
M pkgs/games/ultrastardx/default.nix
M pkgs/games/vessel/default.nix
M pkgs/games/worldofgoo/default.nix
M pkgs/misc/drivers/gutenprint/bin.nix
M pkgs/misc/emulators/wine/stable.nix
M pkgs/misc/emulators/wine/unstable.nix
M pkgs/os-specific/linux/ati-drivers/default.nix
M pkgs/os-specific/linux/nvidia-x11/default.nix
M pkgs/os-specific/linux/nvidia-x11/legacy173.nix
M pkgs/os-specific/linux/nvidia-x11/legacy304.nix
M pkgs/os-specific/linux/nvidia-x11/legacy340.nix
M pkgs/os-specific/linux/ocz-toolbox/default.nix
M pkgs/os-specific/linux/opengl/xorg-sys/default.nix
M pkgs/os-specific/linux/prl-tools/default.nix
M pkgs/os-specific/linux/systemd/default.nix
M pkgs/servers/nosql/influxdb/default.nix
M pkgs/servers/restund/default.nix
M pkgs/tools/admin/tightvnc/default.nix
M pkgs/tools/filesystems/yandex-disk/default.nix
M pkgs/tools/graphics/cuneiform/default.nix
M pkgs/tools/misc/megacli/default.nix
M pkgs/tools/networking/atftp/default.nix
M pkgs/tools/security/tor/torbrowser.nix
Log Message:
-----------
rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc
Commit: 88eae464551f0efadccc8f64dd456679801b7939
https://github.com/NixOS/nixpkgs/commit/88eae464551f0efadccc8f64dd456679801b7939
Author: Eric Seidel <[email protected]>
Date: 2015-01-14 (Wed, 14 Jan 2015)
Changed paths:
M nixos/modules/services/networking/dnscrypt-proxy.nix
M nixos/modules/system/boot/stage-1.nix
M pkgs/applications/misc/xca/default.nix
M pkgs/applications/networking/copy-com/default.nix
M pkgs/applications/networking/dropbox/default.nix
M pkgs/applications/networking/ike/default.nix
M pkgs/applications/science/math/mathematica/9.nix
M pkgs/applications/science/math/mathematica/default.nix
M pkgs/desktops/kde-4.14/kdesdk/kde-dev-utils.nix
M pkgs/development/compilers/ghcjs/default.nix
M pkgs/development/tools/misc/ccache/default.nix
M pkgs/development/tools/misc/distcc/default.nix
M pkgs/development/tools/selenium/server/default.nix
M pkgs/stdenv/linux/default.nix
M pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix
M pkgs/stdenv/linux/make-bootstrap-tools.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
rename occurrences of gcc.gcc to gcc.cc
Commit: b070eacfcdc6be36b2d4aca7c8764cba34e7af58
https://github.com/NixOS/nixpkgs/commit/b070eacfcdc6be36b2d4aca7c8764cba34e7af58
Author: Eric Seidel <[email protected]>
Date: 2015-01-14 (Wed, 14 Jan 2015)
Changed paths:
M maintainers/scripts/patchelf-hints.sh
M pkgs/build-support/build-fhs-chrootenv/default.nix
M pkgs/development/mobile/androidenv/androidsdk.nix
M pkgs/development/mobile/androidenv/build-tools.nix
M pkgs/development/mobile/androidenv/platform-tools.nix
Log Message:
-----------
rename occurrences of cc.gcc to cc.cc
Commit: f27273039986dc634333b125aa975d3a7f812a3d
https://github.com/NixOS/nixpkgs/commit/f27273039986dc634333b125aa975d3a7f812a3d
Author: Eric Seidel <[email protected]>
Date: 2015-01-14 (Wed, 14 Jan 2015)
Changed paths:
M pkgs/applications/graphics/freecad/default.nix
M pkgs/applications/inferno/default.nix
M pkgs/applications/science/math/R/default.nix
M pkgs/tools/typesetting/pdftk/default.nix
Log Message:
-----------
rename <gcc-frontend>.gcc to <gcc-frontend>.cc
Commit: 7dc57a389e3d3eb5b5e8de3b02dfe469496fad1a
https://github.com/NixOS/nixpkgs/commit/7dc57a389e3d3eb5b5e8de3b02dfe469496fad1a
Author: Shea Levy <[email protected]>
Date: 2015-01-16 (Fri, 16 Jan 2015)
Changed paths:
M pkgs/build-support/cc-wrapper/default.nix
M pkgs/build-support/cc-wrapper/setup-hook.sh
Log Message:
-----------
cc-wrapper: Set CC/CXX more specifically if possible
Commit: f326b7995c6615e27e75b05dd3c2edff5b61d3b3
https://github.com/NixOS/nixpkgs/commit/f326b7995c6615e27e75b05dd3c2edff5b61d3b3
Author: Shea Levy <[email protected]>
Date: 2015-01-16 (Fri, 16 Jan 2015)
Changed paths:
M pkgs/build-support/cc-wrapper/cc-wrapper.sh
Log Message:
-----------
Remove libc++ stuff from cc-wrapper
This is now part of the libc++ setup hook
Commit: 88089559b9b3e028ec7745ac593610550d9b2668
https://github.com/NixOS/nixpkgs/commit/88089559b9b3e028ec7745ac593610550d9b2668
Author: Vladimír Čunát <[email protected]>
Date: 2015-01-17 (Sat, 17 Jan 2015)
Changed paths:
M lib/maintainers.nix
M maintainers/scripts/patchelf-hints.sh
M nixos/modules/misc/ids.nix
M nixos/modules/module-list.nix
M nixos/modules/security/pam.nix
M nixos/modules/services/networking/dnscrypt-proxy.nix
A nixos/modules/services/networking/nylon.nix
M nixos/modules/services/x11/desktop-managers/e19.nix
M nixos/modules/system/activation/switch-to-configuration.pl
M nixos/modules/system/boot/stage-1.nix
M nixos/modules/tasks/network-interfaces-scripted.nix
M nixos/modules/tasks/network-interfaces.nix
M nixos/modules/virtualisation/google-compute-image.nix
M pkgs/applications/audio/aumix/default.nix
M pkgs/applications/audio/google-musicmanager/default.nix
M pkgs/applications/audio/mp3info/default.nix
M pkgs/applications/audio/spotify/default.nix
M pkgs/applications/editors/atom/default.nix
M pkgs/applications/editors/emacs-modes/emms/default.nix
M pkgs/applications/editors/idea/default.nix
M pkgs/applications/editors/lighttable/default.nix
M pkgs/applications/editors/sublime/default.nix
M pkgs/applications/editors/sublime3/default.nix
M pkgs/applications/editors/vim/configurable.nix
M pkgs/applications/editors/vim/qvim.nix
M pkgs/applications/graphics/freecad/default.nix
M pkgs/applications/graphics/geeqie/default.nix
M pkgs/applications/graphics/gimp/plugins/default.nix
M pkgs/applications/graphics/qtpfsgui/default.nix
M pkgs/applications/inferno/default.nix
M pkgs/applications/misc/adobe-reader/default.nix
M pkgs/applications/misc/blender/default.nix
M pkgs/applications/misc/calibre/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/hello/ex-2/default.nix
M pkgs/applications/misc/llpp/default.nix
M pkgs/applications/misc/xca/default.nix
M pkgs/applications/networking/browsers/chromium/plugins.nix
M pkgs/applications/networking/browsers/firefox-bin/default.nix
M pkgs/applications/networking/browsers/firefox/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/opera/default.nix
M pkgs/applications/networking/copy-com/default.nix
M pkgs/applications/networking/dropbox/default.nix
M pkgs/applications/networking/ike/default.nix
M pkgs/applications/networking/instant-messengers/baresip/default.nix
M pkgs/applications/networking/instant-messengers/bitlbee/default.nix
M pkgs/applications/networking/instant-messengers/fuze/default.nix
M pkgs/applications/networking/instant-messengers/gtmess/default.nix
R pkgs/applications/networking/instant-messengers/gtmess/va_list.patch
M pkgs/applications/networking/instant-messengers/hipchat/default.nix
M pkgs/applications/networking/instant-messengers/skype/default.nix
M pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
M pkgs/applications/networking/mailreaders/thunderbird/default.nix
M pkgs/applications/networking/newsreaders/liferea/default.nix
M pkgs/applications/networking/p2p/gnunet/default.nix
M pkgs/applications/networking/p2p/gnunet/svn.nix
M pkgs/applications/networking/remote/teamviewer/8.nix
M pkgs/applications/networking/remote/teamviewer/9.nix
M pkgs/applications/networking/remote/teamviewer/default.nix
M pkgs/applications/networking/syncthing/default.nix
M pkgs/applications/office/impressive/default.nix
M pkgs/applications/office/zotero/firefox-bin/default.nix
M pkgs/applications/science/electronics/eagle/default.nix
M pkgs/applications/science/logic/verifast/default.nix
M pkgs/applications/science/math/R/default.nix
M pkgs/applications/science/math/mathematica/9.nix
M pkgs/applications/science/math/mathematica/default.nix
M pkgs/applications/science/misc/vite/default.nix
M pkgs/applications/version-management/git-and-tools/topgit/default.nix
M pkgs/applications/video/gnash/default.nix
M pkgs/applications/video/makemkv/default.nix
M pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
M pkgs/build-support/build-fhs-chrootenv/default.nix
A pkgs/build-support/cc-wrapper/add-flags
A pkgs/build-support/cc-wrapper/cc-wrapper.sh
A pkgs/build-support/cc-wrapper/default.nix
A pkgs/build-support/cc-wrapper/gnat-wrapper.sh
A pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh
A pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh
A pkgs/build-support/cc-wrapper/ld-wrapper.sh
A pkgs/build-support/cc-wrapper/setup-hook.sh
A pkgs/build-support/cc-wrapper/utils.sh
M pkgs/build-support/fetchgit/default.nix
R pkgs/build-support/gcc-wrapper/add-flags
R pkgs/build-support/gcc-wrapper/default.nix
R pkgs/build-support/gcc-wrapper/gcc-wrapper.sh
R pkgs/build-support/gcc-wrapper/gnat-wrapper.sh
R pkgs/build-support/gcc-wrapper/gnatlink-wrapper.sh
R pkgs/build-support/gcc-wrapper/ld-solaris-wrapper.sh
R pkgs/build-support/gcc-wrapper/ld-wrapper.sh
R pkgs/build-support/gcc-wrapper/setup-hook.sh
R pkgs/build-support/gcc-wrapper/utils.sh
M pkgs/data/fonts/redhat-liberation-fonts/binary.nix
M pkgs/data/fonts/redhat-liberation-fonts/default.nix
M pkgs/desktops/kde-4.14/kdesdk/kde-dev-utils.nix
M pkgs/development/compilers/bigloo/default.nix
A pkgs/development/compilers/clash-ghc/default.nix
M pkgs/development/compilers/cryptol/1.8.x.nix
M pkgs/development/compilers/cudatoolkit/5.5.nix
M pkgs/development/compilers/cudatoolkit/6.0.nix
M pkgs/development/compilers/gcc/4.4/default.nix
M pkgs/development/compilers/gcc/4.5/default.nix
M pkgs/development/compilers/gcc/4.6/default.nix
M pkgs/development/compilers/gcc/4.8/default.nix
M pkgs/development/compilers/gcc/4.9/default.nix
M pkgs/development/compilers/gcl/default.nix
M pkgs/development/compilers/ghc/7.4.2-binary.nix
M pkgs/development/compilers/ghc/7.8.3-binary.nix
A pkgs/development/compilers/ghc/gcc-clang-wrapper.sh
M pkgs/development/compilers/ghcjs/default.nix
M pkgs/development/compilers/julia/0.2.1.nix
M pkgs/development/compilers/julia/0.3.5.nix
M pkgs/development/compilers/llvm/3.3/clang.nix
M pkgs/development/compilers/llvm/3.4/clang.nix
M pkgs/development/compilers/mit-scheme/default.nix
M pkgs/development/compilers/mozart/binary.nix
M pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
M pkgs/development/compilers/rustc/0.12.nix
M pkgs/development/compilers/rustc/head.nix
M pkgs/development/compilers/scala/default.nix
M pkgs/development/guile-modules/guile-cairo/default.nix
M pkgs/development/guile-modules/guile-gnome/default.nix
M pkgs/development/guile-modules/guile-lib/default.nix
M pkgs/development/guile-modules/guile-ncurses/default.nix
M pkgs/development/haskell-modules/configuration-common.nix
M pkgs/development/haskell-modules/default.nix
M pkgs/development/haskell-modules/generic-builder.nix
M pkgs/development/haskell-modules/hackage-packages.nix
M pkgs/development/interpreters/dart/default.nix
M pkgs/development/interpreters/pypy/2.4/default.nix
A pkgs/development/interpreters/pypy/2.4/fix-gcc-4-9-2.patch
M pkgs/development/libraries/boehm-gc/default.nix
M pkgs/development/libraries/commoncpp2/default.nix
M pkgs/development/libraries/fmod/default.nix
M pkgs/development/libraries/gdal/default.nix
M pkgs/development/libraries/gdbm/default.nix
M pkgs/development/libraries/gettext/default.nix
M pkgs/development/libraries/glib/default.nix
M pkgs/development/libraries/glibc/common.nix
M pkgs/development/libraries/glibc/default.nix
M pkgs/development/libraries/gmp/4.3.2.nix
M pkgs/development/libraries/gmp/5.0.5.nix
M pkgs/development/libraries/gperftools/default.nix
M pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
M pkgs/development/libraries/gusb/default.nix
A pkgs/development/libraries/haskell/clash-lib/default.nix
A pkgs/development/libraries/haskell/clash-prelude/default.nix
A pkgs/development/libraries/haskell/concurrent-supply/default.nix
M pkgs/development/libraries/haskell/vinyl/default.nix
A pkgs/development/libraries/haskell/yesod-markdown/default.nix
M pkgs/development/libraries/hwloc/default.nix
M pkgs/development/libraries/libchop/default.nix
M pkgs/development/libraries/libffi/default.nix
M pkgs/development/libraries/libre/default.nix
M pkgs/development/libraries/librem/default.nix
M pkgs/development/libraries/libsigsegv/default.nix
M pkgs/development/libraries/libunistring/default.nix
M pkgs/development/libraries/libuv/default.nix
M pkgs/development/libraries/libxmi/default.nix
M pkgs/development/libraries/mpc/default.nix
M pkgs/development/libraries/mpfr/default.nix
M pkgs/development/libraries/ncurses/default.nix
M pkgs/development/libraries/nettle/default.nix
M pkgs/development/libraries/readline/6.2.nix
M pkgs/development/libraries/readline/6.3.nix
M pkgs/development/libraries/slib/default.nix
M pkgs/development/libraries/v8/default.nix
M pkgs/development/libraries/wtk/default.nix
M pkgs/development/misc/amdapp-sdk/default.nix
M pkgs/development/mobile/androidenv/androidsdk.nix
M pkgs/development/mobile/androidenv/build-tools.nix
M pkgs/development/mobile/androidenv/platform-tools.nix
M pkgs/development/r-modules/default.nix
M pkgs/development/tools/analysis/checkstyle/default.nix
M pkgs/development/tools/atom-shell/default.nix
M pkgs/development/tools/build-managers/cargo/snapshot.nix
M pkgs/development/tools/build-managers/gnumake/3.81/default.nix
M pkgs/development/tools/build-managers/gnumake/3.82/default.nix
M pkgs/development/tools/build-managers/gnumake/4.0/default.nix
M pkgs/development/tools/build-managers/gnumake/4.1/default.nix
A pkgs/development/tools/build-managers/tup/default.nix
M pkgs/development/tools/guile/g-wrap/default.nix
M pkgs/development/tools/misc/autoconf/default.nix
M pkgs/development/tools/misc/autogen/default.nix
M pkgs/development/tools/misc/automake/automake-1.11.x.nix
M pkgs/development/tools/misc/automake/automake-1.12.x.nix
M pkgs/development/tools/misc/automake/automake-1.13.x.nix
M pkgs/development/tools/misc/automake/automake-1.14.x.nix
M pkgs/development/tools/misc/ccache/default.nix
M pkgs/development/tools/misc/cflow/default.nix
M pkgs/development/tools/misc/chruby/default.nix
M pkgs/development/tools/misc/complexity/default.nix
M pkgs/development/tools/misc/cppi/default.nix
M pkgs/development/tools/misc/dejagnu/default.nix
M pkgs/development/tools/misc/distcc/default.nix
M pkgs/development/tools/misc/global/default.nix
M pkgs/development/tools/misc/help2man/default.nix
M pkgs/development/tools/misc/libtool/libtool2.nix
M pkgs/development/tools/misc/saleae-logic/default.nix
M pkgs/development/tools/misc/yodl/default.nix
M pkgs/development/tools/node-webkit/default.nix
M pkgs/development/tools/ocaml/ocp-indent/default.nix
M pkgs/development/tools/phantomjs/default.nix
M pkgs/development/tools/selenium/server/default.nix
M pkgs/development/tools/watchman/default.nix
M pkgs/games/adom/default.nix
M pkgs/games/andyetitmoves/default.nix
M pkgs/games/dwarf-fortress/default.nix
M pkgs/games/gsb/default.nix
M pkgs/games/instead/default.nix
M pkgs/games/megaglest/default.nix
M pkgs/games/oilrush/default.nix
M pkgs/games/planetaryannihilation/default.nix
M pkgs/games/quake3/wrapper/default.nix
M pkgs/games/sdlmame/default.nix
M pkgs/games/spring/default.nix
M pkgs/games/tibia/default.nix
M pkgs/games/ue4demos/default.nix
M pkgs/games/ultrastardx/default.nix
M pkgs/games/vessel/default.nix
M pkgs/games/worldofgoo/default.nix
M pkgs/misc/drivers/gutenprint/bin.nix
M pkgs/misc/emulators/wine/stable.nix
M pkgs/misc/emulators/wine/unstable.nix
M pkgs/os-specific/linux/ati-drivers/default.nix
A pkgs/os-specific/linux/kernel/bridge-stp-helper.patch
M pkgs/os-specific/linux/kernel/patches.nix
M pkgs/os-specific/linux/nfs-utils/default.nix
M pkgs/os-specific/linux/nvidia-x11/default.nix
M pkgs/os-specific/linux/nvidia-x11/legacy173.nix
M pkgs/os-specific/linux/nvidia-x11/legacy304.nix
M pkgs/os-specific/linux/nvidia-x11/legacy340.nix
M pkgs/os-specific/linux/ocz-toolbox/default.nix
M pkgs/os-specific/linux/opengl/xorg-sys/default.nix
M pkgs/os-specific/linux/prl-tools/default.nix
M pkgs/os-specific/linux/systemd/default.nix
M pkgs/servers/nosql/influxdb/default.nix
M pkgs/servers/restund/default.nix
M pkgs/servers/squid/squids.nix
M pkgs/servers/unfs3/default.nix
M pkgs/stdenv/adapters.nix
M pkgs/stdenv/darwin/default.nix
M pkgs/stdenv/linux/default.nix
M pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix
M pkgs/stdenv/linux/make-bootstrap-tools.nix
M pkgs/stdenv/native/default.nix
M pkgs/stdenv/nix/default.nix
M pkgs/tools/admin/tightvnc/default.nix
M pkgs/tools/archivers/xarchiver/default.nix
M pkgs/tools/backup/bareos/default.nix
A pkgs/tools/compression/lz4/default.nix
M pkgs/tools/filesystems/ceph/default.nix
M pkgs/tools/filesystems/nixpart/0.4/parted.nix
M pkgs/tools/filesystems/yandex-disk/default.nix
M pkgs/tools/graphics/cuneiform/default.nix
M pkgs/tools/graphics/plotutils/default.nix
M pkgs/tools/misc/megacli/default.nix
M pkgs/tools/misc/parted/default.nix
M pkgs/tools/networking/atftp/default.nix
M pkgs/tools/networking/biosdevname/default.nix
M pkgs/tools/networking/bud/default.nix
M pkgs/tools/networking/inetutils/default.nix
M pkgs/tools/networking/lsh/default.nix
M pkgs/tools/networking/mailutils/default.nix
A pkgs/tools/networking/nylon/configure-use-solib.patch
M pkgs/tools/networking/nylon/default.nix
M pkgs/tools/networking/p2p/seeks/default.nix
M pkgs/tools/networking/tinc/default.nix
M pkgs/tools/package-management/guix/default.nix
A pkgs/tools/security/kpcli/default.nix
M pkgs/tools/security/tor/default.nix
M pkgs/tools/security/tor/torbrowser.nix
A pkgs/tools/system/stress-ng/default.nix
M pkgs/tools/text/enscript/default.nix
M pkgs/tools/text/gawk/default.nix
M pkgs/tools/typesetting/halibut/default.nix
M pkgs/tools/typesetting/lout/default.nix
M pkgs/tools/typesetting/pdftk/default.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/haskell-ng.nix
M pkgs/top-level/haskell-packages.nix
M pkgs/top-level/perl-packages.nix
Log Message:
-----------
Merge #5676: gcc-wrapper -> cc-wrapper and related
Commit: edcda996377719342ab9e335af570afc65058d26
https://github.com/NixOS/nixpkgs/commit/edcda996377719342ab9e335af570afc65058d26
Author: Vladimír Čunát <[email protected]>
Date: 2015-01-17 (Sat, 17 Jan 2015)
Changed paths:
M pkgs/development/libraries/mpc/default.nix
Log Message:
-----------
mpc: rename package name (close #2367)
Commit: a0bf07827bbf031d90ecb03f4e7345576208214a
https://github.com/NixOS/nixpkgs/commit/a0bf07827bbf031d90ecb03f4e7345576208214a
Author: Vladimír Čunát <[email protected]>
Date: 2015-01-17 (Sat, 17 Jan 2015)
Changed paths:
M pkgs/applications/audio/cmus/default.nix
M pkgs/applications/audio/moc/default.nix
M pkgs/development/compilers/gcc/4.5/default.nix
M pkgs/development/compilers/gcc/4.6/default.nix
M pkgs/development/compilers/gcc/4.8/default.nix
M pkgs/development/compilers/gcc/4.9/default.nix
M pkgs/development/compilers/llvm/3.4/dragonegg.nix
A pkgs/development/libraries/libmpc/default.nix
R pkgs/development/libraries/mpc/default.nix
M pkgs/development/misc/avr-gcc-with-avr-libc/default.nix
M pkgs/stdenv/linux/default.nix
M pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix
M pkgs/stdenv/linux/make-bootstrap-tools.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
mpc: also rename the attribute to libmpc
Attrnames and package names should be as close as possible to avoid confusion.
I took care not to confuse the two mpc things during the mass-replace,
so hopefully I suceeded (tarball still builds).
Commit: ec6b82a0c2a6bffa2f76a9744105d6d7257c2636
https://github.com/NixOS/nixpkgs/commit/ec6b82a0c2a6bffa2f76a9744105d6d7257c2636
Author: Peter Simons <[email protected]>
Date: 2015-01-19 (Mon, 19 Jan 2015)
Changed paths:
M doc/stdenv.xml
M lib/maintainers.nix
M maintainers/scripts/vanity-manual-equalities.txt
M maintainers/scripts/vanity.sh
M nixos/modules/hardware/video/bumblebee.nix
M nixos/modules/installer/tools/nixos-install.sh
M nixos/modules/module-list.nix
R nixos/modules/programs/bash/command-not-found.nix
R nixos/modules/programs/bash/command-not-found.pl
A nixos/modules/programs/command-not-found/command-not-found.nix
A nixos/modules/programs/command-not-found/command-not-found.pl
M nixos/modules/services/mail/dovecot.nix
A nixos/modules/services/networking/firefox/sync-server.nix
M nixos/modules/services/printing/cupsd.nix
M nixos/modules/system/boot/stage-2-init.sh
M nixos/modules/system/boot/systemd-unit-options.nix
M nixos/modules/system/etc/setup-etc.pl
M nixos/modules/testing/test-instrumentation.nix
M nixos/modules/virtualisation/containers.nix
M nixos/modules/virtualisation/ec2-data.nix
M nixos/modules/virtualisation/google-compute-image.nix
M nixos/tests/installer.nix
M pkgs/applications/audio/ardour/default.nix
A pkgs/applications/misc/3dfsb/default.nix
A pkgs/applications/misc/cortex/default.nix
A pkgs/applications/misc/ctodo/default.nix
A pkgs/applications/misc/pytrainer/default.nix
A pkgs/applications/misc/pytrainer/pytrainer-webkit.patch
A pkgs/applications/misc/stag/default.nix
M pkgs/applications/misc/taskwarrior/default.nix
M pkgs/applications/misc/xiphos/default.nix
M pkgs/applications/networking/browsers/firefox-bin/sources.nix
A pkgs/applications/networking/browsers/jumanji/default.nix
M pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
M pkgs/applications/networking/sync/backintime/common.nix
R pkgs/applications/networking/sync/backintime/gnome.nix
A pkgs/applications/networking/sync/backintime/qt4.nix
M pkgs/applications/networking/znc/modules.nix
M pkgs/applications/office/abiword/default.nix
M pkgs/build-support/grsecurity/default.nix
M pkgs/build-support/vm/default.nix
A pkgs/data/fonts/open-dyslexic/default.nix
R pkgs/data/fonts/source-han-sans/base.nix
A pkgs/data/fonts/source-han-sans/default.nix
R pkgs/data/fonts/source-han-sans/japanese.nix
R pkgs/data/fonts/source-han-sans/korean.nix
R pkgs/data/fonts/source-han-sans/simplified-chinese.nix
R pkgs/data/fonts/source-han-sans/traditional-chinese.nix
M pkgs/desktops/kde-4.14/kde-workspace.nix
M pkgs/desktops/kde-4.14/kdepim.nix
M pkgs/desktops/kde-4.14/kdeutils/print-manager.nix
M pkgs/desktops/xfce/default.nix
M pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix
A pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix
M pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
A pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix
M pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix
A pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix
A pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix
A pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix
A pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix
A pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix
A pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix
A pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix
M pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix
A pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix
M pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix
M pkgs/development/compilers/emscripten-fastcomp/default.nix
M pkgs/development/compilers/emscripten/default.nix
R pkgs/development/compilers/ghc/6.10.1-binary.nix
R pkgs/development/compilers/ghc/6.10.1.nix
R pkgs/development/compilers/ghc/6.10.2.nix
R pkgs/development/compilers/ghc/6.10.3.nix
R pkgs/development/compilers/ghc/6.11.nix
R pkgs/development/compilers/ghc/6.12.1-binary.nix
R pkgs/development/compilers/ghc/6.12.1.nix
R pkgs/development/compilers/ghc/6.12.2.nix
M pkgs/development/compilers/ghc/6.12.3.nix
R pkgs/development/compilers/ghc/6.4.2-binary.nix
R pkgs/development/compilers/ghc/6.4.2.nix
R pkgs/development/compilers/ghc/6.6.1.nix
R pkgs/development/compilers/ghc/6.8.2.nix
R pkgs/development/compilers/ghc/6.8.3.nix
R pkgs/development/compilers/ghc/7.0.1.nix
R pkgs/development/compilers/ghc/7.0.2.nix
R pkgs/development/compilers/ghc/7.0.3.nix
M pkgs/development/compilers/ghc/7.0.4.nix
A pkgs/development/compilers/ghc/7.10.1.nix
R pkgs/development/compilers/ghc/7.2.1.nix
M pkgs/development/compilers/ghc/7.2.2.nix
R pkgs/development/compilers/ghc/7.4.1.nix
M pkgs/development/compilers/ghc/7.4.2-binary.nix
M pkgs/development/compilers/ghc/7.4.2.nix
R pkgs/development/compilers/ghc/7.6.1.nix
R pkgs/development/compilers/ghc/7.6.2.nix
M pkgs/development/compilers/ghc/7.6.3.nix
R pkgs/development/compilers/ghc/7.8.3-binary.nix
M pkgs/development/compilers/ghc/7.8.4.nix
M pkgs/development/compilers/ghc/head.nix
M pkgs/development/compilers/pakcs/default.nix
M pkgs/development/haskell-modules/configuration-common.nix
A pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
A pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
A pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
A pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
A pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
M pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
M pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
R pkgs/development/haskell-modules/configuration-ghc-7.9.x.nix
A pkgs/development/haskell-modules/configuration-ghc-head.nix
M pkgs/development/haskell-modules/default.nix
M pkgs/development/haskell-modules/generic-builder.nix
M pkgs/development/haskell-modules/hackage-packages.nix
M pkgs/development/haskell-modules/lib.nix
M pkgs/development/haskell-modules/with-packages-wrapper.nix
M pkgs/development/interpreters/lua-4/default.nix
M pkgs/development/interpreters/mujs/default.nix
M pkgs/development/interpreters/python/2.6/default.nix
A pkgs/development/interpreters/python/2.6/python2.6-fix-parallel-make.patch
A pkgs/development/interpreters/ruby/ruby-2.2.0.nix
M pkgs/development/interpreters/ruby/rvm-patchsets.nix
A pkgs/development/libraries/SDL_stretch/default.nix
M pkgs/development/libraries/allegro/5.nix
M pkgs/development/libraries/botan/unstable.nix
M pkgs/development/libraries/glibc/locales.nix
M pkgs/development/libraries/haskell/mvc/default.nix
A pkgs/development/libraries/haskell/yesod-pagination/default.nix
A pkgs/development/libraries/libcli/default.nix
M pkgs/development/libraries/libnetfilter_conntrack/default.nix
M pkgs/development/libraries/libuv/default.nix
A pkgs/development/libraries/openbr/default.nix
A pkgs/development/libraries/readosm/default.nix
R pkgs/development/libraries/science/biology/biolib/default.nix
M pkgs/development/libraries/skalibs/default.nix
M pkgs/development/libraries/sodium/default.nix
A pkgs/development/libraries/spatialite-tools/default.nix
M pkgs/development/lisp-modules/lisp-packages.nix
M pkgs/development/ocaml-modules/tyxml/default.nix
M pkgs/development/python-modules/generic/default.nix
A pkgs/development/python-modules/gevent_sslwrap.patch
A pkgs/development/python-modules/matplotlib/default.nix
M pkgs/development/tools/haskell/ihaskell/wrapper.nix
M pkgs/development/tools/ocaml/merlin/default.nix
M pkgs/development/tools/slimerjs/default.nix
A pkgs/development/tools/sloc/default.nix
A pkgs/development/tools/sloc/package.nix
A pkgs/games/gnubg/default.nix
A pkgs/os-specific/linux/batman-adv/alfred.nix
M pkgs/os-specific/linux/batman-adv/batctl.nix
M pkgs/os-specific/linux/batman-adv/default.nix
A pkgs/os-specific/linux/jfbview/default.nix
M pkgs/os-specific/linux/kernel/linux-3.10.nix
M pkgs/os-specific/linux/kernel/linux-3.12.nix
M pkgs/os-specific/linux/kernel/linux-3.14.nix
M pkgs/os-specific/linux/kernel/linux-3.18.nix
M pkgs/os-specific/linux/kernel/patches.nix
M pkgs/os-specific/linux/spl/default.nix
A pkgs/os-specific/linux/spl/time.patch
M pkgs/servers/dict/dictd-wiktionary.nix
M pkgs/servers/http/couchdb/default.nix
A pkgs/servers/http/pshs/default.nix
M pkgs/servers/monitoring/munin/default.nix
M pkgs/servers/s6/default.nix
M pkgs/servers/squid/squids.nix
M pkgs/tools/X11/bumblebee/default.nix
A pkgs/tools/X11/bumblebee/nvidia-conf.patch
M pkgs/tools/X11/bumblebee/xopts.patch
A pkgs/tools/X11/xbrightness/default.nix
M pkgs/tools/admin/awscli/default.nix
M pkgs/tools/filesystems/smbnetfs/default.nix
M pkgs/tools/graphics/gnuplot/default.nix
M pkgs/tools/misc/execline/default.nix
A pkgs/tools/networking/darkstat/default.nix
A pkgs/tools/networking/httping/default.nix
A pkgs/tools/networking/netsniff-ng/default.nix
M pkgs/tools/networking/s6-dns/default.nix
M pkgs/tools/networking/s6-networking/default.nix
M pkgs/tools/package-management/nix-prefetch-scripts/default.nix
M pkgs/tools/package-management/nix/unstable.nix
M pkgs/tools/system/plan9port/default.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/haskell-defaults.nix
M pkgs/top-level/haskell-ng.nix
M pkgs/top-level/haskell-packages.nix
M pkgs/top-level/perl-packages.nix
M pkgs/top-level/python-packages.nix
M pkgs/top-level/release.nix
Log Message:
-----------
Merge branch 'master' into staging.
Commit: 365ce3ddba0554c1a8c0ac0abd343ac907d04e66
https://github.com/NixOS/nixpkgs/commit/365ce3ddba0554c1a8c0ac0abd343ac907d04e66
Author: Eelco Dolstra <[email protected]>
Date: 2015-01-19 (Mon, 19 Jan 2015)
Changed paths:
M pkgs/development/compilers/openjdk/bootstrap.nix
Log Message:
-----------
openjdk-bootstrap: Don't depend on the length of the Glibc version
Building the bootstrap OpenJDK failed if the Glibc version string is
not 4 characters, e.g. "2.12.1" would cause a corrupt tarball.
Commit: cd993d0e10b1bcc02d579843902398fbdb702e81
https://github.com/NixOS/nixpkgs/commit/cd993d0e10b1bcc02d579843902398fbdb702e81
Author: Vladimír Čunát <[email protected]>
Date: 2015-01-20 (Tue, 20 Jan 2015)
Changed paths:
M pkgs/development/perl-modules/DB_File/default.nix
Log Message:
-----------
perl DB_file: fix build by not changing $out/lib/perl5
The package already installs into $oul/lib/perl5/site_perl by itself.
Presumably it broke after d0bad145f5 due to removing perllocal.pod
(because this compiles on master and not here).
Commit: 4b82bd683e5a386484379083876aab304fd172e8
https://github.com/NixOS/nixpkgs/commit/4b82bd683e5a386484379083876aab304fd172e8
Author: Wout Mertens <[email protected]>
Date: 2015-01-23 (Fri, 23 Jan 2015)
Changed paths:
M pkgs/stdenv/generic/setup.sh
Log Message:
-----------
Merge pull request #5714 from vcunat/p/stdenv-subst
stdenv substitute: avoid using a temporary file
Commit: 9bccb95a82de93d0419495acaf0ae0af581d4642
https://github.com/NixOS/nixpkgs/commit/9bccb95a82de93d0419495acaf0ae0af581d4642
Author: Shea Levy <[email protected]>
Date: 2015-01-25 (Sun, 25 Jan 2015)
Changed paths:
M pkgs/build-support/cc-wrapper/setup-hook.sh
M pkgs/build-support/gcc-cross-wrapper/setup-hook.sh
Log Message:
-----------
cc-wrapper: Fix for cross-compiling
Fixes #5949
Suggested by @ambrop72
Commit: a628d6ee188b2513f0c62d9349a3fa2997709c74
https://github.com/NixOS/nixpkgs/commit/a628d6ee188b2513f0c62d9349a3fa2997709c74
Author: Eelco Dolstra <[email protected]>
Date: 2015-01-26 (Mon, 26 Jan 2015)
Changed paths:
M pkgs/shells/bash/bash-4.3-patches.nix
Log Message:
-----------
bash: Update to 4.3-p30
Commit: 0caae022fd5baa1c96bec716d18a3906b6776911
https://github.com/NixOS/nixpkgs/commit/0caae022fd5baa1c96bec716d18a3906b6776911
Author: Eelco Dolstra <[email protected]>
Date: 2015-01-26 (Mon, 26 Jan 2015)
Changed paths:
M pkgs/tools/compression/xz/default.nix
Log Message:
-----------
xz: Update to 5.2.0
Commit: cfb29ab882323d379aba20a95020c7c24f883eae
https://github.com/NixOS/nixpkgs/commit/cfb29ab882323d379aba20a95020c7c24f883eae
Author: Shea Levy <[email protected]>
Date: 2015-01-28 (Wed, 28 Jan 2015)
Changed paths:
M pkgs/build-support/cc-wrapper/setup-hook.sh
M pkgs/build-support/gcc-cross-wrapper/setup-hook.sh
Log Message:
-----------
Merge branch 'gridaphobe' into staging
fix cc-wrapper for cross-compilation
Commit: c45372f038bc89c69390bdbc6a4b0bfdb63b1423
https://github.com/NixOS/nixpkgs/commit/c45372f038bc89c69390bdbc6a4b0bfdb63b1423
Author: Shea Levy <[email protected]>
Date: 2015-02-02 (Mon, 02 Feb 2015)
Changed paths:
M lib/licenses.nix
M maintainers/scripts/patchelf-hints.sh
M nixos/modules/services/networking/dnscrypt-proxy.nix
M nixos/modules/system/boot/stage-1.nix
M pkgs/applications/audio/cmus/default.nix
M pkgs/applications/audio/google-musicmanager/default.nix
M pkgs/applications/audio/moc/default.nix
M pkgs/applications/audio/spotify/default.nix
M pkgs/applications/editors/atom/default.nix
M pkgs/applications/editors/idea/default.nix
M pkgs/applications/editors/lighttable/default.nix
M pkgs/applications/editors/sublime/default.nix
M pkgs/applications/editors/sublime3/default.nix
M pkgs/applications/editors/vim/configurable.nix
M pkgs/applications/editors/vim/qvim.nix
M pkgs/applications/graphics/freecad/default.nix
M pkgs/applications/inferno/default.nix
M pkgs/applications/misc/adobe-reader/default.nix
M pkgs/applications/misc/googleearth/default.nix
M pkgs/applications/misc/xca/default.nix
M pkgs/applications/networking/browsers/chromium/plugins.nix
M pkgs/applications/networking/browsers/firefox-bin/default.nix
M
pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
M pkgs/applications/networking/browsers/opera/default.nix
M pkgs/applications/networking/copy-com/default.nix
M pkgs/applications/networking/dropbox/default.nix
M pkgs/applications/networking/ike/default.nix
M pkgs/applications/networking/instant-messengers/baresip/default.nix
M pkgs/applications/networking/instant-messengers/fuze/default.nix
M pkgs/applications/networking/instant-messengers/hipchat/default.nix
M pkgs/applications/networking/instant-messengers/skype/default.nix
M pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
M pkgs/applications/networking/remote/teamviewer/8.nix
M pkgs/applications/networking/remote/teamviewer/9.nix
M pkgs/applications/networking/remote/teamviewer/default.nix
M pkgs/applications/office/zotero/firefox-bin/default.nix
M pkgs/applications/science/electronics/eagle/default.nix
M pkgs/applications/science/logic/verifast/default.nix
M pkgs/applications/science/math/R/default.nix
M pkgs/applications/science/math/mathematica/9.nix
M pkgs/applications/science/math/mathematica/default.nix
M pkgs/applications/video/makemkv/default.nix
M pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
M pkgs/build-support/build-fhs-chrootenv/default.nix
A pkgs/build-support/cc-wrapper/add-flags
A pkgs/build-support/cc-wrapper/cc-wrapper.sh
A pkgs/build-support/cc-wrapper/default.nix
A pkgs/build-support/cc-wrapper/gnat-wrapper.sh
A pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh
A pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh
A pkgs/build-support/cc-wrapper/ld-wrapper.sh
A pkgs/build-support/cc-wrapper/setup-hook.sh
A pkgs/build-support/cc-wrapper/utils.sh
M pkgs/build-support/gcc-cross-wrapper/setup-hook.sh
R pkgs/build-support/gcc-wrapper/add-flags
R pkgs/build-support/gcc-wrapper/default.nix
R pkgs/build-support/gcc-wrapper/gcc-wrapper.sh
R pkgs/build-support/gcc-wrapper/gnat-wrapper.sh
R pkgs/build-support/gcc-wrapper/gnatlink-wrapper.sh
R pkgs/build-support/gcc-wrapper/ld-solaris-wrapper.sh
R pkgs/build-support/gcc-wrapper/ld-wrapper.sh
R pkgs/build-support/gcc-wrapper/setup-hook.sh
R pkgs/build-support/gcc-wrapper/utils.sh
M pkgs/desktops/kde-4.14/kdesdk/kde-dev-utils.nix
M pkgs/development/compilers/cudatoolkit/5.5.nix
M pkgs/development/compilers/cudatoolkit/6.0.nix
M pkgs/development/compilers/gcc/4.5/default.nix
M pkgs/development/compilers/gcc/4.6/default.nix
M pkgs/development/compilers/gcc/4.8/default.nix
M pkgs/development/compilers/gcc/4.9/default.nix
M pkgs/development/compilers/gcl/default.nix
M pkgs/development/compilers/ghcjs/default.nix
M pkgs/development/compilers/julia/0.2.nix
M pkgs/development/compilers/julia/0.3.nix
M pkgs/development/compilers/llvm/3.3/clang.nix
M pkgs/development/compilers/llvm/3.4/clang.nix
M pkgs/development/compilers/llvm/3.4/dragonegg.nix
M pkgs/development/compilers/mozart/binary.nix
M pkgs/development/compilers/openjdk/bootstrap.nix
M pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
M pkgs/development/compilers/rustc/1.0.0-alpha.nix
M pkgs/development/compilers/rustc/head.nix
M pkgs/development/guile-modules/guile-lib/default.nix
M pkgs/development/interpreters/dart/default.nix
M pkgs/development/interpreters/perl/5.16/no-impure-config-time.patch
M pkgs/development/libraries/dbus/default.nix
M pkgs/development/libraries/fmod/default.nix
M pkgs/development/libraries/glib/default.nix
M pkgs/development/libraries/glibc/default.nix
M pkgs/development/libraries/harfbuzz/default.nix
M pkgs/development/libraries/libgcrypt/no-build-timestamp.patch
M pkgs/development/libraries/libgpg-error/default.nix
M pkgs/development/libraries/libjpeg-turbo/default.nix
A pkgs/development/libraries/libmpc/default.nix
M pkgs/development/libraries/libre/default.nix
M pkgs/development/libraries/librem/default.nix
R pkgs/development/libraries/mpc/default.nix
M pkgs/development/libraries/v8/default.nix
M pkgs/development/libraries/wtk/default.nix
M pkgs/development/misc/amdapp-sdk/default.nix
M pkgs/development/misc/avr-gcc-with-avr-libc/default.nix
M pkgs/development/mobile/androidenv/androidsdk.nix
M pkgs/development/mobile/androidenv/build-tools.nix
M pkgs/development/mobile/androidenv/platform-tools.nix
M pkgs/development/perl-modules/DB_File/default.nix
M pkgs/development/perl-modules/generic/default.nix
M pkgs/development/tools/atom-shell/default.nix
M pkgs/development/tools/build-managers/cargo/snapshot.nix
M pkgs/development/tools/misc/ccache/default.nix
M pkgs/development/tools/misc/distcc/default.nix
M pkgs/development/tools/misc/saleae-logic/default.nix
M pkgs/development/tools/node-webkit/nw9.nix
M pkgs/development/tools/phantomjs/default.nix
M pkgs/development/tools/selenium/server/default.nix
M pkgs/games/adom/default.nix
M pkgs/games/andyetitmoves/default.nix
M pkgs/games/dwarf-fortress/default.nix
M pkgs/games/gsb/default.nix
M pkgs/games/megaglest/default.nix
M pkgs/games/oilrush/default.nix
M pkgs/games/planetaryannihilation/default.nix
M pkgs/games/quake3/wrapper/default.nix
M pkgs/games/sdlmame/default.nix
M pkgs/games/spring/default.nix
M pkgs/games/tibia/default.nix
M pkgs/games/ue4demos/default.nix
M pkgs/games/ultrastardx/default.nix
M pkgs/games/vessel/default.nix
M pkgs/games/worldofgoo/default.nix
M pkgs/misc/drivers/gutenprint/bin.nix
M pkgs/misc/emulators/wine/stable.nix
M pkgs/misc/emulators/wine/unstable.nix
M pkgs/os-specific/linux/ati-drivers/default.nix
M pkgs/os-specific/linux/kernel/generic.nix
M pkgs/os-specific/linux/nvidia-x11/default.nix
M pkgs/os-specific/linux/nvidia-x11/legacy173.nix
M pkgs/os-specific/linux/nvidia-x11/legacy304.nix
M pkgs/os-specific/linux/nvidia-x11/legacy340.nix
M pkgs/os-specific/linux/ocz-toolbox/default.nix
M pkgs/os-specific/linux/opengl/xorg-sys/default.nix
M pkgs/os-specific/linux/prl-tools/default.nix
M pkgs/os-specific/linux/systemd/default.nix
M pkgs/os-specific/linux/util-linux/default.nix
M pkgs/servers/nosql/influxdb/default.nix
M pkgs/servers/restund/default.nix
M pkgs/shells/bash/bash-4.3-patches.nix
M pkgs/stdenv/adapters.nix
M pkgs/stdenv/darwin/default.nix
M pkgs/stdenv/generic/setup.sh
M pkgs/stdenv/linux/default.nix
M pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix
M pkgs/stdenv/linux/make-bootstrap-tools.nix
M pkgs/stdenv/native/default.nix
M pkgs/stdenv/nix/default.nix
M pkgs/tools/admin/tightvnc/default.nix
M pkgs/tools/compression/xz/default.nix
M pkgs/tools/filesystems/yandex-disk/default.nix
M pkgs/tools/graphics/cuneiform/default.nix
M pkgs/tools/misc/megacli/default.nix
M pkgs/tools/networking/atftp/default.nix
M pkgs/tools/security/tor/torbrowser.nix
M pkgs/tools/typesetting/pdftk/default.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
Partial staging merge, including cc-wrapper fixes
Conflicts:
pkgs/applications/audio/spotify/default.nix
pkgs/build-support/cc-wrapper/default.nix
pkgs/development/compilers/cryptol/1.8.x.nix
Commit: aea1254f96b068d370cb0dbc16638e7cef8ba84c
https://github.com/NixOS/nixpkgs/commit/aea1254f96b068d370cb0dbc16638e7cef8ba84c
Author: Shea Levy <[email protected]>
Date: 2015-02-02 (Mon, 02 Feb 2015)
Changed paths:
M pkgs/applications/audio/spotify/default.nix
A pkgs/build-support/cc-wrapper/setup-hook-stdinc.sh
R pkgs/build-support/gcc-wrapper/setup-hook-stdinc.sh
M pkgs/top-level/all-packages.nix
Log Message:
-----------
cc-wrapper merge fixes
Compare: https://github.com/NixOS/nixpkgs/compare/acbf8eb5617b...aea1254f96b0_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
