summary refs log tree commit diff
Commit message (Expand)AuthorAge
* Merge branch 'master' into stdenv-updates.Peter Simons2012-11-21
|\
| * git-annex: update to version 3.20121112-161-gb27d9eb to fix build errors with...Peter Simons2012-11-21
| * haskell-DAV: add version 0.2Peter Simons2012-11-21
| * haskell-xml-hamlet: add version 0.4.0.3Peter Simons2012-11-21
| * haskell-lens: add version 3.3Peter Simons2012-11-21
| * haskell-comonads-fd: add version 3.0Peter Simons2012-11-21
| * Merge pull request #191 from qknight/gobby_updatePeter Simons2012-11-21
| |\
| | * fixed compile errors for libinfinity and gobbyJoachim Schiele2012-11-20
| * | haskell-monad-peel: update to version 0.1.1Peter Simons2012-11-21
| * | haskell-http-date: update to version 0.0.3Peter Simons2012-11-21
| * | haskell-graphviz: update to version 2999.14.1.0Peter Simons2012-11-21
| * | st: update to 0.3LluĂ­s Batlle i Rossell2012-11-21
| * | neoload: link used jre to a location which is hard-coded into some binariesMathijs Kwik2012-11-21
| * | Merge pull request #158 from bbenoist/qvtkPeter Simons2012-11-20
| |\ \
| | * | vtk: latest version + useQt4 optionBaptist BENOIST2012-10-16
| * | | Merge pull request #155 from bbenoist/newpkgsPeter Simons2012-11-20
| |\ \ \
| | * | | Add gmrun-0.9.2Baptist BENOIST2012-10-16
| | * | | Add qtcreator-2.5.2Baptist BENOIST2012-10-16
| | * | | Add xfe-1.33 and fox-1.6.9Baptist BENOIST2012-10-16
| | * | | Add fox-1.7.9Baptist BENOIST2012-10-16
| | * | | Add geany-1.22Baptist BENOIST2012-10-16
| | * | | Add bbenoist as maintainerBaptist BENOIST2012-10-16
| | |/ /
| * | | Merge pull request #178 from mpashton/abcde-newPeter Simons2012-11-20
| |\ \ \
| | * | | Updated version of abcde to 2.5.4Michael Ashton2012-10-29
| * | | | opera: Upgrade to 12.11Rickard Nilsson2012-11-20
| * | | | haskell-zlib-bindings: update to version 0.1.1.2Peter Simons2012-11-20
| * | | | haskell-cabal2nix: update to version 1.42Peter Simons2012-11-20
| * | | | haskell-highlighting-kate: compile with regex-pcre instead of regex-pcre-builtinPeter Simons2012-11-20
| * | | | haskell-regex-pcre-builtin: removed from Nixpkgs -- use the superior regex-pc...Peter Simons2012-11-20
| * | | | haskell-hlint: update to version 1.8.35Peter Simons2012-11-20
| * | | | haskell-cabal2nix: update to version 1.41Peter Simons2012-11-20
| * | | | haskell-yaml: update to version 0.8.1.1Peter Simons2012-11-20
| * | | | haskell-tls: update to version 1.0.2Peter Simons2012-11-20
| * | | | haskell-test-framework-th: update to version 0.2.3Peter Simons2012-11-20
| * | | | haskell-shelly: update to version 0.14.3Peter Simons2012-11-20
| * | | | haskell-repa-examples: update to version 3.2.2.3Peter Simons2012-11-20
| * | | | haskell-language-haskell-extract: update to version 0.2.3Peter Simons2012-11-20
| * | | | haskell-instant-generics: update to version 0.3.7Peter Simons2012-11-20
| * | | | haskell-http-conduit: update to version 1.8.4Peter Simons2012-11-20
| * | | | haskell-hackage-db: update to version 1.4Peter Simons2012-11-20
| * | | | haskell-digest: update to version 0.0.1.2Peter Simons2012-11-20
| * | | | haskell-cmdargs: update to version 0.10.1Peter Simons2012-11-20
| * | | | haskell-Boolean: update to version 0.1.1Peter Simons2012-11-20
| * | | | nix: Update to 1.2pre2980Eelco Dolstra2012-11-20
| * | | | androidenv: Remove examples directoryEelco Dolstra2012-11-20
| * | | | smartmontools: update drivedb file to trunk revision 3605Peter Simons2012-11-20
| * | | | Merge branch 'chromium-update'.aszlig2012-11-20
| |\ \ \ \
| | * | | | chromium: Add dependency on pciutils for v25.aszlig2012-11-20
| | * | | | chromium: Drop obsolete pre-v23 seccomp patch.aszlig2012-11-20
| | * | | | chromium: Update channels to stable v23.0.1271.64.aszlig2012-11-20