1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 23:52:33 +00:00
Commit graph

63061 commits

Author SHA1 Message Date
Mateusz Kowalczyk 177d40f582 Merge branch 'agda' of https://github.com/Ericson2314/nixpkgs into agda 2015-05-23 04:15:50 +01:00
William A. Kennington III ea7805b5fd Merge pull request #7950 from spwhitt/gtk3
gtk3: fix on Darwin
2015-05-22 19:32:21 -07:00
Mateusz Kowalczyk 6014752e73 tesseract: fix postInstall
We needed to separate each of the unpack commands.
2015-05-23 02:27:47 +01:00
Mateusz Kowalczyk 4d867b0b08 mpv: update to 0.9.2 2015-05-23 01:56:39 +01:00
Mateusz Kowalczyk 815f85edfd python-livestreamer: update to 1.12.2 2015-05-23 01:40:19 +01:00
Spencer Whitt ffcea6546d gtk3: fix on Darwin 2015-05-22 20:11:09 -04:00
Spencer Whitt 3d60104a74 libepoxy: enable on Darwin 2015-05-22 20:10:53 -04:00
William A. Kennington III 1dc671956b consul: 0.5.1 -> 0.5.2 2015-05-22 15:59:05 -07:00
William A. Kennington III dabd9ec29c goPackages: Build on hydra 2015-05-22 15:58:51 -07:00
Peter Simons b7dd802f6c Merge pull request #7948 from magnetophon/fasd-fixup-master
fasd: remove pandoc dep (==haskell), update revision
2015-05-22 23:40:40 +02:00
William A. Kennington III 54963fb5b7 ceph: Now evaluate on darwin 2015-05-22 14:20:29 -07:00
William A. Kennington III 2ebe0fc88b gtk3: Mark as linux only temporarily 2015-05-22 14:20:29 -07:00
William A. Kennington III 3117e0c897 Refactor mkFlag out of old packages 2015-05-22 13:54:52 -07:00
William A. Kennington III 25a148fa19 Refactor mkFlag / shouldUsePkg into the nixpkgs libraries 2015-05-22 13:26:55 -07:00
Bart Brouns 177cbf7348 fasd: remove pandoc dep (==haskell), update revision 2015-05-22 21:50:17 +02:00
Peter Simons 50fa9d8eea Merge pull request #7941 from peti/allow-custom-ssh-moduli-file
nixos: add config.services.openssh.moduliFile option so that users can replace the default file from OpenSSH
2015-05-22 20:51:42 +02:00
Peter Simons 06f3c4dba5 daq: update to version 2.0.5
Fixes https://github.com/NixOS/nixpkgs/issues/7947.
2015-05-22 20:41:59 +02:00
Arseniy Seroka f06ec43e8b Merge pull request #7946 from couchemar/isort-3.9.6
Add python package: isort-3.9.6
2015-05-22 20:04:03 +03:00
Thomas Tuegel 4115f7794b webkitgtk24x: update to webkitgtk-2.4.9, fix build 2015-05-22 11:52:50 -05:00
Andrey Pavlov e32332b9b5 Add python package: isort-3.9.6 2015-05-22 19:11:27 +03:00
Arseniy Seroka 7170d670ce Merge pull request #7943 from spwhitt/readmeGrammar
Readme: Minor grammatical tweaks
2015-05-22 19:06:58 +03:00
Arseniy Seroka 831109cbe7 Merge pull request #7944 from bosu/selenium-2.45
Upgrade to selenium 2.45
2015-05-22 19:05:27 +03:00
Boris Sukholitko 1da49e714d Upgrade to selenium 2.45
Without the upgrade, firefox driver is unusable, due to:

https://code.google.com/p/selenium/issues/detail?id=8399
2015-05-22 17:40:18 +03:00
Peter Simons f3b68ea7e0 haskell-gitlib has been fixed upstream.
Resolves https://github.com/peti/nixpkgs/pull/6.
2015-05-22 16:35:55 +02:00
Peter Simons 4e3669b6ea haskell-configuration-ghc-7.10.x: update ticket URL for ghc-mod 2015-05-22 16:35:55 +02:00
Peter Simons 791e865c3e haskell-token-bucket: disable test suite to avoid build failure because of an apparently trivial error 2015-05-22 16:35:55 +02:00
Peter Simons f25d2e1a71 haskell-snap: drop obsolete override 2015-05-22 16:35:55 +02:00
Peter Simons 2e01d4a2b6 haskell-pipes-errors: fix build of latest (non-default) version 2015-05-22 16:35:55 +02:00
Peter Simons da6567785b hackage-packages.nix: update to 134ac5a06c with hackage2nix revision a31a6f02a9c437a93e5f13394aa2268f476433aa 2015-05-22 16:35:52 +02:00
Peter Simons 86d299bc6e nixos: add config.services.openssh.moduliFile option so that users can replace the default file from OpenSSH
The man page for ssh-keygen(1) has a section "MODULI GENERATION" that describes
how to generate your own moduli file. The following script might also be helpful:

 | #! /usr/bin/env bash
 |
 | moduliFiles=()
 |
 | generateModuli()
 | {
 |   ssh-keygen -G "moduli-$1.candidates" -b "$1"
 |   ssh-keygen -T "moduli-$1" -f "moduli-$1.candidates"
 |   rm "moduli-$1.candidates"
 | }
 |
 | for (( i=0 ; i <= 16 ; ++i )); do
 |   let bitSize="2048 + i * 128"
 |   generateModuli "$bitSize" &
 |   moduliFiles+=( "moduli-$bitSize" )
 | done
 | wait
 |
 | echo >moduli "# Time Type Tests Tries Size Generator Modulus"
 | cat >>moduli "${moduliFiles[@]}"
 | rm "${moduliFiles[@]}"

