diff options
| -rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
3 files changed, 1 insertions, 8 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index ea50fc371981..8ef1e8eb1fef 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -257,13 +257,6 @@ in inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; - mariadb_1010 = self.callPackage generic { - # Supported until 2023-11-17. TODO: remove ahead of 23.11 branchoff - version = "10.10.6"; - hash = "sha256-4eUwEZedKfDsJuE6uMr2E0gb8ClSBWb7loF1RhA5ONU="; - inherit (self.darwin) cctools; - inherit (self.darwin.apple_sdk.frameworks) CoreServices; - }; mariadb_1011 = self.callPackage generic { # Supported until 2028-02-16 version = "10.11.5"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0c1acad2e8e9..52538eba3827 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -563,6 +563,7 @@ mapAliases ({ MACS2 = macs2; # Added 2023-06-12 mariadb_104 = throw "mariadb_104 has been removed from nixpkgs, please switch to another version like mariadb_106"; # Added 2023-09-11 + mariadb_1010 = throw "mariadb_1010 has been removed from nixpkgs, please switch to another version like mariadb_1011"; # Added 2023-11-14 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 markdown-pp = throw "markdown-pp was removed from nixpkgs, because the upstream archived it on 2021-09-02"; # Added 2023-07-22 markmind = throw "markmind has been removed from nixpkgs, because it depended on an old version of electron"; # Added 2023-09-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb085c1fb66e..3c9a5f7207d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26896,7 +26896,6 @@ with pkgs; inherit (import ../servers/sql/mariadb pkgs) mariadb_105 mariadb_106 - mariadb_1010 mariadb_1011 mariadb_110 ; |