diff options
| author | Rushmore Mushambi <rushmore@webenchanter.com> | 2017-06-18 00:46:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-18 00:46:24 +0200 |
| commit | e1ec8d9e9cf49f845584ddd83f4bfd438c98cfc3 (patch) | |
| tree | 6c429cf0bd3f71d8fa154e0837ecfc444b200c69 /pkgs/top-level | |
| parent | 10493d393acc12b83e148b31d75c6f355d4a7e53 (diff) | |
| parent | ec65ef744bfef934cea0374122d830d4c3656223 (diff) | |
| download | nixlib-e1ec8d9e9cf49f845584ddd83f4bfd438c98cfc3.tar nixlib-e1ec8d9e9cf49f845584ddd83f4bfd438c98cfc3.tar.gz nixlib-e1ec8d9e9cf49f845584ddd83f4bfd438c98cfc3.tar.bz2 nixlib-e1ec8d9e9cf49f845584ddd83f4bfd438c98cfc3.tar.lz nixlib-e1ec8d9e9cf49f845584ddd83f4bfd438c98cfc3.tar.xz nixlib-e1ec8d9e9cf49f845584ddd83f4bfd438c98cfc3.tar.zst nixlib-e1ec8d9e9cf49f845584ddd83f4bfd438c98cfc3.zip | |
Merge pull request #26658 from rushmorem/cockroach
cockroachdb: beta-20160915 -> v1.0.2
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 672ae0acdbd2..8190a045dcdc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11548,9 +11548,7 @@ with pkgs; cifs-utils = callPackage ../os-specific/linux/cifs-utils { }; - cockroachdb = callPackage ../servers/sql/cockroachdb { - gcc = gcc6; # needs gcc 6.0 and above - }; + cockroachdb = callPackage ../servers/sql/cockroachdb { }; conky = callPackage ../os-specific/linux/conky ({ lua = lua5_1; # conky can use 5.2, but toluapp can not |