1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 08:01:14 +00:00
Commit graph

53712 commits

Author SHA1 Message Date
Domen Kožar 412a2e21fb chromium: set two additional mimetypes for desktop icon 2014-11-26 20:56:29 +01:00
Shaun Sharples 61d7fb934b fontconfig: avoid questionmark in patch name on darwin
Close #5135.
@vcunat made this conditional to avoid rebuild for now.
2014-11-26 17:11:44 +01:00
Igor Pashev 1dd53cc990 Mediawiki: updated for Apache 2.4 2014-11-26 16:51:30 +01:00
Peter Simons fd27bc85be Merge pull request #5128 from abbradar/c2hs
Move c2hs/c2hsc into tools, update
2014-11-26 14:33:36 +01:00
Mathijs Kwik a5dafe7746 rethinkdb: upgrade to 1.15.2 2014-11-26 14:30:19 +01:00
Peter Simons 26bbbecae3 haskell-pandoc: use new editedCabalFile feature 2014-11-26 14:24:46 +01:00
Peter Simons 232e90378f haskell-twitter-conduit: use new editedCabalFile feature 2014-11-26 14:24:45 +01:00
Peter Simons c7d3f60217 cabal: add support for "editedCabalFile" attribute to address https://github.com/NixOS/cabal2nix/issues/84
When 'editedCabalFile' is set to an SHA256 hash, the build driver replaces the
original Cabal instructions with the new version that is downloaded from
"http://hackage.haskell.org/package/${fname}/${pname}.cabal".
2014-11-26 14:24:45 +01:00
Vincent Laporte 1bd68c4478 zim: update from 0.61 to 0.62 2014-11-26 13:08:01 +00:00
Pascal Wittmann 5c85b556dc Merge pull request #5119 from jeremyjh/dp-monad-control
haskell-distributed-process-monad-control add from Hackage
2014-11-26 12:19:31 +01:00
Edward Tjörnhammar 456882b142 Merge pull request #5115 from iu-parfunc/racket
racket: add libreadline to ffi libs - enables xrepl.
2014-11-26 12:08:50 +01:00
vbgl ee31a41da5 Merge pull request #5033 from michelk/saga_2.1.4
saga: update from 2.1.2 to 2.1.4 and re-enable build on x86_64-linux
2014-11-26 08:47:49 +00:00
vbgl 7f4f44d85a Merge pull request #5131 from spwhitt/git-extras
New package: git-extras
2014-11-26 07:41:30 +00:00
Bjørn Forsman 26c2e6a8a8 python-robomachine: add myself (bjornfor) as maintainer 2014-11-26 08:13:55 +01:00
Jeremy Huffman 1a516da865 haskell-distributed-process-monad-control add from Hackage 2014-11-25 21:56:19 -05:00
Spencer Whitt fdbd5e1323 New package: git-extras 2014-11-25 20:24:43 -05:00
Nikolay Amiantov 08748b4098 c2hs: update and move to development/tools 2014-11-26 01:27:07 +03:00
Nikolay Amiantov df16451fa5 c2hsc: move to development/tools 2014-11-26 01:27:07 +03:00
Edward Tjörnhammar 35bd5e6d0d Merge pull request #5124 from iyzsong/performous
performous: new package
2014-11-25 22:44:59 +01:00
Bjørn Forsman 3c748b6023 python-robomachine: new package
Test data generator for Robot Framework.