Note that generating moduli takes a long time, i.e. several hours on a fast
machine!

This patch resolves https://github.com/NixOS/nixpkgs/pull/5870.
2015-05-22 16:28:45 +02:00
viric bcfa84cae2 Merge pull request #7878 from dezgeg/pr-extlinux
generic-extlinux-compatible: Add new bootloader for ARM
2015-05-22 16:02:22 +02:00
Spencer Whitt 7aeab54129 Readme: Minor grammatical tweaks 2015-05-22 09:10:47 -04:00
Edward Tjörnhammar a49afdf174 idea.clion: 1.0.2 -> 1.0.3
idea.android-studio: 1.2.0.12 -> 1.2.1.1
2015-05-22 14:28:48 +02:00
Arseniy Seroka adfc77fcdf Merge pull request #7935 from doublec/tor
Update tor to 0.2.6.8
2015-05-22 14:48:04 +03:00
Eelco Dolstra 178c52e7ad Add Ubuntu 15.04 2015-05-22 13:21:02 +02:00
Sander van der Burg e612ea59c0 rman: add expression 2015-05-22 10:04:44 +00:00
Peter Simons 01945507c5 README.md: add line breaks to make the file readable outside of Github 2015-05-22 11:57:15 +02:00
Sander van der Burg c5fa23cb85 rman: add package 2015-05-22 09:51:32 +00:00
Eelco Dolstra 99e9710348 thunderbird: Update to 31.7.0
Also enable parallel building, as it seems to work reliably for
Firefox.
2015-05-22 11:46:18 +02:00
aszlig b26de39252
gyp: Revive old SVN version to build Chromium.
Works around regression from a305e6855d.

We're also marking it lowPrio to make sure nobody will accidentally
reference it using nix-env -i.

Until we have fixed #7402, we're going to build with the old gyp version
to prevent being affected by https://crbug.com/462153.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-05-22 11:37:40 +02:00
aszlig 5f50f23013
nixos/tests/chromium: Detect popup using OCR.
This will make the test a lot more reliable, because we no longer need
to press ESC multiple times hoping that it will close the popup.

Unfortunately in order to run this test I needed to locally revert the
gyp update from a305e6855d.

With the old gyp version however the test runs fine and it's able to
properly detect the popup.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-05-22 11:23:09 +02:00
Florian Friesdorf dfbd1ddb8b README.md: more details for nixpkgs-channels 2015-05-22 10:55:06 +02:00
Florian Friesdorf 1b76e29552 README.md: add info about nixpkgs-channels repo 2015-05-22 10:43:33 +02:00
Tobias Geerinckx-Rice 87b27c9da5 stress-ng 0.04.02 -> 0.04.03 2015-05-22 10:39:28 +02:00
Tobias Geerinckx-Rice 5d5044b2ec Use mirror:// URIs for ftp.debian.org
Provide a more robust experience for users with horrible network
hardware (me).
2015-05-22 10:39:27 +02:00
Damien Cassou 188a067d8e Merge pull request #7929 from DamienCassou/update-networkmanager-1.0.2
networkmanager 1.0.0 -> 1.0.2
2015-05-22 10:19:48 +02:00
Damien Cassou 3a50708958 network-manager 1.0.0 -> 1.0.2 2015-05-22 10:17:01 +02:00
aszlig 2475a6a239
nixos/test-driver: Fix bashism in Machine.pm.
Thanks to @bjornfor for the note.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-05-22 08:10:17 +02:00
aszlig f12208c5a4
nixos/testing: Use stripped down tesseract only.
Only include the English language for the VM tests, because we most
likely won't need other languages. At least for now.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-05-22 08:01:17 +02:00
aszlig adb7581459
tesseract: Allow to specify a subset of languages.
Especially useful for our OCR based VM tests, where we only need the
english language. By default the argument is null so all languages are
included. If a list of language name is passed only those languages are
enabled, for example:

tesseract.override { enableLanguages = [ "eng" "spa" ]; };

To only enable support for English and Spanish languages.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-05-22 07:45:59 +02:00