diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 66 |
1 files changed, 57 insertions, 9 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab44630120c5..0afc52aa5f4d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -171,7 +171,7 @@ in }; fetchbower = callPackage ../build-support/fetchbower { - inherit (nodePackages) fetch-bower; + inherit (nodePackages) bower2nix; }; fetchbzr = callPackage ../build-support/fetchbzr { }; @@ -1568,6 +1568,28 @@ in gawp = goPackages.gawp.bin // { outputs = [ "bin" ]; }; + gazeboSimulator = recurseIntoAttrs { + sdformat = gazeboSimulator.sdformat4; + + sdformat3 = callPackage ../development/libraries/sdformat/3.nix { }; + + sdformat4 = callPackage ../development/libraries/sdformat { }; + + gazebo6 = callPackage ../applications/science/robotics/gazebo/6.nix { }; + + gazebo6-headless = callPackage ../applications/science/robotics/gazebo/6.nix { withHeadless = true; }; + + gazebo7 = callPackage ../applications/science/robotics/gazebo { }; + + gazebo7-headless = callPackage ../applications/science/robotics/gazebo { withHeadless = true; }; + + }; + + # at present, Gazebo 7.0.0 does not match Gazebo 6.5.1 for compatibility + gazebo = gazeboSimulator.gazebo6; + + gazebo-headless = gazeboSimulator.gazebo6-headless; + gbdfed = callPackage ../tools/misc/gbdfed { gtk = gtk2; }; @@ -1902,6 +1924,20 @@ in ifuse = callPackage ../tools/filesystems/ifuse/default.nix { }; + ignition = recurseIntoAttrs { + + math = callPackage ../development/libraries/ignition-math { }; + + math2 = ignition.math; + + transport0 = callPackage ../development/libraries/ignition-transport/0.9.0.nix { }; + + transport1 = callPackage ../development/libraries/ignition-transport/1.0.1.nix { }; + + transport = ignition.transport0; + }; + + ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix { inherit (haskellPackages) ihaskell ghcWithPackages; @@ -6358,6 +6394,8 @@ in stdenv = overrideInStdenv stdenv [gnumake380]; }; + cl = callPackage ../development/libraries/cl { }; + clanlib = callPackage ../development/libraries/clanlib { }; classads = callPackage ../development/libraries/classads { }; @@ -8143,6 +8181,8 @@ in nvidia-texture-tools = callPackage ../development/libraries/nvidia-texture-tools { }; + ocl-icd = callPackage ../development/libraries/ocl-icd { }; + ode = callPackage ../development/libraries/ode { }; ogre = callPackage ../development/libraries/ogre {}; @@ -8170,6 +8210,8 @@ in opencascade_oce = callPackage ../development/libraries/opencascade/oce.nix { }; + opencl-headers = callPackage ../development/libraries/opencl-headers { }; + opencollada = callPackage ../development/libraries/opencollada { }; opencsg = callPackage ../development/libraries/opencsg { }; @@ -8750,6 +8792,8 @@ in tinyxml2 = callPackage ../development/libraries/tinyxml/2.6.2.nix { }; + tinyxml-2 = callPackage ../development/libraries/tinyxml-2 { }; + tk = tk-8_6; tk-8_6 = callPackage ../development/libraries/tk/8.6.nix { }; @@ -9116,6 +9160,10 @@ in yuicompressor = callPackage ../development/tools/yuicompressor { }; + ### DEVELOPMENT / BOWER MODULES (JAVASCRIPT) + + buildBowerComponents = callPackage ../development/bower-modules/generic { }; + ### DEVELOPMENT / GO MODULES go14Packages = callPackage ./go-packages.nix { @@ -9572,8 +9620,6 @@ in osrm-backend = callPackage ../servers/osrm-backend { }; - osrm-backend_luajit = callPackage ../servers/osrm-backend { luabind = luabind_luajit; }; - p910nd = callPackage ../servers/p910nd { }; petidomo = callPackage ../servers/mail/petidomo { }; @@ -11446,7 +11492,11 @@ in autopanosiftc = callPackage ../applications/graphics/autopanosiftc { }; - avidemux = callPackage ../applications/video/avidemux { }; + avidemux_unwrapped = callPackage ../applications/video/avidemux { }; + + avidemux = callPackage ../applications/video/avidemux/wrapper.nix { + avidemux = avidemux_unwrapped; + }; avogadro = callPackage ../applications/science/chemistry/avogadro { eigen = eigen2; @@ -13168,6 +13218,8 @@ in openbrf = callPackage ../applications/misc/openbrf { }; + opencpn = callPackage ../applications/misc/opencpn { }; + openimageio = callPackage ../applications/graphics/openimageio { }; openjump = callPackage ../applications/misc/openjump { }; @@ -14047,10 +14099,7 @@ in winswitch = callPackage ../tools/X11/winswitch { }; - wings = callPackage ../applications/graphics/wings { - erlang = erlangR14; - esdl = esdl.override { erlang = erlangR14; }; - }; + wings = callPackage ../applications/graphics/wings { }; wmname = callPackage ../applications/misc/wmname { }; @@ -16312,4 +16361,3 @@ in togglesg-download = callPackage ../tools/misc/togglesg-download { }; } - |