Commit Graph

52444 Commits

Author SHA1 Message Date
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
Eelco Dolstra
4beadc79dc less: Update to 475 2015-04-14 13:19:44 +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
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
Austin Seipp
2d8cfe76a9 Merge pull request #7186 from arno01/checksecfix
checksec: use binutils instead of elfutils
2015-04-13 17:12:41 -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
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
koral
6709a38602 abcde: 2.5.4 -> 2.6 2015-04-13 16:04:24 +00:00
Jascha Geerds
04239d4af2 pycharm: Update to 4.0.6 2015-04-13 14:24:56 +02:00
Peter Simons
3e176fb2e3 Merge pull request #7358 from Fuuzetsu/dyre-nix_ghc
haskell-ng: patch dyre to check NIX_GHC
2015-04-13 13:51:58 +02:00
lethalman
4661e12bf7 Merge pull request #7283 from fooblahblah/dbvis
Package for dbvisualizer 9.2.5
2015-04-13 13:35:47 +02:00
_1126
b1d1397c5c pamixer: update to 1.2.1
This commit also switches from fetchgit to fetchurl.
2015-04-13 13:28:29 +02:00
Mateusz Kowalczyk
8f48e49d71 haskell-ng: patch dyre to check NIX_GHC
xmonad is patched in similar manner already
2015-04-13 11:08:15 +01:00
Pascal Wittmann
6fba1d8628 Merge pull request #7348 from dezgeg/bastet
bastet: new package
2015-04-13 11:49:45 +02:00
Pascal Wittmann
367b4e48a7 Merge pull request #7346 from k0ral/glances
glances: 2.1 -> 2.3
2015-04-13 11:45:19 +02:00
Pascal Wittmann
2162279b92 Merge pull request #7356 from AndersonTorres/atari800
Atari800: 2.2.1 -> 3.1.0
2015-04-13 11:44:52 +02:00
Jascha Geerds
03b87e7243 Merge pull request #7351 from Forkk/fix/cask-init
cask: fix issue with 'cask init' command
2015-04-13 11:31:36 +02:00
AndersonTorres
eae83dc472 Atari800: 2.2.1 -> 3.1.0 2015-04-13 05:35:43 -03:00
Joachim Schiele
4bf8c805b1 Merge pull request #6877 from qknight/eclipse_scala
eclipse-scala: added Scala IDE
2015-04-13 10:29:07 +02:00
Arseniy Seroka
04f52e8cbe Merge pull request #7342 from C0DEHERO/fix/xonotic-update
Fix/xonotic update
2015-04-13 09:54:56 +03:00
William A. Kennington III
c9cb532c8f rsyslog: 8.8.0 -> 8.9.0 2015-04-12 20:39:07 -07:00
William A. Kennington III
6044bfe3af feh: 2.12 -> 2.12.1 2015-04-12 20:34:20 -07:00
William A. Kennington III
6fa8239669 libevdev: 1.3.1 -> 1.4.1 2015-04-12 20:33:00 -07:00
Domen Kožar
c6512f7df3 buildPythonPackage: propagate setuptools 2015-04-12 21:15:36 -04:00
Shea Levy
114ffa0d6c Oops, forgot to update the hash 2015-04-12 19:23:35 -04:00
Shea Levy
e01c96d14c Add linux 4.0
Untested yet, my build machine is too slow
2015-04-12 19:17:53 -04:00
C0DEHERO
fbf5798e82 xonotic: update 0.7.0 -> 0.8.0 2015-04-12 19:09:48 -04:00
Forkk
d385fd9111 cask: fix issue with 'cask init' command
Fix an issue where 'cask init' would fail due to missing template files.
2015-04-13 00:36:49 +02:00