diff options
| author | 7c6f434c <7c6f434c@mail.ru> | 2023-05-01 06:10:54 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-01 06:10:54 +0000 |
| commit | 4b72af7be7bd757219f4b3a1464dc22cfd99bc50 (patch) | |
| tree | 221c71c4ce74ff580f908657ab58e267d4cebe48 | |
| parent | 8267f0fae727f0af71fa618a0fcf19ec0a9a4d4e (diff) | |
| parent | 2ad219c8aadb1666799d446bf66e1e863e473da4 (diff) | |
| download | nixpkgs-4b72af7be7bd757219f4b3a1464dc22cfd99bc50.tar nixpkgs-4b72af7be7bd757219f4b3a1464dc22cfd99bc50.tar.gz nixpkgs-4b72af7be7bd757219f4b3a1464dc22cfd99bc50.tar.bz2 nixpkgs-4b72af7be7bd757219f4b3a1464dc22cfd99bc50.tar.lz nixpkgs-4b72af7be7bd757219f4b3a1464dc22cfd99bc50.tar.xz nixpkgs-4b72af7be7bd757219f4b3a1464dc22cfd99bc50.tar.zst nixpkgs-4b72af7be7bd757219f4b3a1464dc22cfd99bc50.zip | |
Merge pull request #228826 from hraban/sbcl/2.3.3
sbcl: 2.3.2 -> 2.3.4
| -rw-r--r-- | pkgs/development/compilers/sbcl/2.x.nix | 15 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 14 |
2 files changed, 12 insertions, 17 deletions
diff --git a/pkgs/development/compilers/sbcl/2.x.nix b/pkgs/development/compilers/sbcl/2.x.nix index 73794e3ec72..fa5382449cb 100644 --- a/pkgs/development/compilers/sbcl/2.x.nix +++ b/pkgs/development/compilers/sbcl/2.x.nix @@ -19,17 +19,16 @@ let sha256 = "189gjqzdz10xh3ybiy4ch1r98bsmkcb4hpnrmggd4y2g5kqnyx4y"; }; - "2.2.11" = { - sha256 = "sha256-NgfWgBZzGICEXO1dXVXGBUzEnxkSGhUCfmxWB66Elt8="; - }; - - "2.3.0" = { - sha256 = "sha256-v3Q5SXEq4Cy3ST87i1fOJBlIv2ETHjaGDdszTaFDnJc="; - }; - + # The loosely held nixpkgs convention for SBCL is to keep the last two + # versions. + # https://github.com/NixOS/nixpkgs/pull/200994#issuecomment-1315042841 "2.3.2" = { sha256 = "sha256-RMwWLPpjMqmojHoSHRkDiCikuk9r/7d+8cexdAfLHqo="; }; + + "2.3.4" = { + sha256 = "sha256-8RtHZMbqvbJ+WpxGshcgTRG82lNOc7+XBz1Xgx0gnE4="; + }; }; in with versionMap.${version}; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 921edab61a1..acea2323d31 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24737,19 +24737,15 @@ with pkgs; pkg = callPackage ../development/compilers/sbcl/bootstrap.nix {}; faslExt = "fasl"; }; - sbcl_2_2_11 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.2.11"; }; - faslExt = "fasl"; - }; - sbcl_2_3_0 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.0"; }; - faslExt = "fasl"; - }; sbcl_2_3_2 = wrapLisp { pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.2"; }; faslExt = "fasl"; }; - sbcl = sbcl_2_3_2; + sbcl_2_3_4 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.4"; }; + faslExt = "fasl"; + }; + sbcl = sbcl_2_3_4; sbclPackages = recurseIntoAttrs sbcl.pkgs; |