https://github.com/mkorpela/RoboMachine
2014-11-25 22:40:35 +01:00
Edward Tjörnhammar 4b287deccd ideas version bumps 2014-11-25 22:08:26 +01:00
Edward Tjörnhammar 49e112c309 i2pd: 0.3.0 -> 0.4.0 2014-11-25 21:15:53 +01:00
Austin Seipp 57ec90f90f nixpkgs: Fuzzing test case optimizer
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-11-25 13:03:43 -06:00
Austin Seipp b0dc5b17ca nixpkgs: American Fuzzy Lop
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-11-25 12:43:03 -06:00
Rene Donner 49561b8b65 julia -> 0.3.3 2014-11-25 20:57:36 +03:00
Pascal Wittmann c73ce5fa1e lessc: add comment that versions > 2.x break twitter-bootstrap 2014-11-25 18:45:59 +01:00
Pascal Wittmann 10c9196c0f parallel: update from 20141022 to 20141122 2014-11-25 18:18:05 +01:00
Pascal Wittmann 880f6a517e bmon: update from 3.5 to 3.6 2014-11-25 18:18:05 +01:00
Oliver Charles 60e661074d haskellPackages.ekgBosun: New expression 2014-11-25 16:10:36 +00:00
Ricardo M. Correia a4beb6a2b6 flashplayer: Update from 11.2.202.418 -> 11.2.202.424 2014-11-25 16:32:44 +01:00
Eelco Dolstra 1abc3e0155 firefox-bin: Fix meta.license 2014-11-25 16:30:50 +01:00
Eelco Dolstra dd2dedafa3 Style fixes 2014-11-25 16:01:27 +01:00
Shea Levy 957eb52f6f Merge branch 'strongswan' of github.com:ip1981/nixpkgs
Add strongswan service
2014-11-25 09:37:15 -05:00
Cillian de Róiste d250ca4e31 openimageio: update from 1.4.14 to 1.4.15 2014-11-25 15:33:22 +01:00
Igor Pashev 4c33004e1f Added strongSwan service 2014-11-25 15:29:34 +01:00
Igor Pashev 4f9111e91f strongSwan needs python for building (Closes #4940) 2014-11-25 15:29:05 +01:00
Oliver Charles 8a6914e659 haskellPackages.snapErrorCollector: New expression 2014-11-25 14:12:36 +00:00
宋文武 159bdd1219 performous: new package 2014-11-25 21:39:46 +08:00
aszlig 28b29f173d
chromium: Switch to using bundled protobuf.
This is a response to 1fdefd5562.

We are already using bundled protobuf for the beta and dev channels and
it also breaks regularly with about every new Chromium release, so let's
use bundled protobuf for all channels now.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-11-25 14:14:58 +01:00
aszlig 6f683e4ba3
my-env: Use sed to substitute $initialPath.
initialPath is now added to the top of the modified setup.sh. It's not
very nice altogether to patch setup.sh in this way, as it is prone to
break on setup.sh changes, but it should (hopefully finally, but
unfortunately only temporarily) fix the issue ewemoa (in #nixos) had
with myEnvFun.

In the long term, if people want to have roughly similar functionality,
nix-shell provides a better way for that, so maybe we might either
remove myEnvFun or replace it with a smaller implementation using
nix-shell.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-11-25 14:14:43 +01:00
aszlig 7d9fb8625e
chromium: Allow enableWideVine in nixpkgs.config.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-11-25 14:14:43 +01:00
aszlig 690a845de9
chromium: Use Nix expressions for plugin settings.
We now create Nix expressions within the plugin output path(s) which
then will be imported and incorporated into the wrapper. This makes it
easier for other plugins to provide configuration settings to the main
Chromium wrapper.

Of course, in order to allow for external plugins we need to allow
passing a list of plugins to the Chromium derivation, but right now we
keep it internal and only use it for things such as NaCl (as soon as we
support it, of course).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-11-25 14:14:43 +01:00
aszlig 518173ac24
chromium: Shorten line length of name attribute.
No feature change, I'm just very nitpicky if it comes to lines with more
than 79 characters.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-11-25 14:14:43 +01:00
Peter Simons 7ae1a17c89 Merge pull request #5120 from jeremyjh/distributed-process-p2p
haskell-distributed-process-p2p add from Hackage
2014-11-25 13:40:48 +01:00
Eelco Dolstra 1fdefd5562 Revert "protobuf: Clean up and update to version 2.6.1."
This reverts commit 18b306b041. Protobuf
releases are generally not very backwards compatible and likely to
break lots of stuff. E.g.

  http://hydra.nixos.org/build/17535340
  http://hydra.nixos.org/build/17535640
  http://hydra.nixos.org/build/17536998
  http://hydra.nixos.org/build/17536170

See also b851e970da.
2014-11-25 13:00:09 +01:00
vbgl 4158847b3e Merge pull request #5123 from dysinger/purescript-0.6.1.2
Upgrade Purescript to 0.6.1.2
2014-11-25 07:39:24 +00:00
Tim Dysinger dbe6c1a71f Upgrade Purescript to 0.6.1.2 2014-11-25 08:11:32 +01:00
Jeremy Huffman d21dc419d3 haskell-distributed-process-p2p add from Hackage 2014-11-24 20:55:14 -05:00
Shea Levy 140e1de0ec strongswan: dont patchelf
fixes #5045 ('fixes')
2014-11-24 20:50:26 -05:00
aszlig 83c2fcada4
my-env: Provide explicit store path for "rm".
If you do not provide any dependencies which don't propagate coreutils,
you'll get "rm: No such file or directory". Like for example by using
this:

nix-build -E '(import <nixpkgs> {}).myEnvFun {
    name = "mybrokentest";
    buildInputs = [];
}'

Thanks to "ewemoa" from the #nixos IRC channel for spotting this.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-11-25 02:05:48 +01:00