Commit Graph

60946 Commits

Author SHA1 Message Date
vbgl
d8db514f68 Merge pull request #7373 from nathanielbaxter/dev/gecode
gecode: update from 4.3.3 to 4.4.0
2015-04-14 16:24:17 +02:00
Thomas Tuegel
e75a0c50bd emacs: allow gtk without X on Darwin 2015-04-14 09:16:21 -05:00
Tobias Geerinckx-Rice
4213e9f30f netsniff-ng: v0.5.9-rc4-53-gdd5d906 -> v0.5.9-rc4-62-g47a7037 2015-04-14 15:51:36 +02:00
Peter Simons
ef21b5c27c cabal2nix: bump version and fix GHC 7.10.x build error
Fixes https://github.com/NixOS/cabal2nix/issues/158.
2015-04-14 15:42:38 +02:00
Mateusz Kowalczyk
0097e09420 tibia: update to 10.77 2015-04-14 14:27:40 +01:00
Ian-Woo Kim
ca5e8df0f4 haskell-distributed-process-*: disable several checkPhases and haddockPhases for distributed-process-* packages and cloud-haskell.
Resolved https://github.com/NixOS/nixpkgs/pull/7335.
2015-04-14 14:34:38 +02:00
Peter Simons
297f32d3e6 haskell-directory: test suite has been fixed upstream 2015-04-14 14:22:21 +02:00
Peter Simons
ccbe00dafb hackage-packages.nix: re-generate from Hackage 2015-04-13T23:41:21+0200 2015-04-14 14:22:21 +02:00
Peter Simons
65822005f0 Merge pull request #7314 from edwtjo/ihaskell-fixups
IHaskell fixes
2015-04-14 14:21:44 +02:00
Peter Simons
34c4b25e01 Merge pull request #7375 from edwtjo/remove-applied-mono-traversable-patch
haskellngPackages.mono-traversable: removing applied patch
2015-04-14 14:16:53 +02:00
Peter Simons
7de9c54b6e ghcjs: mark broken on 32-bit linux
https://github.com/NixOS/nixpkgs/issues/7341
2015-04-14 13:35:16 +02:00
Peter Simons
6edc3022ef Merge pull request #7345 from joachifm/conditional-shadow-setuids
nixos: condition shadow setuid-wrappers on mutableUsers
2015-04-14 13:23:19 +02:00
Eelco Dolstra
4beadc79dc less: Update to 475 2015-04-14 13:19:44 +02:00
Eelco Dolstra
3fe102b797 Merge pull request #7349 from aszlig/custom-channels
Make it easy to add system-wide custom channels.
2015-04-14 13:00:34 +02:00
Edward Tjörnhammar
c71ec659ee haskell-ng.packages.ghc7101.mono-traversable: removing applied patch 2015-04-14 12:34:01 +02:00
Michael Raskin
c9556bff3c Fix more common-lisp.net source 2015-04-14 12:48:54 +03:00
vbgl
ddfd81ec88 Merge pull request #7374 from nathanielbaxter/dev/keepass
keepass: update from 2.28 to 2.29
2015-04-14 11:29:47 +02:00
Michael Raskin
d4b5194ca6 Pass cacert to fetchdarcs in iterate source; maybe it is an isolated incident not worth fixing in fetchdarcs itself 2015-04-14 11:52:23 +03:00
Michael Raskin
43f227d577 Add default for ASDF in clwrapper 2015-04-14 11:52:23 +03:00
Nathaniel Baxter
23f4f44926 keepass: update from 2.28 to 2.29 2015-04-14 17:49:33 +10:00
Nathaniel Baxter
4b7d390c92 gecode: update from 4.3.3 to 4.4.0 2015-04-14 17:47:30 +10:00
aszlig
b1730f47e0
Merge pull request #7367 plus own fixes.
This introduces beets 1.3.11, changes can be found at:

https://github.com/sampsyo/beets/releases/tag/v1.3.11

Thanks to @pjones for the pull request, which also adds him to the
maintainers.

My changes on the other hand are only of cosmetic nature and do not
change anything in functionality.
2015-04-14 09:45:29 +02:00
aszlig
17ea86d947
beet: Remove unnecessary "LANG = null".
We're passing glibcLocales to the tests directly, so we don't pollute
the builder's environment anyway, so no reason to override anything
there.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-04-14 09:45:18 +02:00
aszlig
642b8ae658
boots: Sort expression strings/attributes.
I know, I know, this is me being ultra-nazi about those things, but
beets is about OCDing your music collection, so why not apply this to
the Nix expressions as well?

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-04-14 09:45:18 +02:00
Peter Jones
b836ab365b
beets: Update to new upstream version 1.3.11
Adds glibcLocales as a dependency so that the unit tests with UTF-8
strings will work correctly.
2015-04-14 09:45:17 +02:00
aszlig
311aa5d8d9
python-wrapper: Handle strings at the beginning.
This should fix #7366 for now, but using the (IMHO) pragmatic approach
of extending the sed expression to recognize strings.

