Commit Graph

1698 Commits

Author SHA1 Message Date
Luca Bruno
b7f49e89af xulrunner: disable gconf 2015-09-29 10:29:48 +02:00
Vladimír Čunát
76ef7a93e3 Merge: xlibs and x11 attribute cleanup
Frequently using multiple *almost* identical attributes is bad.
2015-09-23 10:42:34 +02:00
William A. Kennington III
0a7176c5a1 Revert "bundlerEnv: Use released versions of bundler"
This reverts commit 7bc8b1561e.

This breaks some ruby gems and needs to be reworked again.
2015-09-20 22:05:29 -07:00
William A. Kennington III
7bc8b1561e bundlerEnv: Use released versions of bundler
We were using HEAD for unreleased features. These features are now in
release builds so we should go back to using those. This also means we
won't have to deal with hash mismatches for all ruby packages.
2015-09-20 18:56:56 -07:00
William A. Kennington III
773b4deb7c Merge commit 'a6f6c0e' into master.upstream
This is a partial merge of staging where we have up to date binaries for
all packages.
2015-09-15 12:16:49 -07:00
Vladimír Čunát
88c9f8b574 xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Vladimír Čunát
21e3ff658a x11: replace its usage by xlibsWrapper directly
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
2015-09-15 12:08:24 +02:00
Pascal Wittmann
1e24c18d18 mujs: 2015-01-22 -> 2015-09-15 2015-09-15 11:02:23 +02:00
Domen Kožar
cabb050528 add python35 and python35Packages 2015-09-15 07:46:46 +02:00
Mathnerd314
eb7404d97a all-packages: Use callPackage where possible 2015-09-14 22:27:19 -06:00
Pascal Wittmann
f2e03fb4dc bundler: 1.10.5 -> 1.10.6 2015-09-13 21:25:58 +02:00
Arseniy Seroka
488c5ac433 Merge pull request #9502 from anderspapitto/0ad
add spidermonkey 31.5, and upgrade 0ad to version 18 Alpha
2015-09-09 03:11:43 +03:00
Anders Papitto
4bcde3f244 spidermonkey: add 31.5 2015-09-08 17:00:34 -07:00
Pascal Wittmann
855716a66b ceptre: 2015-08-15 -> 2015-08-30 2015-09-08 18:11:50 +02:00
Eelco Dolstra
0ea1169dae php: Latest versions 2015-09-08 15:32:33 +02:00
Vladimír Čunát
8f33b8cc93 mass rewrite of find parameters to cross-platform style
Fixes #9044, close #9667. Thanks to @taku0 for suggesting this solution.
Now we have no modes starting with `/` or `+`.

Rewrite the `-perm` parameters of find:
 - completely safe: rewrite `/0100` and `+100` to `-0100`,
 - slightly semantics-changing: rewrite `+111` to `-0100`.
I cross-verified the `find` manual pages for Linux, Darwin, FreeBSD.
2015-09-06 10:26:30 +02:00
Ryan Artecona
4183604207 elixir: fix mix on darwin
Darwin disallows shebang scripts from using other scripts as their
command--the command must be a binary. This commit changes the `mix`
shebang script from calling `elixir` directly (another shebang script),
instead using `env` as an intermediary.

