From 609ebcafaf9de3c223a090b6cb4ea0d81873e185 Mon Sep 17 00:00:00 2001 From: Alexander Ben Nasrallah Date: Fri, 30 Jun 2023 09:36:17 +0200 Subject: [PATCH 1/2] cockroachdb-bin: init at 23.1.7 Add cockroachdb-bin using pre-build binaries, since building from source seem impossible. --- .../sql/cockroachdb/cockroachdb-bin.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix diff --git a/pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix b/pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix new file mode 100644 index 000000000000..ef500a114712 --- /dev/null +++ b/pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchzip +, buildFHSEnv +}: + +let + version = "23.1.7"; + name = "cockroachdb-${version}"; + + # For several reasons building cockroach from source has become + # nearly imposible. See https://github.com/NixOS/nixpkgs/pull/152626 + # Therefore we use the pre-build release binary and wrap it with buildFHSUserEnv to + # work on nix. + # You can generate the hashes with + # nix flake prefetch + src = fetchzip (lib.getAttr stdenv.system { + x86_64-linux = { + name = "cockroachdb-release-${version}"; + url = "https://binaries.cockroachdb.com/cockroach-v${version}.linux-amd64.tgz"; + sha256 = "sha256-FL/zDrl+QstBp54LE9/SbIfSPorneGZSef6dcOQJbSo="; + }; + }); + +in +buildFHSEnv { + inherit name; + + runScript = "${src}/cockroach"; + + meta = with lib; { + homepage = "https://www.cockroachlabs.com"; + description = "A scalable, survivable, strongly-consistent SQL database"; + license = licenses.bsl11; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ rushmorem thoughtpolice neosimsim ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7d3617124f6..2626d7fc09f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27384,6 +27384,8 @@ with pkgs; cockroachdb = callPackage ../servers/sql/cockroachdb { }; + cockroachdb-bin = callPackage ../servers/sql/cockroachdb/cockroachdb-bin.nix { }; + coconutbattery = callPackage ../os-specific/darwin/coconutbattery { }; conky = callPackage ../os-specific/linux/conky ({ From a8b0580c84e411f5d7dc2ad765d896a29edcbff0 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 2 Aug 2023 13:45:35 +0200 Subject: [PATCH 2/2] cockroachdb-bin: add aarch64-linux support --- .../sql/cockroachdb/cockroachdb-bin.nix | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix b/pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix index ef500a114712..88a5accaffde 100644 --- a/pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix +++ b/pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix @@ -6,21 +6,25 @@ let version = "23.1.7"; - name = "cockroachdb-${version}"; + name = "cockroachdb"; # For several reasons building cockroach from source has become - # nearly imposible. See https://github.com/NixOS/nixpkgs/pull/152626 + # nearly impossible. See https://github.com/NixOS/nixpkgs/pull/152626 # Therefore we use the pre-build release binary and wrap it with buildFHSUserEnv to # work on nix. # You can generate the hashes with # nix flake prefetch - src = fetchzip (lib.getAttr stdenv.system { - x86_64-linux = { - name = "cockroachdb-release-${version}"; - url = "https://binaries.cockroachdb.com/cockroach-v${version}.linux-amd64.tgz"; - sha256 = "sha256-FL/zDrl+QstBp54LE9/SbIfSPorneGZSef6dcOQJbSo="; + srcs = { + aarch64-linux = fetchzip { + url = "https://binaries.cockroachdb.com/cockroach-v${version}.linux-arm64.tgz"; + hash = "sha256-73qJL3o328NckH6POXv+AUvlAJextb31Vs8NGdc8dwE="; }; - }); + x86_64-linux = fetchzip { + url = "https://binaries.cockroachdb.com/cockroach-v${version}.linux-amd64.tgz"; + hash = "sha256-FL/zDrl+QstBp54LE9/SbIfSPorneGZSef6dcOQJbSo="; + }; + }; + src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); in buildFHSEnv { @@ -32,7 +36,7 @@ buildFHSEnv { homepage = "https://www.cockroachlabs.com"; description = "A scalable, survivable, strongly-consistent SQL database"; license = licenses.bsl11; - platforms = [ "x86_64-linux" ]; + platforms = [ "aarch64-linux" "x86_64-linux" ]; maintainers = with maintainers; [ rushmorem thoughtpolice neosimsim ]; }; }