From b711581edfa5ec9337e81ee7a73bd2179889fb17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 26 Aug 2024 14:04:33 +0200 Subject: [PATCH] cockroachdb: rename from cockroachdb-bin, set meta.sourceProvenance There is no longer a from source build package, so we can reduce the attr. --- .../sql/cockroachdb/{cockroachdb-bin.nix => default.nix} | 1 + pkgs/top-level/aliases.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) rename pkgs/servers/sql/cockroachdb/{cockroachdb-bin.nix => default.nix} (95%) diff --git a/pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix b/pkgs/servers/sql/cockroachdb/default.nix similarity index 95% rename from pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix rename to pkgs/servers/sql/cockroachdb/default.nix index ef7eaaa080f9..c155e0aa076e 100644 --- a/pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -44,6 +44,7 @@ buildFHSEnv { mit cockroachdb-community-license ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = [ "aarch64-linux" "x86_64-linux" ]; maintainers = with maintainers; [ rushmorem thoughtpolice ]; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 42922aa6f19c..342227577fe9 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -258,7 +258,7 @@ mapAliases ({ claws-mail-gtk3 = claws-mail; # Added 2021-07-10 clucene_core_1 = throw "'clucene_core_1' has been renamed to/replaced by 'clucene_core'"; # Added 2023-12-09 cntk = throw "'cntk' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-10-09 - cockroachdb = throw "'cockroachdb' has been removed as it was outdated and unmaintained. Use 'cockroachdb-bin' instead"; # 2024-03-15 + cockroachdb-bin = cockroachdb; # 2024-03-15 codimd = hedgedoc; # Added 2020-11-29 inherit (libsForQt5.mauiPackages) communicator; # added 2022-05-17 compton = throw "'compton' has been renamed to/replaced by 'picom'"; # Converted to throw 2023-09-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed9d4fbf23c9..a4b1adca4dab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26132,7 +26132,7 @@ with pkgs; cpustat = callPackage ../os-specific/linux/cpustat { }; - cockroachdb-bin = callPackage ../servers/sql/cockroachdb/cockroachdb-bin.nix { }; + cockroachdb = callPackage ../servers/sql/cockroachdb { }; coconutbattery = callPackage ../os-specific/darwin/coconutbattery { };