1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs synced 2024-10-19 03:47:13 -04:00
Nix Packages collection & NixOS
Find a file
Peter Simons f67d5a9a39 Merge branch 'master' into stdenv-updates.
Conflicts have been resolved in:

        pkgs/tools/misc/file/default.nix
        pkgs/top-level/all-packages.nix
        pkgs/top-level/python-packages.nix
2012-11-21 16:20:36 +01:00
doc
maintainers
pkgs Merge branch 'master' into stdenv-updates. 2012-11-21 16:20:36 +01:00
.gitignore
COPYING
default.nix
VERSION