1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 23:20:55 +00:00
Commit graph

28675 commits

Author SHA1 Message Date
Vladimír Čunát f7843b341b Merge branch 'x-updates' into master 2013-09-12 18:56:48 +02:00
Vladimír Čunát 56c2ee8dcf gtk3: bugfix update 3.8.2 -> .4 2013-09-12 18:11:00 +02:00
Bjørn Forsman fe520e6d1f ditaa: new package
Ditaa is a small command-line utility written in Java, that can convert
diagrams drawn using ascii art ('drawings' that contain characters that
resemble lines like | / - ), into proper bitmap graphics.

Homepage: http://ditaa.sourceforge.net/
2013-09-12 17:25:09 +02:00
Vladimír Čunát 117f2e6683 libpng: minor update 1.6.3 -> .4
Also make myself maintainer.
2013-09-12 17:19:27 +02:00
Peter Simons edfefa6167 gnulib: update to version 0.0-8015-gf0aab22 2013-09-12 12:22:17 +02:00
Eelco Dolstra 89fa23c43d linux: Update to 3.4.61 2013-09-12 10:38:38 +02:00
Eelco Dolstra 9c49229aae kexec-tools: Update to 2.0.4 2013-09-12 10:38:37 +02:00
Peter Simons 51604bf13f haskell-llvm-general-pure: add version 3.3.8.1 2013-09-11 20:48:05 +02:00
Peter Simons 6c4c9cd8a8 haskell-yesod-form: update to version 1.3.2.2 2013-09-11 20:48:05 +02:00
Peter Simons b6b154a8b8 haskell-yesod-core: update to version 1.2.4.3 2013-09-11 20:48:05 +02:00
Peter Simons 3cfd7ac7c4 haskell-yesod-bin: update to version 1.2.3.3 2013-09-11 20:48:05 +02:00
Peter Simons aae4ca3516 haskell-yesod-auth: update to version 1.2.3 2013-09-11 20:48:05 +02:00
Peter Simons 8bd4aaec49 haskell-mwc-random: update to version 0.13.0.0 2013-09-11 20:45:19 +02:00
Peter Simons bfa5bd9371 haskell-llvm-general: update to version 3.3.8.1 2013-09-11 20:45:19 +02:00
Peter Simons 66dc4eba7f haskell-http-conduit: update to version 1.9.5 2013-09-11 20:45:19 +02:00
Peter Simons 8908a9af7c haskell-hspec: update to version 1.7.2.1 2013-09-11 20:45:19 +02:00
Peter Simons 64e91e00df haskell-diagrams-svg: update to version 0.8.0.1 2013-09-11 20:45:19 +02:00
Peter Simons cd08c94ac8 haskell-diagrams-lib: update to version 0.7.1 2013-09-11 20:45:18 +02:00
Peter Simons 8be4a8f6b0 haskell-diagrams: update to version 0.7.1.1 2013-09-11 20:45:18 +02:00
Peter Simons 4580b1c97e haskell-basic-prelude: update to version 0.3.6.0 2013-09-11 20:45:18 +02:00
Peter Simons b5e626e3db haskell-acid-state: update to version 0.12.0 2013-09-11 20:45:18 +02:00
Peter Simons da6b1e6d81 idris: re-generate with cabal2nix 2013-09-11 20:45:18 +02:00
Peter Simons 39043ce87e yap: add 'zlib' and 'gmp' build inputs to enable additional features 2013-09-11 20:43:04 +02:00
Peter Simons d8d001da13 Merge pull request #954 from DriesVanDaele/master
Update SWI-Prolog to version 6.4.1
2013-09-11 11:33:55 -07:00
Peter Simons 94cfe0549d Merge pull request #955 from DriesVanDaele/upstream
Update YAP to version 6.2.2
2013-09-11 11:33:27 -07:00
Peter Simons e541f509ca git-annex: update to version 4.20130909 2013-09-11 19:59:33 +02:00
Peter Simons a8d3ba9b8d haskell-vault: update to version 0.3.0.2 2013-09-11 19:59:24 +02:00
Peter Simons a1cca8226a happy: add version 1.18.11 2013-09-11 19:58:34 +02:00
Dries Van Daele 0cc6bf647d Update YAP to version 6.2.2 2013-09-11 19:44:17 +02:00
Dries Van Daele 412b970479 Update YAP to version 6.2.2 2013-09-11 19:40:10 +02:00
Dries Van Daele 3d5e7a99f4 Update SWI-Prolog to version 6.4.1 2013-09-11 19:00:31 +02:00
Peter Simons c749c24076 tcpcrypt: patch tcpcryptd to run under uid 93 instead of 666 2013-09-11 17:24:32 +02:00
Peter Simons e761405c50 os-specific/darwin/setfile: drop the "unfree" license
Setfile is included by other derivation, which in turns makes them unfree, too.
This causes plenty of evaluation errors on Hydra, i.e.:

  at `haskellPackages_ghc763_profiling.wx.x86_64-darwin' [nixpkgs = ..., officialRelease = false]:
  user-thrown exception: package ‘setfile’ has an unfree license, refusing to evaluate

Now, it's true that "setfile" is unfree, but this doesn't affect us: our
derivation doesn't include the actual binary -- it just contains a symlink to
"/usr/bin/SetFile". Arguably, our setfile derivation is free and we can
re-distribute it.
2013-09-11 13:08:46 +02:00
Vladimír Čunát 2dc0f91806 mesa: fix the default DRI driver dir to /run/opegl-driver{,-32} 2013-09-11 11:38:15 +02:00
Rob Vermaas aa28196ec4 Update hash for fail2ban 2013-09-11 10:44:14 +02:00
Vladimír Čunát aa8e8303e1 Merge branch 'x-updates' into master 2013-09-11 08:37:03 +02:00
Peter Simons b728835bc1 Merge pull request #953 from errge/statvfs
Add statvfs haskell library
2013-09-10 15:32:34 -07:00
Peter Simons e08fab28f5 Um, make that 'linuxHeaders26'. Sorry. 2013-09-10 21:16:33 +02:00
Peter Simons 5a75874b96 all-packages.nix: add 'linuxHeaders36' attribute
We have that version of the kernel headers in Nixpkgs already, there was
just no attribute for them.
2013-09-10 21:15:41 +02:00
Rickard Nilsson d1882a1940 trac: Update to 1.0.1. The old version did not work at all with the current genshi package (0.7). 2013-09-10 19:19:27 +02:00
Eelco Dolstra b73deae714 nix: Update to 1.6 2013-09-10 17:53:29 +02:00
Vladimír Čunát bb6b42385d Merge PR #901: adding Storm
vcunat edit: use symlink instead of hardlink (failed for me with a
cross-device error), minor whitespace cleanup
2013-09-10 16:18:31 +02:00
Gergely Risko b2c97f6ca5 Add statvfs haskell library 2013-09-10 16:06:56 +02:00
Eelco Dolstra 70fee5da11 Fix Nixpkgs evaluation
The evaluation of liferea causes an error:

  error: assertion failed at `/tmp/nix-build-nixpkgs-tarball-1.0pre28992_1628c03.drv-0/git-export/pkgs/desktops/gnome-2/desktop/libgweather/default.nix:4:1'

Why this happens is a mystery, since liferea doesn't depend on
libgweather.  The problem can be reproduced by evaluating:

  builtins.toXML (import <nixpkgs> { system = "x86_64-darwin"; }).liferea

It seems to have something to do with builderDefs magic in webkit_gtk2.

http://hydra.nixos.org/build/6039089
2013-09-10 15:54:06 +02:00
Eelco Dolstra 64d648e92e Update nixUnstable 2013-09-10 13:57:32 +02:00
Domen Kožar 1628c03c4e upgrade deform and deform_bootstrap 2013-09-10 12:28:10 +02:00
Vladimír Čunát ea8a7bcd0c libav: update 9.8 -> 9.9
It's supposed to include some security-related fixes.
2013-09-10 10:42:33 +02:00
Peter Simons aeefa7b070 Cabal-1.18.0: this version won't build without deepseq 1.3 or later 2013-09-09 15:07:38 +02:00
Peter Simons 66f905c14e haskell-yesod-platform: update to version 1.2.4.2 2013-09-09 15:07:37 +02:00
Peter Simons 563786deff haskell-unix-bytestring: update to version 0.3.7 2013-09-09 15:07:37 +02:00