public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/staging'

Browse Source 
Conflicts:
	pkgs/applications/version-management/subversion/default.nix
This commit is contained in:
Eelco Dolstra
2014-09-08 11:42:09 +02:00
parent ff85b53c5f a71744392b
commit 585983bc95
61 changed files with 3314 additions and 527 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/platforms.nix
View File

@@ -7,7 +7,7 @@ rec {
freebsd = ["i686-freebsd" "x86_64-freebsd"];
openbsd = ["i686-openbsd" "x86_64-openbsd"];
netbsd = ["i686-netbsd" "x86_64-netbsd"];
cygwin = ["i686-cygwin"];
cygwin = ["i686-cygwin" "x86_64-cygwin"];
unix = linux ++ darwin ++ freebsd ++ openbsd;
all = linux ++ darwin ++ cygwin ++ freebsd ++ openbsd;
none = [];