summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Heijligen <src@posteo.de>2024-02-19 19:17:19 +0000
committersternenseemann <sternenseemann@systemli.org>2024-02-25 18:19:50 +0100
commitc1b5933e79e45dd7f75075075f6248af8362da08 (patch)
tree39733a163d5d41261e97f304847b0381e4d6d00d
parentabc4653068fb14d0141eddfeb21f8d205ea83137 (diff)
gnatprove: Rename spark2014
Gnatprove is the tool distributed out of the spark2014 repository. AdaCore, the developer behind it, distribute it under the name gnatprove in the Ada alire package repository [0]. Rename the package to keep in line with other distribution channels. [0] https://alire.ada.dev/crates/gnatprove
-rw-r--r--pkgs/development/libraries/ada/gnatprove/default.nix (renamed from pkgs/development/libraries/ada/spark2014/default.nix)2
-rw-r--r--pkgs/top-level/aliases.nix1
-rw-r--r--pkgs/top-level/all-packages.nix8
3 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/development/libraries/ada/spark2014/default.nix b/pkgs/development/libraries/ada/gnatprove/default.nix
index a52a5ac63f71..ce0f3cc432c1 100644
--- a/pkgs/development/libraries/ada/spark2014/default.nix
+++ b/pkgs/development/libraries/ada/gnatprove/default.nix
@@ -10,7 +10,7 @@
}:
stdenv.mkDerivation rec {
- pname = "spark2014";
+ pname = "gnatprove";
version = "unstable-2022-05-25";
src = fetchFromGitHub {
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 5a44235de0c3..445659c7e560 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1016,6 +1016,7 @@ mapAliases ({
spark2 = throw "'spark2' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08
spark_2_4 = throw "'spark_2_4' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08
spark_3_1 = throw "'spark_3_1' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08
+ spark2014 = gnatprove; # Added 2024-02-25
# Added 2020-02-10
sourceHanSansPackages = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 022bc915b18d..05c3088fa5db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16075,6 +16075,10 @@ with pkgs;
bintools = bintoolsDualAs;
});
+ gnatprove = callPackage ../development/libraries/ada/gnatprove {
+ ocamlPackages = ocaml-ng.ocamlPackages_4_14;
+ };
+
gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk { };
gccgo = wrapCC (gcc.cc.override {
@@ -17930,10 +17934,6 @@ with pkgs;
sparkleshare = callPackage ../applications/version-management/sparkleshare { };
- spark2014 = callPackage ../development/libraries/ada/spark2014 {
- ocamlPackages = ocaml-ng.ocamlPackages_4_14;
- };
-
spidermonkey_78 = callPackage ../development/interpreters/spidermonkey/78.nix {
inherit (darwin) libobjc;
};