Branch: refs/heads/x-updates
Home: https://github.com/NixOS/nixpkgs
Commit: af7fd67e430200cd4f81d1f2f58779713a373841
https://github.com/NixOS/nixpkgs/commit/af7fd67e430200cd4f81d1f2f58779713a373841
Author: Christophe Raffalli <[email protected]>
Date: 2013-06-07 (Fri, 07 Jun 2013)
Changed paths:
M pkgs/development/ocaml-modules/cryptokit/default.nix
Log Message:
-----------
upgraded ocaml/cryptokit to 1.7
Commit: 59877bd1adca6cdb718713c4abdd89f9a6f8ba0a
https://github.com/NixOS/nixpkgs/commit/59877bd1adca6cdb718713c4abdd89f9a6f8ba0a
Author: Christophe Raffalli <[email protected]>
Date: 2013-06-07 (Fri, 07 Jun 2013)
Changed paths:
M pkgs/development/ocaml-modules/camlzip/default.nix
Log Message:
-----------
upgraded camlzip to version 1.05 to allow compilation with ocaml-4.00.1
Commit: b3fa714f1fc7d550199404332a21e11ad2ab6f84
https://github.com/NixOS/nixpkgs/commit/b3fa714f1fc7d550199404332a21e11ad2ab6f84
Author: Christophe Raffalli <[email protected]>
Date: 2013-06-07 (Fri, 07 Jun 2013)
Changed paths:
M pkgs/development/ocaml-modules/lablgtk/default.nix
Log Message:
-----------
upgraded lablgtk to version 2.16 to allow compilation with ocaml-4.00.1
Commit: 87e10894981e4a07f8c320c8ece7100f26fd96ca
https://github.com/NixOS/nixpkgs/commit/87e10894981e4a07f8c320c8ece7100f26fd96ca
Author: Christophe Raffalli <[email protected]>
Date: 2013-06-07 (Fri, 07 Jun 2013)
Changed paths:
A pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
Upgraded omake to 0.9.8.6_rc1. kept the previous version as default because
this is a rc1.
This is necessary to compile the latest camlimages
Commit: 5765e186d242813c852c6a97641352051e2a993b
https://github.com/NixOS/nixpkgs/commit/5765e186d242813c852c6a97641352051e2a993b
Author: Christophe Raffalli <[email protected]>
Date: 2013-06-07 (Fri, 07 Jun 2013)
Changed paths:
M pkgs/development/ocaml-modules/sqlite3/default.nix
Log Message:
-----------
upgraded ocaml/sqlite3 to 2.0.4
Commit: 43faad80633a17c269a78691d531cebeabe6c44c
https://github.com/NixOS/nixpkgs/commit/43faad80633a17c269a78691d531cebeabe6c44c
Author: Christophe Raffalli <[email protected]>
Date: 2013-06-07 (Fri, 07 Jun 2013)
Changed paths:
A pkgs/development/ocaml-modules/ocamlnet/configure.patch
M pkgs/development/ocaml-modules/ocamlnet/default.nix
Log Message:
-----------
Upgraded ocamlnet to 3.6.3. Also enabled mot functionality of ocamlnet like
nethttp
Commit: 270d929089d1299d4022f12f05f2710fcb69d10d
https://github.com/NixOS/nixpkgs/commit/270d929089d1299d4022f12f05f2710fcb69d10d
Author: Christophe Raffalli <[email protected]>
Date: 2013-06-07 (Fri, 07 Jun 2013)
Changed paths:
A pkgs/development/ocaml-modules/camlimages/default.nix
A pkgs/development/ocaml-modules/dypgen/default.nix
A pkgs/development/ocaml-modules/lablgl/Makefile.config.patch
A pkgs/development/ocaml-modules/lablgl/default.nix
A pkgs/development/ocaml-modules/ocaml-cairo/META.patch
A pkgs/development/ocaml-modules/ocaml-cairo/default.nix
A pkgs/tools/typesetting/patoline/default.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
New ocaml packages:
- ocaml-cairo
- camlimages
- dypgen
- patoline
Commit: ac347e5cdeb234f4a70b2652cfbf01ea0bc9e7e7
https://github.com/NixOS/nixpkgs/commit/ac347e5cdeb234f4a70b2652cfbf01ea0bc9e7e7
Author: Christophe Raffalli <[email protected]>
Date: 2013-06-07 (Fri, 07 Jun 2013)
Changed paths:
M pkgs/top-level/all-packages.nix
Log Message:
-----------
Add the possibility to build a patoline environment with
nix-env -i env-patoline.
This is the only reasonnable way to install patoline which require
ocaml compiler with a large set of libraries installed.
Commit: 356983074eb4ad4711262a5b32091332ba2a1d51
https://github.com/NixOS/nixpkgs/commit/356983074eb4ad4711262a5b32091332ba2a1d51
Author: Christophe Raffalli <[email protected]>
Date: 2013-06-07 (Fri, 07 Jun 2013)
Changed paths:
A pkgs/development/tools/ocaml/omake/warn.patch
Log Message:
-----------
Forgotten to add wanr.patch for omake.
Commit: d7223f3a3e9b06468be0d71d3dd1c2bc48fd196c
https://github.com/NixOS/nixpkgs/commit/d7223f3a3e9b06468be0d71d3dd1c2bc48fd196c
Author: Christophe Raffalli <[email protected]>
Date: 2013-06-08 (Sat, 08 Jun 2013)
Changed paths:
M pkgs/top-level/all-packages.nix
Log Message:
-----------
simplify env-patoline and circumvert the bug with libgcc_s.so.1
Commit: e1bd332758d5a37308cdabc6dfa9eeffdbd7de72
https://github.com/NixOS/nixpkgs/commit/e1bd332758d5a37308cdabc6dfa9eeffdbd7de72
Author: Andrew Morsillo <[email protected]>
Date: 2013-06-09 (Sun, 09 Jun 2013)
Changed paths:
A pkgs/applications/misc/keepass/default.nix
M pkgs/development/compilers/mono/default.nix
M pkgs/lib/maintainers.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
Added keepass password manager. Updated mono DLLMap to allow mono to run
WinForms applications (keepass).
Commit: 6fff888ae82c1e3af6cb34baeaa56690beb2817f
https://github.com/NixOS/nixpkgs/commit/6fff888ae82c1e3af6cb34baeaa56690beb2817f
Author: Sander van der Burg <[email protected]>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M pkgs/top-level/node-packages-generated.nix
Log Message:
-----------
nijs: bump to 0.0.8
Commit: f724a5314ba8e9059bd5bf17a8f63e2abeafb5ff
https://github.com/NixOS/nixpkgs/commit/f724a5314ba8e9059bd5bf17a8f63e2abeafb5ff
Author: Vladimír Čunát <[email protected]>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M pkgs/applications/audio/flac/default.nix
M pkgs/applications/video/vlc/default.nix
Log Message:
-----------
flac: update, enable tests
Fix includes in VLC.
Tried a few other programs using it, seems fine.
Commit: 1b64fc9360acaa018967b6b8386b939f2b2de7df
https://github.com/NixOS/nixpkgs/commit/1b64fc9360acaa018967b6b8386b939f2b2de7df
Author: Domen Kozar <[email protected]>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M pkgs/applications/graphics/tesseract/default.nix
Log Message:
-----------
tesseract: upgrade to 3.02.02 and add some languages
Commit: 808cadd3905a828fb15730d80f21e790a219d834
https://github.com/NixOS/nixpkgs/commit/808cadd3905a828fb15730d80f21e790a219d834
Author: Domen Kozar <[email protected]>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M pkgs/applications/graphics/tesseract/default.nix
Log Message:
-----------
tesseract: simplify
Commit: 97f45745bd2e75c4e5271ef2f54aaef360a2913b
https://github.com/NixOS/nixpkgs/commit/97f45745bd2e75c4e5271ef2f54aaef360a2913b
Author: Peter Simons <[email protected]>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M pkgs/development/libraries/haskell/Agda/default.nix
Log Message:
-----------
haskell-Agda: update to version 2.3.2.1
Commit: fd1291e985047a8f3186b982143f108fd03c6d55
https://github.com/NixOS/nixpkgs/commit/fd1291e985047a8f3186b982143f108fd03c6d55
Author: Peter Simons <[email protected]>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M pkgs/development/libraries/haskell/ListLike/default.nix
Log Message:
-----------
haskell-ListLike: update to version 4.0.0
Commit: a7c884eb18369122279c08b6cd12854d6584a134
https://github.com/NixOS/nixpkgs/commit/a7c884eb18369122279c08b6cd12854d6584a134
Author: Peter Simons <[email protected]>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M pkgs/development/libraries/haskell/acid-state/default.nix
Log Message:
-----------
haskell-acid-state: update to version 0.10.0
Commit: 0e169b92ec4e1da8bbeaf330e703e106e52f114c
https://github.com/NixOS/nixpkgs/commit/0e169b92ec4e1da8bbeaf330e703e106e52f114c
Author: Peter Simons <[email protected]>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M pkgs/development/libraries/haskell/persistent/default.nix
Log Message:
-----------
haskell-persistent: update to version 1.2.0.2
Commit: 70b10b6267e86e00089b8d9e80e7d8f2cf369ea6
https://github.com/NixOS/nixpkgs/commit/70b10b6267e86e00089b8d9e80e7d8f2cf369ea6
Author: Peter Simons <[email protected]>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M pkgs/development/libraries/haskell/snap/core.nix
Log Message:
-----------
haskell-snap-core: update to version 0.9.4.0
Commit: acc6039e2c0c33f2d21c12875bc521c4e600e67e
https://github.com/NixOS/nixpkgs/commit/acc6039e2c0c33f2d21c12875bc521c4e600e67e
Author: Peter Simons <[email protected]>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M pkgs/development/libraries/haskell/iteratee/default.nix
Log Message:
-----------
haskell-iteratee: jailbreak to fix build with recent versions of ListLike
Commit: ceea8a18fcda8e940ea431527859440c578401e8
https://github.com/NixOS/nixpkgs/commit/ceea8a18fcda8e940ea431527859440c578401e8
Author: Lluís Batlle i Rossell <[email protected]>
Date: 2013-06-12 (Wed, 12 Jun 2013)
Changed paths:
M pkgs/applications/networking/irc/weechat/default.nix
Log Message:
-----------
weechat: update to 0.4.1
Commit: 6dbb6f78bb0f4e3e4495fef1664f51d40b85561f
https://github.com/NixOS/nixpkgs/commit/6dbb6f78bb0f4e3e4495fef1664f51d40b85561f
Author: Eelco Dolstra <[email protected]>
Date: 2013-06-12 (Wed, 12 Jun 2013)
Changed paths:
M pkgs/applications/version-management/subversion/default.nix
Log Message:
-----------
subversion: Update to 1.7.10
CVE-2013-1968, CVE-2013-2088, CVE-2013-2112.
Commit: c51077b222819c2f79c100289c7ffa1637dcc389
https://github.com/NixOS/nixpkgs/commit/c51077b222819c2f79c100289c7ffa1637dcc389
Author: Gergely Risko <[email protected]>
Date: 2013-06-12 (Wed, 12 Jun 2013)
Changed paths:
A pkgs/development/libraries/haskell/hflags/default.nix
M pkgs/top-level/haskell-packages.nix
Log Message:
-----------
Add hflags
Commit: f2256276affd37ea9e264c42b00512f0a73afb82
https://github.com/NixOS/nixpkgs/commit/f2256276affd37ea9e264c42b00512f0a73afb82
Author: Lluís Batlle i Rossell <[email protected]>
Date: 2013-06-12 (Wed, 12 Jun 2013)
Changed paths:
M pkgs/applications/networking/irc/irssi/otr/default.nix
Log Message:
-----------
irssi_otr: update to latest master
Commit: ce9f40f5a7af545508d02c5ad97fc75f3c0a105a
https://github.com/NixOS/nixpkgs/commit/ce9f40f5a7af545508d02c5ad97fc75f3c0a105a
Author: Lluís Batlle i Rossell <[email protected]>
Date: 2013-06-12 (Wed, 12 Jun 2013)
Changed paths:
M pkgs/applications/networking/p2p/gnunet/svn.nix
Log Message:
-----------
gnunet-svn: updating to latest
Commit: 4970ec637ed634c2ea4d7c4bc953f69bd276c2f0
https://github.com/NixOS/nixpkgs/commit/4970ec637ed634c2ea4d7c4bc953f69bd276c2f0
Author: Lluís Batlle i Rossell <[email protected]>
Date: 2013-06-12 (Wed, 12 Jun 2013)
Changed paths:
A pkgs/os-specific/linux/psmouse-alps/default.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
Adding psmouse-alps, a touchpad kernel driver.
Some laptops use these new touchpads, and this driver is
supposed to provide proper support for them.
Commit: 4fe22e28cb11898de63e0e0291bcb51fa567dde1
https://github.com/NixOS/nixpkgs/commit/4fe22e28cb11898de63e0e0291bcb51fa567dde1
Author: Jason "Don" O'Conal <[email protected]>
Date: 2013-06-12 (Wed, 12 Jun 2013)
Changed paths:
A pkgs/applications/networking/mailreaders/sup/default.nix
M pkgs/lib/maintainers.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
Add sup expression
Commit: 593228f18dea57fd5d538925fa79cec39ef4016d
https://github.com/NixOS/nixpkgs/commit/593228f18dea57fd5d538925fa79cec39ef4016d
Author: Jason "Don" O'Conal <[email protected]>
Date: 2013-06-12 (Wed, 12 Jun 2013)
Changed paths:
M pkgs/top-level/all-packages.nix
Log Message:
-----------
Compile libusb with gccApple on darwin
Commit: ee00c7aa4eab65f010328c11f196e870bf25a2bc
https://github.com/NixOS/nixpkgs/commit/ee00c7aa4eab65f010328c11f196e870bf25a2bc
Author: Jason "Don" O'Conal <[email protected]>
Date: 2013-06-12 (Wed, 12 Jun 2013)
Changed paths:
M pkgs/applications/networking/mailreaders/sup/default.nix
M pkgs/tools/security/gnupg/default.nix
Log Message:
-----------
Add gpgme build input for sup
Commit: a5e65e66b1ae9eb7f33c0bf6b8662166ea112b60
https://github.com/NixOS/nixpkgs/commit/a5e65e66b1ae9eb7f33c0bf6b8662166ea112b60
Author: Jason "Don" O'Conal <[email protected]>
Date: 2013-06-12 (Wed, 12 Jun 2013)
Changed paths:
M pkgs/applications/networking/mailreaders/sup/default.nix
M pkgs/development/interpreters/ruby/generated.nix
M pkgs/development/interpreters/ruby/patches.nix
A pkgs/development/libraries/ruby_gpgme/default.nix
A pkgs/development/libraries/ruby_ncursesw_sup/default.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
sup: separate dependencies
create separate expressions for gems requiring native extensions to be
built:
* gpgme
* ncursesw_sup
* xapian_full_alaveteli
Commit: 150a6a70637a7ffc51222d80dc7bd699720eafda
https://github.com/NixOS/nixpkgs/commit/150a6a70637a7ffc51222d80dc7bd699720eafda
Author: Jason "Don" O'Conal <[email protected]>
Date: 2013-06-12 (Wed, 12 Jun 2013)
Changed paths:
M pkgs/development/libraries/ruby_gpgme/default.nix
Log Message:
-----------
Rename ruby gpgme gem to ruby-gpgme
Commit: b62aa175a2990e75ea1f964d17885390db136c16
https://github.com/NixOS/nixpkgs/commit/b62aa175a2990e75ea1f964d17885390db136c16
Author: Jason "Don" O'Conal <[email protected]>
Date: 2013-06-12 (Wed, 12 Jun 2013)
Changed paths:
M pkgs/tools/security/gnupg/default.nix
Log Message:
-----------
gnupg: use libiconvOrEmpty instead of libiconv (not required for glibc
platforms)
Commit: 6f50a9d4f07da9206de255975b969506bcaf2962
https://github.com/NixOS/nixpkgs/commit/6f50a9d4f07da9206de255975b969506bcaf2962
Author: Jason "Don" O'Conal <[email protected]>
Date: 2013-06-12 (Wed, 12 Jun 2013)
Changed paths:
M pkgs/applications/networking/mailreaders/sup/default.nix
Log Message:
-----------
sup: use libiconvOrEmpty instead of plain old libiconv
Commit: b31db11a69785a5deb63182884c87a3ff929b00a
https://github.com/NixOS/nixpkgs/commit/b31db11a69785a5deb63182884c87a3ff929b00a
Author: Jason "Don" O'Conal <[email protected]>
Date: 2013-06-12 (Wed, 12 Jun 2013)
Changed paths:
M pkgs/misc/ghostscript/default.nix
Log Message:
-----------
ghostscript: add libiconvOrEmpty to build inputs
Commit: 740c2bdf475f510ea5b90ce2ec1a0a6a258e729e
https://github.com/NixOS/nixpkgs/commit/740c2bdf475f510ea5b90ce2ec1a0a6a258e729e
Author: Peter Simons <[email protected]>
Date: 2013-06-12 (Wed, 12 Jun 2013)
Changed paths:
M pkgs/misc/ghostscript/default.nix
Log Message:
-----------
Merge pull request #615 from lovek323/ghostscript
ghostscript: add libiconvOrEmpty to build inputs
Commit: 128166a1f01f1becdde07023a792e27e9a322751
https://github.com/NixOS/nixpkgs/commit/128166a1f01f1becdde07023a792e27e9a322751
Author: Peter Simons <[email protected]>
Date: 2013-06-12 (Wed, 12 Jun 2013)
Changed paths:
A pkgs/development/libraries/haskell/hflags/default.nix
M pkgs/top-level/haskell-packages.nix
Log Message:
-----------
Merge pull request #613 from errge/hflags
Add hflags
Commit: 7e52e251e8f901914f503f0d056bb321ff9a8c57
https://github.com/NixOS/nixpkgs/commit/7e52e251e8f901914f503f0d056bb321ff9a8c57
Author: Jason "Don" O'Conal <[email protected]>
Date: 2013-06-12 (Wed, 12 Jun 2013)
Changed paths:
M pkgs/development/libraries/atk/2.6.x.nix
Log Message:
-----------
atk: add libintlOrEmpty as build input
Commit: 71439b3e96fab0ac9df8ac792a72f177db69e6fa
https://github.com/NixOS/nixpkgs/commit/71439b3e96fab0ac9df8ac792a72f177db69e6fa
Author: Peter Simons <[email protected]>
Date: 2013-06-12 (Wed, 12 Jun 2013)
Changed paths:
A pkgs/applications/networking/mailreaders/sup/default.nix
M pkgs/development/interpreters/ruby/generated.nix
M pkgs/development/interpreters/ruby/patches.nix
A pkgs/development/libraries/ruby_gpgme/default.nix
A pkgs/development/libraries/ruby_ncursesw_sup/default.nix
M pkgs/lib/maintainers.nix
M pkgs/tools/security/gnupg/default.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
Merge pull request #610 from lovek323/sup
Add sup expression
Commit: d884c2b63916e6dcbbf217229b41eb5083371b94
https://github.com/NixOS/nixpkgs/commit/d884c2b63916e6dcbbf217229b41eb5083371b94
Author: Jason "Don" O'Conal <[email protected]>
Date: 2013-06-12 (Wed, 12 Jun 2013)
Changed paths:
M pkgs/development/libraries/gdk-pixbuf/2.26.x.nix
Log Message:
-----------
gdk-pixbuf: add libintlOrEmpty to build inputs
Commit: 930b88c2a983cd286eb2dced5525f56b6ba39a39
https://github.com/NixOS/nixpkgs/commit/930b88c2a983cd286eb2dced5525f56b6ba39a39
Author: Jason "Don" O'Conal <[email protected]>
Date: 2013-06-12 (Wed, 12 Jun 2013)
Changed paths:
M pkgs/development/libraries/cairo/default.nix
Log Message:
-----------
cairo: add correct include path for pixman.h
Commit: e931f3b93519582a7b1f7c368c981c79deb402ed
https://github.com/NixOS/nixpkgs/commit/e931f3b93519582a7b1f7c368c981c79deb402ed
Author: Vladimír Čunát <[email protected]>
Date: 2013-06-13 (Thu, 13 Jun 2013)
Changed paths:
M pkgs/development/libraries/libgcrypt/default.nix
Log Message:
-----------
libgcrypt: attempt to fix i686-freebsd builds, #616
It would probably be better to get newer "as" from somewhere, but I
don't see how.
Commit: dc0c630e54c5c5b79f4b23ca376b0919f115e965
https://github.com/NixOS/nixpkgs/commit/dc0c630e54c5c5b79f4b23ca376b0919f115e965
Author: Jason "Don" O'Conal <[email protected]>
Date: 2013-06-13 (Thu, 13 Jun 2013)
Changed paths:
M pkgs/development/libraries/gtk+/2.24.x.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
gtk2: fix compilation on darwin
* add libintlOrEmpty to build inputs
* allow cups to be disabled by setting config.gtk2.cups to false
Commit: 8232b0eef1ee8188ddefa294ac368c4a297dfcf6
https://github.com/NixOS/nixpkgs/commit/8232b0eef1ee8188ddefa294ac368c4a297dfcf6
Author: Jason "Don" O'Conal <[email protected]>
Date: 2013-06-13 (Thu, 13 Jun 2013)
Changed paths:
M pkgs/development/libraries/pango/1.30.x.nix
Log Message:
-----------
pango: add correct cairo include path
Commit: 7b3ebfe8c505336b666076f9e6e20729da440c57
https://github.com/NixOS/nixpkgs/commit/7b3ebfe8c505336b666076f9e6e20729da440c57
Author: Peter Simons <[email protected]>
Date: 2013-06-13 (Thu, 13 Jun 2013)
Changed paths:
A pkgs/development/tools/documentation/haddock/2.13.2.1.nix
M pkgs/top-level/haskell-packages.nix
Log Message:
-----------
haskell-haddock: add version 2.13.2.1
Commit: 01c57234dbd1c48ba91cbb84e0b5d2c043a640f2
https://github.com/NixOS/nixpkgs/commit/01c57234dbd1c48ba91cbb84e0b5d2c043a640f2
Author: Peter Simons <[email protected]>
Date: 2013-06-13 (Thu, 13 Jun 2013)
Changed paths:
M pkgs/development/libraries/haskell/concurrent-extra/default.nix
Log Message:
-----------
haskell-concurrent-extra: update to version 0.7.0.6
Commit: 21e1ec907978e286adcadde710aa75170d6245e6
https://github.com/NixOS/nixpkgs/commit/21e1ec907978e286adcadde710aa75170d6245e6
Author: Peter Simons <[email protected]>
Date: 2013-06-13 (Thu, 13 Jun 2013)
Changed paths:
M pkgs/development/libraries/haskell/hakyll/default.nix
Log Message:
-----------
haskell-hakyll: update to version 4.3.0.0
Commit: e5c7533b6c9278e35a4f2beb2716476ee55ad181
https://github.com/NixOS/nixpkgs/commit/e5c7533b6c9278e35a4f2beb2716476ee55ad181
Author: Sander van der Burg <[email protected]>
Date: 2013-06-13 (Thu, 13 Jun 2013)
Changed paths:
M pkgs/development/mobile/titaniumenv/titaniumsdk.nix
Log Message:
-----------
titaniumsdk: Bump to version 3.1.1
Commit: 6baad4d4d6686c374af0f0fae2d0d856ab97c713
https://github.com/NixOS/nixpkgs/commit/6baad4d4d6686c374af0f0fae2d0d856ab97c713
Author: Jason "Don" O'Conal <[email protected]>
Date: 2013-06-13 (Thu, 13 Jun 2013)
Changed paths:
M pkgs/applications/editors/vim/configurable.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
vim_configurable: fix compilation on darwin
* compile with gccApple
* enable darwinSupport by default
* do not use patchelf
Commit: c7536d2fa607b06ed257dbae236d672b53f24063
https://github.com/NixOS/nixpkgs/commit/c7536d2fa607b06ed257dbae236d672b53f24063
Author: Michael Raskin <[email protected]>
Date: 2013-06-13 (Thu, 13 Jun 2013)
Changed paths:
M pkgs/applications/editors/vim/configurable.nix
M pkgs/development/libraries/atk/2.6.x.nix
M pkgs/development/libraries/cairo/default.nix
M pkgs/development/libraries/gdk-pixbuf/2.26.x.nix
M pkgs/development/libraries/gtk+/2.24.x.nix
M pkgs/development/libraries/pango/1.30.x.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
Merge pull request #617 from lovek323/vim_configurable
Get vim_configurable compiling on darwin
Commit: 27bbff463fb5cfded08cd992577ba048434e3140
https://github.com/NixOS/nixpkgs/commit/27bbff463fb5cfded08cd992577ba048434e3140
Author: Michael Raskin <[email protected]>
Date: 2013-06-13 (Thu, 13 Jun 2013)
Changed paths:
A pkgs/development/ocaml-modules/camlimages/default.nix
M pkgs/development/ocaml-modules/camlzip/default.nix
M pkgs/development/ocaml-modules/cryptokit/default.nix
A pkgs/development/ocaml-modules/dypgen/default.nix
A pkgs/development/ocaml-modules/lablgl/Makefile.config.patch
A pkgs/development/ocaml-modules/lablgl/default.nix
M pkgs/development/ocaml-modules/lablgtk/default.nix
A pkgs/development/ocaml-modules/ocaml-cairo/META.patch
A pkgs/development/ocaml-modules/ocaml-cairo/default.nix
A pkgs/development/ocaml-modules/ocamlnet/configure.patch
M pkgs/development/ocaml-modules/ocamlnet/default.nix
M pkgs/development/ocaml-modules/sqlite3/default.nix
A pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix
A pkgs/development/tools/ocaml/omake/warn.patch
A pkgs/tools/typesetting/patoline/default.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
Merge pull request #601 from craff/ocaml/upgrade_and_new
Ocaml/upgrade and new
Commit: ed51d54610c88f1b1bf226d58735e1cd0cf4736c
https://github.com/NixOS/nixpkgs/commit/ed51d54610c88f1b1bf226d58735e1cd0cf4736c
Author: Michael Raskin <[email protected]>
Date: 2013-06-13 (Thu, 13 Jun 2013)
Changed paths:
A pkgs/applications/misc/keepass/default.nix
M pkgs/development/compilers/mono/default.nix
M pkgs/lib/maintainers.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
Merge pull request #606 from fignuts/master
Add keepass password manager and update mono DLLMap.
Commit: ebaf0c01d39822b56cf390e534a081cb697e66f2
https://github.com/NixOS/nixpkgs/commit/ebaf0c01d39822b56cf390e534a081cb697e66f2
Author: Malcolm Matalka <[email protected]>
Date: 2013-06-13 (Thu, 13 Jun 2013)
Changed paths:
M pkgs/servers/nosql/riak/1.3.1.nix
Log Message:
-----------
Fixes rebar shebang, also fixes source of leveldb zip to be the canonical one
from github
Commit: 8fe0f0007bb84bafcf5f7209c12c779b24bec7f8
https://github.com/NixOS/nixpkgs/commit/8fe0f0007bb84bafcf5f7209c12c779b24bec7f8
Author: Michael Raskin <[email protected]>
Date: 2013-06-13 (Thu, 13 Jun 2013)
Changed paths:
M pkgs/servers/nosql/riak/1.3.1.nix
Log Message:
-----------
Merge pull request #618 from orbitz/add-riak-1.3.1-fix-rebar-shebang
Fixes rebar shebang, also fixes source of leveldb zip to be the canonica...
Commit: 19530856ed44248c8e14cfc6533b4001318e74d1
https://github.com/NixOS/nixpkgs/commit/19530856ed44248c8e14cfc6533b4001318e74d1
Author: Michael Raskin <[email protected]>
Date: 2013-06-13 (Thu, 13 Jun 2013)
Changed paths:
M pkgs/applications/audio/flac/default.nix
M pkgs/applications/editors/vim/configurable.nix
M pkgs/applications/graphics/tesseract/default.nix
A pkgs/applications/misc/keepass/default.nix
M pkgs/applications/networking/irc/irssi/otr/default.nix
M pkgs/applications/networking/irc/weechat/default.nix
A pkgs/applications/networking/mailreaders/sup/default.nix
M pkgs/applications/networking/p2p/gnunet/svn.nix
M pkgs/applications/version-management/subversion/default.nix
M pkgs/applications/video/vlc/default.nix
M pkgs/development/compilers/mono/default.nix
M pkgs/development/interpreters/ruby/generated.nix
M pkgs/development/interpreters/ruby/patches.nix
M pkgs/development/libraries/atk/default.nix
M pkgs/development/libraries/cairo/default.nix
M pkgs/development/libraries/gdk-pixbuf/default.nix
M pkgs/development/libraries/gtk+/2.x.nix
M pkgs/development/libraries/haskell/Agda/default.nix
M pkgs/development/libraries/haskell/ListLike/default.nix
M pkgs/development/libraries/haskell/acid-state/default.nix
M pkgs/development/libraries/haskell/concurrent-extra/default.nix
M pkgs/development/libraries/haskell/hakyll/default.nix
A pkgs/development/libraries/haskell/hflags/default.nix
M pkgs/development/libraries/haskell/iteratee/default.nix
M pkgs/development/libraries/haskell/persistent/default.nix
M pkgs/development/libraries/haskell/snap/core.nix
M pkgs/development/libraries/libgcrypt/default.nix
M pkgs/development/libraries/pango/default.nix
A pkgs/development/libraries/ruby_gpgme/default.nix
A pkgs/development/libraries/ruby_ncursesw_sup/default.nix
M pkgs/development/mobile/titaniumenv/titaniumsdk.nix
A pkgs/development/ocaml-modules/camlimages/default.nix
M pkgs/development/ocaml-modules/camlzip/default.nix
M pkgs/development/ocaml-modules/cryptokit/default.nix
A pkgs/development/ocaml-modules/dypgen/default.nix
A pkgs/development/ocaml-modules/lablgl/Makefile.config.patch
A pkgs/development/ocaml-modules/lablgl/default.nix
M pkgs/development/ocaml-modules/lablgtk/default.nix
A pkgs/development/ocaml-modules/ocaml-cairo/META.patch
A pkgs/development/ocaml-modules/ocaml-cairo/default.nix
A pkgs/development/ocaml-modules/ocamlnet/configure.patch
M pkgs/development/ocaml-modules/ocamlnet/default.nix
M pkgs/development/ocaml-modules/sqlite3/default.nix
A pkgs/development/tools/documentation/haddock/2.13.2.1.nix
A pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix
A pkgs/development/tools/ocaml/omake/warn.patch
M pkgs/lib/maintainers.nix
M pkgs/misc/ghostscript/default.nix
A pkgs/os-specific/linux/psmouse-alps/default.nix
M pkgs/servers/nosql/riak/1.3.1.nix
M pkgs/tools/security/gnupg/default.nix
A pkgs/tools/typesetting/patoline/default.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/haskell-packages.nix
M pkgs/top-level/node-packages-generated.nix
Log Message:
-----------
Merge remote-tracking branch 'upstream/master' into x-updates
Conflicts:
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/gdk-pixbuf/default.nix
pkgs/development/libraries/gtk+/2.x.nix
pkgs/misc/ghostscript/default.nix
pkgs/top-level/all-packages.nix
Commit: 605c5a55a8f61ac8d1ae4d782a05f092f08dd92a
https://github.com/NixOS/nixpkgs/commit/605c5a55a8f61ac8d1ae4d782a05f092f08dd92a
Author: Michael Raskin <[email protected]>
Date: 2013-06-13 (Thu, 13 Jun 2013)
Changed paths:
M pkgs/applications/audio/flac/default.nix
M pkgs/applications/editors/vim/configurable.nix
M pkgs/applications/graphics/tesseract/default.nix
A pkgs/applications/misc/keepass/default.nix
M pkgs/applications/networking/irc/irssi/otr/default.nix
M pkgs/applications/networking/irc/weechat/default.nix
A pkgs/applications/networking/mailreaders/sup/default.nix
M pkgs/applications/networking/p2p/gnunet/svn.nix
M pkgs/applications/version-management/subversion/default.nix
M pkgs/applications/video/vlc/default.nix
M pkgs/development/compilers/mono/default.nix
M pkgs/development/interpreters/ruby/generated.nix
M pkgs/development/interpreters/ruby/patches.nix
M pkgs/development/libraries/atk/default.nix
M pkgs/development/libraries/cairo/default.nix
M pkgs/development/libraries/gdk-pixbuf/default.nix
M pkgs/development/libraries/gtk+/2.x.nix
M pkgs/development/libraries/haskell/Agda/default.nix
M pkgs/development/libraries/haskell/ListLike/default.nix
M pkgs/development/libraries/haskell/acid-state/default.nix
M pkgs/development/libraries/haskell/concurrent-extra/default.nix
M pkgs/development/libraries/haskell/hakyll/default.nix
A pkgs/development/libraries/haskell/hflags/default.nix
M pkgs/development/libraries/haskell/iteratee/default.nix
M pkgs/development/libraries/haskell/persistent/default.nix
M pkgs/development/libraries/haskell/snap/core.nix
M pkgs/development/libraries/libgcrypt/default.nix
M pkgs/development/libraries/pango/default.nix
A pkgs/development/libraries/ruby_gpgme/default.nix
A pkgs/development/libraries/ruby_ncursesw_sup/default.nix
M pkgs/development/mobile/titaniumenv/titaniumsdk.nix
A pkgs/development/ocaml-modules/camlimages/default.nix
M pkgs/development/ocaml-modules/camlzip/default.nix
M pkgs/development/ocaml-modules/cryptokit/default.nix
A pkgs/development/ocaml-modules/dypgen/default.nix
A pkgs/development/ocaml-modules/lablgl/Makefile.config.patch
A pkgs/development/ocaml-modules/lablgl/default.nix
M pkgs/development/ocaml-modules/lablgtk/default.nix
A pkgs/development/ocaml-modules/ocaml-cairo/META.patch
A pkgs/development/ocaml-modules/ocaml-cairo/default.nix
A pkgs/development/ocaml-modules/ocamlnet/configure.patch
M pkgs/development/ocaml-modules/ocamlnet/default.nix
M pkgs/development/ocaml-modules/sqlite3/default.nix
A pkgs/development/tools/documentation/haddock/2.13.2.1.nix
A pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix
A pkgs/development/tools/ocaml/omake/warn.patch
M pkgs/lib/maintainers.nix
M pkgs/misc/ghostscript/default.nix
A pkgs/os-specific/linux/psmouse-alps/default.nix
M pkgs/servers/nosql/riak/1.3.1.nix
M pkgs/tools/security/gnupg/default.nix
A pkgs/tools/typesetting/patoline/default.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/haskell-packages.nix
M pkgs/top-level/node-packages-generated.nix
Log Message:
-----------
Merge branch 'x-updates-failed-merge-2013-06-13' into x-updates
Commit: 1a41887398e51f11c06deba0eb5ed3ca4b76eff1
https://github.com/NixOS/nixpkgs/commit/1a41887398e51f11c06deba0eb5ed3ca4b76eff1
Author: Michael Raskin <[email protected]>
Date: 2013-06-13 (Thu, 13 Jun 2013)
Changed paths:
M pkgs/development/libraries/cairo/default.nix
Log Message:
-----------
Fix a missing option declaration after merge
Commit: 7093dd2c707dbb76fcd9bb3998d5c8439c5b4d67
https://github.com/NixOS/nixpkgs/commit/7093dd2c707dbb76fcd9bb3998d5c8439c5b4d67
Author: Michael Raskin <[email protected]>
Date: 2013-06-13 (Thu, 13 Jun 2013)
Changed paths:
M pkgs/development/libraries/mesa/default.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
Some fixes
Compare: https://github.com/NixOS/nixpkgs/compare/94d8de2b998e...7093dd2c707d
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
