Mateusz Kowalczyk 5c401ea5ee Merge branch 'bitmeter-master' of https://github.com/magnetophon/nixpkgs

2015-05-26 11:39:06 +01:00

..

applications

Merge branch 'bitmeter-master' of https://github.com/magnetophon/nixpkgs

2015-05-26 11:39:06 +01:00

build-support

Merge pull request #7973 from oxij/fetchurl-meta

2015-05-25 21:14:35 +03:00

data

geolite-legacy -> 2015-05-20

2015-05-20 16:42:38 +02:00

desktops

mutter: fix failure on i686

2015-05-26 10:57:01 +02:00

development

Merge pull request #7246 from spwhitt/iniparser

2015-05-26 11:08:47 +01:00

games

xbomb: add version 2.2b

2015-05-24 14:24:33 +00:00

misc

Update alock to version 20150418

2015-05-25 23:45:53 +02:00

os-specific

Merge pull request #7559 from offlinehacker/openvswitch/ipsec

2015-05-26 11:26:02 +01:00

servers

lua-nginx-module: Update from 0.9.15 to 0.9.16rc1

2015-05-26 08:05:26 +02:00

shells

Merge pull request #7903 from joelmo/patch-3

2015-05-26 11:00:36 +01:00

stdenv

Refactor mkFlag / shouldUsePkg into the nixpkgs libraries

2015-05-22 13:26:55 -07:00

test

…

tools

Remove w3c-css-validator

2015-05-26 11:46:41 +02:00

top-level

Merge branch 'bitmeter-master' of https://github.com/magnetophon/nixpkgs

2015-05-26 11:39:06 +01:00