3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

69591 commits

Author SHA1 Message Date
Jude Taylor 4f9ef9bbfb give xquartz impure deps to make it build 2015-09-28 14:45:45 -07:00
Jude Taylor 41ef382b9b bring darwin libtool back into scope for node 2015-09-28 10:47:34 -07:00
Jude Taylor 6367e48225 Revert "pop"
This reverts commit 724e243159.

This (clearly) should never have been committed, and is probably due to a failed stash pop
on my part.
2015-09-28 09:41:02 -07:00
Jude Taylor 638f24cc93 excise accidental change included with 14bd5c0 2015-09-28 09:36:15 -07:00
Jude Taylor 406c366432 revert realLibtool 2015-09-28 09:16:05 -07:00
Jude Taylor 01f130e577 update bundler-head SHA256 2015-09-26 23:12:59 -07:00
Jude Taylor ae8cc5449b revert rubies callPackages change 2015-09-26 06:27:25 -07:00
Jude Taylor e7c8dd748a Merge pull request #9834 from NixOS/rubies
Merge Ruby versions into one file
2015-09-26 06:25:01 -07:00
Jude Taylor 68e802c46b PR comments 2015-09-26 06:23:25 -07:00
Jude Taylor 1223210576 re-indent; make rubies overridable 2015-09-26 05:55:59 -07:00
Jude Taylor 99a66bc2f9 put all rubies in scope 2015-09-26 05:55:59 -07:00
Jude Taylor dcf933e258 move rubies into a single file 2015-09-26 05:55:59 -07:00
Luca Bruno 5aa066a942 Merge branch 'gnome-staging' into staging 2015-09-26 14:16:19 +02:00
Luca Bruno 7d1cb980bf libarchive: fix .la file for lzo2 2015-09-25 14:06:58 +02:00
Luca Bruno 702fde3a91 libarchive: fix .la file for lzo2 2015-09-25 14:06:23 +02:00
Eelco Dolstra 2896861c7e pcre: Smaller patch for CVE-2015-3210, CVE-2015-5073 2015-09-25 11:53:19 +02:00
Eelco Dolstra 298ec05e74 Revert "pcre: Updates to fix a number of vulnerabilities"
This reverts commit 453b986d2f. Such
large patches should not be included in the repo.
2015-09-25 11:38:34 +02:00
Eelco Dolstra 72aa458285 Revert "pcre: Fix patch method"
This reverts commit fb30776a77.
2015-09-25 11:38:26 +02:00
Jude Taylor e43d3b7114 fix faulty include in libpsl 2015-09-25 02:33:30 -07:00
Jaka Hudoklin 5d6500fee8 Merge pull request #10028 from itkovian/elasticsearch-1.7.2
elasticsearch: 1.5.2 -> 1.7.2
2015-09-25 11:10:10 +02:00
Luca Bruno 45b1f5858c Merge branch 'gnome' into staging 2015-09-25 10:51:50 +02:00
Luca Bruno 26aea8b1aa gnome3: init 3.18 2015-09-25 10:48:41 +02:00
Luca Bruno 41fc49ed7e clutter: init 1.24.0 2015-09-25 10:48:41 +02:00
Luca Bruno bb16eb8f9d cogl: init 1.22.0 2015-09-25 10:48:41 +02:00
Luca Bruno 48ac26f512 gtk+: 3.16.6 -> 3.18.0 2015-09-25 10:48:41 +02:00
Luca Bruno 0a40884e3c pango: 1.36.8 -> 1.38.0 2015-09-25 10:48:41 +02:00
Luca Bruno 4c9b91b2a2 gdk-pixbuf: 2.31.6 -> 2.32.0 2015-09-25 10:48:40 +02:00
Luca Bruno 0688a56a49 at-spi2-atk: 2.16.0 -> 2.18.0 2015-09-25 10:48:40 +02:00
Luca Bruno 8b3e6b5f62 at-spi2-core: 2.16.0 -> 2.18.0 2015-09-25 10:48:40 +02:00
Luca Bruno 6858ca17db gobject-introspection: 1.44.0 -> 1.46.0 2015-09-25 10:48:40 +02:00
Luca Bruno 63ccbf55b2 atk: 2.16.0 -> 2.18.0 2015-09-25 10:48:40 +02:00
Luca Bruno 6bb4df642e glib: 2.44.1 -> 2.46.0 2015-09-25 10:48:39 +02:00
Luca Bruno b1f4a7ef32 webkitgtk: 2.8.5 -> 2.10.0 2015-09-25 10:48:39 +02:00
Luca Bruno 697d61ceab maint script gnome.sh: update all packages 2015-09-25 10:48:39 +02:00
Gabriel Ebner d06a172c1c metis-prover: init at 2.3 2015-09-25 10:48:39 +02:00
Brian McKenna be5d0141c5 google-musicmanager: beta_1.0.182.3607-r0 -> beta_1.0.221.5230-r0
The previous version was 404

Also fixes i686 typo
2015-09-25 10:48:38 +02:00
Robbin C 9e15068099 ctpp2: init at 2.8.3.
This adds ctpp2, a high performance templating engine.
2015-09-25 10:48:38 +02:00
William A. Kennington III 4086bd92a5 Merge branch 'master.upstream' into staging.upstream 2015-09-23 22:33:52 -07:00
William A. Kennington III 9c345fc97d jemalloc: 4.0.0 -> 4.0.2 2015-09-23 22:31:40 -07:00
William A. Kennington III 4856efb704 rustc: Disable system jemalloc until we can make it compatible 2015-09-23 22:31:28 -07:00
William A. Kennington III 2dc9cb1120 libcap-ng: 0.7.3 -> 0.7.7
Also support swig + python bindings
2015-09-23 20:49:19 -07:00
William A. Kennington III 09d336ea5e libarchive: Support lzo 2015-09-23 20:49:03 -07:00
William A. Kennington III 5856e44258 jemalloc: Fix jemalloc prefix for applications which expect ^malloc 2015-09-23 20:48:14 -07:00
Jude Taylor e7605dd08b add nodejs-4.1.0 2015-09-23 16:13:34 -07:00
Andy Georges cdf13a0a06 elasticsearch: 1.5.2 -> 1.7.2 2015-09-24 00:18:29 +02:00
Robbin C 7c149b86c3 dfhack: init at 0.40.24-r3
A Dwarf Fortress memory access library, distributed with scripts and plugins implementing a wide variety of useful functions and tools.
2015-09-23 23:52:03 +02:00
William A. Kennington III d3f4ba9d6f Merge branch 'master.upstream' into staging.upstream 2015-09-23 14:44:21 -07:00
Drew Hess 3c8b92f4b3 Workaround for getcwd configure test on 10.11.
See https://openradar.appspot.com/22671534 for a description of the
problem.
2015-09-23 14:41:41 -07:00
William A. Kennington III 5cfe893cc4 Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream
This is a partial commit from staging in an attempt to make merges
smaller.
2015-09-23 14:35:36 -07:00
William A. Kennington III 0d0be13878 rustUnstable: Don't depend on a stable rust compiler 2015-09-23 12:30:00 -07:00