Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4dfa36fe6d14
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 213804cbf997
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 16, 2020

  1. cockroachdb: fix license information

    @anmonteiro
    anmonteiro committed Nov 16, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    miketheman Mike Fiedler
    GPG key ID: 5E1134F2FAF158B9
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c7b9b3d View commit details

  2. Merge pull request #88804 from anmonteiro/anmonteiro/cockroachdb-20.1.0 

    cockroachdb: fix license
    @thoughtpolice
    thoughtpolice authored Nov 16, 2020
    Copy the full SHA
    213804c View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/servers/sql/cockroachdb/default.nix
2 changes: 1 addition & 1 deletion pkgs/servers/sql/cockroachdb/default.nix
View file
Original file line number Diff line number Diff line change
@@ -56,7 +56,7 @@ buildGoPackage rec {
meta = with stdenv.lib; {
homepage = "https://www.cockroachlabs.com";
description = "A scalable, survivable, strongly-consistent SQL database";
license = licenses.asl20;
license = licenses.bsl11;
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
maintainers = with maintainers; [ rushmorem thoughtpolice rvolosatovs ];
};