diff options
| author | Peter Simons <simons@cryp.to> | 2013-12-04 18:33:45 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2013-12-04 18:33:52 +0100 |
| commit | c32bf83301bc4063df924ee442d8e35c1b96d912 (patch) | |
| tree | 5a0821f9960cfa2508fc6b451fbaf8bfa6326367 /pkgs/top-level/release.nix | |
| parent | 88c7b4c7fee42c1ae5167fd1e7806d600e4451e4 (diff) | |
| parent | 41f0e6ad9203a1859996e53323321a758c1fc7c4 (diff) | |
| download | nixpkgs-c32bf83301bc4063df924ee442d8e35c1b96d912.tar nixpkgs-c32bf83301bc4063df924ee442d8e35c1b96d912.tar.gz nixpkgs-c32bf83301bc4063df924ee442d8e35c1b96d912.tar.bz2 nixpkgs-c32bf83301bc4063df924ee442d8e35c1b96d912.tar.lz nixpkgs-c32bf83301bc4063df924ee442d8e35c1b96d912.tar.xz nixpkgs-c32bf83301bc4063df924ee442d8e35c1b96d912.tar.zst nixpkgs-c32bf83301bc4063df924ee442d8e35c1b96d912.zip | |
Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts: pkgs/development/interpreters/perl/5.16/default.nix pkgs/tools/networking/curl/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/release-python.nix pkgs/top-level/release-small.nix pkgs/top-level/release.nix
Diffstat (limited to 'pkgs/top-level/release.nix')
| -rw-r--r-- | pkgs/top-level/release.nix | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index a3d42f6b68b..7963277d94a 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -140,7 +140,6 @@ let gphoto2 = linux; gpm = linux; gprolog = linux; - gpsbabel = all; gpscorrelate = linux; gpsd = linux; gqview = gtkSupported; @@ -212,7 +211,6 @@ let mysql = linux; mysql51 = linux; mysql55 = linux; - namazu = all; nano = allBut "i686-cygwin"; ncat = linux; netcat = all; |