diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-08 11:42:09 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-08 11:42:09 +0200 |
| commit | 585983bc954d043d40a14b29c0bddca42bb9cdfb (patch) | |
| tree | f64c271969e6fa21b7e3e49da7653a92f2d6face /lib | |
| parent | ff85b53c5f266a6a7bbcf8b30c4eea7c3f6160ee (diff) | |
| parent | a71744392b6964e624d3ae968bee660731b7d271 (diff) | |
| download | nixpkgs-585983bc954d043d40a14b29c0bddca42bb9cdfb.tar nixpkgs-585983bc954d043d40a14b29c0bddca42bb9cdfb.tar.gz nixpkgs-585983bc954d043d40a14b29c0bddca42bb9cdfb.tar.bz2 nixpkgs-585983bc954d043d40a14b29c0bddca42bb9cdfb.tar.lz nixpkgs-585983bc954d043d40a14b29c0bddca42bb9cdfb.tar.xz nixpkgs-585983bc954d043d40a14b29c0bddca42bb9cdfb.tar.zst nixpkgs-585983bc954d043d40a14b29c0bddca42bb9cdfb.zip | |
Merge remote-tracking branch 'origin/staging'
Conflicts: pkgs/applications/version-management/subversion/default.nix
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/platforms.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/platforms.nix b/lib/platforms.nix index 44a56b659c7..067670c6b3e 100644 --- a/lib/platforms.nix +++ b/lib/platforms.nix @@ -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 = []; |