However, this approach is obviously not parsing the full AST, nor does
it wrap Python itself (as pointed out by @spwhitt in #7366) but tries to
match Python strings as best as possible without getting TOO unreadable.

We also use a little bit of Nix to help generating the SED expression,
because doing the whole quote matching block over and over again would
be quite repetitious and error-prone to change. The reason why I'm using
imap here is that we need to have unique labels to avoid jumping into
the wrong branch.

So the new expression is not only able to match continous regions of
triple-quoted strings, but also regions with only one quote character
(even with escaped inner quotes) and empty strings.

However, what it doesn't correctly recognize is something like this:

"string1" "string2" "multi
line
string"

Which is very unlikely that we'll find something like this in the wild.
Of course, we could handle it as well, but it would mean that we need to
substitute the current line into hold space until we're finished parsing
the strings, branch off to another label where we match multiline
strings of all sorts and swap hold/pattern space and finally print the
result. So to summarize: The SED expression would be 3 to 4 times bigger
than now and we gain very little from that.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-04-14 07:13:15 +02:00
William A. Kennington III
a9e364a998 Merge pull request #7159 from codyopel/libvpx-cleanup
libvpx: refactor & 1.3.0 -> 1.4.0
2015-04-13 21:38:07 -07:00
William A. Kennington III
33e1cd6c38 ceph: 0.94 -> 0.94.1 2015-04-13 18:05:31 -07:00
William A. Kennington III
909f04995c gnupg: 2.1.2 -> 2.1.3 2015-04-13 18:03:01 -07:00
William A. Kennington III
cf1d7a9cb4 pinentry: 0.9.0 -> 0.9.1 2015-04-13 18:03:01 -07:00
William A. Kennington III
362ac71a66 libksba: 1.3.2 -> 1.3.3 2015-04-13 18:03:01 -07:00
William A. Kennington III
c855339dc7 libgpg-error: 1.18 -> 1.19 2015-04-13 18:03:01 -07:00
Joachim Fasting
75ab7bf960 nixos: condition shadow setuid-wrappers on mutableUsers
Having junk setuid wrappers in PATH is annoying.
2015-04-14 00:27:11 +02:00
Austin Seipp
2d8cfe76a9 Merge pull request #7186 from arno01/checksecfix
checksec: use binutils instead of elfutils
2015-04-13 17:12:41 -05:00
Austin Seipp
8d3b8d0dc8 Merge pull request #7149 from joachifm/grsec-gradm-optional
grsecurity module: configure gradm iff RBAC is enabled
2015-04-13 17:11:29 -05:00
Austin Seipp
b86f6a3ed6 Merge pull request #7148 from joachifm/grsec-trivial
grsecurity module: trivial improvements
2015-04-13 17:10:47 -05:00
Austin Seipp
409da39c08 Merge pull request #7163 from joachifm/tarsnap-bandwidth-options
tarsnap module: add options for controlling bandwidth
2015-04-13 17:10:04 -05:00
Charles Strahan
d48ff3a9b4 mailcore2: update to version 0.5.1 2015-04-13 16:54:51 -04:00
Charles Strahan
5bc00cce22 make libtidy an alias for html-tidy
I accidentally introduced the libtidy attr in 7e4ca1cc7
2015-04-13 16:54:51 -04:00
Jascha Geerds
57c1e7f23f Merge pull request #6770 from kirelagin/cups-browsed-avahi
cups-browsed: build with Avahi
2015-04-13 22:54:19 +02:00
Kirill Elagin
29f431e2a4 cups-browsed: build with Avahi
Fixes 5409.
2015-04-13 23:21:44 +03:00
Kirill Elagin
82eed03bfa cups-filters: fix build on non-NixOS 2015-04-13 23:20:30 +03:00
Arseniy Seroka
bf365c0da2 Merge pull request #7365 from k0ral/synergy
synergy: 1.6.2 -> 1.6.3
2015-04-13 22:08:07 +03:00
koral
cf2433f749 synergy: 1.6.2 -> 1.6.3 2015-04-13 18:13:11 +00:00
Arseniy Seroka
d829b2a3b0 Merge pull request #7359 from 1126/bump-pamixer
pamixer: update to 1.2.1
2015-04-13 20:15:51 +03:00
lethalman
5ce00faf1f Merge pull request #7362 from k0ral/abcde
abcde: 2.5.4 -> 2.6
2015-04-13 18:46:00 +02:00
koral
6709a38602 abcde: 2.5.4 -> 2.6 2015-04-13 16:04:24 +00:00
Eelco Dolstra
574173f0e6 Merge pull request #7027 from ecraven/apache-sslchain
apache-httpd: adding support for sslServerChain
2015-04-13 16:48:20 +02:00
Peter Feigl
3837ef82ad fixing documentation 2015-04-13 15:42:01 +02:00
Peter Feigl
e5b3918f85 apache-httpd: adding support for sslServerChain 2015-04-13 15:41:10 +02:00