about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorSilvan Mosberger <infinisil@icloud.com>2018-12-31 16:20:02 +0100
committerGitHub <noreply@github.com>2018-12-31 16:20:02 +0100
commitced0be5c06be5e240b4e7196b2563c918d0cb396 (patch)
tree07e98d7c70bb9081234980e15ac7c3dbdf030861 /pkgs/top-level
parent8252eb91510e690e6c410ef44b1f4e8c2095657d (diff)
parentc65e727236e9222c49cc0eb8b157c0352190657d (diff)
downloadnixlib-ced0be5c06be5e240b4e7196b2563c918d0cb396.tar
nixlib-ced0be5c06be5e240b4e7196b2563c918d0cb396.tar.gz
nixlib-ced0be5c06be5e240b4e7196b2563c918d0cb396.tar.bz2
nixlib-ced0be5c06be5e240b4e7196b2563c918d0cb396.tar.lz
nixlib-ced0be5c06be5e240b4e7196b2563c918d0cb396.tar.xz
nixlib-ced0be5c06be5e240b4e7196b2563c918d0cb396.tar.zst
nixlib-ced0be5c06be5e240b4e7196b2563c918d0cb396.zip
Merge pull request #53078 from tex/wings3d
wings3d: 1.5.4 -> 2.2.1
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix5
1 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 38f03cd8de98..34bf096fcd99 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9657,8 +9657,6 @@ in
 
   epoxy = callPackage ../development/libraries/epoxy {};
 
-  esdl = callPackage ../development/libraries/esdl { };
-
   libesmtp = callPackage ../development/libraries/libesmtp { };
 
   exiv2 = callPackage ../development/libraries/exiv2 { };
@@ -19993,8 +19991,7 @@ in
   winswitch = callPackage ../tools/X11/winswitch { };
 
   wings = callPackage ../applications/graphics/wings {
-    esdl = esdl.override { erlang = erlangR18; };
-    erlang = erlangR18;
+    erlang = erlangR21;
   };
 
   write_stylus = libsForQt5.callPackage ../applications/graphics/write_stylus { };