diff options
| author | Hraban Luyat <hraban@0brg.net> | 2022-08-24 09:11:19 +0200 |
|---|---|---|
| committer | Hraban Luyat <hraban@0brg.net> | 2022-10-02 14:28:15 -0400 |
| commit | 9a9b1952fe5d9095f3d13f0ad9e66b448f2ee91f (patch) | |
| tree | dc505592b7160e80fe791efc8e259dd5fdcbbec5 | |
| parent | 465f68a5af0289a913a3a8aff41549b501695825 (diff) | |
| download | nixpkgs-9a9b1952fe5d9095f3d13f0ad9e66b448f2ee91f.tar nixpkgs-9a9b1952fe5d9095f3d13f0ad9e66b448f2ee91f.tar.gz nixpkgs-9a9b1952fe5d9095f3d13f0ad9e66b448f2ee91f.tar.bz2 nixpkgs-9a9b1952fe5d9095f3d13f0ad9e66b448f2ee91f.tar.lz nixpkgs-9a9b1952fe5d9095f3d13f0ad9e66b448f2ee91f.tar.xz nixpkgs-9a9b1952fe5d9095f3d13f0ad9e66b448f2ee91f.tar.zst nixpkgs-9a9b1952fe5d9095f3d13f0ad9e66b448f2ee91f.zip | |
sbcl: 2.2.6 -> 2.2.9
| -rw-r--r-- | pkgs/development/compilers/sbcl/2.2.9.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/sbcl/common.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/development/compilers/sbcl/2.2.9.nix b/pkgs/development/compilers/sbcl/2.2.9.nix new file mode 100644 index 00000000000..22e0e30f392 --- /dev/null +++ b/pkgs/development/compilers/sbcl/2.2.9.nix @@ -0,0 +1,4 @@ +import ./common.nix { + version = "2.2.9"; + sha256 = "sha256-fr69bSAj//cHewNy+hFx+IBSm97GEE8gmDKXwv63wXI="; +} diff --git a/pkgs/development/compilers/sbcl/common.nix b/pkgs/development/compilers/sbcl/common.nix index 05fa6b39089..261c14106a6 100644 --- a/pkgs/development/compilers/sbcl/common.nix +++ b/pkgs/development/compilers/sbcl/common.nix @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { url = "https://github.com/sbcl/sbcl/commit/8fa3f76fba2e8572e86ac6fc5754e6b2954fc774.patch"; sha256 = "1ic531pjnws1k3xd03a5ixbq8cn10dlh2nfln59k0vbm0253g3lv"; }) - ++ lib.optionals (lib.versionAtLeast version "2.1.10") [ - # Fix pending upstream inclusion on -fno-common toolchains: + ++ lib.optionals (lib.versionAtLeast version "2.1.10" && lib.versionOlder version "2.2.9") [ + # Fix included in SBCL trunk since 2.2.9: # https://bugs.launchpad.net/sbcl/+bug/1980570 (fetchpatch { name = "darwin-fno-common.patch"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1c5fd77f4d..4a400d3dd52 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14869,7 +14869,8 @@ with pkgs; sbcl_2_1_11 = callPackage ../development/compilers/sbcl/2.1.11.nix {}; sbcl_2_2_4 = callPackage ../development/compilers/sbcl/2.2.4.nix {}; sbcl_2_2_6 = callPackage ../development/compilers/sbcl/2.2.6.nix {}; - sbcl = sbcl_2_2_6; + sbcl_2_2_9 = callPackage ../development/compilers/sbcl/2.2.9.nix {}; + sbcl = sbcl_2_2_9; roswell = callPackage ../development/tools/roswell { }; |