1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-30 01:20:40 +00:00
Commit graph

23615 commits

Author SHA1 Message Date
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
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 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
Charles Strahan d48ff3a9b4 mailcore2: update to version 0.5.1 2015-04-13 16:54:51 -04: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
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
Austin Seipp a4e63baf35 nixpkgs: arcanist 20150318 -> 20150412
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-04-12 12:16:30 -05:00
Shea Levy 526bf50e2e data-clist: Bump to 0.0.7.4
Refs sw17ch/data-clist#8

Not a full hackage update due to NixOS/cabal2nix#160
2015-04-12 12:45:30 -04:00
Austin Seipp 11ff78da80 nixpkgs: update oraclejdk8 sha256s
Apparently, these changed.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-04-12 01:15:52 -05:00
Shea Levy 95c8a358f5 diagrams-rasterific: jailbreak 2015-04-11 18:26:29 -04:00
Shea Levy 1cbf0b7d27 diagrams-lib: build on ghc-7.10 2015-04-11 18:22:50 -04:00
Shea Levy ed892e222b ekg: jailbreak 2015-04-11 17:46:37 -04:00
Shea Levy 5b1692531e diagrams-core: Enable building on ghc 7.10 2015-04-11 17:40:04 -04:00
Shea Levy aa65eacedc statestack: Patch in ghc 7.10 support 2015-04-11 17:26:32 -04:00
Shea Levy 6d6bd65b62 monoid-extras: Build on 7.10 2015-04-11 17:20:20 -04:00
Shea Levy da2d0519d7 haskell-linear: Patch out Werror 2015-04-11 17:01:10 -04:00
Shea Levy 06089c3505 ekg-core: Jailbreak for ghc-prim 2015-04-11 16:34:09 -04:00
Shea Levy 4316ecdd81 haskell-ng.data-clist: jailbreak 2015-04-11 16:30:50 -04:00
Shea Levy 0521b74009 safecopy: Disable tests on ghc 7.10
Refs acid-state/safecopy#25 acid-state/safecopy#26
2015-04-11 15:23:53 -04:00
Shea Levy afa985d4e7 arithmoi: Fix for ghc 7.10 2015-04-11 14:40:39 -04:00
Shea Levy fe4d221a30 ffmpeg-light: libavutil is part of ffmpeg.
Refs NixOS/cabal2nix#159
2015-04-11 14:24:02 -04:00
William A. Kennington III f2c5ddb966 xmlrpc-c: 1.25.30 -> 1.33.17 2015-04-10 23:23:53 -07:00
John Wiegley 86bead829a bedrock: Don't bulid Cito without the platform 2015-04-10 14:13:54 -05:00
Vincent Laporte 0dcd94bf81 ocaml-pgocaml: update from 2.1 to 2.2 2015-04-10 17:45:37 +02:00
Arseniy Seroka 3fb880fc77 Merge pull request #7296 from devhell/mediainfo
Update mediainfo{-gui} and dependencies
2015-04-10 17:52:45 +03:00
Peter Simons 37f7e152d5 Merge pull request #7303 from teh/master
Update closure-compiler and fix purescript for ghc 7.8
2015-04-10 13:48:40 +02:00
Peter Simons 79fca7c3e4 Merge pull request #7267 from couchemar/erlang-r17.5
erlang/R17 update to 17.5
2015-04-10 11:12:40 +02:00
Vladimír Čunát 6e80d9b5fb shroedinger: add a mirror, as homepage is inaccessible 2015-04-10 09:41:03 +02:00
Arseniy Seroka 00c3a9751a Merge pull request #7284 from couchemar/elixir-1.0.4
Update elixir to 1.0.4
2015-04-09 23:49:02 +03:00
Charles Strahan 7d11b9535d Merge pull request #7161 from cstrahan/taffybar-fix
haskell: fix taffybar on GHC 7.10
2015-04-09 16:33:35 -04:00
William A. Kennington III f00f25bf6a libsecret: 0.16 -> 0.18 2015-04-09 13:21:46 -07:00
Charles Strahan b5f63776a0 haskell: simplify ghcjs-dom expression for GHCJS 2015-04-09 15:02:16 -04:00
Charles Strahan ed30c8ba40 haskell: use native alex and happy for GHCJS 2015-04-09 15:02:16 -04:00
Charles Strahan f415ce2953 haskell: bring back wl-pprint patch
partially reverts 5742215
2015-04-09 15:02:16 -04:00
devhell 4c9d7ccbe7 Update mediainfo{-gui} and dependencies
* mediainfo{-gui} 0.7.72 -> 0.7.73
* libmediainfo    0.7.72 -> 0.7.73
* libzen          0.4.30 -> 0.4.31

