about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
author7c6f434c <7c6f434c@mail.ru>2024-01-30 00:18:08 +0000
committerGitHub <noreply@github.com>2024-01-30 00:18:08 +0000
commit7e913c43b4dc9e1fd0e989b603af26f5f0152306 (patch)
treea2078e9c86ddecf42b2822be9c90b315e70085c1 /pkgs
parentfb15daf152589b58ba1e1194968a545faa7fbe5a (diff)
parentb3d9b990d63676bdc1dd7b2d043fa0931d6f18bd (diff)
Merge pull request #284591 from hraban/sbcl-2.4.1
sbcl: 2.4.0 -> 2.4.1
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/by-name/sb/sbcl/bootstrap.nix (renamed from pkgs/development/compilers/sbcl/bootstrap.nix)0
-rw-r--r--pkgs/by-name/sb/sbcl/fix-2.4.0-aarch64-darwin.patch (renamed from pkgs/development/compilers/sbcl/fix-2.4.0-aarch64-darwin.patch)0
-rw-r--r--pkgs/by-name/sb/sbcl/package.nix (renamed from pkgs/development/compilers/sbcl/2.x.nix)6
-rw-r--r--pkgs/top-level/all-packages.nix10
4 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/by-name/sb/sbcl/bootstrap.nix
index e23557c5a62fc..e23557c5a62fc 100644
--- a/pkgs/development/compilers/sbcl/bootstrap.nix
+++ b/pkgs/by-name/sb/sbcl/bootstrap.nix
diff --git a/pkgs/development/compilers/sbcl/fix-2.4.0-aarch64-darwin.patch b/pkgs/by-name/sb/sbcl/fix-2.4.0-aarch64-darwin.patch
index cd344f0cbd193..cd344f0cbd193 100644
--- a/pkgs/development/compilers/sbcl/fix-2.4.0-aarch64-darwin.patch
+++ b/pkgs/by-name/sb/sbcl/fix-2.4.0-aarch64-darwin.patch
diff --git a/pkgs/development/compilers/sbcl/2.x.nix b/pkgs/by-name/sb/sbcl/package.nix
index f91e5147cf6a9..2f18dcc78d4c9 100644
--- a/pkgs/development/compilers/sbcl/2.x.nix
+++ b/pkgs/by-name/sb/sbcl/package.nix
@@ -19,12 +19,12 @@ let
       sha256 = "189gjqzdz10xh3ybiy4ch1r98bsmkcb4hpnrmggd4y2g5kqnyx4y";
     };
 
-    "2.3.11" = {
-      sha256 = "sha256-hL7rjXLIeJeEf8AoWtyz+k9IG9s5ECxPuat5aEGErSk=";
-    };
     "2.4.0" = {
       sha256 = "sha256-g9i3TwjSJUxZuXkLwfZp4JCZRXuIRyDs7L9F9LRtF3Y=";
     };
+    "2.4.1" = {
+      sha256 = "sha256-2k+UhvrUE9OversbCSaTJf20v/fnuI8hld3udDJjz34=";
+    };
   };
   # Collection of pre-built SBCL binaries for platforms that need them for
   # bootstrapping. Ideally these are to be avoided.  If CLISP (or any other
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 98a4ad7a2175d..d8cb2b0211542 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26026,17 +26026,17 @@ with pkgs;
   };
 
   # Steel Bank Common Lisp
-  sbcl_2_3_11 = wrapLisp {
-    pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.11"; };
+  sbcl_2_4_0 = wrapLisp {
+    pkg = callPackage ../by-name/sb/sbcl/package.nix { version = "2.4.0"; };
     faslExt = "fasl";
     flags = [ "--dynamic-space-size" "3000" ];
   };
-  sbcl_2_4_0 = wrapLisp {
-    pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.4.0"; };
+  sbcl_2_4_1 = wrapLisp {
+    pkg = callPackage ../by-name/sb/sbcl/package.nix { version = "2.4.1"; };
     faslExt = "fasl";
     flags = [ "--dynamic-space-size" "3000" ];
   };
-  sbcl = sbcl_2_4_0;
+  sbcl = sbcl_2_4_1;
 
   sbclPackages = recurseIntoAttrs sbcl.pkgs;