cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
60913 commits 1 branch 0 tags 3.7 GiB
Commit graph

60913 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Eelco Dolstra
5501f5568b Merge pull request #6962 from ecraven/moodle-master 
apache-httpd: adding subservice moodle
 2015-04-13 15:01:04 +02: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
Peter Feigl
69b18fc4b6 fixing indentation 2015-04-13 13:46:42 +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
Peter Feigl
44ea83b986 changed config to only include the minimum necessary 2015-04-13 13:10:04 +02:00
Peter Feigl
49eb77b26c apache-httpd: adding subservice moodle 2015-04-13 13:06:39 +02:00
Eelco Dolstra
4466707ddf switch-to-configuration: Better error checking 2015-04-13 12:28:12 +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
Joachim Schiele
85c454ab1d Merge pull request #6785 from qknight/wordpress 
zef hemel's wordpress.nix adapted to extraSubservices
 2015-04-13 10:27:55 +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