From the mediainfo ChangeLog:
```
Version 0.7.73, 2015-04-09

+ BPG: basic support, thanks to Kurtnoise
+ CAF: basic support of Apple Core Audio Format, sponsored by FlavorSys
+ JPEG-2000: Display of profile (Rsiz)
+ JPEG-2000: detection of XYZ colorspace (based on D-Cinema profile)
+ FFV1 in MOV: more details (version...)
+ MOV/MPEG-4: handling of clcn (little endian nclc) Color parameter type
+ #P84, Matroska: Add TEXTST support to the MKV Parser, thanks to Kurtnoise
+ #P85, MPEG-TS: Add TEXTST support to the MPEG-PSI Parser, thanks to Kurtnoise
+ MediaInfoDLL interface: clean up, more debug features added
+ MediaInfoDLL interface: Giant threads lock removed
+ #F460, VC-3/DNxHD: detection of RGB 444 and other SMPTE ST 2019 (2014) new CIDs
+ VC-3/DNxHD: version number (HVN)
+ Clean aperture size is move from width/height to its own field
+ HEVC: tier
+ MXF: writing library and writing application fields are cleaned up
+ ProRes: support of 4444 profiles
+ CAP: detection of CAP files from Cheetah and Lambda
x B886, XML and HTML outputs were broken
x B902: EBU AspectRatio invalid in case of non classic numerator:denominator format
x #B758, VC-3/DNxHD: wrong color space and subsampling in case of unknown CID, now empty if format version is not known
x #B903, MXG: Incorrect timecode track used for AS-11 DPP MXF files
x #B904, MXF: Handling repetition of Header Metadata in MXF files
x MXF: AFD value was wrong (displaying the complete byte, but AFD is only 4 bits of this byte)
x DTS: some streams in Little endian were not detected
x MPEG-4: some files were having an incorrect frame count
x AVC: Some SCTE 128 caption streams were displayed twice
x BMP; accepting files with file size information set to -1
x RF64: samplesCount was not always right
x MOV: avoid wrong parsing in case of "colr" atom with "prof" color parameter type
x DCP/IMF: ID has now the AM/PKL CPL order in order in all cases (not only when there is more than one CPL)
x #B893, MXF: Crash with Panasonic P2 3.0 files
x DPX: time information was with native ":" character
x Images sequence: "Delay" field is filled from the number in the name of the first file
x FLV: some files were not having the right duration
x DPX: Cineon files were detected as DPX Version 1, version number was not corresponding to the real version
```
2015-04-09 18:57:30 +01:00
lethalman 99c0410ccf Merge pull request #7291 from Havvy/master
Update io.js
2015-04-09 18:56:28 +02:00
John Wiegley 208400cb3e haskellngPackages.stm-conduit: 2.6.0 fails to build tests 2015-04-09 10:57:43 -05:00
Ryan Scheel (Havvy) ae8efc22a5 Remove error hiding, comment saying where to call script from. 2015-04-09 17:11:47 +02:00
Ryan Scheel (Havvy) 2e465757f8 Update iojs to latest version. 2015-04-09 17:10:13 +02:00
Tom Hunger 0fb056f521 haskell-ng: Fix purescript build expression for GHC 7.8. 2015-04-09 14:21:17 +01:00
Tom Hunger f71fa3cf75 closure-compiler: 20130603 -> 20150315. 2015-04-09 14:21:17 +01:00
Utku Demir 57422158b2 Remove haskellngPackages.wl-pprint-* patches since updated upstream 2015-04-09 13:02:04 +00:00
Andrey Pavlov c3fd42ff64 Update elixir to 1.0.4 2015-04-09 10:10:35 +03:00
Nikolay Amiantov 08bf6c93c5 haskellng.leksah: don't run tests 2015-04-09 03:27:16 +03:00
Nikolay Amiantov 7e3d178e7b haskell-ng.llvm-general: style fix 2015-04-09 03:05:57 +03:00
Nikolay Amiantov f0f7707a03 haskellng.llvm-general: fix build
Closes #7259
2015-04-09 03:02:43 +03:00