public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
a2c316288c8f3714e57dc1037d7a993a2088ab18
nixpkgs/pkgs
History
Vladimír Čunát a2c316288c Merge master into stdenv-updates 
Conflicts:
	pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved)
	pkgs/top-level/all-packages.nix (trivial)
2014-01-12 12:29:24 +01:00
..
applications
Merge master into stdenv-updates
2014-01-12 12:29:24 +01:00
build-support
Merge master into stdenv-updates
2014-01-12 12:29:24 +01:00
data
Whitespace fixes in package expressions I maintain
2014-01-02 17:58:08 +01:00
desktops
Merge master into stdenv-updates
2014-01-12 12:29:24 +01:00
development
Merge master into stdenv-updates
2014-01-12 12:29:24 +01:00
games
Merge master into stdenv-updates
2014-01-04 18:34:53 +01:00
misc
Merge master into stdenv-updates
2014-01-12 12:29:24 +01:00
os-specific
Merge master into stdenv-updates
2014-01-12 12:29:24 +01:00
servers
Merge master into stdenv-updates
2014-01-12 12:29:24 +01:00
shells
Merge master into stdenv-updates
2013-12-29 10:01:22 +01:00
stdenv
Merge master into stdenv-updates
2014-01-12 12:29:24 +01:00
test
…
tools
Merge master into stdenv-updates
2014-01-12 12:29:24 +01:00
top-level
Merge master into stdenv-updates
2014-01-12 12:29:24 +01:00