Fixes #9050
2015-09-05 23:49:51 -04:00
Pascal Wittmann
46d9fbc446 ceptre: init at 2015-08-15
A linear logic programming language for modeling generative interactive systems
2015-09-05 11:20:29 +02:00
William A. Kennington III
c6f689f951 Merge branch 'master.upstream' into staging.upstream 2015-09-04 12:05:11 -07:00
Nikolay Amiantov
c31a677482 Revert "bundler-HEAD: fix checksum"
This reverts commit 9cea5bcf2c.
See 9cea5bcf2c (commitcomment-13058505)
2015-09-04 01:14:50 +03:00
William A. Kennington III
86ebd3ee25 Merge branch 'master.upstream' into staging.upstream 2015-09-03 11:15:58 -07:00
Nikolay Amiantov
9cea5bcf2c bundler-HEAD: fix checksum
Related to #8567
2015-09-03 12:22:12 +03:00
Domen Kožar
89cec0c096 racket: don't build docs as it causes failures sometimes
(cherry picked from commit 1a392bd62e4d8ff92ec92ebe48912b8295714e2e)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-02 21:16:20 +02:00
William A. Kennington III
7735c6cb0e Merge branch 'master.upstream' into staging.upstream 2015-08-31 10:28:18 -07:00
Thomas Tuegel
5d57d8244a Merge pull request #9427 from henrytill/racket-6.2.1
racket: 6.2 -> 6.2.1
2015-08-30 13:56:54 -05:00
William A. Kennington III
5ca1c32a9d Merge branch 'master.upstream' into staging.upstream 2015-08-28 17:55:20 -07:00
Edward Tjörnhammar
28a18999fa ruby: use fetchFromSavannah to enable better availability for proxied users. 2015-08-28 07:45:49 +02:00
Thomas Tuegel
ce79122119 pypy: wrap original, not symlink 2015-08-26 09:35:48 -05:00
Jude Taylor
4e8279b43b darwin purity: ruby-2.1.6 2015-08-25 17:14:02 -07:00
Henry Till
94abba931d racket: 6.2 -> 6.2.1 2015-08-24 14:54:05 -04:00
Jude Taylor
65dd349574 update mysteriously varying git hashes 2015-08-21 12:00:35 -07:00
William A. Kennington III
2ac70270e8 Merge branch 'master.upstream' into staging.upstream 2015-08-18 11:36:32 -07:00
Nikolay Amiantov
344e522166 python: add .env for convenient nix-shell's 2015-08-17 21:22:50 +03:00
William A. Kennington III
a106080623 Merge branch 'master.upstream' into staging.upstream 2015-08-14 13:22:00 -07:00
Shea Levy
c541c23692 nix-exec: Bugfix bump 2015-08-14 15:56:01 -04:00
Shea Levy
529596fd31 Bump nix-exec for new nix 2015-08-14 09:49:41 -04:00
William A. Kennington III
952def0e3c Merge branch 'master.upstream' into staging.upstream 2015-08-13 11:55:02 -07:00
Eelco Dolstra
64b3974d13 php: Use callPackages 2015-08-11 13:24:23 +02:00
Eelco Dolstra
e7504ebf71 php: Update to 5.4.44, 5.5.28, 5.6.12 2015-08-11 13:24:23 +02:00
William A. Kennington III
4624985561 Merge branch 'master.upstream' into staging.upstream 2015-08-07 13:40:39 -07:00
Pascal Wittmann
006a2f553e picoc: disable broken tests on i686 2015-08-06 12:52:34 +02:00
William A. Kennington III
09b4a7cc1b Merge branch 'master.upstream' into staging.upstream 2015-07-31 17:26:20 -07:00
Tobias Geerinckx-Rice
6c6201a99b Remove unnecessary rec{s from "my" packages 2015-07-31 02:02:07 +02:00
Eelco Dolstra
55932c1bec Don't statically depend on cacert for certificates
This reverts commit cd52c04456 and
others.

Managing certificates (including revoking certificates and adding
custom certificates) becomes extremely painful if every package in the
system potentially depends on a different copy of cacert. Also, it
makes updating cacert rather expensive.
2015-07-31 01:34:58 +02:00
William A. Kennington III
7ebe164ae0 Merge branch 'master.upstream' into staging.upstream 2015-07-30 15:03:10 -07:00
Luca Bruno
863d426a3b supercollider: build with gcc48 (ZHF) 2015-07-30 13:09:58 +02:00
Vladimír Čunát
862900e42e mass-replace deprecated usage of find -perm (Fixes #9044)
sed 's|-perm +0|-perm /0|g'
It's a mass-rebuild due to usage in stdenv's default setup hooks.
2015-07-30 10:30:17 +02:00
William A. Kennington III
aaef42ab8c Merge branch 'master.upstream' into staging.upstream 2015-07-29 10:23:08 -07:00
Jude Taylor
78e6b78bc6 fix source hashes for cabal2nix and bundler 2015-07-28 12:24:14 -07:00
Eelco Dolstra
cca7cdb631 php: Update to 5.4.43, 5.5.27, 5.6.11
CVE-2015-3152
2015-07-28 13:10:53 +02:00