Go to file
Mathijs Kwik 609f8dc04b Merge branch 'master' into stdenv-updates
Conflicts:
	pkgs/top-level/all-packages.nix
2013-11-01 08:31:54 +01:00
doc Unify the Nixpkgs and NixOS version numbers 2013-10-10 13:28:22 +02:00
lib Fix backward compatibility with Nix < 1.6 2013-10-30 19:12:25 +01:00
maintainers/scripts Fix references to pkgs/lib 2013-10-10 13:28:22 +02:00
nixos Mark the value for nixpkgs.system as a default 2013-11-01 00:35:48 +01:00
pkgs Merge branch 'master' into stdenv-updates 2013-11-01 08:31:54 +01:00
.gitignore Merge .gitignore files 2013-10-10 13:28:22 +02:00
.version Unify the Nixpkgs and NixOS version numbers 2013-10-10 13:28:22 +02:00
COPYING * Applying an MIT-style license to Nixpkgs. 2006-04-25 16:50:34 +00:00
default.nix * For convenience, provide a top-level Nix expression that simply 2007-04-26 14:32:57 +00:00